From da7196f0acb1349fe0bc6b3b652093b495416adc Mon Sep 17 00:00:00 2001
From: zxx <Zxx@HanInfo>
Date: 星期五, 11 七月 2025 17:42:42 +0800
Subject: [PATCH] 1

---
 HH.WCS.Mobox3/HH.WCS.Mobox3.XiaoMi/process/TaskProcess.cs |  403 +++++++++++++++++++++++++++++++++++++--------------------
 1 files changed, 261 insertions(+), 142 deletions(-)

diff --git a/HH.WCS.Mobox3/HH.WCS.Mobox3.XiaoMi/process/TaskProcess.cs b/HH.WCS.Mobox3/HH.WCS.Mobox3.XiaoMi/process/TaskProcess.cs
index d2a5cdf..943814b 100644
--- a/HH.WCS.Mobox3/HH.WCS.Mobox3.XiaoMi/process/TaskProcess.cs
+++ b/HH.WCS.Mobox3/HH.WCS.Mobox3.XiaoMi/process/TaskProcess.cs
@@ -27,6 +27,8 @@
 using Newtonsoft.Json.Linq;
 using S7.Net;
 using System.Threading.Tasks;
+using HH.WCS.XiaoMi.LISTA.dispatch;
+using static HH.WCS.XiaoMi.LISTA.dispatch.RcsHelper;
 
 namespace HH.WCS.XiaoMi.process
 {
@@ -46,32 +48,14 @@
             {
                 Console.WriteLine($"浠诲姟{mst.S_CODE} 璐т綅{mst.S_START_LOC}鍙栬揣瀹屾垚锛岃捣鐐硅В缁戝鍣▄mst.S_CNTR_CODE}");
                 LogHelper.Info($"浠诲姟{mst.S_CODE} 璐т綅{mst.S_START_LOC}鍙栬揣瀹屾垚锛岃捣鐐硅В缁戝鍣▄mst.S_CNTR_CODE}");
-                if (mst.S_FRAME_CODE != null)
-                {
-                    LocationHelper.UnBindingLocHj(mst.S_START_LOC, mst.S_FRAME_CODE);
+                LocationHelper.UnBindingLoc(mst.S_START_LOC, mst.S_CNTR_CODE.Split(',').ToList());
 
-                }
-                else
-                {
-                    LocationHelper.UnBindingLoc(mst.S_START_LOC, mst.S_CNTR_CODE.Split(',').ToList());
-
-                }
             }
             else
             {
                 Console.WriteLine($"浠诲姟{mst.S_CODE} 璐т綅{mst.S_END_LOC}鍗歌揣瀹屾垚锛岀粓鐐圭粦瀹氬鍣▄mst.S_CNTR_CODE}");
                 LogHelper.Info($"浠诲姟{mst.S_CODE} 璐т綅{mst.S_END_LOC}鍗歌揣瀹屾垚锛岀粓鐐圭粦瀹氬鍣▄mst.S_CNTR_CODE}");
-                //濡傛灉璐ф灦鏈夊�鍒欑粦璐ф灦
-                if (mst.S_FRAME_CODE!=null)
-                {
-                    LocationHelper.BindingLocHj(mst.S_END_LOC, mst.S_FRAME_CODE);
-
-                }
-                else
-                {
-                    LocationHelper.BindingLoc(mst.S_END_LOC, mst.S_CNTR_CODE.Split(',').ToList());
-
-                }
+                LocationHelper.BindingLoc(mst.S_END_LOC, mst.S_CNTR_CODE.Split(',').ToList());
             }
 
         }
@@ -138,9 +122,15 @@
             if (state == 7)
             {
                 CacheBitCancelUpdate(mst);
+                ////灏忕背璁㈠崟鍙栨秷
+                //CancelModel cancelModel = new CancelModel();
+                //cancelModel.order_id = mst.S_WORKSHOP_NO;
+                //cancelModel.order_command_type_id = "2";
+                //RcsHelper.CancelOrder(cancelModel);
+
             }
         }
-        
+
         private static object locLocker = new object();
 
         /// <summary>
@@ -368,7 +358,127 @@
             else { result = true; }
             return result;
         }
