From a72fe8b0ad01c6586293340115655c080d005853 Mon Sep 17 00:00:00 2001
From: czw <selecti@yeah.net>
Date: 星期五, 20 六月 2025 20:08:26 +0800
Subject: [PATCH] 1
---
HH.WCS.QingXiNongfu/process/DeviceProcess.cs | 1
HH.WCS.QingXiNongfu/core/TaskCore.cs | 44 +++++++-
HH.WCS.QingXiNongfu/core/Monitor.cs | 225 ++++++++++++++++++++++++--------------------
3 files changed, 159 insertions(+), 111 deletions(-)
diff --git a/HH.WCS.QingXiNongfu/core/Monitor.cs b/HH.WCS.QingXiNongfu/core/Monitor.cs
index 2db77df..164310d 100644
--- a/HH.WCS.QingXiNongfu/core/Monitor.cs
+++ b/HH.WCS.QingXiNongfu/core/Monitor.cs
@@ -1009,9 +1009,7 @@
static bool InworkLock = false;
/// <summary>
/// 鍘熸潗鏂�妫�祴鍚勬祦杞綅缃� 鍐欏叆鎵樼洏璐т綅s_type 涓�涓嬩竴涓洰鐨勫湴銆傚氨寮�涓浆銆�- /// 2025.4.8
- /// 1.娓呮邯鍘熸潗鏂欐祴璇曚笌鎴愬搧鎷嗗垎
- /// 2.杩涘嚭鍙ｅ崟鎹笌CS寮傚父澶勭悊
+ /// 鍘熺墿鏂欑焊绠憋紝鍏ュ簱鍫嗗彔鍖鸿浆杩� /// </summary>
internal static void BottTask()
{
@@ -1019,6 +1017,9 @@
var usingSpace = new List<string> { "鍏ュ簱鎺ラ┏鍖�, "搴撳唴鎺ラ┏鍖�, "鍑哄簱鎺ラ┏鍖�, "鎻愬崌鏈洪�鏂欏彛" };
//usingSpace = new List<string> { "YWLRGDD", "YWLWJJB", "YWLYLTKQ", "YWLTKKTQ", "YWLKTDDQ", "YWLT1TSJ", "YWLT1TSJCD", "YWLT2TSJ", "YWLT2TSJCD" };
usingSpace = new List<string> { "YWLYLTKQ", "YWLTKKTQ", "YWLWJJB", "YWLRGDD", "YWLT1TSJ", "YWLT2TSJ" };
+ ///----------------------------閫�綑鏂欎腑闂村簱鍖猴紝閫�┖涓棿搴撳尯锛�+ /// /*鎵樼洏璐т綅琛ㄧ殑 S_TYPE銆� 搴撳尯1,搴撳尯,*/
+
foreach (var area in usingSpace)
{
try
@@ -1259,6 +1260,9 @@
public static string RK_BQCDQ = "SXBQDDKQ";
}
+ /// <summary>
+ /// 鎻愭墸 銆�+ /// </summary>
internal static void YwlTKPEBQ_Auto()
{
LogHelper.CoCo(DateTime.Now + "鏍囩-鎻愭墸-PE鑶�>>>>>>>>>>>> ", ConsoleColor.Cyan);
@@ -1736,7 +1740,7 @@
var db = new SqlHelper<object>().GetInstance();
var v = db.Queryable<Location>().
LeftJoin<LocCntrRel>((l, c) => l.S_LOC_CODE == c.S_LOC_CODE)
- .Where((l, c) => (l.S_AREA_CODE == WJ_BQ.RK_XBKQ || l.S_AREA_CODE == WJ_BQ.RK_BQJBQ) && c.S_TYPE == BQ_PRA.B)
+ .Where((l, c) => (l.S_AREA_CODE == WJ_BQ.RK_XBKQ /*|| l.S_AREA_CODE == WJ_BQ.RK_BQJBQ*/) && c.S_TYPE == BQ_PRA.B)
.ToList();
if (v.Any())
{
@@ -1759,45 +1763,46 @@
{
var s_type = ContainerHelper.GetCntrItemRel(CNTR.FirstOrDefault().S_CNTR_CODE).FirstOrDefault()?.N_BQ_TRAY_TYPE ?? 0;
Location Endbit = null;
- if (area == WJ_BQ.RK_BQJBQ)
+ if (area == area/* WJ_BQ.RK_BQJBQ*/)
{
var hjs = LocationHelper.GetAreaNormalLocList(WJ_BQ.RK_BBHJQ, true, false);
Endbit = hjs.FindAll(x => x.N_CURRENT_NUM == 0 && x.N_LAYER == (s_type == .5 ? 1 : (s_type == .75 ? 2 : 3))).OrderBy(x => x.N_ROW).ThenBy(x => x.N_COL).FirstOrDefault();
if (Endbit != null)
{
- var re = TaskProcess.CreateTransport("", lastfull.S_LOC_CODE.Trim(), Endbit.S_LOC_CODE, "鏍囩鍙夎繍-鎺ラ┏鏍囩閫�簱", CNTR.Select(x => x.S_CNTR_CODE).ToList(), 1, 1, 1, 62);
+ var re = TaskProcess.CreateTransport("", lastfull.S_LOC_CODE.Trim(), Endbit.S_LOC_CODE, "鏍囩鍙夎繍-绾胯竟鏍囩閫�簱", CNTR.Select(x => x.S_CNTR_CODE).ToList(), 1, 1, 1, 62);
LogHelper.CSucessLog($"from {lastfull.S_LOC_CODE} to {Endbit.S_LOC_CODE} 鏍囩鍙夎繍-鎺ラ┏鏍囩閫�簱 锛屽垱寤簕re}");
}
}
- else
- {
- var jbqs = LocationHelper.GetAreaNormalLocList(WJ_BQ.RK_BQJBQ);
- foreach (var rowloc in jbqs.GroupBy(x => x.N_ROW))
- {
- var y2 = rowloc.OrderBy(x => x.N_COL).ToList();
- var l2 = y2.FindAll(x => x.N_CURRENT_NUM > 0).LastOrDefault();
- if (l2 != null && l2.N_CURRENT_NUM > 0)
- {
- var c = LocationHelper.GetList<LocCntrRel>(x => x.S_LOC_CODE == l2.S_LOC_CODE);
- if (c.FirstOrDefault()?.S_TYPE != BQ_PRA.B)
- {
- continue;
- }
- var xcirs = ContainerHelper.GetCntrItemRel(c.FirstOrDefault().S_CNTR_CODE);
- if (!xcirs.Any()) continue;
- var xcir = xcirs.OrderByDescending(x => x.T_CREATE).FirstOrDefault();
- if (cir.S_ITEM_CODE != xcir.S_ITEM_CODE || cir.S_ITEM_NAME != xcir.S_ITEM_NAME)
- continue;
- }
- var e = y2.Find(x => x.N_COL > (l2?.N_COL ?? 0) && x.N_CURRENT_NUM == 0);
- if (e != null)
- {
- var re = TaskProcess.CreateTransport("", lastfull.S_LOC_CODE.Trim(), e.S_LOC_CODE, "鏍囩鍙夎繍-绾胯竟鏍囩閫�簱", new List<string> { CNTR.FirstOrDefault().S_CNTR_CODE }, 1, 1, 1, 62, BQ_PRA.B);
- LogHelper.Info($"from {lastfull.S_LOC_CODE} to {e.S_LOC_CODE} 鏍囩鍙夎繍-绾胯竟鏍囩閫�簱 锛屽垱寤簕re} ");
- break;
- }
- }
- }
+
+ //else
+ //{
+ // var jbqs = LocationHelper.GetAreaNormalLocList(WJ_BQ.RK_BQJBQ);
+ // foreach (var rowloc in jbqs.GroupBy(x => x.N_ROW))
+ // {
+ // var y2 = rowloc.OrderBy(x => x.N_COL).ToList();
+ // var l2 = y2.FindAll(x => x.N_CURRENT_NUM > 0).LastOrDefault();
+ // if (l2 != null && l2.N_CURRENT_NUM > 0)
+ // {
+ // var c = LocationHelper.GetList<LocCntrRel>(x => x.S_LOC_CODE == l2.S_LOC_CODE);
+ // if (c.FirstOrDefault()?.S_TYPE != BQ_PRA.B)
+ // {
+ // continue;
+ // }
+ // var xcirs = ContainerHelper.GetCntrItemRel(c.FirstOrDefault().S_CNTR_CODE);
+ // if (!xcirs.Any()) continue;
+ // var xcir = xcirs.OrderByDescending(x => x.T_CREATE).FirstOrDefault();
+ // if (cir.S_ITEM_CODE != xcir.S_ITEM_CODE || cir.S_ITEM_NAME != xcir.S_ITEM_NAME)
+ // continue;
+ // }
+ // var e = y2.Find(x => x.N_COL > (l2?.N_COL ?? 0) && x.N_CURRENT_NUM == 0);
+ // if (e != null)
+ // {
+ // var re = TaskProcess.CreateTransport("", lastfull.S_LOC_CODE.Trim(), e.S_LOC_CODE, "鏍囩鍙夎繍-绾胯竟鏍囩閫�簱", new List<string> { CNTR.FirstOrDefault().S_CNTR_CODE }, 1, 1, 1, 62, BQ_PRA.B);
+ // LogHelper.Info($"from {lastfull.S_LOC_CODE} to {e.S_LOC_CODE} 鏍囩鍙夎繍-绾胯竟鏍囩閫�簱 锛屽垱寤簕re} ");
+ // break;
+ // }
+ // }
+ //}
}
}
}
@@ -2476,73 +2481,74 @@
LogHelper.Info($" 鏃犺弻鍑哄簱 寮�");
//1.妫�煡鏄惁鏈夐�搴� var db = new SqlHelper<object>().GetInstance();
- ///绗笁娈碉細鎺ラ┏鍖�杞�绾胯竟
- var JQBS = LocationHelper.GetAreaNormalLocList(WJ_BQ.RK_BQJBQ);
- foreach (var jbr in JQBS.GroupBy(x => x.N_ROW))
+
+ if (false)
{
- LogHelper.Info($" 鏃犺弻鍑哄簱 鎺ラ┏鏈夋暟鎹�);
- var y2 = jbr.OrderBy(x => x.N_COL).ToList();
- var l2 = y2.FindAll(x => x.N_CURRENT_NUM > 0).LastOrDefault();
- if (l2 != null)
+ ///绗笁娈碉細鎺ラ┏鍖�杞�绾胯竟
+ var JQBS = LocationHelper.GetAreaNormalLocList(WJ_BQ.RK_BQJBQ);
+ foreach (var jbr in JQBS.GroupBy(x => x.N_ROW))
{
- var c = LocationHelper.GetList<LocCntrRel>(x => x.S_LOC_CODE == l2.S_LOC_CODE);
- if (!c.Any() || c.FirstOrDefault()?.S_TYPE == BQ_PRA.B)
+ LogHelper.Info($" 鏃犺弻鍑哄簱 鎺ラ┏鏈夋暟鎹�);
+ var y2 = jbr.OrderBy(x => x.N_COL).ToList();
+ var l2 = y2.FindAll(x => x.N_CURRENT_NUM > 0).LastOrDefault();
+ if (l2 != null)
{
- //鍥炲簱銆�- LogHelper.Info($"寰幆鏈夋棤閫�簱==> 鏈�閫�簱" + l2.S_LOC_CODE);
- continue;
- }
- var cirs = ContainerHelper.GetCntrItemRel(c.FirstOrDefault().S_CNTR_CODE);
- if (!cirs.Any())
- {
- LogHelper.Info($"寰幆鏈夋棤閫�簱==> 娌℃湁鐗╂枡淇℃伅 鎵樼洏:" + c.FirstOrDefault().S_CNTR_CODE);
- continue;
- }
- var cir = cirs.OrderByDescending(x => x.T_CREATE).FirstOrDefault();
-
- var xbqs = LocationHelper.GetAreaNormalLocList(WJ_BQ.RK_XBKQ);
- foreach (var x1 in xbqs.GroupBy(x => x.N_ROW))
- {
- LogHelper.Info($" 鏃犺弻鍑哄簱 绾胯竟鏈夋暟鎹�);
- var x2 = x1.OrderBy(x => x.N_COL).ToList();
- var l3 = x2.FindAll(x => x.N_CURRENT_NUM > 0).LastOrDefault();
- if (l3 != null)
+ var c = LocationHelper.GetList<LocCntrRel>(x => x.S_LOC_CODE == l2.S_LOC_CODE);
+ if (!c.Any() || c.FirstOrDefault()?.S_TYPE == BQ_PRA.B)
{
- var xc = LocationHelper.GetList<LocCntrRel>(x => x.S_LOC_CODE == l3.S_LOC_CODE);
- if (!xc.Any() || xc.FirstOrDefault()?.S_TYPE == BQ_PRA.B)
- {
- LogHelper.Info($"寰幆绾胯竟==> 鏈�閫�簱" + xc.FirstOrDefault()?.S_TYPE);
- continue;
- }
- var xcirs = ContainerHelper.GetCntrItemRel(xc.FirstOrDefault().S_CNTR_CODE);
- if (!xcirs.Any())
- {
- LogHelper.Info($"寰幆绾胯竟==> 娌℃湁鐗╂枡淇℃伅 鎵樼洏:" + xc.FirstOrDefault().S_CNTR_CODE);
- continue;
- }
-
- var xcir = xcirs.OrderByDescending(x => x.T_CREATE).FirstOrDefault();
- if (xcir.S_ITEM_CODE != cir.S_ITEM_CODE || xcir.S_ITEM_NAME != cir.S_ITEM_CODE)
- {
- LogHelper.Info($"寰幆绾胯竟==> 鐗╂枡涓嶅尮閰�鎵樼洏:" + xc.FirstOrDefault().S_CNTR_CODE);
- continue;
- }
+ //鍥炲簱銆�+ LogHelper.Info($"寰幆鏈夋棤閫�簱==> 鏈�閫�簱" + l2.S_LOC_CODE);
+ continue;
}
- var e = x2.FindAll(x => x.N_COL > (l3?.N_COL ?? 0) && x.N_CURRENT_NUM == 0).FirstOrDefault();
- LogHelper.Info($"鏃犺弻 鐢熸垚浠诲姟==> 鏄惁鏈夊悎閫傜殑璐т綅淇℃伅" + e?.S_LOC_CODE);
- if (e != null)
+ var cirs = ContainerHelper.GetCntrItemRel(c.FirstOrDefault().S_CNTR_CODE);
+ if (!cirs.Any())
{
- var re = TaskProcess.CreateTransport("", l2.S_LOC_CODE.Trim(), e.S_LOC_CODE, "鏍囩鍙夎繍-鎺ラ┏杞嚎杈�, new List<string> { c.FirstOrDefault().S_CNTR_CODE }, 1, 1, 1, 62, BQ_PRA.Out);
- LogHelper.Info($"from {l2.S_LOC_CODE} to {e.S_LOC_CODE} 鏍囩鍙夎繍-鎺ラ┏杞嚎杈�锛屽垱寤簕re} ");
- break;
+ LogHelper.Info($"寰幆鏈夋棤閫�簱==> 娌℃湁鐗╂枡淇℃伅 鎵樼洏:" + c.FirstOrDefault().S_CNTR_CODE);
+ continue;
+ }
+ var cir = cirs.OrderByDescending(x => x.T_CREATE).FirstOrDefault();
+
+ var xbqs = LocationHelper.GetAreaNormalLocList(WJ_BQ.RK_XBKQ);
+ foreach (var x1 in xbqs.GroupBy(x => x.N_ROW))
+ {
+ LogHelper.Info($" 鏃犺弻鍑哄簱 绾胯竟鏈夋暟鎹�);
+ var x2 = x1.OrderBy(x => x.N_COL).ToList();
+ var l3 = x2.FindAll(x => x.N_CURRENT_NUM > 0).LastOrDefault();
+ if (l3 != null)
+ {
+ var xc = LocationHelper.GetList<LocCntrRel>(x => x.S_LOC_CODE == l3.S_LOC_CODE);
+ if (!xc.Any() || xc.FirstOrDefault()?.S_TYPE == BQ_PRA.B)
+ {
+ LogHelper.Info($"寰幆绾胯竟==> 鏈�閫�簱" + xc.FirstOrDefault()?.S_TYPE);
+ continue;
+ }
+ var xcirs = ContainerHelper.GetCntrItemRel(xc.FirstOrDefault().S_CNTR_CODE);
+ if (!xcirs.Any())
+ {
+ LogHelper.Info($"寰幆绾胯竟==> 娌℃湁鐗╂枡淇℃伅 鎵樼洏:" + xc.FirstOrDefault().S_CNTR_CODE);
+ continue;
+ }
+
+ var xcir = xcirs.OrderByDescending(x => x.T_CREATE).FirstOrDefault();
+ if (xcir.S_ITEM_CODE != cir.S_ITEM_CODE || xcir.S_ITEM_NAME != cir.S_ITEM_CODE)
+ {
+ LogHelper.Info($"寰幆绾胯竟==> 鐗╂枡涓嶅尮閰�鎵樼洏:" + xc.FirstOrDefault().S_CNTR_CODE);
+ continue;
+ }
+ }
+ var e = x2.FindAll(x => x.N_COL > (l3?.N_COL ?? 0) && x.N_CURRENT_NUM == 0).FirstOrDefault();
+ LogHelper.Info($"鏃犺弻 鐢熸垚浠诲姟==> 鏄惁鏈夊悎閫傜殑璐т綅淇℃伅" + e?.S_LOC_CODE);
+ if (e != null)
+ {
+ var re = TaskProcess.CreateTransport("", l2.S_LOC_CODE.Trim(), e.S_LOC_CODE, "鏍囩鍙夎繍-鎺ラ┏杞嚎杈�, new List<string> { c.FirstOrDefault().S_CNTR_CODE }, 1, 1, 1, 62, BQ_PRA.Out);
+ LogHelper.Info($"from {l2.S_LOC_CODE} to {e.S_LOC_CODE} 鏍囩鍙夎繍-鎺ラ┏杞嚎杈�锛屽垱寤簕re} ");
+ break;
+ }
}
}
}
- }
- LogHelper.Info($" 鏃犺弻鍑哄簱 鍒扮嚎杈�缁撴潫");
- ///鎷嗗灈鍖哄彇娑堛�
- if (false)
- {
+ LogHelper.Info($" 鏃犺弻鍑哄簱 鍒扮嚎杈�缁撴潫");
+ ///鎷嗗灈鍖哄彇娑堛�
///绗簩娈碉細鎷嗗灈鍖恒�鎷嗗幓鎺ラ┏銆�鎴栬�鍥炲簱銆� var v = LocationHelper.GetAreaNormalLocList(WJ_BQ.RK_BQCDQ);
///鎷嗗灈鐨勫嚭搴撱� 鍗曞眰鐨勫洖搴� 鍗曞眰涓嶅叆鎷嗗灈鍖�@@ -2597,6 +2603,7 @@
}
}
}
+
///绗竴娈碉細鍑哄簱 -鍒版媶鍨涙垨鑰�鎺ラ┏銆� var yuworders = LocationHelper.GetList<YWLWorkOrder>(x => x.SQL_PLineNo == "鏃犺弻鏍囩鍑哄簱" && x.WorkType == 6 && x.SQL_State == "鎵ц涓�).FindAll(x => x.OutNum > 0 && DateTime.Now.Subtract(x.SQL_Modify_TIme ?? DateTime.Now).TotalSeconds > 10).OrderBy(x => !string.IsNullOrEmpty(x.TagOver) ? 1 : 2).ThenBy(x => x.TagOverTime).ToList();
@@ -2660,7 +2667,7 @@
if (tagLoc.N_LAYER == 1 || tagLoc.N_CURRENT_NUM == 1)
{
// 鐩存帴鍑烘帴椹充綅
- var jbqs = LocationHelper.GetAreaNormalLocList(WJ_BQ.RK_BQJBQ);
+ var jbqs = LocationHelper.GetAreaNormalLocList(WJ_BQ.RK_XBKQ);
foreach (var rowloc in jbqs.GroupBy(x => x.N_ROW))
{
var y2 = rowloc.OrderBy(x => x.N_COL).ToList();
@@ -2672,16 +2679,16 @@
{
continue;
}
- var cirs = ContainerHelper.GetCntrItemRel(c.FirstOrDefault().S_CNTR_CODE);
- if (!cirs.Any()) continue;
- var cir = cirs.OrderByDescending(x => x.T_CREATE).FirstOrDefault();
- if (cir.S_ITEM_CODE != tagLoc.S_ITEM_CODE || cir.S_ITEM_NAME != tagLoc.S_ITEM_NAME)
- continue;
+ //var cirs = ContainerHelper.GetCntrItemRel(c.FirstOrDefault().S_CNTR_CODE);
+ //if (!cirs.Any()) continue;
+ //var cir = cirs.OrderByDescending(x => x.T_CREATE).FirstOrDefault();
+ //if (cir.S_ITEM_CODE != tagLoc.S_ITEM_CODE || cir.S_ITEM_NAME != tagLoc.S_ITEM_NAME)
+ // continue;
}
var e = y2.FindAll(x => x.N_COL > (l2?.N_COL ?? 0) && x.N_CURRENT_NUM == 0).FirstOrDefault();
if (e != null)
{
- var re = TaskProcess.CreateTransport("", tagLoc.S_LOC_CODE.Trim(), e.S_LOC_CODE, "鏍囩鍙夎繍-璐ф灦鍑烘帴椹�, new List<string> { tagLoc.S_CNTR_CODE }, 1, 1, 1, 62);
+ var re = TaskProcess.CreateTransport("", tagLoc.S_LOC_CODE.Trim(), e.S_LOC_CODE, "鏍囩鍙夎繍-璐ф灦鍑虹嚎杈�, new List<string> { tagLoc.S_CNTR_CODE }, 1, 1, 1, 62);
LogHelper.Info($"from {tagLoc.S_LOC_CODE} to {e.S_LOC_CODE} 鏍囩鍙夎繍-璐ф灦鍑烘帴椹�锛屽垱寤簕re} ");
if (re)
oto.Add(item);
@@ -3014,7 +3021,7 @@
if (endBit != null)
{
LogHelper.Info($"{spn} - 鍘讳腑杞尯锛屾壘鍒颁綅缃畕endBit.S_LOC_CODE}");
- bool bb = TaskProcess.CreateTransport(order.SQL_WorkNo, strBit.S_LOC_CODE, endBit.S_LOC_CODE, spn + "涓浆鍘�, new List<string> { crl.S_CNTR_CODE }, strBit.N_CURRENT_NUM, endBit.N_CURRENT_NUM+1, 1, 50, crl.S_TYPE);
+ bool bb = TaskProcess.CreateTransport(order.SQL_WorkNo, strBit.S_LOC_CODE, endBit.S_LOC_CODE, spn + "涓浆鍘�, new List<string> { crl.S_CNTR_CODE }, strBit.N_CURRENT_NUM, endBit.N_CURRENT_NUM + 1, 1, 50, crl.S_TYPE);
LogHelper.Info($"{spn}鏈紑锛岀炕鏂楁満寮��绾跨▼锛屽垱寤哄幓{areaList}涓浆鍖虹殑浠诲姟{(bb ? "鎴愬姛" : "澶辫触")}");
if (bb && needBread)
{
@@ -3309,6 +3316,7 @@
LogHelper.Info($"澶囪揣鍗曪細{outOer.S_Work_NO} 鏈�悗绉诲簱搴撳尯{ea} - 鎺抺er} 鎬庝箞浠栧鏄┖鐨勶紒锛侊紒璇′簡涓紓鐨�);
}
}
+
eaaa:
if (string.IsNullOrEmpty(end_area))
{
@@ -3389,7 +3397,6 @@
//}
}
}
-
if (string.IsNullOrEmpty(start_area)
|| string.IsNullOrEmpty(start_row)
@@ -3667,7 +3674,10 @@
break;
}
if (StartBit == null)
+ {
+ LogHelper.Info($"{od.SQL_PLineNo} 鍑哄簱 {Lart.area}鍖哄煙娌℃湁鐗╂枡鍙敤璧风偣");
continue;
+ }
Location Endbit = null;
var loc = LocationHelper.GetLoc(PLC.location[0]);
@@ -3731,6 +3741,11 @@
db.Updateable(od).UpdateColumns(it => new { it.TagOverTime }).ExecuteCommand();
//break;
}
+ }
+ else
+ {
+ LogHelper.Info($"{od.SQL_PLineNo} 鍑哄簱璧风偣{StartBit.S_LOC_CODE}-{StartBit.N_CURRENT_NUM},娌℃湁鍙敤缁堢偣");
+ continue;
}
}
}
@@ -3841,6 +3856,7 @@
list.AddRange(item.MidArea.Split('$'));
}
}
+
foreach (var item in list.Distinct())
{
var locs = LocationHelper.GetList<Location>(x => x.S_AREA_CODE == item && x.N_CURRENT_NUM > 0 && x.S_LOCK_STATE == "鏃�);
@@ -3930,7 +3946,8 @@
else InworkLock = true;
}
else InworkLock = false;
- var zzlocs = LocationHelper.GetAreaNormalLocList(od.S_ZZ_AREA);
+ string nextarea = !string.IsNullOrEmpty(od.S_ZZ_AREA) ? od.S_ZZ_AREA : od.S_END_AREA;
+ var zzlocs = LocationHelper.GetAreaNormalLocList(nextarea);
Location Endbit = null;
foreach (var zzrs in zzlocs.GroupBy(x => x.N_ROW).OrderBy(x => x.Key))
{
@@ -3959,7 +3976,7 @@
if (Endbit != null)
{
//鐢熸垚鎺ラ┏鍖轰换鍔★紝鏍囪涓虹粓鐐瑰簱鍖恒�
- var b = TaskProcess.CreateTransport(od.S_ID, lastful.S_LOC_CODE, Endbit.S_LOC_CODE, "鍘熺墿鏂欐惉杩�绾哥", crs.Select(x => x.S_CNTR_CODE).ToList(), 1, 1, crs.Count, 50, od.S_END_AREA);
+ var b = TaskProcess.CreateTransport(od.S_ID, lastful.S_LOC_CODE, Endbit.S_LOC_CODE, "鍘熺墿鏂欐惉杩�绾哥", crs.Select(x => x.S_CNTR_CODE).ToList(), 1, 1, crs.Count, 50, nextarea == od.S_END_AREA ? "" : od.S_END_AREA);
if (od.S_ZZ_AREA == "YWLWJJB") InworkLock = false;
break;
}
diff --git a/HH.WCS.QingXiNongfu/core/TaskCore.cs b/HH.WCS.QingXiNongfu/core/TaskCore.cs
index 7f03a0e..29be3a2 100644
--- a/HH.WCS.QingXiNongfu/core/TaskCore.cs
+++ b/HH.WCS.QingXiNongfu/core/TaskCore.cs
@@ -3,6 +3,7 @@
using HH.WCS.QingXigongchang.process;
using HH.WCS.QingXigongchang.util;
using HH.WCS.QingXigongchang.wms;
+using Newtonsoft.Json;
using System;
using System.Collections.Generic;
using System.Linq;
@@ -386,12 +387,14 @@
var totalRows = 0;
var list = new List<KuRong>();
var areas = db.Queryable<Location>().Select(x => x.S_AREA_CODE).ToList().FindAll(x => x != null && System.Text.RegularExpressions.Regex.IsMatch(x, @"QX-\d+_[A-Z]+")).Select(x => x.Split('_')[0]).Distinct().ToList(); //GetAreas();
+ LogHelper.Info($"KurRongCalc List {JsonConvert.SerializeObject(areas)}");
areas.ForEach(area =>
{
totalX += db.Queryable<Location>().Count(b => b.S_AREA_CODE.StartsWith(area) && b.S_AREA_CODE.Contains("_X"));
totalRows += db.Queryable<Location>().Where(b => b.S_AREA_CODE.StartsWith(area) && b.S_AREA_CODE.Contains("_X")).Select(b => b.N_ROW).Distinct().Count();
var aresList = db.Queryable<Location>().Where(b => b.S_AREA_CODE.StartsWith(area) && b.S_AREA_CODE.Contains("_")).Select(b => b.S_AREA_CODE).Distinct().ToList();
aresList = aresList.Select(a => a.Split('_')[0]).Distinct().ToList();
+ LogHelper.Info($"KurRongCalc aresList {JsonConvert.SerializeObject(aresList)}");
aresList.ForEach(a =>
{
//b => b.S_AREA_CODE == a + "_X"
@@ -406,26 +409,53 @@
var kr = new KuRong() { StorageLoc = a.Split('-')[1] + "-" + b, T_MODIFY = DateTime.Now };
Console.WriteLine(kr.StorageLoc);
//姣忎竴鎺掕鏌ヤ竴涓嬫湁娌℃湁鎵樼洏
- var listLoc = db.Queryable<Location>().Where(c => c.S_AREA_CODE.Contains(c.S_AREA_CODE) && c.N_ROW == b && c.N_CURRENT_NUM > 0).ToList();
- if (!listLoc.Any())
+ var listLoc = db.Queryable<Location>().Where(c => c.S_AREA_CODE.Contains(a) && c.N_ROW == b).ToList();//&& c.N_CURRENT_NUM > 0
+
+ //濡傛灉鏈夋甯哥墿鏂欐帓锛屽氨鐢紝 娌℃湁鎴栬� 绌烘帓 锛屽氨鐢ㄥ皬鏉�+ var norAreacode = "";
+ foreach (var arl in listLoc.GroupBy(x => x.S_AREA_CODE))
{
+ if (arl.ToList().Find(x => x.S_LOCK_STATE.Contains("绌洪棿閿�)) == null)
+ {
+ if (arl.ToList().Find(x => x.N_CURRENT_NUM > 0) != null)
+ {
+ norAreacode = arl.Key;
+ break;
+ }
+ }
+ }
+ LogHelper.Info($"KurRongCalc [{a}]-{b} 缁熻鏄惁姝ｅ父{norAreacode}");
+ if (string.IsNullOrEmpty(norAreacode))
+ {
+ norAreacode = a + "_X";
//娌℃墭鐩橈紝榛樿鏈�ぇ瀹归噺鏄皬鏉跨殑鏁伴噺
- var count = db.Queryable<Location>().Count(c => c.S_AREA_CODE == a + "_X" && c.N_ROW == b) * 2 * 2;//2灞�鎵�+ var count = db.Queryable<Location>().Count(c => c.S_AREA_CODE == norAreacode && c.N_ROW == b) * 2 * 2;//2灞�鎵� kr.MaxCapacity = count;
kr.AvailableCapacity = count;
kr.ProductItem = "";
}
else
{
+ var locode = listLoc.Find(x => x.S_AREA_CODE == norAreacode && x.N_CURRENT_NUM > 0);
//鏈夋墭鐩�鍒ゆ柇鏄彔2灞傝繕鏄�灞傦紝瑕佽幏鍙栫墿鏂欎俊鎭�- var lcr = db.Queryable<LocCntrRel>().Includes(it => it.CntrItemRel).Where(l => l.S_LOC_CODE == listLoc[0].S_LOC_CODE).First();
+ var lcr = db.Queryable<LocCntrRel>().Includes(it => it.CntrItemRel).Where(l => l.S_LOC_CODE == locode.S_LOC_CODE).First();
+ LogHelper.Info($"KurRongCalc {norAreacode}-{locode.S_LOC_CODE}-鑾峰彇鍒版墭鐩樼墿鏂欎俊鎭紵锛歿lcr != null}");
if (lcr != null && lcr.CntrItemRel != null)
{
- var maxLayer = ContainerHelper.GetItem(ass => ass.S_ITEM_NAME == lcr.CntrItemRel.S_ITEM_NAME && ass.S_ITEM_CODE == lcr.CntrItemRel.S_ITEM_CODE)?.MaxLayer ?? listLoc[0].N_CAPACITY;
- var total = db.Queryable<Location>().Count(c => c.S_AREA_CODE == listLoc[0].S_AREA_CODE && c.N_ROW == b) * maxLayer * 2;
- var count = db.Queryable<Location>().Where(c => c.S_AREA_CODE == listLoc[0].S_AREA_CODE && c.N_ROW == b && c.N_CURRENT_NUM > 0).Sum(c => c.N_CURRENT_NUM) * 2; // 鎸囧畾缁熻瀛楁
+ var maxLayer = ContainerHelper.GetItem(ass => ass.S_ITEM_NAME == lcr.CntrItemRel.S_ITEM_NAME && ass.S_ITEM_CODE == lcr.CntrItemRel.S_ITEM_CODE)?.MaxLayer ?? 0;
+
+ //LogHelper.Info($"KurRongCalc {norAreacode}-{lcr.CntrItemRel.S_ITEM_NAME}-{lcr.CntrItemRel.S_ITEM_CODE}-maxlayer:{maxLayer}-{locode.S_LOC_CODE}-{locode.N_CAPACITY}");
+ if (maxLayer <= 0)
+ {
+ maxLayer = locode.N_CAPACITY;
+ }
+ var total = db.Queryable<Location>().Count(c => c.S_AREA_CODE == norAreacode && c.N_ROW == b) * maxLayer * 2;
+ //LogHelper.Info($"KurRongCalc {norAreacode}-{locode.S_LOC_CODE}");
+ var count = db.Queryable<Location>().Where(c => c.S_AREA_CODE == norAreacode && c.N_ROW == b && c.N_CURRENT_NUM > 0).Sum(c => c.N_CURRENT_NUM) * 2; // 鎸囧畾缁熻瀛楁
kr.ProductItem = lcr.CntrItemRel.S_ITEM_CODE;
+ if(!string.IsNullOrEmpty(lcr.CntrItemRel.S_ITEM_NAME))
+ kr.ProductItem = lcr.CntrItemRel.S_ITEM_NAME;
kr.MaxCapacity = total;
kr.FilledCapacity = count;
kr.AvailableCapacity = total - count;
diff --git a/HH.WCS.QingXiNongfu/process/DeviceProcess.cs b/HH.WCS.QingXiNongfu/process/DeviceProcess.cs
index 65482f3..af4df1d 100644
--- a/HH.WCS.QingXiNongfu/process/DeviceProcess.cs
+++ b/HH.WCS.QingXiNongfu/process/DeviceProcess.cs
@@ -286,6 +286,7 @@
if (!string.IsNullOrEmpty(od.S_ROW))
list.Add(od.S_ROW);
ma = string.Join(",", list);
+
List<LocCntrRel> lcrl = new List<LocCntrRel>
{
new LocCntrRel
--
Gitblit v1.9.1