From 9cba325e0d7c30644606e63e5df01faba0c42038 Mon Sep 17 00:00:00 2001
From: lss <2538410689@qq.com>
Date: 星期三, 06 八月 2025 17:18:41 +0800
Subject: [PATCH] 优化

---
 HH.WCS.Mobox3/HH.WCS.Mobox3.JiaTong/process/DeviceProcess.cs |   99 ++++++++++++++++++++++---------------------------
 1 files changed, 44 insertions(+), 55 deletions(-)

diff --git a/HH.WCS.Mobox3/HH.WCS.Mobox3.JiaTong/process/DeviceProcess.cs b/HH.WCS.Mobox3/HH.WCS.Mobox3.JiaTong/process/DeviceProcess.cs
index 656e571..119bf86 100644
--- a/HH.WCS.Mobox3/HH.WCS.Mobox3.JiaTong/process/DeviceProcess.cs
+++ b/HH.WCS.Mobox3/HH.WCS.Mobox3.JiaTong/process/DeviceProcess.cs
@@ -228,7 +228,6 @@
                 {
                     foreach (var device in devices)
                     {
-
                         try
                         {
                             // 涓烘瘡涓澶囧垱寤虹嫭绔嬪鐞嗗尯
@@ -236,7 +235,6 @@
                             {
                                 DpjTrafficRead(device);
                             });
-
                         }
                         catch (Exception ex)
                         {
@@ -293,6 +291,10 @@
             }
 
         }
+        /// <summary>
+        /// 绾跨▼璇诲彇鍙犵洏鏈烘暟鎹�瀛樻斁鍐呭瓨
+        /// </summary>
+        /// <param name="device"></param>
         internal static void DpjTrafficRead(Settings.deviceInfo device)
         {
             while (true)
@@ -324,10 +326,48 @@
 
                     LogHelper.Error($"ReadDpj DpjTraffic:{ex}", ex);
                 }
+                Thread.Sleep(1000);
             }
           
 
         }
+
+        /// <summary>
+        /// 鍙犵洏鏈哄唴瀛樻暟鎹Е鍙戜换鍔�+        /// </summary>
+        /// <param name="dpj"></param>
+        internal static void DpjTraffic2(DpjInfo dpj)
+        {
+
+            try
+            {
+                LogHelper.Info($"鍙犵洏鏈簕dpj.Address},鍙犵洏淇″彿{dpj.PickUp},鏁伴噺{dpj.qty}");
+                if (dpj.qty >= 1 && dpj.PickUp == 1)
+                {
+                   
+                    //鍒涘缓杩囨湭瀹屾垚鐨勪换鍔′笉鍙戣捣璇锋眰
+                    var mst = WCSHelper.GetTaskByStartloc(dpj.Loc);
+                    if (mst == null)
+                    {
+                        Traystacker(dpj.Loc, dpj.qty, 2);
+                    }
+                    else
+                    {
+                        LogHelper.Info($"鏈夋墽琛屼腑鐨勫彔鐩樺洖搴撲换鍔mst.S_CODE}锛屼笉瑙﹀彂鍙犵洏浠诲姟");
+                    }
+                
+                }
+            }
+            catch (Exception ex)
+            {
+
+                LogHelper.Error($"ReadDpj DpjTraffic:{ex}", ex);
+            }
+        }
+        /// <summary>
+        /// 璇诲彇鍙犵洏鏈烘暟鎹Е鍙戜换鍔�+        /// </summary>
+        /// <param name="device"></param>
         internal static void DpjTraffic1(Settings.deviceInfo device)
         {
 
@@ -399,65 +439,14 @@
             {
 
                 LogHelper.Error($"ReadDpj DpjTraffic:{ex}", ex);
+                throw;
             }
 
 
 
 
         }
-
-        internal static void DpjTraffic2(DpjInfo dpj)
-        {
-
-            try
-            {
-                LogHelper.Info($"鍙犵洏鏈簕dpj.Address},鍙犵洏淇″彿{dpj.PickUp},鏁伴噺{dpj.qty}");
-                if (dpj.qty >= 1 && dpj.PickUp == 1)
-                {
-                    //var cntr = db.Queryable<LocCntrRel>().Where(a => a.S_LOC_CODE.Trim() == item.S_CODE).ToList();
-                    //if (cntr.Count > 0)
-                    //{
-                    //    var cntrcodes = cntr.Select(a => a.S_CNTR_CODE).ToArray();
-                    //    cntrcode = string.Join(",", cntrcodes);
-                    //}
-
-                    //鍒涘缓杩囨湭瀹屾垚鐨勪换鍔′笉鍙戣捣璇锋眰
-                    var mst = WCSHelper.GetTaskByStartloc(dpj.Loc);
-                    if (mst == null)
-                    {
-                        Traystacker(dpj.Loc, dpj.qty, 2);
-                    }
-                    else
-                    {
-                        LogHelper.Info($"鏈夋墽琛屼腑鐨勫彔鐩樺洖搴撲换鍔mst.S_CODE}锛屼笉瑙﹀彂鍙犵洏浠诲姟");
-                    }
-                    //var loc = LocationHelper.GetLocByLoc(device.TN_Location);
-                    //if (loc != null)
-                    //{
-                    //    if (loc.N_LOCK_STATE == 0) {
-                    //        Traystacker(device.TN_Location, value, 2);
-                    //    }
-                    //    else
-                    //    {
-                    //        LogHelper.Info($"璁惧璧风偣锛歿device.TN_Location}鏈夐攣锛屼笉鐢熸垚浠诲姟");
-                    //    }
-                    //}
-                    //else
-                    //{
-                    //    LogHelper.Info($"鏍规嵁璁惧锛歿device.deviceName}锛岃捣鐐癸細{device.TN_Location},鏈壘鍒拌揣浣�);
-                    //}
-                }
-            }
-            catch (Exception ex)
-            {
-
-                LogHelper.Error($"ReadDpj DpjTraffic:{ex}", ex);
-            }
-
-
-
-
-        }
+   
         /// <summary>
         /// 鍘熸潗鏂欏簱鎺ュ彛璁块棶
         /// </summary>    

--
Gitblit v1.9.1