+        //灏忕背鎺ㄩ�浠诲姟
+        internal static bool SendXmTask(WCSTask mst)
+        {
+            var result = false;
+            var taskState = mst.N_B_STATE;
+            if (taskState == 0)
+            {
+                Console.WriteLine($"浠诲姟mst {JsonConvert.SerializeObject(mst)}");
+                LogHelper.Info($"浠诲姟mst {JsonConvert.SerializeObject(mst)}", "浠诲姟");
+                //var startLoc = LocationHelper.GetLoc(mst.S_START_LOC);
+                //var endLoc = LocationHelper.GetLoc(mst.S_END_LOC);
+                if (mst.S_START_LOC != null && mst.S_END_LOC != null)
+                {
+                    bool res = false;
+                    if (mst.S_TYPE == "澶т欢")
+                    {
+                        string src = $"\"src\":\"{mst.S_START_LOC}\",";
+                        string dst = $"\"dst\":\"{mst.S_END_LOC}\",";
+                        string carrier_type_id = $"\"carrier_type_id\":\"1\"";
+                        string parmeS = "{";
+                        string parmeD = "}";
+                        string parme = parmeS + src + dst + carrier_type_id + parmeD;
 
+                        LogHelper.Info($"鎺ㄩ�浠诲姟鍙傛暟{parme}", "浠诲姟");
+                        AntsTaskModel model = new AntsTaskModel();
+                        model.order_name = mst.S_CODE;
+                        model.priority = 1;
+                        model.dead_line = DateTime.Now.ToString();
+                        model.ts_name = mst.S_TYPE;
+                        model.parameters = parme;
+                        //model.parameters = new AntsParasModel { 
+                        //    src = mst.S_START_LOC,
+                        //    dst = mst.S_END_LOC,
+                        //    carrier_type_id="-99"
+                        //};
+                        res = RcsHelper.CreateAntsOrder(model);
+                    }
+                    else if (mst.S_TYPE == "灏忎欢閫氱敤杞﹀瀷")
+                    {
+                        string src = $"\"src\":\"{mst.S_START_LOC}\",";
+                        string dst = $"\"dst\":\"{mst.S_END_LOC}\",";
+                        string car_type = $"\"car_type\":\"1\",";
+                        string src_ort = $"\"src_ort\":\"-1\",";
+                        string dst_ort = $"\"dst_ort\":\"-1\"";
+                        string parmeS = "{";
+                        string parmeD = "}";
+                        string parme = parmeS + src + dst + car_type + src_ort + dst_ort + parmeD;
+
+                        LogHelper.Info($"鎺ㄩ�浠诲姟鍙傛暟{parme}", "浠诲姟");
+
+                        PickingTaskModel model = new PickingTaskModel();
+                        model.order_name = mst.S_CODE;
+                        model.priority = 1;
+                        model.dead_line = DateTime.Now.ToString();
+                        model.ts_name = "p2p";
+                        model.parameters = parme;
+                        //model.parameters = new AntsParasModel { 
+                        //    src = mst.S_START_LOC,
+                        //    dst = mst.S_END_LOC,
+                        //    carrier_type_id="-99"
+                        //};
+                        res = RcsHelper.CreatePickingOrder(model);
+                    }
+                    else if (mst.S_TYPE == "inbound")
+                    {
+                        //鏌ュ嚭璐ф灦缂栫爜
+                        var db = new SqlHelper<Object>().GetInstance();
+                        var locFrameRel = db.Queryable<LocFrameRel>().Where(a => a.S_LOC_CODE == mst.S_START_LOC).First();
+                        string tote_id = $"\"tote_id\":\"{locFrameRel.S_FRAME_CODE}\",";
+                        string task_type = $"\"task_type\":\"{mst.S_TYPE}\",";
+                        string src = $"\"src\":\"{mst.S_START_LOC}\",";
+                        string dst = $"\"dst\":\"{mst.S_END_LOC}\",";
+
+                        string extra_info = $"\"extra_info\":";
+                        string layer = $"\"layer\":[1,2,3,4],";
+                        string put = $"\"put\":true";
+                        string parmeS = "{";
+                        string parmeD = "}";
+                        string parmezS = "[";
+                        string parmezD = "]";
+                        string parme = parmeS + tote_id + task_type + src + dst + extra_info + parmezS+ parmeS  + layer + put + parmeD + parmezD + parmeD;
+
+                        LogHelper.Info($"鎺ㄩ�浠诲姟鍙傛暟{parme}", "浠诲姟");
+
+                        PickingTaskModel model = new PickingTaskModel();
+                        model.order_name = mst.S_CODE;
+                        model.priority = 1;
+                        model.dead_line = DateTime.Now.ToString();
+                        model.ts_name = "picking_ts";
+                        model.parameters = parme;
+                        //model.parameters = new AntsParasModel { 
+                        //    src = mst.S_START_LOC,
+                        //    dst = mst.S_END_LOC,
+                        //    carrier_type_id="-99"
+                        //};
+                        res = RcsHelper.CreatePickingOrder(model);
+                    }
+
+
+                    if (res)
+                    {
+                        //鏇存柊浠诲姟鐘舵�
+                        mst.N_B_STATE = 1;
+                        //mst.S_EQ_TASK_CODE = res.ToString();
+                        WCSHelper.UpdateStatus(mst);
+                        WCSHelper.UpdateEQNo(mst);
+                        ////鎺ㄩ�鎴愬姛锛屼慨鏀逛换鍔$姸鎬�+                        //TaskHelper.UpdateStatus(mst, "宸叉帹閫�);
+                        ////鎺ㄩ�鎴愬姛锛屼慨鏀瑰浗鑷狪D
+                        //TaskHelper.UpdateGzId(mst, res);
+                        LogHelper.Info($"浠诲姟mst {mst.S_CODE}鎺ㄩ�鎴愬姛", "浠诲姟");
+                        result = true;
+                    }
+
+                }
+
+            }
+
+            else { result = true; }
+            return result;
+        }
 
         /// <summary>
         /// 鍒涘缓鎼繍浠诲姟
