From 43d2d040be7416230db1c562526f2743e87d75ea Mon Sep 17 00:00:00 2001
From: pan <antony1029@163.com>
Date: 星期六, 22 十一月 2025 10:56:56 +0800
Subject: [PATCH] 提交

---
 项目代码/WMS无仓储版/WIDESEA_WMSServer/WIDESEA_OutboundService/OutboundPickingService.cs |   20 ++++++++++++++++----
 1 files changed, 16 insertions(+), 4 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/OutboundPickingService.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/OutboundPickingService.cs"
index b1b0548..df1fcf7 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/OutboundPickingService.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/OutboundPickingService.cs"
@@ -473,6 +473,7 @@
             // 5. 鏇存柊鍘熼攣瀹氫俊鎭�
             lockInfo.AssignQuantity = remainingStockQty;
             lockInfo.PickedQty = 0;
+            lockInfo.Operator = App.User.UserName;
             await _outStockLockInfoService.Db.Updateable(lockInfo).ExecuteCommandAsync();
 
             // 6. 璁剧疆缁撴灉
@@ -493,6 +494,7 @@
             // 2. 鏇存柊閿佸畾淇℃伅
             lockInfo.PickedQty += actualQty;
             lockInfo.Status = (int)OutLockStockStatusEnum.鎷i�夊畬鎴�;
+            lockInfo.Operator = App.User.UserName;
             await _outStockLockInfoService.Db.Updateable(lockInfo).ExecuteCommandAsync();
         }
 
@@ -511,6 +513,7 @@
             // 2. 鏇存柊閿佸畾淇℃伅
             lockInfo.PickedQty += stockOutQty;
             lockInfo.AssignQuantity = remainingAssignQty;
+            lockInfo.Operator = App.User.UserName;
             await _outStockLockInfoService.Db.Updateable(lockInfo).ExecuteCommandAsync();
 
             // 3. 鏇存柊鎷嗗寘璁板綍鐘舵��
@@ -1097,10 +1100,13 @@
 
         private async Task HandlePalletStockGoodsReturn(List<Dt_StockInfoDetail> palletStockGoods)
         {
+            _logger.LogInformation($"鍥炲簱鎿嶄綔锛氬彂鐜皗palletStockGoods.Count}涓簱瀛樻槑缁嗛渶瑕佸洖搴擄紝绛夊緟AGV鎼繍");
             foreach (var stockGood in palletStockGoods)
             {
-                // 鎭㈠搴撳瓨鐘舵��
-                stockGood.OutboundQuantity = 0;
+                _logger.LogInformation($"寰呭洖搴撹揣鐗� - 鏉$爜: {stockGood.Barcode}, 鏁伴噺: {stockGood.StockQuantity}, 褰撳墠鐘舵��: {stockGood.Status}");
+            
+            // 鎭㈠搴撳瓨鐘舵��
+            stockGood.OutboundQuantity = 0;
                 stockGood.Status = StockStatusEmun.鍏ュ簱纭.ObjToInt();
 
                 await _stockInfoDetailService.Db.Updateable(stockGood).ExecuteCommandAsync();
@@ -1121,6 +1127,7 @@
 
         private async Task UpdateStockInfoStatus(Dt_StockInfo stockInfo)
         {
+            _logger.LogInformation($"鍥炲簱鎿嶄綔锛氭墭鐩榹stockInfo.PalletCode}绛夊緟AGV鍥炲簱鎼繍");
             // 鏇存柊搴撳瓨涓昏〃鐘舵��
             stockInfo.StockStatus = StockStatusEmun.鍏ュ簱纭.ObjToInt();
             await _stockInfoService.Db.Updateable(stockInfo).ExecuteCommandAsync();
@@ -1337,7 +1344,7 @@
                     business_type = outboundOrder.BusinessType,
                     factoryArea = outboundOrder.FactoryArea,
                     operationType = 1,
-                    Operator = outboundOrder.Operator,
+                    Operator = App.User.UserName,
                     orderNo = outboundOrder.UpperOrderNo,
                     status = outboundOrder.OrderStatus,
                     details = new List<FeedbackOutboundDetailsModel>()
@@ -1422,7 +1429,12 @@
                 CurrentBarcode = newBarcode,
                 OriginalLockQuantity = quantity,
                 IsSplitted = 1,
-                ParentLockId = originalLock.Id
+                ParentLockId = originalLock.Id,
+                Operator=  App.User.UserName,
+                FactoryArea=originalLock.FactoryArea,
+                lineNo=originalLock.lineNo,
+                WarehouseCode=originalLock.WarehouseCode,
+
             };
 
             var newLockId = await _outStockLockInfoService.Db.Insertable(newLockInfo).ExecuteReturnIdentityAsync();

--
Gitblit v1.9.3