From 5321419f5fddb4e877fe90ccd90ebdc1a115af64 Mon Sep 17 00:00:00 2001
From: 海波 张 <2956280567@qq.com>
Date: 星期五, 18 七月 2025 17:29:26 +0800
Subject: [PATCH] 出库修改
---
process/TaskProcess.cs | 59 ++++++++++++++++++++++++++++++-----------------------------
1 files changed, 30 insertions(+), 29 deletions(-)
diff --git a/process/TaskProcess.cs b/process/TaskProcess.cs
index 9d53a2e..c2088d3 100644
--- a/process/TaskProcess.cs
+++ b/process/TaskProcess.cs
@@ -553,7 +553,7 @@
return false;
}
- if (wcsTask.S_B_STATE == "鏈墽琛�)
+ if (wcsTask.S_B_STATE == "鏈墽琛� || wcsTask.S_B_STATE == "宸叉帹閫�)
{
LogHelper.Info($"鎺ㄩ�浠诲姟{mst.S_CODE}锛屽搴旂殑Wcs鍑哄簱浠诲姟鏈墽琛岋紝鏆備笉鎺ㄩ�", "NDC");
return false;
@@ -1080,33 +1080,14 @@
result.success = true;
return result;
}
- else if (wcsTask.S_B_STATE.Trim() != "鍙栨秷" && wcsTask.S_B_STATE.Trim() != "澶辫触" && wcsTask.S_B_STATE.Trim() != "瀹屾垚")
+ else
{
- var db = new SqlHelper<object>().GetInstance();
- var qhflag = db.Queryable<WmsTaskAction>().Where(a => a.S_TASK_CODE == wcsTask.S_CODE && a.S_ACTION == "5").First();
-
- LogHelper.Info($"璇ヤ换鍔wcsTask.S_CODE}鍔ㄤ綔淇℃伅"+JsonConvert.SerializeObject(qhflag), "鍙栨秷");
- if (qhflag != null)
- {
- LogHelper.Info($"璇ヤ换鍔wcsTask.S_CODE}宸茬粡鍙栬揣瀹屾垚", "鍙栨秷");
+ LogHelper.Info($"璇ヤ换鍔wcsTask.S_CODE}宸茬粡鎺ㄩ�", "鍙栨秷");
result.errCode = 1;
- result.errMsg = "浠诲姟宸茬粡鍙栬揣瀹屾垚锛屼笉鍏佽鍙栨秷";
+ result.errMsg = "浠诲姟宸茬粡鎺ㄩ�锛屼笉鍏佽鍙栨秷";
result.success = false;
return result;
- }
-
- if (wcsTask.S_TYPE.Contains("鍏ュ簱") || wcsTask.S_TYPE.Contains("鍥炲簱"))
- {
- ContainerHelper.delCntr(wcsTask.S_CNTR_CODE);
- ContainerHelper.delCntrItem(wcsTask.S_CNTR_CODE);
- ContainerHelper.delCntrLoc(wcsTask.S_CNTR_CODE);
- }
- WcsTask.WcsCancellTask(wcsTask);
- TaskHelper.Fail(wcsTask);
- TaskProcess.OperateStatus(wcsTask, 7);
- result.errCode = 0;
- result.errMsg = "鍙栨秷鎴愬姛";
- result.success = true;
+
}
}
}
@@ -1769,15 +1750,35 @@
var TOOLSTYPE = "";
if (!string.IsNullOrEmpty(model.TOOLS_TPYE))
{
- TOOLSTYPE = model.TOOLS_TPYE;
-
+ TOOLSTYPE = model.TOOLS_TPYE;
}
- workFlow = TaskHelper.selectWorkFlowByType(model.BUSI_TYPE, TOOLSTYPE);
-
+ //鍏ュ簱鎸夌収宸ヨ鍜屾祦绋嬬紪鍙�+ if (model.Task_type == 1) {
+ workFlow = TaskHelper.selectWorkFlowByType(model.BUSI_TYPE, TOOLSTYPE);
+ }
+ else if (model.Task_type == 2)
+ {
+ //鍑哄簱鎸夌収缁堢偣搴撳尯鍜屾祦绋嬬紪鍙�+
+ var end = LocationHelper.GetLoc(model.Location_To);
+ LogHelper.Info($"ZCSendTask鍑哄簱浠诲姟涓嬪彂缁堢偣淇℃伅" + JsonConvert.SerializeObject(end), "Mes浠诲姟涓嬪彂");
+
+
+ if (end == null)
+ {
+ LogHelper.Info($"ZCSendTask鍑哄簱浠诲姟涓嬪彂澶辫触锛岀粓鐐�{model.Location_To},娌℃壘鍒�, "Mes浠诲姟涓嬪彂");
+ throw new Exception($"缁堢偣:{model.Location_To},娌℃壘鍒�);
+ }
+
+ workFlow = TaskHelper.selectWorkFlowByEndArea(model.BUSI_TYPE, end.S_AREA_CODE);
+ TOOLSTYPE = workFlow.TOOLSTYPE;
+ }
+
LogHelper.Info($"浣滀笟{model.task_no}锛屽伐瑁呯被鍨媨TOOLSTYPE}", "Mes浠诲姟涓嬪彂");
-
+
+
if (workFlow == null) {
LogHelper.Info($"ZCSendTask浠诲姟涓嬪彂澶辫触锛孊USI_TYpe:{model.BUSI_TYPE},娌℃壘鍒板搴斾綔涓氭祦绋�, "Mes浠诲姟涓嬪彂");
throw new Exception($"BUSI_TYpe:{model.BUSI_TYPE},娌℃壘鍒板搴斾綔涓氭祦绋�);
--
Gitblit v1.9.1