From adbeeccfcddddbba49718136a1ebb3429ab3b7ae Mon Sep 17 00:00:00 2001
From: lss <Lss@HanInfo>
Date: 星期三, 04 六月 2025 08:35:50 +0800
Subject: [PATCH] 电梯流程开发

---
 HH.WCS.Mobox3/HH.WCS.Mobox3.JiaTong/core/WCSCore.cs |   41 +++++++++++++++++++----------------------
 1 files changed, 19 insertions(+), 22 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..fc40140 100644
--- a/HH.WCS.Mobox3/HH.WCS.Mobox3.JiaTong/core/WCSCore.cs
+++ b/HH.WCS.Mobox3/HH.WCS.Mobox3.JiaTong/core/WCSCore.cs
@@ -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);
+                                    }
+                                }
+                            }
                             //鍘熸潗鏂欐帴鍙i渶瑕佸姞涓妕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