From 802fc04c2d744d08c3e577dd4d91d60a3071e3d7 Mon Sep 17 00:00:00 2001
From: user <user@DESKTOP-SM1UI64>
Date: 星期二, 15 七月 2025 23:08:35 +0800
Subject: [PATCH] 111
---
HH.WCS.Mobox3.NongFuLinZhi/core/WCSCore.cs | 42 ++++++++++++++++++++++++++++--------------
1 files changed, 28 insertions(+), 14 deletions(-)
diff --git a/HH.WCS.Mobox3.NongFuLinZhi/core/WCSCore.cs b/HH.WCS.Mobox3.NongFuLinZhi/core/WCSCore.cs
index b2ef758..001b6ba 100644
--- a/HH.WCS.Mobox3.NongFuLinZhi/core/WCSCore.cs
+++ b/HH.WCS.Mobox3.NongFuLinZhi/core/WCSCore.cs
@@ -1,4 +1,5 @@
-锘縰sing HH.WCS.Mobox3.NFLZ.dispatch;
+锘縰sing HH.WCS.Mobox3.NFLZ.api;
+using HH.WCS.Mobox3.NFLZ.dispatch;
using HH.WCS.Mobox3.NFLZ.process;
using HH.WCS.Mobox3.NFLZ.util;
using HH.WCS.Mobox3.NFLZ.wms;
@@ -13,26 +14,26 @@
public const string AlterControlSwitch01 = "1";//浠诲姟涓婃姤MES鍙樻洿寮�彂 1-寮�惎 0-鍏抽棴
public static void OperateAgvTaskStatus(AgvTaskState model) {
- if (string.IsNullOrEmpty(model.No)) {
+ if (string.IsNullOrEmpty(model.task_no)) {
//鏃犱换鍔″彿璇锋眰(浜ょ)
//DeviceProcess.Traffic(model.ForkliftNo, model.LockNo, model.State==1023);
}
else {
- var TN_Task = WCSHelper.GetTask(model.No);
+ var TN_Task = WCSHelper.GetTask(model.task_no);
if (TN_Task != null) {
- if (model.State <= 7)
+ if (model.state <= 7)
{
- if (!WCSHelper.CheckActionRecordExist(model.No, model.State))
+ if (!WCSHelper.CheckActionRecordExist(model.task_no, model.state))
{
//鏈変换鍔″彿璇锋眰
- switch (model.State)
+ switch (model.state)
{
case 1:
WCSHelper.Begin(TN_Task);
break;
#region MyRegion
case 3:
- WCSHelper.UpdateStatus(TN_Task, "寮�鍙栬揣", model.ForkliftNo);
+ WCSHelper.UpdateStatus(TN_Task, "寮�鍙栬揣", model.forklift_no);
//if (TN_Task.S_TYPE == "娉ㄥ搴撳瓨婊℃墭涓嬬嚎锛堢摱鍧級" || TN_Task.S_TYPE == "娉ㄥ鍗充骇婊℃墭涓嬬嚎锛堢摱鍧級")
//{
// TaskProcess.writeSignal(TN_Task);
@@ -40,6 +41,10 @@
break;
case 4:
WCSHelper.UpdateStatus(TN_Task, "鍙栬揣瀹屾垚");
+ if (TN_Task.S_TYPE.Contains("婊℃墭涓嬬嚎"))
+ {
+ TaskProcess.writeSignal(TN_Task,4);
+ }
TaskProcess.OperateStatus(TN_Task, 4);
break;
case 5:
@@ -47,6 +52,10 @@
break;
case 6:
WCSHelper.UpdateStatus(TN_Task, "鍗歌揣瀹屾垚");
+ if (TN_Task.S_TYPE.Contains("绌烘墭涓婄嚎"))
+ {
+ TaskProcess.writeSignal(TN_Task,6);
+ }
TaskProcess.OperateStatus(TN_Task, 6);
break;
#endregion
@@ -70,18 +79,23 @@
//WMSHelper.End(TN_Task);
break;
}
- WCSHelper.AddActionRecord(model.No, model.State, model.ForkliftNo, model.ExtData);
+ WCSHelper.AddActionRecord(model.task_no, model.state, model.forklift_no, model.ext_data);
//璋冪敤绗笁鏂规帴鍙ｏ紙濡傛灉鏈夛級TaskProcess.ReportStatus
- TaskProcess.ThirdReportStatus(TN_Task, model.State, model.ForkliftNo);
- TaskProcess.UpdateAgvNo(TN_Task, model.ForkliftNo);
- if (AlterControlSwitch01 == "1") TaskProcess.GeneralInterFaceFunc(TN_Task, model.State.ToString(), model.ForkliftNo);
+ TaskProcess.ThirdReportStatus(TN_Task, model.state, model.forklift_no);
+ TaskProcess.UpdateAgvNo(TN_Task, model.forklift_no);
+ if (AlterControlSwitch01 == "1") TaskProcess.GeneralInterFaceFunc(TN_Task, model.state.ToString(), model.forklift_no);
}
}
- else {
+ else if(model.state == 8)
+ {
+ TaskProcess.cancelTask(TN_Task);
+ }
+ else
+ {
LogHelper.Info("瀹夊叏璇锋眰浜や簰");
//瀹夊叏璇锋眰绛�- TaskProcess.OperateReq(model.No, model.State, model.ForkliftNo, model.ExtData);
- WCSHelper.AddActionRecord(model.No, model.State, model.ForkliftNo, model.ExtData);
+ TaskProcess.OperateReq(model.task_no, model.state, model.forklift_no, model.ext_data);
+ WCSHelper.AddActionRecord(model.task_no, model.state, model.forklift_no, model.ext_data);
}
}
}
--
Gitblit v1.9.1