@@ -390,6 +500,25 @@
 
 
             var res = WCSHelper.CreateTask(taskNo, start.Trim(), end.Trim(), taskType, priority, trayCodes, trayCarryCount, startLayer, endLayer);
+            if (res)
+            {
+                result = true;
+                //浠诲姟鍒涘缓鎴愬姛锛岃捣鐐硅揣浣嶅嚭搴撻攣瀹氾紝缁堢偣璐т綅鍏ュ簱閿佸畾
+                LocationHelper.LockLoc(start, 2);
+                LocationHelper.LockLoc(end, 1);
+            }
+            return result;
+        }
+        //灏忕背澶т欢
+        public static bool CreateTransportDj(string start, string end, string taskType, string cntrs, string orderName, int startLayer, int endLayer, int trayCarryCount = 1, int priority = 1)
+        {
+            var result = false;
+            var trayCodes = cntrs;
+            var taskNo = DateTime.Now.Ticks.ToString();
+
+
+
+            var res = WCSHelper.CreateTaskDj(taskNo, start.Trim(), end.Trim(), taskType, priority, trayCodes, orderName, trayCarryCount, startLayer, endLayer);
             if (res)
             {
                 result = true;
@@ -714,7 +843,7 @@
                         result = list.OrderBy(s => s.N_ROW).ThenBy(x => x.N_COL).FirstOrDefault();
 
                     }
-                    
+
                 }
 
             }
