From 3a56820d028e98ac3c4bd315aa76181d7d6720cd Mon Sep 17 00:00:00 2001
From: 海波 张 <2956280567@qq.com>
Date: 星期一, 28 七月 2025 17:29:57 +0800
Subject: [PATCH] 金坛二合一出库修改
---
process/TaskProcess.cs | 26 +++++++++++++-------------
1 files changed, 13 insertions(+), 13 deletions(-)
diff --git a/process/TaskProcess.cs b/process/TaskProcess.cs
index d3111fd..475d1c8 100644
--- a/process/TaskProcess.cs
+++ b/process/TaskProcess.cs
@@ -54,13 +54,13 @@
if (load)
{
Console.WriteLine($"浠诲姟{mst.S_CODE} 璐т綅{mst.S_START_LOC}鍙栬揣瀹屾垚锛岃捣鐐硅В缁戝鍣▄mst.S_CNTR_CODE}");
- LogHelper.Info($"浠诲姟{mst.S_CODE} 璐т綅{mst.S_START_LOC}鍙栬揣瀹屾垚锛岃捣鐐硅В缁戝鍣▄mst.S_CNTR_CODE}");
+ LogHelper.Info($"浠诲姟{mst.S_CODE} 璐т綅{mst.S_START_LOC}鍙栬揣瀹屾垚锛岃捣鐐硅В缁戝鍣▄mst.S_CNTR_CODE}","瑙ｉ攣");
LocationHelper.UnBindingLoc(mst.S_START_LOC, mst.S_CNTR_CODE.Split(',').ToList());
}
else
{
Console.WriteLine($"浠诲姟{mst.S_CODE} 璐т綅{mst.S_END_LOC}鍗歌揣瀹屾垚锛岀粓鐐圭粦瀹氬鍣▄mst.S_CNTR_CODE}");
- LogHelper.Info($"浠诲姟{mst.S_CODE} 璐т綅{mst.S_END_LOC}鍗歌揣瀹屾垚锛岀粓鐐圭粦瀹氬鍣▄mst.S_CNTR_CODE}");
+ LogHelper.Info($"浠诲姟{mst.S_CODE} 璐т綅{mst.S_END_LOC}鍗歌揣瀹屾垚锛岀粓鐐圭粦瀹氬鍣▄mst.S_CNTR_CODE}","瑙ｉ攣");
LocationHelper.BindingLoc(mst.S_END_LOC, mst.S_CNTR_CODE.Split(',').ToList());
}
@@ -71,7 +71,7 @@
/// </summary>
/// <param name="mst"></param>
internal static void CacheBitCancelUpdate(WMSTask mst) {
-
+ LogHelper.Info($"CacheBitCancelUpdate瑙ｉ攣锛氫换鍔″彿锛歿mst.S_CODE}", "瑙ｉ攣");
LocationHelper.UnLockLoc(mst.S_START_LOC);
LocationHelper.UnLockLoc(mst.S_END_LOC);
@@ -245,9 +245,6 @@
try
{
-
-
-
//绌烘墭鍏ュ簱鍒ゆ柇绌烘墭鍑虹紦瀛樿〃锛屾湁瀵瑰簲璁板綍鐩存帴鏀归亾鍒扮紦瀛樿〃缁堢偣
if (workFlow.FLOWCODE=="3") {
var kt = db.Queryable<MesKtTask>().Where(e => e.TOOLS_TPYE==task.TOOLSTYPE && e.Status=="N").OrderBy(a=>a.CreateDate).First();
@@ -1023,13 +1020,15 @@
work.T_END_TIME = DateTime.Now;
var db = new SqlHelper<object>().GetInstance();
db.Updateable(work).UpdateColumns(it => new { it.N_B_STATE, it.S_B_STATE, it.T_MODIFY, it.T_END_TIME }).ExecuteCommand();
+
+ LogHelper.Info($"cancelTask1鍙栨秷{model.task_no}锛岃В閿�, "瑙ｉ攣");
LocationHelper.UnLockLoc(work.S_START_LOC);
LocationHelper.UnLockLoc(work.S_END_LOC);
if (!string.IsNullOrEmpty(work.CONNECTION))
{
LocationHelper.UnLockLoc(work.CONNECTION);
}
- result.errCode = 0;
+ result.errCode = 0;
result.errMsg = "鍙栨秷鎴愬姛";
result.success = true;
return result;
@@ -1050,6 +1049,7 @@
//鏈墽琛岀洿鎺ヤ慨鏀圭姸鎬佷负鍙栨秷
TaskHelper.opMesTask(task, 3);
TaskHelper.Fail(task);
+
TaskProcess.CacheBitCancelUpdate(task);
ContainerHelper.delCntr(task.S_CNTR_CODE);
@@ -1111,7 +1111,7 @@
if (wcsTask != null)
{
LogHelper.Info($"cancelTask1鍙栨秷Wcs浠诲姟{wcsTask.S_CODE}", "鍙栨秷");
- if (wcsTask.S_B_STATE.Trim() == "鏈墽琛� && task.S_B_STATE.Trim() == "鏈墽琛�)
+ if (wcsTask.S_B_STATE.Trim() == "鏈墽琛�)
{
//鏈墽琛岀洿鎺ヤ慨鏀圭姸鎬佷负鍙栨秷
TaskHelper.Fail(wcsTask);
@@ -1119,7 +1119,6 @@
result.errCode = 0;
result.errMsg = "鍙栨秷鎴愬姛";
result.success = true;
- return result;
}
else
{
@@ -1955,7 +1954,7 @@
if (TOOLSTYPE == "25" || TOOLSTYPE == "35")
{
LogHelper.Info($"ZCSendTask鍏ュ簱浠诲姟宸ヨ鏄簩鍚堜竴搴�闇�鐗╂枡鍧囪 ", "Mes浠诲姟涓嬪彂");
- balanceLocList = LocationHelper.RoadWayBalance1ByItem(balanceLocList, model.PROD_NO);
+ balanceLocList = LocationHelper.RoadWayBalance1ByItem(endList, model.PROD_NO);
}
else {
balanceLocList = LocationHelper.FindBalanceEndLocList(endList, workFlow.ENDAREA, workFlow.ROADWAY);
@@ -2137,7 +2136,7 @@
cntr1.S_CODE = cntrCode;
cntr1.C_ENABLE = "Y";
cntr1.N_DETAIL_COUNT = cntrCount;
- cntr1.S_TYPE = "";
+ cntr1.S_TYPE = TOOLSTYPE;
LogHelper.Info($"娣诲姞瀹瑰櫒淇℃伅" + JsonConvert.SerializeObject(cntr1), "Mes浠诲姟涓嬪彂");
if (ContainerHelper.CreateCntr(cntr1))
@@ -2185,7 +2184,7 @@
S_START_AREA_NAME = start.S_AREA_Name,
//璧风偣搴撳尯鍚嶇О
S_END_AREA_NAME = end.S_AREA_Name,
- //璧风偣搴撳尯鍚嶇О
+ //鎺ラ┏搴撳尯鍚嶇О
CONNECTION_AREA = connectionArea,
};
@@ -2194,6 +2193,7 @@
{
if (connection != "")
{
+ LogHelper.Info($"{operation.S_CODE}閿佽揣浣�, "涓婇攣");
LocationHelper.LockLoc(operation.S_START_LOC, "鍑哄簱閿�, 2);
LocationHelper.LockLoc(operation.S_END_LOC, "鍏ュ簱閿�, 1);
LocationHelper.LockLoc(operation.CONNECTION, "鍏朵粬閿�, 3);
@@ -2491,7 +2491,7 @@
S_START_AREA_NAME = start.S_AREA_Name,
//璧风偣搴撳尯鍚嶇О
S_END_AREA_NAME = end.S_AREA_Name,
- //璧风偣搴撳尯鍚嶇О
+ //鎺ラ┏搴撳尯鍚嶇О
CONNECTION_AREA = connectionArea
};
--
Gitblit v1.9.1