From 8f7e6826d51a25c7b368c210dbb321d423d24a85 Mon Sep 17 00:00:00 2001
From: huangxiaoqiang <huangxiaoqiang@hnkhzn.com>
Date: 星期一, 10 十一月 2025 17:24:12 +0800
Subject: [PATCH] 1

---
 项目代码/WMS/WIDESEA_WMSServer/WIDESEA_OrderServices/Dt_ProductionOutboundOrderService.cs |   16 +++++++++++++---
 1 files changed, 13 insertions(+), 3 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 c1ab047..9a7f90b 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"
@@ -172,7 +172,8 @@
                                 MaterielCode = outboundOrderdetail.MaterielCode,
                                 Position = item.LocationCode,
                                 PalletCode = item.PalletCode,
-                                AreaId = Convert.ToInt32(requestOut.AreaId),
+                                //AreaId = Convert.ToInt32(requestOut.AreaId),
+                                AreaId = Convert.ToInt32(2),
                             };
                             taskDtos.Add(task);
                             item.StockInfoDetails.Where(x => x.MaterielCode == outboundOrderdetail.MaterielCode).FirstOrDefault().Status = (int)StockStateEmun.鍑哄簱閿佸畾;
@@ -206,6 +207,8 @@
                         {
                             throw new Exception($"{outboundOrderdetail.MaterielCode}鏈壘鍒板彲鍑哄簱鎵樼洏");
                         }
+                        //List<DtStockInfo> stockNew = new List<DtStockInfo>();
+                        //List<Dt_OrderOutDetails> outDetailsNew = new List<Dt_OrderOutDetails>();
                         foreach (var item in taskNews)
                         {
                             taskDTOs.Add(CreateTaskDTO(item));
@@ -216,13 +219,14 @@
                             locations.AddRange(result1.Item2);
                             locations.AddRange(result2.Item2);
                         }
-
+                        outboundOrder.OrderStatus = (int)OrderStateEmun.寮�濮�;
                         await _unitOfWorkManage.UseTranAsync(async () =>
                         {
                             _taskRepository.AddData(taskNews);
                             _stockInfoRepository.UpdateDataNav(result.Item1);
                             await _locationStatusChangeRecordRepository.AddDataAsync(locationStatusChangeRecords);
                             await _locationRepository.UpdateDataAsync(locations);
+                            BaseDal.UpdateData(outboundOrder);
                             _productionoutboundOrderDetailRepository.UpdateData(result.Item2);
                             _outDetailsRepository.AddData(outDetails);
                         });
@@ -251,7 +255,8 @@
                 Id = 0,
                 TaskType = task.TaskType,
                 AGVTaskNum = task.AGVTaskNum,
-                Remark = task.Remark
+                Remark = task.Remark,
+                Floor =task.Floor,
             };
         }
         public (List<DtStockInfo>, Dt_ProductionOutboundOrderDetail) AssignStockOutbound(Dt_ProductionOutboundOrderDetail outboundOrderdetail, List<StockSelectViewDTO> stockSelectViews)
@@ -307,11 +312,16 @@
 
             }
             outboundOrderdetail.OverOutQuantity = outboundOrderdetail.OrderQuantity - needQuantity;
+            outboundOrderdetail.NotOutQuantity = outboundOrderdetail.OrderQuantity - outboundOrderdetail.OverOutQuantity;
 
             if (outboundOrderdetail.OverOutQuantity != 0)
             {
                 outboundOrderdetail.OrderDetailStatus = (int)OrderStateEmun.寮�濮�;
             }
+            if (outboundOrderdetail.OverOutQuantity == outboundOrderdetail.OrderQuantity)
+            {
+                outboundOrderdetail.OrderDetailStatus = (int)OrderStateEmun.宸插畬鎴�;
+            }
             return (outStockNews, outboundOrderdetail);
         }
 

--
Gitblit v1.9.3