From 61d8f975a9f02a4e1d3bd0eb234851e6da39fff4 Mon Sep 17 00:00:00 2001
From: pan <antony1029@163.com>
Date: 星期二, 02 十二月 2025 14:16:28 +0800
Subject: [PATCH] 提交

---
 项目代码/WMS无仓储版/WIDESEA_WMSServer/WIDESEA_OutboundService/OutStockLockInfoService.cs |    9 ++++++---
 1 files changed, 6 insertions(+), 3 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_OutboundService/OutStockLockInfoService.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_OutboundService/OutStockLockInfoService.cs"
index d4a584d..e583f96 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_OutboundService/OutStockLockInfoService.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_OutboundService/OutStockLockInfoService.cs"
@@ -43,7 +43,7 @@
             Dt_OutboundOrderDetail outboundOrderDetail,
             Dt_StockInfo outStock,
             decimal assignQuantity,
-            string barcode = null)
+            string barcode = null,string outboundBatchNo = "")
         {
             // 鑾峰彇搴撳瓨鏄庣粏淇℃伅
             var stockDetails = outStock.Details
@@ -74,7 +74,7 @@
                 // 浣跨敤绗竴涓彲鐢ㄦ潯鐮�
                   firstAvailableDetail = stockDetails
                     .Where(x => x.StockQuantity > x.OutboundQuantity)
-                    .OrderBy(x => x.CreateDate)
+                    .OrderByDescending(x => x.CreateDate)
                     .FirstOrDefault();
 
                 if (firstAvailableDetail == null)
@@ -107,9 +107,12 @@
                 IsSplitted = 0,
                 MaterielCode = outboundOrderDetail.MaterielCode,
                 BatchNo = firstAvailableDetail.BatchNo,
-                Unit = firstAvailableDetail.BarcodeUnit,
+                Unit = firstAvailableDetail.Unit,
+                BarcodeQty = firstAvailableDetail.BarcodeQty,
+                BarcodeUnit = firstAvailableDetail.BarcodeUnit,
                 FactoryArea = firstAvailableDetail.FactoryArea,
                 lineNo = outboundOrderDetail.lineNo,
+                OutboundBatchNo= outboundBatchNo
             };
         }
 

--
Gitblit v1.9.3