From f7d36a3dd47e06bf76863179af1d76bd0e23054f Mon Sep 17 00:00:00 2001
From: lss <Lss@HanInfo>
Date: 星期一, 19 五月 2025 10:25:17 +0800
Subject: [PATCH] s7协议S7200Smart开发,接口字段更新

---
 HH.WCS.Mobox3/HH.WCS.Mobox3.JiaTong/process/DeviceProcess.cs |   63 ++++++++++++++++++++++++++-----
 1 files changed, 52 insertions(+), 11 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 a153929..ae84134 100644
--- a/HH.WCS.Mobox3/HH.WCS.Mobox3.JiaTong/process/DeviceProcess.cs
+++ b/HH.WCS.Mobox3/HH.WCS.Mobox3.JiaTong/process/DeviceProcess.cs
@@ -10,6 +10,7 @@
 using System.Linq;
 using System.Threading;
 using static HH.WCS.JiaTong.LISTA.process.HttpModel;
+using static System.Collections.Specialized.BitVector32;
 
 namespace HH.WCS.JiaTong.process
 {
@@ -51,24 +52,30 @@
             try
             {
                 //涓婁紶鏁版嵁
-                Result<Traystacker> result1 = new Result<Traystacker>();
-                Traystacker traystacker = new Traystacker() { station = loc, taskSource = 1, Qty = qty };
-                result1.data.Add(traystacker);
+                Traystacker result1 = new Traystacker(){ station = loc, taskSource = 1, Qty = qty };
+              
                 HttpHelper httpHelper = new HttpHelper();
                 Result result = new Result();
                 string date = JsonConvert.SerializeObject(result1);
-                string url = Settings.tableUrls.Find(a => a.id == 2).url;
-                LogHelper.Info($"鍙犵洏鏈虹┖鎵樿繑鍥烇細鍦板潃:{url}锛屽唴瀹癸細{date}");
-                var r = httpHelper.WebPost(url, date);
-                result = JsonConvert.DeserializeObject<Result>(r);
-                if (result.code == "0")
+                var url = Settings.tableUrls.Find(a => a.id == 2);
+                if (url != null)
                 {
+                    LogHelper.Info($"鍙犵洏鏈虹┖鎵樿繑鍥烇細鍦板潃:{url.url}锛屽唴瀹癸細{date}");
+                    var r = httpHelper.WebPost(url.url, date);
+                    result = JsonConvert.DeserializeObject<Result>(r);
+                    if (result.code == "0")
+                    {
 
-                    LogHelper.Info($"鍙犵洏鏈虹┖鎵樿繑鍥炶姹傛垚鍔�);
+                        LogHelper.Info($"鍙犵洏鏈虹┖鎵樿繑鍥炶姹傛垚鍔�);
+                    }
+                    else
+                    {
+                        LogHelper.Info($"鍙犵洏鏈虹┖鎵樿繑鍥炶姹傚け璐�>msg:{result.msg}");
+                    }
                 }
                 else
                 {
-                    LogHelper.Info($"鍙犵洏鏈虹┖鎵樿繑鍥炶姹傚け璐�>msg:{result.msg}");
+                    LogHelper.Info($"鍙犵洏鏈虹┖鎵�鏍规嵁id=2锛屾湭鎵惧埌閰嶇疆閾炬帴锛岃妫�煡閰嶇疆鏂囦欢");
                 }
 
             }
@@ -78,6 +85,9 @@
             }
         }
 
+        /// <summary>
+        /// 鍘熸潗鏂欏簱agv鍙犵洏鍥炲簱
+        /// </summary>
         internal static void Traffic()
         {
             var db = new SqlHelper<object>().GetInstance();
@@ -108,9 +118,13 @@
                 }
             }
         }
+
+        /// <summary>
+        /// 浜曟澗agv鍙犵洏鍥炲簱
+        /// </summary>
         internal static void KjTraffic()
         {
-           
+
 
             var db = new SqlHelper<object>().GetInstance();
             List<string> locs = new List<string>() { "PMDDW-001" };
@@ -140,6 +154,33 @@
                 }
             }
         }
+
+        /// <summary>
+        /// 浜曟澗鍙犵洏鏈哄彔鐩樺洖搴�+        /// </summary>
+        internal static void DpjTraffic()
+        {
+            string startBti = "CMB17-DP-001";
+
+            var value = S7Helper.ReadDpj(2014, S7.Net.VarType.Int);
+
+            if (value >= 7)
+            {
+                //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)
+                {
+                    Traystacker(startBti, value);
+                }
+            }
+        }
         /// <summary>
         /// 鍘熸潗鏂欏簱鎺ュ彛璁块棶
         /// </summary>    

--
Gitblit v1.9.1