@@ -894,70 +1023,71 @@
                 switch (model.ts_name)
                 {
                     case "p2p":
-                        startLoc = db.Queryable<Location>().Where(a => a.S_CODE == model.parameter.src).First();
+                        startLoc = db.Queryable<Location>().Where(a => a.S_CODE == model.parameters.src).First();
                         if (startLoc == null || startLoc.N_LOCK_STATE != 0 || startLoc.C_ENABLE != "Y")
                         {
-                            Message = $"{model.parameter.src}搴撲綅宸茶閿佸畾!";
+                            Message = $"{model.parameters.src}搴撲綅宸茶閿佸畾!";
                         }
-                        endLocStr = model.parameter.dst;
-                        
+                        endLocStr = model.parameters.dst;
+
                         break;
                     case "p2a":
-                        startLoc = db.Queryable<Location>().Where(a => a.S_CODE == model.parameter.src).First();
+                        startLoc = db.Queryable<Location>().Where(a => a.S_CODE == model.parameters.src).First();
                         if (startLoc == null || startLoc.N_LOCK_STATE != 0 || startLoc.C_ENABLE != "Y")
                         {
-                            Message = $"{model.parameter.src}搴撲綅宸茶閿佸畾!";
+                            Message = $"{model.parameters.src}搴撲綅宸茶閿佸畾!";
                         }
-                        var endLoc = InWorkTransport(model.parameter.dst_area);
-                        if (endLoc==null)
+                        var endLoc = InWorkTransport(model.parameters.dst_area);
+                        if (endLoc == null)
                         {
                             //濡傛灉娌℃壘鍒板氨绛夌涓�潯
-                            endLocStr = db.Queryable<Location>().Where(a => a.S_AREA_CODE.Trim() == model.parameter.dst).OrderByDescending(a => a.N_ROW).ToList()[0].S_CODE;
+                            endLocStr = db.Queryable<Location>().Where(a => a.S_AREA_CODE.Trim() == model.parameters.dst).OrderByDescending(a => a.N_ROW).ToList()[0].S_CODE;
 
                         }
                         break;
                     case "a2p":
-                        startLoc = OutWorkTransport(model.parameter.src_area);
-                        if (startLoc==null)
-                        {
-                            Message = $"{model.parameter.dst}搴撳尯娌℃湁鍙嚭璐т綅!";
-                        }
-
-                        endLocStr = model.parameter.dst;
-                        break;
-                    case "a2a":
-                        startLoc = OutWorkTransport(model.parameter.src_area);
+                        startLoc = OutWorkTransport(model.parameters.src_area);
                         if (startLoc == null)
                         {
-                            Message = $"{model.parameter.src}搴撳尯娌℃湁鍙嚭璐т綅!";
+                            Message = $"{model.parameters.dst}搴撳尯娌℃湁鍙嚭璐т綅!";
                         }
-                        var endLoc1 = InWorkTransport(model.parameter.dst_area);
+
+                        endLocStr = model.parameters.dst;
+                        break;
+                    case "a2a":
+                        startLoc = OutWorkTransport(model.parameters.src_area);
+                        if (startLoc == null)
+                        {
+                            Message = $"{model.parameters.src}搴撳尯娌℃湁鍙嚭璐т綅!";
+                        }
+                        var endLoc1 = InWorkTransport(model.parameters.dst_area);
                         if (endLoc1 == null)
                         {
                             //濡傛灉娌℃壘鍒板氨绛夌涓�潯
-                            endLocStr = db.Queryable<Location>().Where(a => a.S_AREA_CODE.Trim() == model.parameter.dst).OrderByDescending(a => a.N_ROW).ToList()[0].S_CODE;
+                            endLocStr = db.Queryable<Location>().Where(a => a.S_AREA_CODE.Trim() == model.parameters.dst).OrderByDescending(a => a.N_ROW).ToList()[0].S_CODE;
 
                         }
                         break;
                     case "p2u":
-                        startLoc = OutWorkTransport(model.parameter.src);
+                        startLoc = OutWorkTransport(model.parameters.src);
                         if (startLoc == null)
                         {
-                            Message = $"{model.parameter.src}搴撳尯娌℃湁鍙嚭璐т綅!";
+                            Message = $"{model.parameters.src}搴撳尯娌℃湁鍙嚭璐т綅!";
                         }
                         endLocStr = "";
                         break;
                 }
 
+                LogHelper.Info($"bigMaterial  鎺ユ敹鍙傛暟{JsonConvert.SerializeObject(model)}");
                 //鍒涘缓鎵樼洏璐т綅缁戝畾鍏崇郴
                 string trayCode = ContainerHelper.GenerateCntrNo();
                 //缁戝畾璧风偣璐т綅(浜х嚎)鍜岀墿鏂�-                ContainerHelper.BindLocCntrsXm(startLoc.S_CODE, trayCode, model.parameter.sku, "", model.parameter.BatchNo, model.parameter.issueMode, model.parameter.num);
