From 7df9475d342d199ae9cc5585d5d3a95888c33208 Mon Sep 17 00:00:00 2001
From: wankeda <Administrator@DESKTOP-HAU3ST3>
Date: 星期三, 04 二月 2026 08:49:29 +0800
Subject: [PATCH] 1

---
 WMS/WIDESEA_WMSServer/WIDESEA_TaskInfoService/NewPartialTaskService_Outbound.cs |   33 ++++++++-------------------------
 1 files changed, 8 insertions(+), 25 deletions(-)

diff --git a/WMS/WIDESEA_WMSServer/WIDESEA_TaskInfoService/NewPartialTaskService_Outbound.cs b/WMS/WIDESEA_WMSServer/WIDESEA_TaskInfoService/NewPartialTaskService_Outbound.cs
index 0734036..3f465c6 100644
--- a/WMS/WIDESEA_WMSServer/WIDESEA_TaskInfoService/NewPartialTaskService_Outbound.cs
+++ b/WMS/WIDESEA_WMSServer/WIDESEA_TaskInfoService/NewPartialTaskService_Outbound.cs
@@ -41,6 +41,7 @@
                 }
                 if (outboundOrderDetails.FirstOrDefault()?.LPNNo == null)
                 {
+                    outboundOrderDetails.Clear();
                     try
                     {
                         List<StockSelectViewDTO> stockSelectViews = new List<StockSelectViewDTO>();
@@ -63,17 +64,13 @@
                             }
                             if (result.Item5 != null && result.Item5.Count > 0)
                             {
-                                locationInfos.AddRange(result.Item5);
+                                locationInfos.AddRange(result.Item5.DistinctBy(x => x.LocationCode));
                             }
                             if (result.Item1 != null && result.Item1.Count > 0)
                             {
                                 tasks.AddRange(result.Item1);
                             }
-                            if (locationInfos.First().RoadwayNo.Contains("DW") || locationInfos.First().RoadwayNo.Contains("YS"))
-                            {
-                                break;
-                            }
-
+                            break;
                         }
 
                         WebResponseContent content = NEWGenerateOutboundTaskDataUpdate(tasks, stockInfos, outboundOrderDetails, outStockLockInfos, locationInfos);
@@ -447,14 +444,14 @@
             List<Dt_LocationInfo>? locationInfos = null;
             //if (outboundOrderDetail.OrderDetailStatus == OrderDetailStatusEnum.New.ObjToInt())
             {
-                Dt_OutboundOrder dt_OutboundOrder = _outboundService.OutboundOrderService.Repository.QueryData(x => x.Id == outboundOrderDetails.First().OrderId).First();
+                Dt_NewOutboundOrder dt_OutboundOrder = _outboundService.NewOutboundOrderService.Repository.QueryData(x => x.Id == outboundOrderDetails.First().OrderId).First();
                 (List<Dt_StockInfo>, List<Dt_NewOutboundOrderDetail>, List<Dt_OutStockLockInfo>, List<Dt_LocationInfo>) result = new();
 
                 result = _outboundService.NewOutboundOrderDetailService.CPAssignStockOutbound(outboundOrderDetails);
 
                 if (result.Item1 != null && result.Item1.Count > 0)
                 {
-                    Dt_OutboundOrder outboundOrder = _outboundService.OutboundOrderService.Repository.QueryFirst(x => x.Id == outboundOrderDetails.FirstOrDefault().OrderId);
+                    Dt_NewOutboundOrder outboundOrder = _outboundService.NewOutboundOrderService.Repository.QueryFirst(x => x.Id == outboundOrderDetails.FirstOrDefault().OrderId);
                     TaskTypeEnum typeEnum = outboundOrder.OrderType switch
                     {
                         (int)OrderTypeEnum.鐢熶骇鍑哄簱鍗� => TaskTypeEnum.Outbound,
@@ -467,24 +464,10 @@
                     {
                         x.OrderNo = outboundOrder.OrderNo;
                     });
-                    if (dt_OutboundOrder.OutWareHouse.Contains("DW") || dt_OutboundOrder.OutWareHouse.Contains("YS"))
+                    result.Item2.ForEach(x =>
                     {
-                        result.Item2.ForEach(x =>
-                        {
-                            if (x.LockQuantity == x.OrderQuantity)
-                            {
-                                x.OrderDetailStatus = OrderDetailStatusEnum.Outbound.ObjToInt();
-                            }
-                        });
-                    }
-                    else
-                    {
-                        result.Item2.ForEach(x =>
-                        {
-                            x.OrderDetailStatus = OrderDetailStatusEnum.Outbound.ObjToInt();
-                        });
-                    }
-
+                        x.OrderDetailStatus = OrderDetailStatusEnum.Outbound.ObjToInt();
+                    });
                     result.Item3.ForEach(x =>
                     {
 

--
Gitblit v1.9.3