From ba528c7a15058967ee3af7364035209aa0048025 Mon Sep 17 00:00:00 2001
From: lss <2538410689@qq.com>
Date: 星期一, 07 七月 2025 17:30:14 +0800
Subject: [PATCH] 测试优化
---
HH.WCS.Mobox3/HH.WCS.Mobox3.DaYang/core/WCSCore.cs | 47 ++++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 46 insertions(+), 1 deletions(-)
diff --git a/HH.WCS.Mobox3/HH.WCS.Mobox3.DaYang/core/WCSCore.cs b/HH.WCS.Mobox3/HH.WCS.Mobox3.DaYang/core/WCSCore.cs
index 100b5db..bc6bc6a 100644
--- a/HH.WCS.Mobox3/HH.WCS.Mobox3.DaYang/core/WCSCore.cs
+++ b/HH.WCS.Mobox3/HH.WCS.Mobox3.DaYang/core/WCSCore.cs
@@ -1,5 +1,6 @@
锘縰sing HH.WCS.DaYang.dispatch;
using HH.WCS.DaYang.process;
+using HH.WCS.DaYang.util;
using HH.WCS.DaYang.wms;
using System;
using System.Collections.Generic;
@@ -59,6 +60,21 @@
#endregion
case 2:
WCSHelper.End(TN_Task);
+ //鏌ヨ褰撳墠浠诲姟鏄惁瀛樺湪浣滀笟锛屽鏋滄湁浣滀笟鍒欏畬鎴愪綔涓�+ if (!string.IsNullOrEmpty(TN_Task.S_OP_CODE))
+ {
+ var NowmsTask = WCSHelper.GetWcsTaskByState(TN_Task.S_OP_CODE, new int[] { 1, 2 });
+ if (NowmsTask == null)
+ {
+ var WmsTask = WMSHelper.GetWmsTask(TN_Task.S_OP_CODE);
+ if (WmsTask == null)
+ {
+ WmsTask.N_B_STATE = 3;
+ WMSHelper.UpdateTaskState(WmsTask);
+ }
+
+ }
+ }
break;
case 7:
TaskProcess.OperateStatus(TN_Task, 7);
@@ -83,6 +99,7 @@
public static Result<Empty> NotifyTaskStatus(NotifyTaskStatusModel model)
{
Result<Empty> result = new Result<Empty>() { Code = 1, Msg = "鍙嶉鎴愬姛" };
+
try
{
var TN_Task = WCSHelper.GetTask(model.TaskNo);
@@ -110,10 +127,38 @@
case 6:
WCSHelper.UpdateStatus(TN_Task, "鍗歌揣瀹屾垚");
TaskProcess.OperateStatus(TN_Task, 6);
+ if (TN_Task.S_TYPE == "鐗╂枡鍏ュ簱")
+ {
+ //鍏ュ簱瀹屾垚 淇敼鍏ュ簱鏃堕棿
+ var cntrItme = ContainerHelper.FindCntrItemByCntr(TN_Task.S_CNTR_CODE);
+ if (cntrItme != null)
+ {
+ ContainerHelper.UpdateInTime(cntrItme);
+ }
+ else
+ {
+ LogHelper.Info($"浠诲姟{TN_Task.S_CODE}锛屽嵏璐у畬鎴愶紝骞舵棤鎵樼洏鐗╂枡缁戝畾鍏崇郴");
+ }
+ }
break;
#endregion
case 2:
WCSHelper.End(TN_Task);
+ //鏌ヨ褰撳墠浠诲姟鏄惁瀛樺湪浣滀笟锛屽鏋滄湁浣滀笟鍒欏畬鎴愪綔涓�+ if (!string.IsNullOrEmpty(TN_Task.S_OP_CODE))
+ {
+ var NowmsTask = WCSHelper.GetWcsTaskByState(TN_Task.S_OP_CODE, new int[] { 0, 1, 2 });
+ if (NowmsTask == null)
+ {
+ var WmsTask = WMSHelper.GetWmsTask(TN_Task.S_OP_CODE);
+ if (WmsTask != null)
+ {
+ WmsTask.N_B_STATE = 3;
+ WMSHelper.UpdateTaskState(WmsTask);
+ }
+
+ }
+ }
break;
case 7:
TaskProcess.OperateStatus(TN_Task, 7);
@@ -140,7 +185,7 @@
result.Msg = $"Error:ex";
LogHelper.Info($"EquipmentInfo:{result.Msg}");
return result;
-
+
}
}
--
Gitblit v1.9.1