From 59f836bf0eb00b7707c74fe8edb8fa7662c871ab Mon Sep 17 00:00:00 2001
From: lss <Lss@HanInfo>
Date: 星期二, 27 五月 2025 17:22:42 +0800
Subject: [PATCH] 合肥佳通优化

---
 HH.WCS.Mobox3/HH.WCS.Mobox3.JiaTong/process/DeviceProcess.cs |   61 +++++++++++++++++-------------
 1 files changed, 35 insertions(+), 26 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 8a26bb6..e5c5e4f 100644
--- a/HH.WCS.Mobox3/HH.WCS.Mobox3.JiaTong/process/DeviceProcess.cs
+++ b/HH.WCS.Mobox3/HH.WCS.Mobox3.JiaTong/process/DeviceProcess.cs
@@ -160,38 +160,47 @@
         /// </summary>
         internal static void DpjTraffic()
         {
-            string startBti = "CMB17-DP-001";
+            var devices = Settings.deviceInfos.Where(a => a.deviceType == 1).ToList();
+            //var db = new SqlHelper<object>().GetInstance();
+            //var list = db.Queryable<Location>().Where(a => a.N_CURRENT_NUM > 0  && a.N_LOCK_STATE == 0).OrderByDescending(a => a.N_COL).Take(1).PartitionBy(a => a.N_ROW).ToList();
             try
             {
-                var IsDp = S7Helper.ReadDpj(2001, S7.Net.VarType.Byte);
-                var value = S7Helper.ReadDpj(2014, S7.Net.VarType.Int);
-
-                if (value >= 1 && IsDp == 1)
+                if (devices.Count > 0)
                 {
-                    //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(startBti);
-                    if (mst == null)
+                    foreach (var device in devices)
                     {
-                        Traystacker(startBti, value, 2);
-                    }
-                    else
-                    {
-                        LogHelper.Info($"鏈夋墽琛屼腑鐨勫彔鐩樺洖搴撲换鍔mst.S_CODE}锛屼笉瑙﹀彂鍙犵洏浠诲姟");
-                    }
+                        var IsDp = S7Helper.ReadDpj(device.address,2001, S7.Net.VarType.Byte);
+                        var value = S7Helper.ReadDpj(device.address,2014, S7.Net.VarType.Int);
 
+                        if (value >= 1 && IsDp == 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(device.TN_Location);
+                            if (mst == null)
+                            {
+                                Traystacker(device.TN_Location, value, 2);
+                            }
+                            else
+                            {
+                                LogHelper.Info($"鏈夋墽琛屼腑鐨勫彔鐩樺洖搴撲换鍔mst.S_CODE}锛屼笉瑙﹀彂鍙犵洏浠诲姟");
+                            }
+
+                        }
+                        else
+                        {
+                            LogHelper.Info($"鍙犵洏鏈烘暟閲忥細{value},鍙犵洏淇″彿锛歿IsDp}锛屼笉瑙﹀彂鍙犵洏浠诲姟");
+                        }
+                        Thread.Sleep(8000);
+                    }
                 }
-                else
-                {
-                    LogHelper.Info($"鍙犵洏鏈烘暟閲忥細{value},鍙犵洏淇″彿锛歿IsDp}锛屼笉瑙﹀彂鍙犵洏浠诲姟");
-                }
-                Thread.Sleep(8000);
+               
             }
             catch (Exception ex)
             {

--
Gitblit v1.9.1