From e1a97fc8b29f063e96e3ebbae2f07ee95b276069 Mon Sep 17 00:00:00 2001
From: lss <Lss@HanInfo>
Date: 星期四, 05 六月 2025 17:25:31 +0800
Subject: [PATCH] 合肥佳通优化
---
HH.WCS.Mobox3/HH.WCS.Mobox3.JiaTong/core/WCSCore.cs | 45 +++++++++++++++++++++------------------------
1 files changed, 21 insertions(+), 24 deletions(-)
diff --git a/HH.WCS.Mobox3/HH.WCS.Mobox3.JiaTong/core/WCSCore.cs b/HH.WCS.Mobox3/HH.WCS.Mobox3.JiaTong/core/WCSCore.cs
index 8c33a08..92da512 100644
--- a/HH.WCS.Mobox3/HH.WCS.Mobox3.JiaTong/core/WCSCore.cs
+++ b/HH.WCS.Mobox3/HH.WCS.Mobox3.JiaTong/core/WCSCore.cs
@@ -32,7 +32,7 @@
switch (model.state)
{
case 1:
- WCSHelper.Begin(TN_Task);
+ WCSHelper.Begin(TN_Task, model.forklift_no);
break;
#region MyRegion
case 3:
@@ -47,7 +47,7 @@
break;
case 6:
WCSHelper.UpdateStatus(TN_Task, "鍗歌揣瀹屾垚");
- if (TN_Task.S_NOTE != "鍏ュ簱")
+ if (TN_Task.S_NOTE != "鍏ュ簱" && TN_Task.S_NOTE != "绌烘墭鍥炲簱")
{
TaskProcess.OperateStatus(TN_Task, 6);
}
@@ -104,36 +104,33 @@
{
LogHelper.Info($"浠诲姟鍥炴姤锛氫换鍔＄被鍨嬮敊璇�);
}
+ if (TN_Task.S_TYPE.Contains("鐢垫"))
+ {
+ if (TN_Task.S_TYPE == "鐢垫1")
+ {
+ if (TN_Task.S_CODE == "1" || TN_Task.S_CODE == "3" || TN_Task.S_CODE == "4")
+ {
+ TaskProcess.Reportbackmobox(TN_Task.S_EQ_NO, TN_Task.S_CODE, model.state, url);
+ }
+ }
+ else if (TN_Task.S_TYPE == "鐢垫2")
+ {
+ if (TN_Task.S_CODE == "5" || TN_Task.S_CODE == "6" || TN_Task.S_CODE == "2")
+ {
+ TaskProcess.Reportbackmobox(TN_Task.S_EQ_NO, TN_Task.S_CODE, model.state, url);
+ }
+ }
+ }
//鍘熸潗鏂欐帴鍙ｉ渶瑕佸姞涓妕oken
- if (TN_Task.Z_TYPE == 4)
+ else if (TN_Task.Z_TYPE == 4)
{
Console.WriteLine($"鍘熸潗鏂欎换鍔″洖鎶TN_Task.S_EQ_NO}");
var db = new SqlHelper<object>().GetInstance();
var mstbyEqno = db.Queryable<WCSTask>().Where(a => a.S_EQ_NO.Trim() == TN_Task.S_EQ_NO).ToList();
//鍒嗘。浠诲姟鍥炴姤,浠诲姟1鍙洖鎶� 3 4 浠诲姟2鍙洖鎶�5 6 2
- if (TN_Task.S_TYPE.Contains("鐢垫"))
- {
- if (TN_Task.S_TYPE == "鐢垫1")
- {
- if (TN_Task.S_CODE == "1" || TN_Task.S_CODE == "3" || TN_Task.S_CODE == "4")
- {
- TaskProcess.Reportbackmobox(TN_Task.S_EQ_NO, TN_Task.S_CODE, model.state, url);
- }
- }
- else if (TN_Task.S_TYPE == "鐢垫2")
- {
- if (TN_Task.S_CODE == "5" || TN_Task.S_CODE == "6" || TN_Task.S_CODE == "2")
- {
- TaskProcess.Reportbackmobox(TN_Task.S_EQ_NO, TN_Task.S_CODE, model.state, url);
- }
- }
- }
- else
- {
- TaskProcess.Reportbackmobox(TN_Task.S_EQ_NO, TN_Task.S_CODE, model.state, url);
- }
+ TaskProcess.Reportbackmobox(TN_Task.S_EQ_NO, TN_Task.S_CODE, model.state, url);
}
else
{
--
Gitblit v1.9.1