From 9ad3666d15deccc40a2aa4d1b96950c78eaf165f Mon Sep 17 00:00:00 2001
From: 海波 张 <2956280567@qq.com>
Date: 星期四, 22 五月 2025 17:28:56 +0800
Subject: [PATCH] 金坛修改
---
process/TaskProcess.cs | 20 ++++++++++++++------
1 files changed, 14 insertions(+), 6 deletions(-)
diff --git a/process/TaskProcess.cs b/process/TaskProcess.cs
index b89a122..f7b6b43 100644
--- a/process/TaskProcess.cs
+++ b/process/TaskProcess.cs
@@ -263,7 +263,7 @@
var endLoc = LocationHelper.GetLocOne(wcsTask.S_END_LOC);
var endList = LocationHelper.GetAllLocList1(workFlow.ENDAREA);
- var end = LocationHelper.FindEndcolByLocList(endList, workFlow.ENDAREA, workFlow.ROADWAY);
+ var end = LocationHelper.FindBalanceEndcolByLocList(endList, workFlow.ENDAREA, workFlow.ROADWAY);
LogHelper.Info($"褰撳墠宸烽亾涓嶅彲鐢紝闇�鏀归亾锛屾柊缁堢偣淇℃伅" + JsonConvert.SerializeObject(end), "鏀归亾瀹夊叏浜や簰");
if (end == null)
{
@@ -1335,15 +1335,22 @@
}
//鏌ユ壘缁堢偣
- var endList = LocationHelper.GetAllLocList1(workFlow.ENDAREA);
+ List<Location> endList ;
Location end = null;
+ if (!string.IsNullOrEmpty(workFlow.ZONECODE))
+ {
+ endList = LocationHelper.GetZoneLoc(workFlow.ZONECODE);
+ }
+ else {
+ endList = LocationHelper.GetAllLocList1(workFlow.ENDAREA);
+ }
if (workFlow.FLOWCODE == "1")
{
//婊℃墭鍏�- end = LocationHelper.FindEndcolByLocList(endList, workFlow.ENDAREA, workFlow.ROADWAY);
+ end = LocationHelper.FindBalanceEndcolByLocList(endList, workFlow.ENDAREA, workFlow.ROADWAY);
}
else if (workFlow.FLOWCODE == "3")
{
@@ -1356,7 +1363,7 @@
//if (end == null)
//{
LogHelper.Info($"ZCSendTask鍏ュ簱浠诲姟娌℃壘鍒扮┖鎵樼紦瀛樺尯缁堢偣,瀵绘壘绔嬪簱鍖虹┖璐т綅", "Mes浠诲姟涓嬪彂");
- end = LocationHelper.FindEndcolByLocList(endList, workFlow.ENDAREA, workFlow.ROADWAY);
+ end = LocationHelper.FindBalanceEndcolByLocList(endList, workFlow.ENDAREA, workFlow.ROADWAY);
//}
//else
//{
@@ -1374,7 +1381,7 @@
}
else
{
- end = LocationHelper.FindEndcolByLocList(endList, workFlow.ENDAREA, workFlow.ROADWAY);
+ end = LocationHelper.FindBalanceEndcolByLocList(endList, workFlow.ENDAREA, workFlow.ROADWAY);
}
}
else if (workFlow.FLOWCODE == "12")
@@ -1551,7 +1558,7 @@
start = LocationHelper.FindStartcolByLoclistAndItem(strrtList, model.PROD_NO, workFlow.STARTAREA, workFlow.ROADWAY);
if (start==null)
{
-
+ strrtList = LocationHelper.GetAllLocList2(workFlow.STARTAREA);
var itemFlag = LocationHelper.FindStartcolByLoclistAndItemFlag(strrtList, model.PROD_NO, workFlow.STARTAREA);
LogHelper.Info($"ZCSendTask婊℃墭鍑哄簱浠诲姟娌℃壘鍒拌捣鐐癸紝鏍￠獙鏄惁鏈夊簱瀛樹絾鏄澶囨姤璀itemFlag}", "Mes浠诲姟涓嬪彂");
if (itemFlag)
@@ -1571,6 +1578,7 @@
start = LocationHelper.FindStartcolByLoclistAndcntr(strrtList, workFlow.STARTAREA);
if (start == null)
{
+ strrtList = LocationHelper.GetAllLocList2(workFlow.STARTAREA);
var itemFlag = LocationHelper.FindStartcolByLoclistAndcntrFlag(strrtList, workFlow.STARTAREA);
LogHelper.Info($"ZCSendTask绌烘墭鍑哄簱浠诲姟娌℃壘鍒拌捣鐐癸紝鏍￠獙鏄惁鏈夊簱瀛樹絾鏄澶囨姤璀itemFlag}", "Mes浠诲姟涓嬪彂");
--
Gitblit v1.9.1