From 121a380d651097586384ee0ac70943ce1fc13583 Mon Sep 17 00:00:00 2001
From: 海波 张 <2956280567@qq.com>
Date: 星期三, 09 七月 2025 17:32:58 +0800
Subject: [PATCH] 金坛入库修改
---
process/TaskProcess.cs | 255 +++++++++++++++++++++++++++++++++-----------------
1 files changed, 169 insertions(+), 86 deletions(-)
diff --git a/process/TaskProcess.cs b/process/TaskProcess.cs
index 5f2c653..8fff495 100644
--- a/process/TaskProcess.cs
+++ b/process/TaskProcess.cs
@@ -174,6 +174,7 @@
NDCApi.ChangeOrderParam(mst.S_CODE, 1, startSite);
NDCApi.ChangeOrderParam(mst.S_CODE, 2, endSite);
NDCApi.ChangeOrderParam(mst.S_CODE, 4, "0");
+ Thread.Sleep(1000);
NDCApi.ChangeOrderParam(mst.S_CODE, 6, "2");
}
}
@@ -203,13 +204,16 @@
/// <param name="state"></param>
internal static void OperateStatus(WMSTask mst, int state)
{
- if (state == 4)
+ if (state == 4)//鍙栬揣瀹屾垚
{
CacheBitUpdate(mst, true);
}
if (state == 6)//鍗歌揣瀹屾垚
{
- CacheBitUpdate(mst, false);
+ //閫�簱浠诲姟涓嶇粦瀹�+ if (!LocationHelper.GetErroArea(mst.S_END_AREA)) {
+ CacheBitUpdate(mst, false);
+ }
}
if (state == 7)
{
@@ -261,7 +265,9 @@
//鏀逛竴娈典换鍔＄粓鐐� task.S_END_LOC = end.S_CODE;
task.S_END_AREA = end.S_AREA_CODE;
- db.Updateable(task).UpdateColumns(it => new { it.S_END_LOC, it.S_END_AREA }).ExecuteCommand();
+ task.S_END_AREA_NAME = end.S_AREA_Name;
+
+ db.Updateable(task).UpdateColumns(it => new { it.S_END_LOC, it.S_END_AREA ,it.S_END_AREA_NAME}).ExecuteCommand();
kt.Status = "Y";
db.Updateable(kt).UpdateColumns(it => new { it.Status }).ExecuteCommand();
db.CommitTran();
@@ -269,6 +275,7 @@
LogHelper.Info($"浠诲姟{task.S_CODE}鏀归亾鎴愬姛锛屾敼鍙傛暟2涓簕site},鍙傛暟6涓�锛�涓�", "鏀归亾瀹夊叏浜や簰");
NDCApi.ChangeOrderParam(task.S_CODE, 2, site);
NDCApi.ChangeOrderParam(task.S_CODE, 4, "0");
+ Thread.Sleep(1000);
NDCApi.ChangeOrderParam(task.S_CODE, 6, "2");
return;
}
@@ -346,10 +353,9 @@
{
endList = LocationHelper.GetAllLocList1(workFlow.ENDAREA);
}
-
+
balanceLocList = LocationHelper.FindBalanceEndLocList(endList, workFlow.ENDAREA, workFlow.ROADWAY);
-
balanceConnectionList = LocationHelper.GetConnectionListByst(usableConnectionList.available);
@@ -360,7 +366,7 @@
//LogHelper.Info($"鏀归亾瀹夊叏浜や簰item淇℃伅" + JsonConvert.SerializeObject(item), "鏀归亾瀹夊叏浜や簰");
foreach (var item1 in balanceConnectionList)
{
- if (item1.CONNEC_ROADWAY == item.N_ROADWAY && item1.N_CURRENT_NUM < 2)
+ if (item1.CONNEC_ROADWAY == item.N_ROADWAY)
{
connection = item1;
@@ -376,6 +382,7 @@
}
}
}
+
if (connection == null)
{
@@ -397,11 +404,6 @@
db.Updateable(wcsTask).UpdateColumns(it => new { it.S_END_LOC }).ExecuteCommand();
db.CommitTran();
-
-
-
-
-
LocationHelper.LockLoc(connection.S_CODE, "鍏ュ簱閿�, 1);
var endLoc1 = LocationHelper.GetLocOne(task.S_END_LOC);
endLoc1.N_LOCK_STATE = 0;
@@ -411,19 +413,24 @@
//鏀逛竴娈典换鍔＄粓鐐� task.S_END_LOC = connection.S_CODE;
task.S_END_AREA = connection.S_AREA_CODE;
- db.Updateable(task).UpdateColumns(it => new { it.S_END_LOC, it.S_END_AREA }).ExecuteCommand();
+
+ task.S_END_AREA_NAME = connection.S_AREA_Name;
+ db.Updateable(task).UpdateColumns(it => new { it.S_END_LOC, it.S_END_AREA,it.S_END_AREA_NAME }).ExecuteCommand();
//鏀逛簩娈典换鍔¤捣鐐� wcsTask.S_START_LOC = connection.S_CODE;
wcsTask.S_START_AREA = connection.S_AREA_CODE;
- db.Updateable(wcsTask).UpdateColumns(it => new { it.S_START_LOC, it.S_START_AREA }).ExecuteCommand();
+
+ wcsTask.S_START_AREA_NAME = connection.S_AREA_Name;
+ db.Updateable(wcsTask).UpdateColumns(it => new { it.S_START_LOC, it.S_START_AREA,it.S_START_AREA_NAME}).ExecuteCommand();
db.CommitTran();
var site = LocationHelper.GetAgvSiteZc(connection.S_CODE);
LogHelper.Info($"浠诲姟{task.S_CODE}鏀归亾鎴愬姛锛屾敼鍙傛暟2涓簕site},鍙傛暟6涓�,4涓�024", "鏀归亾瀹夊叏浜や簰");
NDCApi.ChangeOrderParam(task.S_CODE, 2, site);
NDCApi.ChangeOrderParam(task.S_CODE, 4, "1024");
+ Thread.Sleep(1000);
NDCApi.ChangeOrderParam(task.S_CODE, 6, "2");
//} else if (workFlow.FLOWNAME.Contains("鍑哄簱")) {
@@ -441,6 +448,7 @@
else {
LogHelper.Info($"褰撳墠浠诲姟{task.S_CODE}鎺ラ┏浣峽task.S_END_LOC}鍙敤,褰撳墠搴撳尯{wcsTask.S_END_AREA}褰撳墠宸烽亾{loc1.N_ROADWAY}鍙敤锛屼笉闇�鏀归亾锛岀洿鎺ヤ慨鏀瑰弬鏁�涓�锛�涓�024", "鏀归亾瀹夊叏浜や簰");
NDCApi.ChangeOrderParam(task.S_CODE, 4, "1024");
+ Thread.Sleep(1000);
NDCApi.ChangeOrderParam(task.S_CODE, 6, "2");
}
}
@@ -515,17 +523,34 @@
if (mst.S_TYPE.Contains("鍑哄簱"))
{
- var wcsTask = TaskHelper.GetTaskByWork("wcs", mst.S_OP_CODE);
- if (wcsTask == null) {
- LogHelper.Info($"鎺ㄩ�浠诲姟{mst.S_CODE}锛屾病鎵惧埌浣滀笟:{mst.S_OP_CODE}瀵瑰簲鐨勫嚭搴撲换鍔�, "NDC");
+ //鏌ユ壘瀵瑰簲浣滀笟锛屾槸鎺ラ┏浣嶅氨鏌ヨ瀵瑰簲绔嬪簱浠诲姟
+
+
+ var wmsWork = TaskHelper.GetWmsWork(mst.S_OP_CODE);
+
+ if (wmsWork==null)
+ {
+ LogHelper.Info($"鎺ㄩ�浠诲姟{mst.S_CODE}锛屾病鎵惧埌浣滀笟:{mst.S_OP_CODE}", "NDC");
return false;
}
- if (wcsTask.S_B_STATE=="鏈墽琛�)
+ if (!string.IsNullOrEmpty(wmsWork.CONNECTION))
{
- LogHelper.Info($"鎺ㄩ�浠诲姟{mst.S_CODE}锛屽搴旂殑Wcs鍑哄簱浠诲姟鏈墽琛岋紝鏆備笉鎺ㄩ�", "NDC");
- return false;
+ var wcsTask = TaskHelper.GetTaskByWork("wcs", mst.S_OP_CODE);
+ if (wcsTask == null)
+ {
+ LogHelper.Info($"鎺ㄩ�浠诲姟{mst.S_CODE}锛屾病鎵惧埌浣滀笟:{mst.S_OP_CODE}瀵瑰簲鐨勫嚭搴撲换鍔�, "NDC");
+ return false;
+ }
+
+ if (wcsTask.S_B_STATE == "鏈墽琛�)
+ {
+ LogHelper.Info($"鎺ㄩ�浠诲姟{mst.S_CODE}锛屽搴旂殑Wcs鍑哄簱浠诲姟鏈墽琛岋紝鏆備笉鎺ㄩ�", "NDC");
+ return false;
+ }
}
+ //鎺ラ┏浣嶄袱涓猘gv浠诲姟锛宎浠诲姟鍙栬揣瀹屾垚 鎺ㄩ�b浠诲姟
+
}
@@ -738,15 +763,22 @@
var TrayLocation = db.Queryable<LocCntrRel>().Where(e => e.S_CNTR_CODE == model.TOOLS_NO).ToList();
if (TrayLocation.Count() > 0)
{
- LogHelper.Info("鏌ヨ鍒拌宸ヨ宸茬粡缁戝畾浜嗚揣浣嶄俊鎭�, "鐗╂枡缁戝畾瑙ｇ粦");
- throw new Exception("鏌ヨ鍒拌宸ヨ宸茬粡缁戝畾浜嗚揣浣嶄俊鎭�);
+ LogHelper.Info("鏌ヨ鍒拌宸ヨ鎵樼洏鐮佸凡缁忕粦瀹氫簡璐т綅淇℃伅", "鐗╂枡缁戝畾瑙ｇ粦");
+ throw new Exception("鏌ヨ鍒拌宸ヨ鎵樼洏鐮佸凡缁忕粦瀹氫簡璐т綅淇℃伅");
}
var TrayItems = db.Queryable<CntrItemRel>().Where(e => e.S_CNTR_CODE == model.TOOLS_NO).ToList();
if (TrayItems.Count() > 0)
{
- LogHelper.Info("鏌ヨ鍒拌宸ヨ宸茬粡缁戝畾浜嗙墿鏂欎俊鎭�, "鐗╂枡缁戝畾瑙ｇ粦");
- throw new Exception("鏌ヨ鍒拌宸ヨ宸茬粡缁戝畾浜嗙墿鏂欎俊鎭�);
+ LogHelper.Info("鏌ヨ鍒拌宸ヨ鎵樼洏鐮佸凡缁忕粦瀹氫簡鐗╂枡淇℃伅", "鐗╂枡缁戝畾瑙ｇ粦");
+ throw new Exception("鏌ヨ鍒拌宸ヨ鎵樼洏鐮佸凡缁忕粦瀹氫簡鐗╂枡淇℃伅");
}
+ var Tray = db.Queryable<Container>().Where(e => e.S_CODE == model.TOOLS_NO).ToList();
+ if (Tray.Count() > 0)
+ {
+ LogHelper.Info("鏌ヨ鍒拌宸ヨ鎵樼洏鐮佸凡缁忕粦瀹氫簡瀹瑰櫒淇℃伅", "鐗╂枡缁戝畾瑙ｇ粦");
+ throw new Exception("鏌ヨ鍒拌宸ヨ鎵樼洏鐮佸凡缁忕粦瀹氫簡瀹瑰櫒淇℃伅");
+ }
+
var Locations = db.Queryable<Location>().Where(e => e.S_CODE == model.LOCATION_CODE)?.First();
if (Locations == null)
{
@@ -897,7 +929,7 @@
{
db.RollbackTran();
LogHelper.Info("鐗╂枡缁戝畾瑙ｇ粦寮傚父:" + e.Message, "鐗╂枡缁戝畾瑙ｇ粦");
- result.errMsg = "鐗╂枡缁戝畾瑙ｇ粦寮傚父";
+ result.errMsg = "鐗╂枡缁戝畾瑙ｇ粦寮傚父" + e.Message;
result.errCode = 1;
result.success = false;
return result;
@@ -937,6 +969,9 @@
ContainerHelper.delCntr(task.S_CNTR_CODE);
ContainerHelper.delCntrItem(task.S_CNTR_CODE);
}
+ else {
+ WcsTask.WcsCancellTask(wcsTask);
+ }
TaskHelper.Fail(wcsTask);
@@ -970,6 +1005,9 @@
{
ContainerHelper.delCntr(task.S_CNTR_CODE);
ContainerHelper.delCntrItem(task.S_CNTR_CODE);
+ }
+ else {
+ WcsTask.WcsCancellTask(wcsTask);
}
TaskHelper.Fail(wcsTask);
TaskProcess.OperateStatus(wcsTask, 7);
@@ -1468,65 +1506,114 @@
{
//姝ｅ紡浠ｇ爜锛岃皟鐢ㄦ帴鍙ｅ鎵惧彲鐢ㄦ帴椹充綅
- var connectionList = LocationHelper.GetConnectionList(workFlow.CONNECTION);
- var usableConnectionList = WcsTask.WcsPositionAvailable(model.task_no, connectionList);
- if (usableConnectionList != null && usableConnectionList.code == "0")
+ //var connectionList = LocationHelper.GetConnectionList(workFlow.CONNECTION);
+ //var usableConnectionList = WcsTask.WcsPositionAvailable(model.task_no, connectionList);
+ //if (usableConnectionList != null && usableConnectionList.code == "0")
+ //{
+ // var balanceConnectionList = LocationHelper.GetConnectionListByst(usableConnectionList.available);
+ // LogHelper.Info($"ZCSendTask鍏ュ簱浠诲姟涓嬪彂瀵绘壘鍙敤鎺ラ┏浣� + JsonConvert.SerializeObject(balanceConnectionList), "Mes浠诲姟涓嬪彂");
+
+ // if (workFlow.FLOWCODE == "1" || workFlow.FLOWCODE == "2")
+ // {
+ // //婊℃墭鍏�+ // balanceLocList = LocationHelper.FindBalanceEndLocList(endList, workFlow.ENDAREA, workFlow.ROADWAY);
+
+ // if (TOOLSTYPE == "25" || TOOLSTYPE == "35") {
+ // LogHelper.Info($"ZCSendTask鍏ュ簱浠诲姟宸ヨ鏄簩鍚堜竴搴�闇�鐗╂枡鍧囪 ", "Mes浠诲姟涓嬪彂");
+ // balanceLocList = LocationHelper.RoadWayBalance1ByItem(balanceLocList, model.PROD_NO);
+ // }
+
+
+
+ // }
+ // else if (workFlow.FLOWCODE == "3")
+ // {
+ // //绌烘墭鍏ョ珛搴撳尯
+ // cntrCount = 0;
+ // LogHelper.Info($"ZCSendTask鍏ュ簱浠诲姟,瀵绘壘绔嬪簱鍖虹┖璐т綅", "Mes浠诲姟涓嬪彂");
+ // balanceLocList = LocationHelper.FindBalanceEndLocList(endList, workFlow.ENDAREA, workFlow.ROADWAY);
+ // }
+
+ // LogHelper.Info($"ZCSendTask鍏ュ簱浠诲姟涓嬪彂瀵绘壘缁堢偣鏁伴噺{balanceLocList.Count}", "Mes浠诲姟涓嬪彂");
+
+ // foreach (var item in balanceLocList)
+ // {
+ // if (item.S_LOCK_STATE == "鏃� && item.N_CURRENT_NUM == 0)
+ // {
+ // // LogHelper.Info($"ZCSendTask鍏ュ簱浠诲姟涓嬪彂item淇℃伅" + JsonConvert.SerializeObject(item), "Mes浠诲姟涓嬪彂");
+ // foreach (var item1 in balanceConnectionList)
+ // {
+ // if (item1.CONNEC_ROADWAY == item.N_ROADWAY)
+ // {
+ // connection = item1.S_CODE;
+ // connectionArea = item1.S_AREA_Name;
+ // end = item;
+ // LogHelper.Info($"ZCSendTask鍏ュ簱浠诲姟涓嬪彂瀵绘壘鍒板彲鐢ㄦ帴椹充綅{connection}", "Mes浠诲姟涓嬪彂");
+ // break;
+ // }
+ // }
+ // if (end!=null)
+ // {
+ // LogHelper.Info($"ZCSendTask鍏ュ簱浠诲姟涓嬪彂瀵绘壘鍒扮粓鐐箋end.S_CODE}", "Mes浠诲姟涓嬪彂");
+ // break;
+ // }
+ // }
+ // }
+ // if (connection == "")
+ // {
+ // LogHelper.Info($"ZCSendTask鍏ュ簱浠诲姟涓嬪彂娌℃壘鍒版帴椹充綅", "Mes浠诲姟涓嬪彂");
+ // throw new Exception($"ZCSendTask鍏ュ簱浠诲姟涓嬪彂娌℃壘鍒版帴椹充綅");
+ // }
+ //}
+ //else
+ //{
+ // LogHelper.Info($"ZCSendTask鍏ュ簱浠诲姟涓嬪彂瀵绘壘鎺ラ┏浣嶆帴鍙ｅけ璐�, "Mes浠诲姟涓嬪彂");
+ // throw new Exception($"ZCSendTask鍏ュ簱浠诲姟涓嬪彂瀵绘壘鎺ラ┏浣嶆帴鍙ｅけ璐�);
+ //}
+
+
+ if (workFlow.FLOWCODE == "1" || workFlow.FLOWCODE == "2")
{
- var balanceConnectionList = LocationHelper.GetConnectionListByst(usableConnectionList.available);
- LogHelper.Info($"ZCSendTask鍏ュ簱浠诲姟涓嬪彂瀵绘壘鍙敤鎺ラ┏浣� + JsonConvert.SerializeObject(balanceConnectionList), "Mes浠诲姟涓嬪彂");
+ //婊℃墭鍏�
- if (workFlow.FLOWCODE == "1" || workFlow.FLOWCODE == "2")
+ if (TOOLSTYPE == "25" || TOOLSTYPE == "35")
{
- //婊℃墭鍏�- balanceLocList = LocationHelper.FindBalanceEndLocList(endList, workFlow.ENDAREA, workFlow.ROADWAY);
+ LogHelper.Info($"ZCSendTask鍏ュ簱浠诲姟宸ヨ鏄簩鍚堜竴搴�闇�鐗╂枡鍧囪 ", "Mes浠诲姟涓嬪彂");
+ end = LocationHelper.FindBalanceEndcolByLocListItem(endList, workFlow.ENDAREA, workFlow.ROADWAY, workFlow.CONNECTION, model.task_no, model.PROD_NO);
+
}
- else if (workFlow.FLOWCODE == "3")
- {
- //绌烘墭鍏ョ珛搴撳尯
- cntrCount = 0;
- LogHelper.Info($"ZCSendTask鍏ュ簱浠诲姟,瀵绘壘绔嬪簱鍖虹┖璐т綅", "Mes浠诲姟涓嬪彂");
- balanceLocList = LocationHelper.FindBalanceEndLocList(endList, workFlow.ENDAREA, workFlow.ROADWAY);
+ else {
+ end = LocationHelper.FindBalanceEndcolByLocList(endList, workFlow.ENDAREA, workFlow.ROADWAY, workFlow.CONNECTION, model.task_no);
}
- LogHelper.Info($"ZCSendTask鍏ュ簱浠诲姟涓嬪彂瀵绘壘缁堢偣鏁伴噺{balanceLocList.Count}", "Mes浠诲姟涓嬪彂");
-
- foreach (var item in balanceLocList)
- {
- if (item.S_LOCK_STATE == "鏃� && item.N_CURRENT_NUM == 0)
- {
- // LogHelper.Info($"ZCSendTask鍏ュ簱浠诲姟涓嬪彂item淇℃伅" + JsonConvert.SerializeObject(item), "Mes浠诲姟涓嬪彂");
- foreach (var item1 in balanceConnectionList)
- {
- if (item1.CONNEC_ROADWAY == item.N_ROADWAY && item1.N_CURRENT_NUM < 2)
- {
- connection = item1.S_CODE;
- connectionArea = item1.S_AREA_Name;
- end = item;
- LogHelper.Info($"ZCSendTask鍏ュ簱浠诲姟涓嬪彂瀵绘壘鍒板彲鐢ㄦ帴椹充綅{connection}", "Mes浠诲姟涓嬪彂");
- break;
- }
- }
- if (connection == "")
- {
- LogHelper.Info($"ZCSendTask鍏ュ簱浠诲姟涓嬪彂娌℃壘鍒版帴椹充綅", "Mes浠诲姟涓嬪彂");
- throw new Exception($"ZCSendTask鍏ュ簱浠诲姟涓嬪彂娌℃壘鍒版帴椹充綅");
- }
-
- if (end!=null)
- {
- LogHelper.Info($"ZCSendTask鍏ュ簱浠诲姟涓嬪彂瀵绘壘鍒扮粓鐐箋end.S_CODE}", "Mes浠诲姟涓嬪彂");
- break;
- }
- }
- }
}
- else
+ else if (workFlow.FLOWCODE == "3")
{
- LogHelper.Info($"ZCSendTask鍏ュ簱浠诲姟涓嬪彂瀵绘壘鎺ラ┏浣嶅け璐�, "Mes浠诲姟涓嬪彂");
- throw new Exception($"ZCSendTask鍏ュ簱浠诲姟涓嬪彂瀵绘壘鎺ラ┏浣嶅け璐�);
+ //绌烘墭鍏ョ珛搴撳尯
+ cntrCount = 0;
+ LogHelper.Info($"ZCSendTask鍏ュ簱浠诲姟,瀵绘壘绔嬪簱鍖虹┖璐т綅", "Mes浠诲姟涓嬪彂");
+ end = LocationHelper.FindBalanceEndcolByLocList(endList, workFlow.ENDAREA, workFlow.ROADWAY, workFlow.CONNECTION, model.task_no);
}
-
+ if (end == null)
+ {
+ LogHelper.Info($"ZCSendTask鍏ュ簱浠诲姟{model.task_no}涓嬪彂澶辫触锛岀粓鐐瑰簱鍖簕workFlow.ENDAREA},娌℃壘鍒扮粓鐐瑰贩閬撴垨鎺ラ┏浣嶄笉鍙敤", "Mes浠诲姟涓嬪彂");
+ throw new Exception($"{model.task_no}涓嬪彂澶辫触缁堢偣搴撳尯{workFlow.ENDAREA},娌℃壘鍒扮粓鐐�宸烽亾鎴栨帴椹充綅涓嶅彲鐢�);
+ }
+
+ var jb = LocationHelper.GetConnectionByEnd(workFlow.CONNECTION, end.N_ROADWAY);
+
+ if (jb==null)
+ {
+ LogHelper.Info($"ZCSendTask鍏ュ簱浠诲姟涓嬪彂搴撳尯{workFlow.CONNECTION}锛屽贩閬搟end.N_ROADWAY},娌℃壘鍒版帴椹充綅", "Mes浠诲姟涓嬪彂");
+ throw new Exception($"ZCSendTask鍏ュ簱浠诲姟涓嬪彂搴撳尯{workFlow.CONNECTION}锛屽贩閬搟end.N_ROADWAY},娌℃壘鍒版帴椹充綅");
+ }
+
+
+ connection = jb.S_CODE;
+ connectionArea = jb.S_AREA_Name;
+
+
}
else {
if (workFlow.FLOWCODE == "3")
@@ -1554,16 +1641,14 @@
}
}
-
-
-
-
LogHelper.Info($"ZCSendTask鍏ュ簱浠诲姟涓嬪彂缁堢偣淇℃伅" + JsonConvert.SerializeObject(end), "Mes浠诲姟涓嬪彂");
if (end == null) {
- LogHelper.Info($"ZCSendTask鍏ュ簱浠诲姟涓嬪彂澶辫触锛岀粓鐐瑰簱鍖簕workFlow.ENDAREA},娌℃壘鍒扮粓鐐�, "Mes浠诲姟涓嬪彂");
- throw new Exception($"缁堢偣搴撳尯{workFlow.ENDAREA},娌℃壘鍒扮粓鐐�);
+ LogHelper.Info($"ZCSendTask鍏ュ簱浠诲姟{model.task_no}涓嬪彂澶辫触锛岀粓鐐瑰簱鍖簕workFlow.ENDAREA},娌℃壘鍒扮粓鐐�, "Mes浠诲姟涓嬪彂");
+ throw new Exception($"{model.task_no}涓嬪彂澶辫触缁堢偣搴撳尯{workFlow.ENDAREA},娌℃壘鍒扮粓鐐�);
}
+
+
//娣诲姞鎵樼洏鐗╂枡鍏宠仈琛� if (cntrCount != 0)
@@ -1580,7 +1665,7 @@
var EXPIRED_TIME = model.EXPIRED_TIME.ToString();
if (EXPIRED_TIME == "0001/1/1 0:00:00")
{
- rel.expireTime = model.SHELF_LIFE_TIME.AddHours(model.EXPIRED_REP);
+ rel.expireTime = model.PRODUCE_TIME.AddHours(model.EXPIRED_REP);
LogHelper.Info($"澶辨晥鏃堕棿涓�001/1/1 0:00:00锛屼慨鏀逛负锛歿rel.expireTime}", "Mes浠诲姟涓嬪彂");
}
else
@@ -1591,7 +1676,7 @@
var SHELF_LIFE_TIME = model.SHELF_LIFE_TIME.ToString();
if (SHELF_LIFE_TIME == "0001/1/1 0:00:00")
{
- rel.takeEffectTime = model.SHELF_LIFE_TIME.AddHours(-model.SHELF_REP);
+ rel.takeEffectTime = model.PRODUCE_TIME.AddHours(-model.SHELF_REP);
LogHelper.Info($"鐢熸晥鏃堕棿涓�001/1/1 0:00:00锛屼慨鏀逛负锛歿rel.takeEffectTime}", "Mes浠诲姟涓嬪彂");
}
else
@@ -1763,7 +1848,7 @@
- if (workFlow.FLOWCODE == "9")
+ if (workFlow.FLOWCODE == "9" || workFlow.FLOWCODE == "4")
{
if (TOOLSTYPE == "85" || TOOLSTYPE == "95")
{
@@ -1773,7 +1858,7 @@
else
{
//鏍规嵁鍒跺搧缂栧彿瀵绘壘绔嬪簱鍖哄搴旂墿鏂欐墭鐩�- start = LocationHelper.FindStartcolByLoclistAndItem(strrtList, model.PROD_NO, workFlow.STARTAREA, workFlow.ROADWAY);
+ start = LocationHelper.FindStartcolByLoclistAndItem(strrtList, model.PROD_NO, workFlow.STARTAREA, workFlow.ROADWAY,workFlow.CONNECTION);
if (start == null)
{
strrtList = LocationHelper.GetAllLocList2(workFlow.STARTAREA);
@@ -1911,7 +1996,7 @@
var balanceConnectionList = LocationHelper.GetBalanceConnectionList(connectionList);
foreach (var item in balanceConnectionList)
{
- if (item.loc.N_CURRENT_NUM < 2 && item.loc.CONNEC_ROADWAY==start.N_ROADWAY)
+ if (item.loc.CONNEC_ROADWAY==start.N_ROADWAY)
{
connection = item.loc.S_CODE;
connectionArea = item.loc.S_AREA_Name;
@@ -1997,8 +2082,6 @@
LogHelper.Info("ZCSendTask鍑哄簱浠诲姟涓嬪彂澶辫触锛孴ask_type涓嶇瓑浜�鎴�", "Mes浠诲姟涓嬪彂");
throw new Exception("Task_type涓嶇瓑浜�鎴�");
}
-
-
}
catch (Exception ex)
--
Gitblit v1.9.1