From d292487812b280e7f484a5cdf6e8a994baa486fd Mon Sep 17 00:00:00 2001
From: huangxiaoqiang <huangxiaoqiang@hnkhzn.com>
Date: 星期三, 03 十二月 2025 14:02:06 +0800
Subject: [PATCH] 1

---
 项目代码/WMS/WIDESEA_WMSServer/WIDESEA_OrderServices/Dt_AllocateOutboundOrderService.cs |   18 ++++++++++--------
 1 files changed, 10 insertions(+), 8 deletions(-)

diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_OrderServices/Dt_AllocateOutboundOrderService.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_OrderServices/Dt_AllocateOutboundOrderService.cs"
index 3e14a4a..78e9eaf 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_OrderServices/Dt_AllocateOutboundOrderService.cs"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_OrderServices/Dt_AllocateOutboundOrderService.cs"
@@ -162,8 +162,7 @@
                     else
                         return content.Error("璇烽�夋嫨璋冩嫧浠撳簱");
 
-
-                        List<RequestTaskDto> taskDtos = new List<RequestTaskDto>();
+                    List<RequestTaskDto> taskDtos = new List<RequestTaskDto>();
                     Dt_AllocateOutboundOrderDetail allocateoutboundOrderdetail = _allocateoutboundOrderDetailRepository.QueryFirst(x => x.Id == orderId);
                     Dt_AllocateOutboundOrder outboundOrder = BaseDal.QueryFirst(x => x.Id == allocateoutboundOrderdetail.OrderId);
 
@@ -188,7 +187,6 @@
                                 MaterielCode = allocateoutboundOrderdetail.MaterielCode,
                                 Position = item.LocationCode,
                                 PalletCode = item.PalletCode,
-                                //AreaId = Convert.ToInt32(requestOut.AreaId),
                                 AreaId = Convert.ToInt32(2),
                             };
                             taskDtos.Add(task);
@@ -221,19 +219,22 @@
                         }
                         List<DtLocationStatusChangeRecord> locationStatusChangeRecords = new List<DtLocationStatusChangeRecord>();
                         List<DtLocationInfo> locations = new List<DtLocationInfo>();
-                        if(taskNews.Count <= 0)
+                        if (taskNews.Count <= 0)
                         {
                             throw new Exception($"{allocateoutboundOrderdetail.MaterielCode}鏈壘鍒板彲鍑哄簱鎵樼洏");
                         }
                         foreach (var item in taskNews)
                         {
                             taskDTOs.Add(CreateTaskDTO(item));
-                            var result1 = _taskService.UpdateLocationStatus(item.SourceAddress, LocationEnum.InStockDisable, item.TaskNum.Value, (int)StatusChangeTypeEnum.AutomaticOutbound);
-                            var result2 = _taskService.UpdateLocationStatus(item.TargetAddress, LocationEnum.Lock, item.TaskNum.Value, (int)StatusChangeTypeEnum.AutomaticOutbound);
+                            var result1 = _taskService.UpdateLocationStatus(item.SourceAddress, LocationEnum.InStockDisable, item.TaskNum.Value,(int)StatusChangeTypeEnum.AutomaticOutbound);
                             locationStatusChangeRecords.AddRange(result1.Item1);
-                            locationStatusChangeRecords.AddRange(result2.Item1);
                             locations.AddRange(result1.Item2);
-                            locations.AddRange(result2.Item2);
+                            var result2 = _taskService.UpdateEndLocationStatus(item.TargetAddress, LocationEnum.Lock, item.TaskNum.Value, StatusChangeTypeEnum.AutomaticOutbound);
+                            if (result2.Item1 != null && result2.Item2 != null)
+                            {
+                                locationStatusChangeRecords.AddRange(result2.Item1);
+                                locations.AddRange(result2.Item2);
+                            }
                         }
                         outboundOrder.OrderStatus = (int)OrderStateEmun.寮�濮�;
                         await _unitOfWorkManage.UseTranAsync(async () =>
@@ -273,6 +274,7 @@
                 AGVTaskNum = task.AGVTaskNum,
                 Remark = task.Remark,
                 Floor = task.Floor,
+                DoubleTray = task.DoubleTray,
             };
         }
         public (List<DtStockInfo>, Dt_AllocateOutboundOrderDetail) AssignStockOutbound(Dt_AllocateOutboundOrderDetail allocateoutboundOrderdetail, List<StockSelectViewDTO> stockSelectViews)

--
Gitblit v1.9.3