From 30b008a25cc30a32f1e2fdee4a34ae71146e990e Mon Sep 17 00:00:00 2001
From: 海波 张 <2956280567@qq.com>
Date: 星期一, 21 七月 2025 17:28:09 +0800
Subject: [PATCH] 取消，异常流程，修改
---
api/MoboxController.cs | 12 +++++-------
1 files changed, 5 insertions(+), 7 deletions(-)
diff --git a/api/MoboxController.cs b/api/MoboxController.cs
index 7baf13f..82c18fe 100644
--- a/api/MoboxController.cs
+++ b/api/MoboxController.cs
@@ -61,7 +61,7 @@
return result;
}
- internal static Result cancelTask1(cancleTaskParme model)
+ internal static Result cancelTask1(MoboxTaskBase model)
{
var result = new Result();
LogHelper.Info("cancelTask1鍙栨秷浠诲姟淇℃伅锛� + JsonConvert.SerializeObject(model), "鍙栨秷");
@@ -75,9 +75,9 @@
try
{
- var task = TaskHelper.GetTaskByWorkNo(model.task_no, "agv");
+ var task = TaskHelper.GetTaskByWorkNo(model.TaskNo, "agv");
- var wcsTask = TaskHelper.GetTaskByWorkNo(model.task_no, "wcs");
+ var wcsTask = TaskHelper.GetTaskByWorkNo(model.TaskNo, "wcs");
if (task != null)
{
@@ -141,8 +141,9 @@
else
{
result.errCode = 1;
- result.errMsg = $"{model.task_no}浠诲姟涓嶅瓨鍦�;
+ result.errMsg = $"{model.TaskNo}浠诲姟涓嶅瓨鍦�;
result.success = false;
+ return result;
}
if (wcsTask != null)
@@ -230,9 +231,7 @@
WmsTaskAction ac4 = TaskHelper.GetActionRecord(task.S_CODE, "4");
if (ac4 != null)
{
-
LogHelper.Info("CompleteTask agv浠诲姟宸茬粡鍙栬揣瀹屾垚,浠诲姟寮哄埗瀹屾垚澶勭悊", "寮哄埗瀹屾垚");
-
TaskHelper.UpdateStatus(task, "鍗歌揣瀹屾垚");
LocationHelper.UnLockLoc(task.S_END_LOC);
@@ -249,7 +248,6 @@
}
else
{
-
LogHelper.Info("CompleteTask agv浠诲姟娌℃湁鍙栬揣瀹屾垚,浠诲姟鍙栨秷澶勭悊", "寮哄埗瀹屾垚");
var cancle = new cancleTaskParme();
cancle.task_no = task.S_CODE;
--
Gitblit v1.9.1