From 011d17bc8df981ba31e895873ab0e4a17da8288f Mon Sep 17 00:00:00 2001
From: lss <2538410689@qq.com>
Date: 星期四, 26 六月 2025 17:46:13 +0800
Subject: [PATCH] 优化

---
 HH.WCS.Mobox3/HH.WCS.Mobox3.JiaTong/process/TaskProcess.cs |   32 +++++++++++++++++++++++---------
 1 files changed, 23 insertions(+), 9 deletions(-)

diff --git a/HH.WCS.Mobox3/HH.WCS.Mobox3.JiaTong/process/TaskProcess.cs b/HH.WCS.Mobox3/HH.WCS.Mobox3.JiaTong/process/TaskProcess.cs
index d6064c0..0482db9 100644
--- a/HH.WCS.Mobox3/HH.WCS.Mobox3.JiaTong/process/TaskProcess.cs
+++ b/HH.WCS.Mobox3/HH.WCS.Mobox3.JiaTong/process/TaskProcess.cs
@@ -8,6 +8,7 @@
 using HH.WCS.JiaTong.wms;
 using Microsoft.Owin.BuilderProperties;
 using Newtonsoft.Json;
+using Newtonsoft.Json.Linq;
 using SqlSugar;
 using System;
 using System.Collections.Generic;
@@ -83,13 +84,10 @@
             }
             else
             {
-
                 //璧风偣缁堢偣瑙i攣
                 LocationHelper.UnLockLoc(mst.S_START_LOC);
                 LocationHelper.UnLockLoc(mst.S_END_LOC);
-
             }
-
         }
 
         /// <summary>
@@ -214,13 +212,25 @@
                             if (Device != null)
                             {
                                 //鍐欏叆澶辫触閲嶆柊鍐欏叆
-                                while (!S7Helper.WriteDpj(Device.address, 1001, 1))
+                                if (!S7Helper.WriteDpj(Device.address, 1001, 1))
                                 {
-                                    Thread.Sleep(1000);
+                                    Task.Run(() =>
+                                    {
+                                        while (!S7Helper.WriteDpj(Device.address, 1001, 1))
+                                        {
+                                            Thread.Sleep(1000);
+                                        }
+                                    });
                                 }
-                                while (!S7Helper.WriteDpj(Device.address, 1002, 0))
+                                if (!S7Helper.WriteDpj(Device.address, 1002, 0))
                                 {
-                                    Thread.Sleep(1000);
+                                    Task.Run(() =>
+                                    {
+                                        while (!S7Helper.WriteDpj(Device.address, 1002, 0))
+                                        {
+                                            Thread.Sleep(1000);
+                                        }
+                                    });
                                 }
                             }
                             else
@@ -476,12 +486,16 @@
                 else if (mst.S_TYPE == "鐢垫2")
                 {
                     var mst2 = mstbyEqno.Where(a => a.S_TYPE == "鐢垫1").First();
-                    if (mst2.S_B_STATE == "鍗歌揣瀹屾垚" || mst2.S_B_STATE == "瀹屾垚")
-                    {
+                    if (mst2 == null)
+                    { 
                         return result;
                     }
                     else
                     {
+                        if (mst2.S_B_STATE == "鍗歌揣瀹屾垚" || mst2.S_B_STATE == "瀹屾垚")
+                        {
+                            return result;
+                        }
                         result = false;
                     }
                 }

--
Gitblit v1.9.1