From 413194b8c6a71fea8cb7a567800b11703c6c7d5a Mon Sep 17 00:00:00 2001
From: chengsc <11752@DESKTOP-DS49RCP>
Date: 星期三, 11 六月 2025 14:40:05 +0800
Subject: [PATCH] 添加叠托机业务

---
 Admin.NET/WCS.Application/OpenApi/OpenApi.cs |   33 ++++++++++++++++++++++++++++++---
 1 files changed, 30 insertions(+), 3 deletions(-)

diff --git a/Admin.NET/WCS.Application/OpenApi/OpenApi.cs b/Admin.NET/WCS.Application/OpenApi/OpenApi.cs
index e1a8e4b..c6a068c 100644
--- a/Admin.NET/WCS.Application/OpenApi/OpenApi.cs
+++ b/Admin.NET/WCS.Application/OpenApi/OpenApi.cs
@@ -3,6 +3,7 @@
 using Furion.Logging;
 using WCS.Application.Entity;
 using WCS.Application.Util;
+using static SKIT.FlurlHttpClient.Wechat.Api.Models.ComponentTCBBatchCreateContainerServiceVersionRequest.Types;
 
 namespace WCS.Application;
 
@@ -98,7 +99,8 @@
             throw Oops.Bah("浠诲姟宸插瓨鍦�!");
         }
         var listTask = new List<WcsTask>();
-        foreach (var models in modelList)
+        var list = modelList.OrderBy(m => m.Order).ThenBy(m => m.TaskNo).ToList();
+        foreach (var models in list)
         {
             if (models.TaskType == "0")
             {
@@ -125,6 +127,7 @@
                 EndLocate = models.EndLocate,
                 EndRoadway = models.EndRoadway,
                 PalletNo = models.PalletNo,
+                CreateTime = DateTime.Now
             };
 
             // 鑻ラ潪AGV浠诲姟澧炲姞浠诲姟ID
@@ -133,9 +136,9 @@
                 taskAdd.TaskId = FourWayCarUtil.GetTaskId(); 
             }
 
-            listTask.Add(taskAdd);
+            await _db.Insertable(taskAdd).ExecuteCommandAsync();
         }
-        await _db.Insertable(listTask).ExecuteCommandAsync();
+        
     }
     /// <summary>
     /// WCS鎺ュ彈WMS涓嬪彂鐨勪换鍔�(鍗曟潯浠诲姟)
@@ -426,7 +429,11 @@
             Code = "0"
         };
         if (input.robotTaskCode.Substring(0, 3) != "WCS" && input.robotTaskCode.Substring(0, 2) != "TK")
+        {
+            result.Message = "鍙嶉鐨勪换鍔′笉鏄疻CS鐨勪换鍔�"; 
+            result.Code = "1";
             return result;
+        }
         PLCUtil modUtil = null;
         try
         {
@@ -530,6 +537,26 @@
                             }
                         }
                         break;
+                    case "notifyFullSite":
+                        {
+                            var palletNo = input.Extra.Values.carrierCode;
+                            var count = input.Extra.Values.pileCount;
+                            if (string.IsNullOrWhiteSpace(palletNo) || count <= 0)
+                            {
+                                throw new Exception("鍙傛暟锛氭墭鐩樺彿/鏁伴噺楠岃瘉澶辫触");
+                            }
+                            //鍚慦MS鐢宠绌烘墭鍏ュ簱
+                            HttpService httpService = new HttpService();
+                            var inputs = new NullPallInRequest();
+                             
+                            inputs.PalletNo = modTask.PalletNo;
+                            inputs.PallNum = count;
+                            inputs.Locate = "B100101";//鍙犳墭鐩樻満浣嶇疆
+                            inputs.HouseNo = "W02";
+                            var modResponseTask = httpService.RequestLiKuPallet(inputs);
+
+                        }
+                        break;
                     case "cancel"://浠诲姟鍙栨秷
                         {
                             PLCService.AGVStatus = false;

--
Gitblit v1.8.0