From 3a56820d028e98ac3c4bd315aa76181d7d6720cd Mon Sep 17 00:00:00 2001
From: 海波 张 <2956280567@qq.com>
Date: 星期一, 28 七月 2025 17:29:57 +0800
Subject: [PATCH] 金坛二合一出库修改
---
api/MoboxController.cs | 24 +++++++++++++++++-------
1 files changed, 17 insertions(+), 7 deletions(-)
diff --git a/api/MoboxController.cs b/api/MoboxController.cs
index 227a20b..b9cbb86 100644
--- a/api/MoboxController.cs
+++ b/api/MoboxController.cs
@@ -78,8 +78,11 @@
if (wcsTask1 != null)
{
+ if (wcsTask1.S_B_STATE != "鍙栨秷" && wcsTask1.S_B_STATE != "瀹屾垚")
+ {
+ TaskHelper.Fail(wcsTask1);
+ }
TaskProcess.OperateStatus(wcsTask1, 7);
- TaskHelper.Fail(wcsTask1);
}
}
else
@@ -146,6 +149,8 @@
}
else {
WmsTaskAction ac4 = TaskHelper.GetActionRecord(wmsTask.S_CODE, "4");
+
+ LogHelper.Info($"鏌ヨ浠诲姟{wmsTask.S_CODE}锛屾槸鍚﹀彇璐у畬鎴愶細" + JsonConvert.SerializeObject(ac4), "Mobox鍙栨秷");
if (ac4 != null)
{
ContainerHelper.delCntr(wmsTask.S_CNTR_CODE);
@@ -192,16 +197,18 @@
}
var transportTask = TaskHelper.GetTaskByNoType(model.TaskNo,"wcs");
+
+
if (transportTask != null)
{
- if (transportTask.S_TYPE == "鍙栨秷"|| transportTask.S_TYPE == "瀹屾垚")
+ if (transportTask.S_B_STATE == "鍙栨秷"|| transportTask.S_B_STATE == "瀹屾垚")
{
result.resultCode = 1;
- result.resultMsg = $"{model.TaskNo},閫氱煡Wcs鍙栨秷浠诲姟澶辫触锛屼换鍔＄姸鎬亄transportTask.S_TYPE}";
+ result.resultMsg = $"{model.TaskNo},閫氱煡Wcs鍙栨秷浠诲姟澶辫触锛屼换鍔＄姸鎬亄transportTask.S_B_STATE}";
LogHelper.Info($"CancelWcsTask杩斿洖:" + JsonConvert.SerializeObject(result), "Mobox鍙栨秷");
return result;
}
- if (transportTask.S_TYPE == "鏈墽琛�)
+ if (transportTask.S_B_STATE == "鏈墽琛�)
{
TaskHelper.Fail(transportTask);
TaskProcess.OperateStatus(transportTask, 7);
@@ -223,6 +230,8 @@
{
TaskHelper.Fail(agvTask1);
NDCApi.CancelOrder(agvTask1.S_CODE.Trim());
+
+ LogHelper.Info($"CancelWcsTask鍙栨秷{model.TaskNo}锛岃В閿�, "瑙ｉ攣");
TaskProcess.CacheBitCancelUpdate(agvTask1);
}
}
@@ -425,7 +434,8 @@
LogHelper.Info("CompleteTask agv浠诲姟宸茬粡鍙栬揣瀹屾垚,浠诲姟寮哄埗瀹屾垚澶勭悊", "寮哄埗瀹屾垚");
TaskHelper.UpdateStatus(task, "鍗歌揣瀹屾垚");
- LocationHelper.UnLockLoc(task.S_END_LOC);
+
+ //LocationHelper.UnLockLoc(task.S_END_LOC);
TaskProcess.OperateStatus(task, 6);
//濡傛灉鏄簩娈典换鍔″垯涓嬪彂绔嬪簱浠诲姟
@@ -449,9 +459,9 @@
if (task.S_SCHEDULE_TYPE.Contains("wcs")) {
LogHelper.Info("CompleteTask wcs浠诲姟寮哄埗瀹屾垚澶勭悊", "寮哄埗瀹屾垚");
- LocationHelper.UnLockLoc(task.S_START_LOC);
+ //LocationHelper.UnLockLoc(task.S_START_LOC);
TaskProcess.OperateStatus(task, 4);
- LocationHelper.UnLockLoc(task.S_END_LOC);
+ //LocationHelper.UnLockLoc(task.S_END_LOC);
TaskProcess.OperateStatus(task, 6);
TaskHelper.End(task);
LocationHelper.CreateUpAndDown(task);
--
Gitblit v1.9.1