From 265fbfa342cc03991c79934b162f26c0a6699f95 Mon Sep 17 00:00:00 2001
From: 海波 张 <2956280567@qq.com>
Date: 星期五, 25 七月 2025 17:31:20 +0800
Subject: [PATCH] 0725
---
process/TaskProcess.cs | 7 +++----
1 files changed, 3 insertions(+), 4 deletions(-)
diff --git a/process/TaskProcess.cs b/process/TaskProcess.cs
index adb30f5..63905a7 100644
--- a/process/TaskProcess.cs
+++ b/process/TaskProcess.cs
@@ -1029,7 +1029,7 @@
{
LocationHelper.UnLockLoc(work.CONNECTION);
}
- result.errCode = 0;
+ result.errCode = 0;
result.errMsg = "鍙栨秷鎴愬姛";
result.success = true;
return result;
@@ -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
{
@@ -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))
--
Gitblit v1.9.1