From 00b6105b34870f6f5a33551534d0088f3f741906 Mon Sep 17 00:00:00 2001
From: 海波 张 <2956280567@qq.com>
Date: 星期一, 07 七月 2025 17:33:53 +0800
Subject: [PATCH] 退库修改
---
core/TaskCore.cs | 188 +++++++++++++++++++++++++---------------------
1 files changed, 101 insertions(+), 87 deletions(-)
diff --git a/core/TaskCore.cs b/core/TaskCore.cs
index 4d8e582..755865b 100644
--- a/core/TaskCore.cs
+++ b/core/TaskCore.cs
@@ -20,104 +20,118 @@
internal class TaskCore
{
public static void OperateTaskStatus(AgvTaskState model) {
+ //var wmsTask = TaskHelper.GetTask(model.task_no);
+ //var db = new SqlHelper<object>().GetInstance();
- var wmsTask = TaskHelper.GetTask(model.task_no);
- var db = new SqlHelper<object>().GetInstance();
+ //LogHelper.Info("OperateTaskStatus--浠诲姟淇℃伅" + JsonConvert.SerializeObject(wmsTask), "API");
+ //LogHelper.Info("OperateTaskStatus--鍙傛暟淇℃伅" + JsonConvert.SerializeObject(model), "API");
+ //if (wmsTask != null)
+ // {
+ // if (model.state <= 7)
+ // {
+ // //鏈変换鍔″彿璇锋眰
+ // switch (model.state)
+ // {
+ // case 1:
+ // TaskHelper.Begin(wmsTask,model.forklift_no.ToString());
+ // //鑳庨潰浜や簰
+ // TaskHelper.TmSafety(wmsTask);
+ // break;
+ // case 3:
+ // TaskHelper.UpdateStatus(wmsTask, "寮�鍙栬揣");
+ // break;
+ // case 4:
+ // TaskHelper.UpdateStatus(wmsTask, "鍙栬揣瀹屾垚");
+ // LocationHelper.UnLockLoc(wmsTask.S_START_LOC);
+ // TaskProcess.OperateStatus(wmsTask, 4);
+ // break;
+ // case 5:
+ // TaskHelper.UpdateStatus(wmsTask, "寮�鍗歌揣");
+ // break;
+ // case 6:
+ // TaskHelper.UpdateStatus(wmsTask, "鍗歌揣瀹屾垚");
+ // LocationHelper.UnLockLoc(wmsTask.S_END_LOC);
+ // TaskProcess.OperateStatus(wmsTask, 6);
- LogHelper.Info("OperateTaskStatus--浠诲姟淇℃伅" + JsonConvert.SerializeObject(wmsTask), "API");
- LogHelper.Info("OperateTaskStatus--鍙傛暟淇℃伅" + JsonConvert.SerializeObject(model), "API");
- if (wmsTask != null)
- {
- if (model.state <= 7)
- {
- //鏈変换鍔″彿璇锋眰
- switch (model.state)
- {
- case 1:
- TaskHelper.Begin(wmsTask,model.forklift_no);
- //鑳庨潰浜や簰
- TaskHelper.TmSafety(wmsTask);
- break;
- case 3:
- TaskHelper.UpdateStatus(wmsTask, "寮�鍙栬揣");
- break;
- case 4:
- TaskHelper.UpdateStatus(wmsTask, "鍙栬揣瀹屾垚");
- LocationHelper.UnLockLoc(wmsTask.S_START_LOC);
- TaskProcess.OperateStatus(wmsTask, 4);
- break;
- case 5:
- TaskHelper.UpdateStatus(wmsTask, "寮�鍗歌揣");
- break;
- case 6:
- TaskHelper.UpdateStatus(wmsTask, "鍗歌揣瀹屾垚");
- LocationHelper.UnLockLoc(wmsTask.S_END_LOC);
- TaskProcess.OperateStatus(wmsTask, 6);
+ // //濡傛灉鏄簩娈典换鍔″垯涓嬪彂绔嬪簱浠诲姟
+ // var wcsTask = TaskHelper.GetTaskByState("鏈墽琛�, "wcs", wmsTask.S_OP_CODE,"鍏ュ簱");
+ // if (wcsTask!=null)
+ // {
+ // LocationHelper.LockLoc(wcsTask.S_START_LOC, "鍑哄簱閿�, 2);
+ // WcsTask.WcsTaskEntity(wcsTask);
+ // }
+ // break;
+ // case 2:
+ // //绌烘墭鍑烘垨鑰呮弧鎵樺嚭浠诲姟瀹屾垚鍒ゆ柇鏄惁瑕佹彁楂樺叆搴撲紭鍏堢骇
- //濡傛灉鏄簩娈典换鍔″垯涓嬪彂绔嬪簱浠诲姟
- var wcsTask = TaskHelper.GetTaskByState("鏈墽琛�, "wcs", wmsTask.S_OP_CODE,"鍏ュ簱");
- if (wcsTask!=null)
- {
- LocationHelper.LockLoc(wcsTask.S_START_LOC, "鍑哄簱閿�, 2);
- WcsTask.WcsTaskEntity(wcsTask);
- }
- break;
- case 2:
- //绌烘墭鍑烘垨鑰呮弧鎵樺嚭浠诲姟瀹屾垚鍒ゆ柇鏄惁瑕佹彁楂樺叆搴撲紭鍏堢骇
+ // LogHelper.Info($"浠诲姟{wmsTask.S_CODE}瀹屾垚锛屽垽鏂叆搴撲紭鍏堢骇", "鍏ュ簱浼樺厛绾�);
+ // TaskProcess.inPri(wmsTask);
+ // TaskHelper.End(wmsTask);
+ // break;
+ // case 7:
- LogHelper.Info($"浠诲姟{wmsTask.S_CODE}瀹屾垚锛屽垽鏂叆搴撲紭鍏堢骇", "鍏ュ簱浼樺厛绾�);
- TaskProcess.inPri(wmsTask);
- TaskHelper.End(wmsTask);
- break;
- case 7:
+ // var wcsTask1 = TaskHelper.GetTaskByWorkNo(wmsTask.S_OP_CODE, "wcs");
+ // if (wcsTask1!=null)
+ // {
+ // //閫�簱浠诲姟涓嶉�鐭�+ // //agv鎵ц閫氱煡 wcs鍙栨秷
+ // if (wcsTask1.S_B_STATE!="鏈墽琛�&& wcsTask1.S_B_STATE != "瀹屾垚"&& wcsTask1.S_B_STATE != "鍙栨秷")
+ // {
+ // WcsTask.WcsCallback(wmsTask, model.state, model.forklift_no.ToString());
+ // }
+ // TaskHelper.Fail(wcsTask1);
+ // TaskProcess.OperateStatus(wcsTask1, 7);
+ // }
- var wcsTask1 = TaskHelper.GetTaskByWorkNo(wmsTask.S_OP_CODE, "wcs");
- if (wcsTask1!=null)
- {
- //agv鎵ц閫氱煡 wcs鍙栨秷
- WcsTask.WcsCallback(wmsTask, model.state, model.forklift_no);
- if (!TaskHelper.CheckActionRecordExist(wcsTask1.S_CODE, "6"))
- {
- TaskHelper.Fail(wcsTask1);
- TaskProcess.OperateStatus(wcsTask1, 7);
- }
- }
-
+ // TaskHelper.Fail(wmsTask);
+ // TaskProcess.OperateStatus(wmsTask, 7);
+ // //鍏ュ簱鎴栬�鍥炲簱浠诲姟鍙栨秷鍒犻櫎鎵樼洏鐗╂枡
+ // if (wmsTask.S_TYPE.Contains("鍏ュ簱") || wmsTask.S_TYPE.Contains("鍥炲簱"))
+ // {
+ // ContainerHelper.delCntr(wmsTask.S_CNTR_CODE);
+ // ContainerHelper.delCntrItem(wmsTask.S_CNTR_CODE);
+ // }
- TaskHelper.Fail(wmsTask);
- TaskProcess.OperateStatus(wmsTask, 7);
- //鍏ュ簱鎴栬�鍥炲簱浠诲姟鍙栨秷鍒犻櫎鎵樼洏鐗╂枡
- if (wmsTask.S_TYPE.Contains("鍏ュ簱") || wmsTask.S_TYPE.Contains("鍥炲簱"))
- {
- ContainerHelper.delCntr(wmsTask.S_CNTR_CODE);
- ContainerHelper.delCntrItem(wmsTask.S_CNTR_CODE);
- }
- //鍑哄簱鍙栨秷鍒ゆ柇鎺ラ┏浣嶆槸鍚︽湁璐э紝鏈夎揣闇�瑙ｇ粦
- if (!WcsTask.WcsCvstate(wmsTask))
- {
- LogHelper.Info($"Wcs绔嬪簱鎺ラ┏浣嶆棤璐э紝瑙ｇ粦璐т綅:{wmsTask.S_START_LOC}", "绔嬪簱");
- TaskProcess.OperateStatus(wmsTask, 4);
- ContainerHelper.delCntr(wmsTask.S_CNTR_CODE);
- ContainerHelper.delCntrItem(wmsTask.S_CNTR_CODE);
- }
- break;
+ // //鍑哄簱鍙栨秷鍒ゆ柇鎺ラ┏浣嶆槸鍚︽湁璐э紝鏈夎揣闇�瑙ｇ粦
+ // if (!WcsTask.WcsCvstate(wmsTask))
+ // {
+ // LogHelper.Info($"Wcs绔嬪簱鎺ラ┏浣嶆棤璐э紝瑙ｇ粦璐т綅:{wmsTask.S_START_LOC}", "绔嬪簱");
+ // TaskProcess.OperateStatus(wmsTask, 4);
+ // ContainerHelper.delCntr(wmsTask.S_CNTR_CODE);
+ // ContainerHelper.delCntrItem(wmsTask.S_CNTR_CODE);
+ // }
+ // break;
- }
- TaskHelper.AddActionRecord(wmsTask.S_CODE, model.state, model.forklift_no, model.ext_data);
-
- }
- else
- {
- //瀹夊叏璇锋眰绛�- TaskProcess.OperateReq(model.task_no, model.state, model.forklift_no, model.ext_data);
- }
- }
-
+ // }
+ // TaskHelper.AddActionRecord(wmsTask.S_CODE, model.state, model.forklift_no.ToString());
+ // }
+ // else
+ // {
+ // //瀹夊叏璇锋眰绛�+ // TaskProcess.OperateReq(model.task_no, model.state, model.forklift_no.ToString());
+ // }
+ //}
}
-
+ public static void addAgvActionState(AgvTaskState model)
+ {
+ var agvAction = new AgvActionState();
+ agvAction.state = model.state;
+ agvAction.task_no = model.task_no;
+ agvAction.forklift_no = model.forklift_no.ToString();
+ if (TaskHelper.CreateAgvActionState(agvAction))
+ {
+ LogHelper.Info("娣诲姞agv鍔ㄤ綔缂撳瓨鎴愬姛淇℃伅" + JsonConvert.SerializeObject(agvAction), "agv鍔ㄤ綔缂撳瓨");
+ }
+ else {
+ LogHelper.Info("娣诲姞agv鍔ㄤ綔缂撳瓨澶辫触淇℃伅" + JsonConvert.SerializeObject(agvAction), "agv鍔ㄤ綔缂撳瓨");
+ }
+ }
+
+
+
/// <summary>
--
Gitblit v1.9.1