+                ContainerHelper.BindLocCntrsXm(startLoc.S_CODE, trayCode, model.parameters.sku, "", model.parameters.BatchNo, model.parameters.issueMode, model.parameters.num);
 
                 var locCntrRel = db.Queryable<LocCntrRel>().Where(a => a.S_LOC_CODE == startLoc.S_CODE).First();
                 //鍒涘缓浠诲姟
-                LogHelper.Info($"鍒涘缓浠诲姟 璧风偣:{startLoc.S_CODE}缁堢偣:{endLocStr}", model.ts_name);
-                var res = TaskProcess.CreateTransport(startLoc.S_CODE, endLocStr, model.ts_name, locCntrRel.S_CNTR_CODE, 1, 1);
+                LogHelper.Info($"鍒涘缓浠诲姟 璧风偣:{startLoc.S_CODE}缁堢偣:{endLocStr}", "澶т欢");
+                var res = TaskProcess.CreateTransportDj(startLoc.S_CODE, endLocStr, "澶т欢", locCntrRel.S_CNTR_CODE, model.order_name, 1, 1);
                 if (!res)
                 {
                     return new TaskResponse
@@ -1000,127 +1130,116 @@
 
         }
 
-        
-        public static TaskResponse autoSmallMaterial(smallMaterial model) {
+        //灏忎欢
+        public static TaskResponse smallMaterial(smallMaterial model)
+        {
             var db = new SqlHelper<Location>().GetInstance();
-
-            string Message = null;
-
-            //鎷嗗垎鎴愪袱鏉′换鍔★紝涓�潯鏄枡鏋跺埌鎸囧畾鐨勭紦瀛樺尯锛屼簩鏄枡鏋朵笂鐨勬墭鐩樺埌鎸囧畾鐨勫伐浣嶏紙灏忕背wcs浼狅級涓�澶�-            var startFrame = db.Queryable<LocFrameRel>().Where(a => a.S_LOC_CODE == model.parameters[0].src).First();
-
-            var startLoc = db.Queryable<Location>().Where(a => a.S_CODE == startFrame.S_FRAME_CODE).First();
-            if (startLoc == null || startLoc.N_LOCK_STATE != 0)
+            try
             {
-                return new TaskResponse
-                {
-                    header = new ResponseHead { code = 0, desc = $"{model.parameters[0].src}搴撲綅宸茶閿佸畾!" }
-                };
-            }
-            var endReservoirs = Settings.ReservoirAreas.Where(s => s.areaName == model.routeType).FirstOrDefault();
-            var endLoc = TaskProcess.InWorkTransport(endReservoirs.areaCode);
-            if (endLoc != null)
-            {
-                //鍒涘缓鍒扮紦瀛樺尯浠诲姟
-                var locCntrRel = db.Queryable<LocCntrRel>().Where(a => a.S_LOC_CODE == startLoc.S_CODE).First();
-                //鍒涘缓浠诲姟
-                LogHelper.Info($"鍒涘缓浠诲姟 璧风偣:{startLoc.S_CODE}缁堢偣:{endLoc.S_CODE}", model.ts_name);
-                var res = TaskProcess.CreateTransportHj(startLoc.S_CODE, endLoc.S_CODE, model.ts_name, locCntrRel.S_FRAME_CODE, 1, 1);
-                if (!res)
+                string Message = null;
+
+                //鎷嗗垎鎴愪袱鏉′换鍔★紝涓�潯鏄枡鏋跺埌鎸囧畾鐨勭紦瀛樺尯锛屼簩鏄枡鏋朵笂鐨勬墭鐩樺埌鎸囧畾鐨勫伐浣嶏紙灏忕背wcs浼狅級涓�澶�+                var startLoc = db.Queryable<Location>().Where(a => a.S_CODE == model.taskList[0].parameters.src).First();
+                if (startLoc == null || startLoc.N_LOCK_STATE != 0)
                 {
                     return new TaskResponse
                     {
-                        header = new ResponseHead { code = 0, desc = "鑷姩涓婄嚎浠诲姟鍒涘缓澶辫触" }
-                    }; 
+                        header = new ResponseHead { code = 0, desc = $"{model.taskList[0].parameters.src}搴撲綅宸茶閿佸畾!" }
+                    };
                 }
-            }
-            //鏂欐灦涓婄殑鎵樼洏鍒版寚瀹氱殑宸ヤ綅
-            foreach (var parameter in model.parameters)
-            {
-                var startLocHj = db.Queryable<Location>().Where(a => a.S_CODE == parameter.src).First();
-                if (startLocHj == null || startLocHj.N_LOCK_STATE != 0)
+                var endLoc = TaskProcess.InWorkTransport(model.shippingRoute);
+                if (endLoc != null)
                 {
-                     Message = Message==null? $"{model.parameters[0].src}搴撲綅宸茶閿佸畾!": Message+ $"{model.parameters[0].src}搴撲綅宸茶閿佸畾!";
-                }
-                else
-                {
-                    //璐ф灦涓婄殑璐у垽鏂竴涓嬭揣鏋舵湁娌℃湁閿�-                    var startFrameParent = db.Queryable<LocFrameRel>().Where(a => a.S_LOC_CODE == parameter.src).First();
-                    if (startFrameParent != null)
+                    ////鍒涘缓鍒扮紦瀛樺尯浠诲姟
+                    //var locCntrRel = db.Queryable<LocCntrRel>().Where(a => a.S_LOC_CODE == startLoc.S_CODE).First();
+                    
+                    //鎵緋2a鐨勪换鍔$紪鐮�+                    var order_name = model.taskList.Find(s=>s.ts_name=="p2a").order_name;
+                    //鍒涘缓浠诲姟
+                    LogHelper.Info($"鍒涘缓浠诲姟 璧风偣:{startLoc.S_CODE}缁堢偣:{endLoc.S_CODE}", "灏忎欢閫氱敤杞﹀瀷");
+                    var res = TaskProcess.CreateTransportDj(startLoc.S_CODE, endLoc.S_CODE, "灏忎欢閫氱敤杞﹀瀷", model.rackNumber, order_name, 1, 1);
+                    if (!res)
                     {
-                        var startLocParent = db.Queryable<Location>().Where(a => a.S_CODE == startFrameParent.S_FRAME_CODE).First();
-                        if (startLocParent == null || startLocParent.N_LOCK_STATE != 0)
+                        return new TaskResponse
+                        {
+                            header = new ResponseHead { code = 0, desc = "鑷姩涓婄嚎浠诲姟鍒涘缓澶辫触" }
+                        };
+                    }
+                }
+                //鏂欐灦涓婄殑鎵樼洏鍒版寚瀹氱殑宸ヤ綅
+                foreach (var tasklist in model.taskList)
+                {
+                    if (tasklist.ts_name == "p2p")
+                    {
+                        //鍏堢粦瀹氭枡鏋跺拰鏂欑浣�+                        ContainerHelper.BindLocCntrsXmLj(tasklist.rackPosition, model.rackNumber);
+
+                        var startloc = db.Queryable<Location>().Where(a => a.S_CODE == tasklist.rackPosition).First();
+                        if (startloc == null || startloc.N_LOCK_STATE != 0)
                         {
                             return new TaskResponse
                             {
-                                header = new ResponseHead { code = 0, desc = $"{startFrameParent.S_FRAME_CODE}璐ф灦宸茶閿佸畾!" }
+                                header = new ResponseHead { code = 0, desc = $"{startloc.S_CODE}搴撲綅宸茶閿佸畾!" }
                             };
                         }
-                    }
-                    var endLocHj = db.Queryable<Location>().Where(a => a.S_CODE == parameter.dst).First();
-                    if (endLocHj == null || endLocHj.N_LOCK_STATE != 0 || endLocHj.C_ENABLE != "Y")
-                    {
-                        //搴旇缁曡矾
+                        var endlocstr = tasklist.parameters.dst;
 
-                        Message = Message == null ? $"{parameter.dst}搴撲綅宸茶閿佸畾!" : Message + $"{parameter.dst}搴撲綅宸茶閿佸畾!";
-                    }
-                    else
-                    {
-                        //璐ф灦涓婄殑璐у垽鏂竴涓嬭揣鏋舵湁娌℃湁閿�-                        var endFrameParent = db.Queryable<LocFrameRel>().Where(a => a.S_LOC_CODE == parameter.dst).First();
-                        if (endFrameParent != null)
-                        {
-                            var endLocParent = db.Queryable<Location>().Where(a => a.S_CODE == endFrameParent.S_FRAME_CODE).First();
-                            if (endLocParent == null || endLocParent.N_LOCK_STATE != 0)
-                            {
-                                return new TaskResponse
-                                {
-                                    header = new ResponseHead { code = 0, desc = $"{endFrameParent.S_FRAME_CODE}璐ф灦宸茶閿佸畾!" }
-                                };
-                            }
-                        }
-                        //鍒涘缓鍒扮紦瀛樺尯浠诲姟
-                        var locCntrRel1 = db.Queryable<LocCntrRel>().Where(a => a.S_LOC_CODE == startLocHj.S_CODE).First();
+                        //鍒涘缓鎵樼洏璐т綅缁戝畾鍏崇郴
+                        string trayCode = ContainerHelper.GenerateCntrNo();
+                        //缁戝畾璧风偣璐т綅(浜х嚎)鍜岀墿鏂�+                        ContainerHelper.BindLocCntrsXm(startloc.S_CODE, trayCode, tasklist.parameters.sku, "", tasklist.parameters.BatchNo, tasklist.parameters.issueMode, tasklist.parameters.num);
+
+                        var locCntrRel = db.Queryable<LocCntrRel>().Where(a => a.S_LOC_CODE == startloc.S_CODE).First();
                         //鍒涘缓浠诲姟
-                        LogHelper.Info($"鍒涘缓浠诲姟 璧风偣:{startLocHj.S_CODE}缁堢偣:{endLocHj.S_CODE}", model.ts_name);
-                        var res = TaskProcess.CreateTransport(startLocHj.S_CODE, endLocHj.S_CODE, model.ts_name, locCntrRel1.S_CNTR_CODE, 1, 1);
+                        LogHelper.Info($"鍒涘缓浠诲姟 璧风偣:{startloc.S_CODE}缁堢偣:{endlocstr}", "inbound");
+                        var res = TaskProcess.CreateTransportDj(startloc.S_CODE, endlocstr, "inbound", locCntrRel.S_CNTR_CODE, tasklist.order_name, 1, 1);
                         if (!res)
                         {
                             return new TaskResponse
                             {
-                                header = new ResponseHead { code = 0, desc = "鑷姩涓婄嚎浠诲姟2鍒涘缓澶辫触" }
+                                header = new ResponseHead { code = 1, desc = Message }
                             };
+
                         }
 
                     }
-                    
+
                 }
-            }
-            var result = new TaskResponse();
-            if (Message != null)
-            {
-                result = new TaskResponse
+                var result = new TaskResponse();
+                if (Message != null)
                 {
-                    header = new ResponseHead { code = 0, desc = Message }
-                };
-            }
-            else
-            {
-                result = new TaskResponse
-                {
-                    header = new ResponseHead { code = 200, desc = "SUCCESS" },
-                    body = new ResponseBody
+                    result = new TaskResponse
                     {
-                        msg = "success",
-                        app_name = "Guozi client",
-                        data = new List<ResponseData> { new ResponseData { in_order_id = model.taskID } },
-                        version = ""
-                    }
-                };
+                        header = new ResponseHead { code = 0, desc = Message }
+                    };
+                }
+                else
+                {
+                    result = new TaskResponse
+                    {
+                        header = new ResponseHead { code = 200, desc = "SUCCESS" },
+                        body = new ResponseBody
+                        {
+                            msg = "success",
+                            app_name = "Guozi client",
+                            data = new List<ResponseData> { new ResponseData { in_order_id = model.taskList[0].taskID } },
+                            version = ""
+                        }
+                    };
+                }
+                return result;
+
+
+
             }
-            return result;
+            catch (Exception ex)
+            {
+                Console.WriteLine("smallMaterial:" + ex.Message + ex.StackTrace);
+                LogHelper.Error("smallMaterial:" + ex.Message, ex);
+                throw;
+            }
         }
-        
+
 
 
     }

--
Gitblit v1.9.1