From 25184cadd4011856d95e76f1d79b37ce51a3e548 Mon Sep 17 00:00:00 2001
From: chengsc <Demo@DESKTOP-CPA90BF>
Date: 星期三, 30 十月 2024 11:34:12 +0800
Subject: [PATCH] 修改问题

---
 Admin.NET/WCS.Application/Util/HttpService.cs |   66 +++++++++++++++++++++++++++++++-
 1 files changed, 63 insertions(+), 3 deletions(-)

diff --git a/Admin.NET/WCS.Application/Util/HttpService.cs b/Admin.NET/WCS.Application/Util/HttpService.cs
index b462687..9e0a195 100644
--- a/Admin.NET/WCS.Application/Util/HttpService.cs
+++ b/Admin.NET/WCS.Application/Util/HttpService.cs
@@ -60,12 +60,14 @@
                     StartLocate = startLocat,
                     PalletNo = palletNo,
                     TaskNo = result.TaskList.TaskNo,
+                    Levels = 999,
                     EndLocate = result.TaskList.EndLocate,
                     EndRoadway = result.TaskList.EndRoadway
                 };
                 
                 _db.Insertable(taskAdd).ExecuteCommand();
                 endLocat = result.TaskList.EndRoadway;
+                taskNo = result.TaskList.TaskNo;
                 returnStr = result.TaskList.EndLocate;
                 
             }
@@ -101,9 +103,9 @@
         {
             var model = new BoxPalletBindVm()
             {
-                OrderCode= orderNo,
+                OrderCode= "",//鏆傛棤涓婃父绯荤粺缂栧彿
                 AsnNo= orderNo,
-                AsnDetailNo=0,
+                AsnDetailNo=0,//鏆傛棤鍏ュ簱鍗曟槑缁嗙紪鍙凤紝WMS鏍规嵁鐗╂枡鎵规鏌ユ壘
                 PalletNo=palletNo,
                 Qty= qty,
                 Type=type,
@@ -227,7 +229,6 @@
         }
 
         return returnStr;
-        
     }
 
 
@@ -269,4 +270,63 @@
         Log.Information("璋冪敤WMS鎺ュ彛鍙嶉婊″彇寮傚父鎺ュ彛" + result.ToJson());
         return result;
     }
+
+    /// <summary>
+    /// 璋冪敤WMS鎺ュ彛鐢宠绌烘墭璺哄嚭搴�
+    /// </summary>
+    /// <param name="Num"></param>
+    /// <param name="OutMode"></param>
+    /// <returns></returns>
+    public string IssuePlnOutHouseWcs(string Num,string OutMode)
+    {
+        string returnStr = "";
+
+        var model = new OutPalletModel()
+        {
+            Num = Num,//鍑哄簱璺烘暟
+            OutMode = OutMode//鍑哄簱鍙�
+        };
+        string url = Urls.WMSAddress + ":" + Urls.WMSPort;
+        var result = (url + "/api/DownAPi/IssuePlnOutHouseWcs").SetBody(model, "application/json", Encoding.UTF8).PostAsAsync<ResponseOutPallet>().Result;
+        Log.Information("璋冪敤WMS鎺ュ彛鍙嶉浠诲姟鎺ュ彛" + result.ToJson());
+
+        if (result.Success == 0)
+        {
+            foreach (var item in result.TaskList)
+            {
+                var taskUp = _db.Queryable<WcsTask>().First(m => m.IsDelete == false && m.TaskNo == item.TaskNo);
+                if (taskUp == null)
+                {
+                    var taskAdd = new WcsTask()
+                    {
+                        TaskNo = item.TaskNo,
+                        TaskType = (TaskTypeEnum)(int.Parse(item.TaskType)),
+                        Status = TaskStatusEnum.Wait,
+                        //IsSuccess =TaskSuccessEnum.Success,
+                        Origin = "WMS",
+                        StartLocate = item.StartLocate,
+                        StartRoadway=item.StartRoadway,
+                        PalletNo = item.PalletNo,
+                        EndLocate = item.EndLocate,
+                        EndRoadway = item.EndRoadway
+                    };
+                    _db.Insertable(taskAdd).ExecuteCommand();
+                    HubUtil.PublicTask(taskAdd.Adapt<WcsTaskOutput>());
+                }
+                else
+                {
+                    taskUp.EndRoadway = item.EndRoadway;
+                    taskUp.EndLocate = item.EndLocate;
+                    _db.Updateable(taskUp).ExecuteCommand();
+                    HubUtil.PublicTask(taskUp.Adapt<WcsTaskOutput>());
+                }
+            }
+        }
+        else
+        {
+            returnStr = "-1:" + result.Message;
+            return returnStr;
+        }
+        return returnStr;
+    }
 }

--
Gitblit v1.8.0