From 4dfe8ece141f05a163cf7d290b6fe4c520d89909 Mon Sep 17 00:00:00 2001
From: huangxiaoqiang <huangxiaoqiang@hnkhzn.com>
Date: 星期五, 31 十月 2025 17:28:33 +0800
Subject: [PATCH] 1

---
 项目代码/WMS/WIDESEA_WMSServer/WIDESEA_OrderServices/Dt_ProductionOutboundOrderService.cs |   69 ++++++++++++++++++++++++++++------
 1 files changed, 56 insertions(+), 13 deletions(-)

diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_OrderServices/Dt_ProductionOutboundOrderService.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_OrderServices/Dt_ProductionOutboundOrderService.cs"
index d0b82aa..b727a2b 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_OrderServices/Dt_ProductionOutboundOrderService.cs"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_OrderServices/Dt_ProductionOutboundOrderService.cs"
@@ -178,29 +178,73 @@
                             item.StockInfoDetails.Where(x => x.MaterielCode == outboundOrderdetail.MaterielCode).FirstOrDefault().Status = (int)StockStateEmun.鍑哄簱閿佸畾;
                             item.StockStatus = (int)StockStateEmun.鍑哄簱閿佸畾;
 
-                            outDetails.Add(new Dt_OrderOutDetails()
+                            item.StockInfoDetails.Where(x => x.OutboundQuantity > 0 && x.MaterielCode == outboundOrderdetail.MaterielCode).ForEach(x =>
                             {
-                                OrderNo = outboundOrder.UpperOrderNo,
-                                PalletCode = item.PalletCode,
-                                OrderType = outboundOrder.OrderType,
-                                ERPOrderId = outboundOrderdetail.ERPOrderId,
-                                MaterielCode = outboundOrderdetail.MaterielCode,
-                                MaterielName = outboundOrderdetail.MaterielName,
-                                Warehouse = "鏅鸿兘绔嬪簱",
-                                WareHouseId = "107",
-                                OutboundQuantity = item.StockInfoDetails.Where(x => x.MaterielCode == outboundOrderdetail.MaterielCode).Sum(x => x.Quantity),
+                                outDetails.Add(new Dt_OrderOutDetails()
+                                {
+                                    OrderNo = outboundOrder.UpperOrderNo,
+                                    PalletCode = item.PalletCode,
+                                    OrderType = outboundOrder.OrderType,
+                                    ERPOrderId = outboundOrderdetail.ERPOrderId,
+                                    MaterielCode = outboundOrderdetail.MaterielCode,
+                                    MaterielName = outboundOrderdetail.MaterielName,
+                                    Warehouse = "鏅鸿兘绔嬪簱",
+                                    WareHouseId = "107",
+                                    OutboundQuantity = x.OutboundQuantity,
+                                });
                             });
 
+                            item.StockInfoDetails.Where(x => x.OutboundQuantity == 0 || (x.Quantity - x.OutboundQuantity) > 0).ForEach(x =>
+                            {
+                                if(x.MaterielCode == outboundOrderdetail.MaterielCode)
+                                {
+                                    outDetails.Add(new Dt_OrderOutDetails()
+                                    {
+                                        OrderNo = "",
+                                        PalletCode = item.PalletCode,
+                                        OrderType = (int)OrderTypeEmun.璋冩嫧鍑哄簱鍗�,
+                                        ERPOrderId = "",
+                                        MaterielCode = x.MaterielCode,
+                                        MaterielName = x.MaterielName,
+                                        AllocateWarehouse = "WMS鍑哄簱缂撳瓨鍖�",
+                                        Warehouse = "鏅鸿兘绔嬪簱",
+                                        WareHouseId = "107",
+                                        AllocateWarehouseId = "205",
+                                        OutboundQuantity = x.Quantity - x.OutboundQuantity,
+                                    });
+                                }
+                                else
+                                {
+                                    outDetails.Add(new Dt_OrderOutDetails()
+                                    {
+                                        OrderNo = "",
+                                        PalletCode = item.PalletCode,
+                                        OrderType = (int)OrderTypeEmun.璋冩嫧鍑哄簱鍗�,
+                                        ERPOrderId = "",
+                                        MaterielCode = x.MaterielCode,
+                                        MaterielName = x.MaterielName,
+                                        AllocateWarehouse = "WMS鍑哄簱缂撳瓨鍖�",
+                                        Warehouse = "鏅鸿兘绔嬪簱",
+                                        WareHouseId = "107",
+                                        AllocateWarehouseId = "205",
+                                        OutboundQuantity = x.Quantity,
+                                    });
+                                }
+                                
+                            });
                         });
                         List<Dt_Task> taskNews = new List<Dt_Task>();
                         List<WMSTaskDTO> taskDTOs = new List<WMSTaskDTO>();
                         foreach (var item in taskDtos)
                         {
                             taskNews.Add(await _taskService.RequestOutboundTaskAsync(item));
-
                         }
                         List<DtLocationStatusChangeRecord> locationStatusChangeRecords = new List<DtLocationStatusChangeRecord>();
                         List<DtLocationInfo> locations = new List<DtLocationInfo>();
+                        if (taskNews.Count <= 0)
+                        {
+                            throw new Exception($"{outboundOrderdetail.MaterielCode}鏈壘鍒板彲鍑哄簱鎵樼洏");
+                        }
                         foreach (var item in taskNews)
                         {
                             taskDTOs.Add(CreateTaskDTO(item));
@@ -269,8 +313,7 @@
 
             foreach (var item in outStocks)
             {
-                var stockDetail = item.StockInfoDetails
-                .Where(d => d.MaterielCode == outboundOrderdetail.MaterielCode && d.Quantity > 0);
+                var stockDetail = item.StockInfoDetails.Where(d => d.MaterielCode == outboundOrderdetail.MaterielCode && d.Quantity > 0);
                 if (needQuantity <= 0)
                 {
                     continue;

--
Gitblit v1.9.3