From c283573b53247033cf83b8fcddd8a022ea6454ab Mon Sep 17 00:00:00 2001
From: IPC-610 <IPC-610@DESKTOP-6LEOOS3>
Date: 星期四, 26 九月 2024 08:20:38 +0800
Subject: [PATCH] 修改测试问题

---
 Admin.NET/WCS.Application/Util/HttpService.cs |   80 +++++++++++++++++++++++++++++++++++++---
 1 files changed, 74 insertions(+), 6 deletions(-)

diff --git a/Admin.NET/WCS.Application/Util/HttpService.cs b/Admin.NET/WCS.Application/Util/HttpService.cs
index 1119c0f..b462687 100644
--- a/Admin.NET/WCS.Application/Util/HttpService.cs
+++ b/Admin.NET/WCS.Application/Util/HttpService.cs
@@ -1,8 +1,10 @@
-锘縰sing Elastic.Clients.Elasticsearch;
+锘縰sing DocumentFormat.OpenXml.EMMA;
+using Elastic.Clients.Elasticsearch;
 using Furion.Logging;
 using Furion.RemoteRequest.Extensions;
 using Newtonsoft.Json;
 using System.Text;
+using WCS.Application.Entity;
 using static SKIT.FlurlHttpClient.Wechat.Api.Models.ComponentTCBBatchCreateContainerServiceVersionResponse.Types;
 
 namespace WCS.Application;
@@ -86,6 +88,70 @@
     }
 
     /// <summary>
+    /// 璋冪敤WMS鎺ュ彛鑷姩鐮佸灈缁戝畾淇℃伅杩斿洖宸烽亾鍙�
+    /// </summary>
+    /// <returns></returns>
+    public string BindRequestRoadWay(string orderNo, string palletNo,decimal qty ,string type,string skuNo, string lotNo, string lotText, string supplierLot, List<WcsBoxInfo> detail,
+        string startLocat, string taskModel, string ceng, ref string endLocat, ref string taskNo)
+    {
+        string returnStr = "";
+
+        var task = _db.Queryable<WcsTask>().First(m => m.IsDelete == false && (m.Status == TaskStatusEnum.Wait || m.Status == TaskStatusEnum.Doing) && m.TaskType == TaskTypeEnum.In && m.PalletNo == palletNo);
+        if (task == null)
+        {
+            var model = new BoxPalletBindVm()
+            {
+                OrderCode= orderNo,
+                AsnNo= orderNo,
+                AsnDetailNo=0,
+                PalletNo=palletNo,
+                Qty= qty,
+                Type=type,
+                SkuNo=skuNo,
+                LotNo= lotNo,
+                LotText= lotText,
+                SupplierLot= supplierLot,
+                Detail=detail
+            };
+            string url = Urls.WMSAddress + ":" + Urls.WMSPort;
+            var result = (url + "/api/DownAPi/BindRequestRoadWay").SetBody(model, "application/json", Encoding.UTF8).PostAsAsync<ResponseTasks>().Result;
+            Log.Information("璋冪敤WMS鎺ュ彛鍙嶉浠诲姟鎺ュ彛" + result.ToJson());
+            if (result.Success == 0)
+            {
+                var taskAdd = new WcsTask()
+                {
+                    TaskType = TaskTypeEnum.In,
+                    Status = TaskStatusEnum.Wait,
+                    Origin = "WMS",
+                    StartLocate = startLocat,
+                    PalletNo = palletNo,
+                    TaskNo = result.TaskList.TaskNo,
+                    EndLocate = result.TaskList.EndLocate,
+                    EndRoadway = result.TaskList.EndRoadway
+                };
+
+                _db.Insertable(taskAdd).ExecuteCommand();
+                endLocat = result.TaskList.EndRoadway;
+                returnStr = result.TaskList.EndLocate;
+            }
+            else
+            {
+                returnStr = "-1:" + result.Message;
+                return returnStr;
+            }
+        }
+        else
+        {
+            returnStr = task.EndLocate;
+            endLocat = task.EndRoadway;
+            taskNo = task.TaskNo;
+        }
+
+        endLocat = PLCCommon.RoadwayToStationNum(endLocat, ceng);
+
+        return returnStr;
+    }
+    /// <summary>
     /// 璋冪敤WMS鎺ュ彛鐢宠鍌ㄤ綅鎺ュ彛
     /// </summary>
     /// <param name="palletNo"></param>
@@ -99,7 +165,9 @@
         string returnStr = "";
 
 
-        var task = _db.Queryable<WcsTask>().First(m => m.IsDelete == false && (m.Status == TaskStatusEnum.Wait || m.Status == TaskStatusEnum.Doing) && m.TaskType == TaskTypeEnum.In && m.PalletNo == palletNo && string.IsNullOrWhiteSpace(m.EndLocate));
+        var task = _db.Queryable<WcsTask>().First(m => m.IsDelete == false 
+        && (m.Status == TaskStatusEnum.Wait || m.Status == TaskStatusEnum.Doing) 
+        && m.TaskType == TaskTypeEnum.In && m.PalletNo == palletNo && !string.IsNullOrWhiteSpace(m.EndLocate));
 
         if (task == null)
         {
@@ -116,8 +184,6 @@
             Log.Information("璋冪敤WMS鐢宠鍌ㄤ綅鎺ュ彛鍙嶉浠诲姟鎺ュ彛" + result.ToJson());
             if (result.Success == 0)
             {
-
-               
                 var taskUp = _db.Queryable<WcsTask>().First(m => m.IsDelete == false && m.TaskNo == result.TaskList.TaskNo);
                 if (taskUp == null)
                 {
@@ -134,12 +200,14 @@
                         EndRoadway = result.TaskList.EndRoadway
                     };
                     _db.Insertable(taskAdd).ExecuteCommand();
+                    HubUtil.PublicTask(taskAdd.Adapt<WcsTaskOutput>());
                 }
                 else
                 {
                     taskUp.EndRoadway = result.TaskList.EndRoadway;
                     taskUp.EndLocate = result.TaskList.EndLocate;
                     _db.Updateable(taskUp).ExecuteCommand();
+                    HubUtil.PublicTask(taskUp.Adapt<WcsTaskOutput>());
                 }
 
                
@@ -168,10 +236,10 @@
     /// </summary>
     /// <param name="model">浠诲姟瀹屾垚鐘舵��</param>
     /// <returns></returns>
-    public async Task<ResponseTasks> RequestTask(TaskRequest model)
+    public async Task<ResponseModel> RequestTask(TaskRequestWMS model)
     {
         string url = Urls.WMSAddress + ":" + Urls.WMSPort;
-        var result = await (url + "/api/DownAPi/ReceiveWcsSignal").SetBody(model, "application/json", Encoding.UTF8).PostAsAsync<ResponseTasks>();
+        var result = await (url + "/api/DownAPi/ReceiveWcsSignal").SetBody(model, "application/json", Encoding.UTF8).PostAsAsync<ResponseModel>();
         Log.Information("璋冪敤WMS鎺ュ彛鍙嶉浠诲姟鎺ュ彛" + result.ToJson());
         return result;
     }

--
Gitblit v1.8.0