From 3865194441f1e1da34c0be9034d86c8d0d68706c Mon Sep 17 00:00:00 2001
From: lss <2538410689@qq.com>
Date: 星期五, 04 七月 2025 17:26:23 +0800
Subject: [PATCH] 接口调用中间表开发

---
 HH.WCS.Mobox3/HH.WCS.Mobox3.JiaTong/process/DeviceProcess.cs |   52 ++++++++++++++++++++++++++++++++++++++++------------
 1 files changed, 40 insertions(+), 12 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 bb8dea6..29f1da9 100644
--- a/HH.WCS.Mobox3/HH.WCS.Mobox3.JiaTong/process/DeviceProcess.cs
+++ b/HH.WCS.Mobox3/HH.WCS.Mobox3.JiaTong/process/DeviceProcess.cs
@@ -48,7 +48,7 @@
         /// <summary>
         /// 鍙犵洏鏈虹┖鎵樿繑鍥�         /// </summary>    
-        internal static void Traystacker(string loc, int qty, int type)
+        internal static void Traystacker(string loc, int qty, int type,string cntrcode="")
         {
             try
             {
@@ -91,8 +91,9 @@
         /// </summary>
         internal static void Traffic()
         {
+            Console.WriteLine("寮�鍘熸潗鏂欏彔鐩樹綅缃垽鏂�);
             var db = new SqlHelper<object>().GetInstance();
-            List<string> locs = new List<string>() { "LCDP-001" };
+            List<string> locs = new List<string>() { "LCDP-001", "BADPW-01" };
             var location = db.Queryable<Location>().Where(a => locs.Contains(a.S_CODE)).ToList();
             if (location.Count > 0)
             {
@@ -105,8 +106,8 @@
                         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);
+                             cntrcode = cntr.OrderBy(a=>a.T_CREATE).First().S_CNTR_CODE;
+                           // cntrcode = string.Join(",", cntrcodes);
                         }
 
                         //鍒涘缓杩囨湭瀹屾垚鐨勪换鍔′笉鍙戣捣璇锋眰
@@ -126,9 +127,9 @@
         internal static void KjTraffic()
         {
 
-
+            Console.WriteLine("寮�浜曟澗agv鍙犵洏鍥炲簱浣嶇疆鍒ゆ柇");
             var db = new SqlHelper<object>().GetInstance();
-            List<string> locs = new List<string>() { "PMDDW-001" };
+            List<string> locs = new List<string>() { "AGV12DP-001", "AGV01DP-001", "AGV05DP-001" };
             var location = db.Queryable<Location>().Where(a => locs.Contains(a.S_CODE)).ToList();
             if (location.Count > 0)
             {
@@ -144,12 +145,23 @@
                         //    var cntrcodes = cntr.Select(a => a.S_CNTR_CODE).ToArray();
                         //    cntrcode = string.Join(",", cntrcodes);
                         //}
-
+                        string cntrcode = "";
+                        var cntr = db.Queryable<LocCntrRel>().Where(a => a.S_LOC_CODE.Trim() == item.S_CODE).ToList();
+                        if (cntr.Count > 0)
+                        {
+                            cntrcode = cntr.OrderBy(a => a.T_CREATE).First().S_CNTR_CODE;
+                            // cntrcode = string.Join(",", cntrcodes);
+                        }
+                        LogHelper.Info($"璐т綅{item.S_CODE}鍙犳弧6涓紑濮嬪洖璋冩帴鍙�);
                         //鍒涘缓杩囨湭瀹屾垚鐨勪换鍔′笉鍙戣捣璇锋眰
                         var mst = WCSHelper.GetTaskByStartloc(item.S_CODE);
                         if (mst == null)
                         {
-                            Traystacker(item.S_CODE, item.N_CURRENT_NUM, 1);
+                            Traystacker(item.S_CODE, item.N_CURRENT_NUM, 2, cntrcode);
+                        }
+                        else
+                        {
+                            LogHelper.Info($"鏈夋墽琛屼腑鐨勫彔鐩樺洖搴撲换鍔mst.S_CODE}锛屼笉瑙﹀彂鍙犵洏浠诲姟");
                         }
                     }
                 }
@@ -215,7 +227,21 @@
                             {
                                 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},鏈壘鍒拌揣浣�);
+                            //}
                         }
                         else
                         {
@@ -237,8 +263,9 @@
         /// <summary>
         /// 鍘熸潗鏂欏簱鎺ュ彛璁块棶
         /// </summary>    
-        internal static void AgvEmptyBack(string loc, string cntrcode)
+        internal static Resultmobox AgvEmptyBack(string loc, string cntrcode)
         {
+            Resultmobox result = new Resultmobox();
             try
             {
                 string partNumber = "";
@@ -248,7 +275,7 @@
                 result1.data = traystacker;
                 HttpHelper httpHelper = new HttpHelper();
                 //璋冪敤鎺ュ彛
-                Resultmobox result = new Resultmobox();
+             
                 string date = JsonConvert.SerializeObject(result1);
                 string url = Settings.tableUrls.Find(a => a.id == 11).url;
                 LogHelper.Info($"绌烘墭杩斿洖锛氬湴鍧�{url}锛屽唴瀹癸細{date}");
@@ -263,11 +290,12 @@
                 {
                     LogHelper.Info($"绌烘墭杩斿洖璇锋眰澶辫触=>msg:{result.err_msg}");
                 }
-
+                return result;
             }
             catch (Exception ex)
             {
                 LogHelper.Info($"绌烘墭杩斿洖  Error=>{ex.ToString()}");
+                return result;
             }
         }
 

--
Gitblit v1.9.1