From 266e4bf654c55ce2f7e9271048e4625f1b8b49f6 Mon Sep 17 00:00:00 2001
From: heshaofeng <heshaofeng@hnkhzn.com>
Date: 星期一, 29 十二月 2025 14:36:08 +0800
Subject: [PATCH] Merge branch 'htq20251215' of http://115.159.85.185:8098/r/ZhongRui/ALDbanyunxiangmu into htq20251215

---
 项目代码/WMS无仓储版/WIDESEA_WMSServer/WIDESEA_OutboundService/OutboundPickingService.cs |   48 +++++++++++++++++++++++++-----------------------
 1 files changed, 25 insertions(+), 23 deletions(-)

diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS\346\227\240\344\273\223\345\202\250\347\211\210/WIDESEA_WMSServer/WIDESEA_OutboundService/OutboundPickingService.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS\346\227\240\344\273\223\345\202\250\347\211\210/WIDESEA_WMSServer/WIDESEA_OutboundService/OutboundPickingService.cs"
index 145c076..d244dd5 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS\346\227\240\344\273\223\345\202\250\347\211\210/WIDESEA_WMSServer/WIDESEA_OutboundService/OutboundPickingService.cs"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS\346\227\240\344\273\223\345\202\250\347\211\210/WIDESEA_WMSServer/WIDESEA_OutboundService/OutboundPickingService.cs"
@@ -1678,29 +1678,29 @@
                 //if (moveResult)
                 //{
                 //  鍒涘缓鍥炲簱浠诲姟
-                var essTask = new TaskModel()
-                {
-                    taskType = "putaway",
-                    taskGroupCode = "",
-                    groupPriority = 0,
-                    tasks = new List<TasksType>{  new() {
-                            taskCode = returnTask.TaskNum.ToString(),
-                            taskPriority = 0,
-                            taskDescribe = new TaskDescribeType
-                            {
-                                containerCode = palletCode,
-                                containerType = "CT_KUBOT_STANDARD",
-                                fromLocationCode = stations.GetValueOrDefault(targetAddress) ?? "",
-                                toStationCode = "",
-                                toLocationCode = returnTask.TargetAddress,
-                                deadline = 0,
-                                storageTag = ""
-                            }
-                        } }
-                };
+                //var essTask = new TaskModel()
+                //{
+                //    taskType = "putaway",
+                //    taskGroupCode = "",
+                //    groupPriority = 0,
+                //    tasks = new List<TasksType>{  new() {
+                //            taskCode = returnTask.TaskNum.ToString(),
+                //            taskPriority = 0,
+                //            taskDescribe = new TaskDescribeType
+                //            {
+                //                containerCode = palletCode,
+                //                containerType = "CT_KUBOT_STANDARD",
+                //                fromLocationCode = stations.GetValueOrDefault(targetAddress) ?? "",
+                //                toStationCode = "",
+                //                toLocationCode = returnTask.TargetAddress,
+                //                deadline = 0,
+                //                storageTag = ""
+                //            }
+                //        } }
+                //};
 
-                var resultTask = await _eSSApiService.CreateTaskAsync(essTask);
-                _logger.LogInformation($"ReturnRemaining 鍒涘缓浠诲姟鎴愬姛: {resultTask}");
+                //var resultTask = await _eSSApiService.CreateTaskAsync(essTask);
+                //_logger.LogInformation($"ReturnRemaining 鍒涘缓浠诲姟鎴愬姛: {resultTask}");
                 //}
             }
             catch (Exception ex)
@@ -2483,7 +2483,7 @@
                         Operator = App.User.UserName,
                         lineNo = outboundOrderDetail.lineNo,
                         WarehouseCode = outboundOrderDetail.WarehouseCode ?? "鏃�",
-                        BarcodeQty = outboundOrderDetail.NoStockOutQty,
+                        BarcodeQty = outboundOrderDetail.BarcodeQty,
                         BarcodeUnit = outboundOrderDetail.BarcodeUnit,
                         BatchNo = outboundOrderDetail.BatchNo
                     };
@@ -2618,6 +2618,8 @@
                               }).ToList()
                           }).ToList();
                     outfeedmodel.details.AddRange(groupdata);
+
+                    _outStockLockInfoService.DeleteData(detailLocks);
                 }
                 //瀛樺偍鍥炰紶鍙傛暟锛屼繚璇佸紓甯告墜鍔ㄥ洖浼�
                 Dt_InterfaceLog interfaceLog = new Dt_InterfaceLog

--
Gitblit v1.9.3