From d9096b4d67994e9887e50a7a837e1ebd8cd27835 Mon Sep 17 00:00:00 2001
From: 647556386 <647556386@qq.com>
Date: 星期一, 22 十二月 2025 14:46:55 +0800
Subject: [PATCH] 1

---
 项目代码/WMS无仓储版/WIDESEA_WMSServer/WIDESEA_TaskInfoService/TaskService.cs |   11 +++++++----
 1 files changed, 7 insertions(+), 4 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_TaskInfoService/TaskService.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_TaskInfoService/TaskService.cs"
index 2d00c24..ff848e8 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_TaskInfoService/TaskService.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_TaskInfoService/TaskService.cs"
@@ -718,6 +718,9 @@
                 {
                     return content.Error("鏈壘鍒板叆鏅轰粨鐨勭墿鏂欎俊鎭�");
                 }
+
+                string Operator = allocateMaterialInfos.FirstOrDefault().Creater;
+
                 _unitOfWorkManage.BeginTran();
                 var alldelete = _allocateMaterialInfo.DeleteAndMoveIntoHty(allocateMaterialInfos ,OperateTypeEnum.鑷姩鍒犻櫎);
                 if (!alldelete)
@@ -758,7 +761,7 @@
                     {
                         return WebResponseContent.Instance.Error($"鏈壘鍒板搴旂殑璋冩嫧鍗�");
                     }
-                    AllocationReturnDTO? returnDTO = BuildAllocationFeedbackData(outboundOrder, allocateOrder.FromWarehouse, allocateOrder.ToWarehouse);
+                    AllocationReturnDTO? returnDTO = BuildAllocationFeedbackData(outboundOrder, allocateOrder.FromWarehouse, allocateOrder.ToWarehouse, Operator);
                     if (returnDTO == null)
                     {
                         return WebResponseContent.Instance.Error($"鏋勫缓鍥炶皟瀵硅薄澶辫触");
@@ -858,7 +861,7 @@
             }
         }
 
-        public AllocationReturnDTO? BuildAllocationFeedbackData(Dt_OutboundOrder outboundOrder, string fromWarehouse, string toWarehouse)
+        public AllocationReturnDTO? BuildAllocationFeedbackData(Dt_OutboundOrder outboundOrder, string fromWarehouse, string toWarehouse,string Operator)
         {
             try
             {
@@ -893,10 +896,10 @@
                     Details = returnDetails,
                     FactoryArea = outboundOrder.FactoryArea,
                     OperationType = 1,
-                    OrderNo = outboundOrder.OrderNo,
+                    OrderNo = outboundOrder.UpperOrderNo,
                     FromWarehouse = fromWarehouse,
                     ToWarehouse = toWarehouse,
-                    Operator = App.User.UserName
+                    Operator = Operator
                 };
 
                 return outboundReturnDTO;

--
Gitblit v1.9.3