From 64ec1a7fb55389d8db371d112e49f741de866796 Mon Sep 17 00:00:00 2001
From: lss <Lss@HanInfo>
Date: 星期三, 18 六月 2025 16:41:26 +0800
Subject: [PATCH] 业务开发与优化
---
HH.WCS.Mobox3/HH.WCS.Mobox3.DaYang/core/WCSCore.cs | 40 +++++++++++++++++++++++++++-------------
1 files changed, 27 insertions(+), 13 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 f2a2a48..100b5db 100644
--- a/HH.WCS.Mobox3/HH.WCS.Mobox3.DaYang/core/WCSCore.cs
+++ b/HH.WCS.Mobox3/HH.WCS.Mobox3.DaYang/core/WCSCore.cs
@@ -42,7 +42,7 @@
//{
// WMSHelper.DeletetWHInventory(TN_Task);
//}
- // WMSHelper.DeleteAZLInventory(TN_Task);
+ // WMSHelper.DeleteAZLInventory(TN_Task);
break;
case 5:
WCSHelper.UpdateStatus(TN_Task, "寮�鍗歌揣");
@@ -54,7 +54,7 @@
//{
// WMSHelper.AddWHInventory(TN_Task);
//}
- // WMSHelper.AddAZLInventory(TN_Task);
+ // WMSHelper.AddAZLInventory(TN_Task);
break;
#endregion
case 2:
@@ -65,7 +65,7 @@
WCSHelper.Fail(TN_Task);
break;
}
- WCSHelper.AddActionRecord(model.No, model.State, model.ForkliftNo, model.ExtData,"agv");
+ WCSHelper.AddActionRecord(model.No, model.State, model.ForkliftNo, model.ExtData, "agv");
//璋冪敤绗笁鏂规帴鍙ｏ紙濡傛灉鏈夛級TaskProcess.ReportStatus
}
else
@@ -80,9 +80,11 @@
}
}
- public static void NotifyTaskStatus(NotifyTaskStatusModel model)
+ public static Result<Empty> NotifyTaskStatus(NotifyTaskStatusModel model)
{
-
+ Result<Empty> result = new Result<Empty>() { Code = 1, Msg = "鍙嶉鎴愬姛" };
+ try
+ {
var TN_Task = WCSHelper.GetTask(model.TaskNo);
if (TN_Task != null)
{
@@ -118,13 +120,29 @@
WCSHelper.Fail(TN_Task);
break;
}
- WCSHelper.AddActionRecord(model.TaskNo, model.Status,"","","wcs");
- //璋冪敤绗笁鏂规帴鍙ｏ紙濡傛灉鏈夛級TaskProcess.ReportStatus
+ WCSHelper.AddActionRecord(model.TaskNo, model.Status, "", "", "wcs");
}
-
+
+ }
+ else
+ {
+ result.Code = -1;
+ result.Msg = $"鏍规嵁浠诲姟鍙�{model.TaskNo}鏈幏鍙栧埌浠诲姟";
+ LogHelper.Info($"EquipmentInfo:{result.Msg}");
+ return result;
}
-
+ return result;
+ }
+ catch (Exception ex)
+ {
+ result.Code = -1;
+ result.Msg = $"Error:ex";
+ LogHelper.Info($"EquipmentInfo:{result.Msg}");
+ return result;
+
+ }
+
}
/// <summary>
/// 浠诲姟鍒嗗彂锛屾牴鎹皟搴︾被鍨嬪彂缁欎笉鍚岀殑璋冨害绯荤粺
@@ -138,16 +156,12 @@
{
list.ForEach(task =>
{
-
if (!TaskProcess.Intercept(task))
{
//浣跨敤鑷畾涔変换鍔℃帹閫� TaskProcess.SendTask(task);
}
-
});
-
-
}
}
--
Gitblit v1.9.1