From 7feb87dec6ebb75c7ec235505bc6c3dd94c1cde0 Mon Sep 17 00:00:00 2001
From: xxyy <cathay_xy@163.com>
Date: 星期二, 18 二月 2025 10:24:55 +0800
Subject: [PATCH] 合并

---
 Code Management/WMS/WIDESEA_WMSServer/WIDESEA_StorageTaskServices/Task/Dt_TaskService.cs |   23 ++++++++++++++---------
 1 files changed, 14 insertions(+), 9 deletions(-)

diff --git a/Code Management/WMS/WIDESEA_WMSServer/WIDESEA_StorageTaskServices/Task/Dt_TaskService.cs b/Code Management/WMS/WIDESEA_WMSServer/WIDESEA_StorageTaskServices/Task/Dt_TaskService.cs
index a001e83..5e9b978 100644
--- a/Code Management/WMS/WIDESEA_WMSServer/WIDESEA_StorageTaskServices/Task/Dt_TaskService.cs
+++ b/Code Management/WMS/WIDESEA_WMSServer/WIDESEA_StorageTaskServices/Task/Dt_TaskService.cs
@@ -761,7 +761,7 @@
                 {
                     NGStation = efg.Select(x => x.stationNGChildCode).ToList();
                 }
-                content = await CreateNewTask(input, result.ProductionLine, NGStation, 2);
+                content = await CreateNewTask(input, result.ProductionLine, result.ProcessCode, NGStation, 2);
                 return content.Error("瀛樺湪寮傚父鐢佃姱");
             }
 
@@ -798,7 +798,7 @@
                 {
                     // TODO 閫佽嚦鍖呰
                     List<string> strings = stationManagers.Where(x => x.stationType == 0).Select(x => x.Roadway).ToList();
-                    content = await CreateNewTask(input, result.ProductionLine, strings, 3);
+                    content = await CreateNewTask(input, result.ProductionLine, result.ProcessCode, strings, 3);
                     return content;
                 }
                 else
@@ -806,7 +806,7 @@
                     var config = _configService.GetByConfigKey("SYS_InStacker", "CW3InStacker");
                     var strings = config.ConfigValue.Split(',').ToList();
                     // TODO 鍏ュ簱
-                    content = await CreateNewTask(input, result.ProductionLine, strings);
+                    content = await CreateNewTask(input, result.ProductionLine, result.ProcessCode, strings);
                     if (content.Status)
                         await _boxingInfoRepository.AddDataNavAsync(boxing);
                 }
@@ -895,7 +895,7 @@
                 List<string> strings = stationManagers.Roadway.Split(',').ToList();
                 Console.WriteLine(strings.ToJsonString() + "b-----------------------");
                 //// 璋冪敤CreateNewTask鏂规硶锛屽垱寤烘柊浠诲姟
-                content = await CreateNewTask(input, result.ProductionLine, strings);
+                content = await CreateNewTask(input, result.ProductionLine,result.ProcessCode, strings);
                 if (content.Status)
                 {
                     var isBox = await _boxingInfoRepository.AddDataNavAsync(boxing);
@@ -952,6 +952,7 @@
                     CreateDate = DateTime.Now,
                     TaskId = 0,
                     ProductionLine = stock.ProductionLine,
+                    ProcessCode = stock.ProcessCode,
                 };
 
                 var taskDTO = CreateTaskDTO(taskNew);
@@ -1125,7 +1126,7 @@
             }
             List<string> strings = stationManagers.Roadway.Split(',').ToList();
 
-            return await CreateNewTask(input, result.ProductionLine, strings, 1);
+            return await CreateNewTask(input, result.ProductionLine, result.ProcessCode,strings, 1);
         }
         catch (Exception)
         {
@@ -1360,6 +1361,7 @@
             CreateDate = DateTime.Now,
             TaskId = 0,
             ProductionLine = stockInfo.ProductionLine,
+            ProcessCode = stockInfo.ProcessCode,
         };
     }
 
@@ -1729,7 +1731,8 @@
                         TaskType = (int)TaskInboundTypeEnum.Inbound,
                         TaskNum = await BaseDal.GetTaskNo(),
                         Creater = "Systeam",
-                        ProductionLine = result.ProductionLine
+                        ProductionLine = result.ProductionLine,
+                        ProcessCode=result.ProcessCode,
                     };
 
                     // 鍒涘缓WMS浠诲姟
@@ -1766,7 +1769,8 @@
                         TaskType = (int)TaskInboundTypeEnum.InTray,
                         TaskNum = await BaseDal.GetTaskNo(),
                         Creater = "Systeam",
-                        ProductionLine = result.ProductionLine
+                        ProductionLine = result.ProductionLine,
+                        ProcessCode = result.ProcessCode,
                     };
                     // 鍒涘缓WMS浠诲姟
                     WMSTaskDTO taskDTO = CreateWMSTaskDTO(task);
@@ -2275,7 +2279,7 @@
     /// <param name="process">宸烽亾</param>
     /// <param name="flag">鏍囪瘑锛�0-鍏ュ簱锛�1-绌烘墭鐩樺叆搴擄紝2-NG鍏ュ簱锛�3-鍑哄簱锛�</param>
     /// <returns></returns>
-    private async Task<WebResponseContent> CreateNewTask(RequestTaskDto input, string productionLine, List<string> process = null, int flag = 0)
+    private async Task<WebResponseContent> CreateNewTask(RequestTaskDto input, string productionLine, string processCode, List<string> process = null, int flag = 0)
     {
         WebResponseContent content = new WebResponseContent();
 
@@ -2304,7 +2308,8 @@
             TaskType = flag == 0 ? (int)TaskInboundTypeEnum.Inbound : flag == 1 ? (int)TaskInboundTypeEnum.InTray : flag == 2 ? (int)TaskInboundTypeEnum.InNG : (int)TaskOutboundTypeEnum.Outbound,
             TaskNum = await BaseDal.GetTaskNo(),
             Creater = "Systeam",
-            ProductionLine = productionLine
+            ProductionLine = productionLine,
+            ProcessCode = processCode
         };
 
         // 灏濊瘯娣诲姞鏂颁换鍔�

--
Gitblit v1.9.3