From 44e934d78d8906424b09c86e627a4974b93a1455 Mon Sep 17 00:00:00 2001
From: pan <antony1029@163.com>
Date: 星期一, 24 十一月 2025 13:27:58 +0800
Subject: [PATCH] 提交
---
项目代码/WMS无仓储版/WIDESEA_WMSServer/WIDESEA_OutboundService/OutboundPickingService.cs | 41 +++++++++++++++++++----------------------
1 files changed, 19 insertions(+), 22 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 14ac400..4e34b27 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"
@@ -187,10 +187,12 @@
return WebResponseContent.Instance.Error(overPickingValidation.ErrorMessage);
}
- // 鎵ц鍒嗘嫞閫昏緫
+ // 鎵ц鍒嗘嫞閫昏緫锛堝彧澶勭悊搴撳瓨鍜岄攣瀹氾紝涓嶅鐞嗚鍗曪級
var pickingResult = await ExecutePickingLogic(lockInfo, orderDetail, stockDetail, orderNo, palletCode, barcode, actualQty);
-
+ // 缁熶竴鏇存柊璁㈠崟鏁版嵁锛堟墍鏈夊垎鏀兘鍦ㄨ繖閲屾洿鏂帮級
+ await UpdateOrderRelatedData(orderDetail.Id, pickingResult.ActualPickedQty, orderNo);
+
// 璁板綍鎿嶄綔鍘嗗彶
await RecordPickingHistory(pickingResult, orderNo, palletCode);
@@ -205,6 +207,7 @@
return WebResponseContent.Instance.Error($"鎷ｉ�夌‘璁ゅけ璐ワ細{ex.Message}");
}
}
+
/// <summary>
/// 鍙栨秷鎷ｉ��
/// </summary>
@@ -550,8 +553,8 @@
private async Task<PickingResult> ExecutePickingLogic(
- Dt_OutStockLockInfo lockInfo, Dt_OutboundOrderDetail orderDetail, Dt_StockInfoDetail stockDetail,
- string orderNo, string palletCode, string barcode, decimal actualQty)
+ Dt_OutStockLockInfo lockInfo, Dt_OutboundOrderDetail orderDetail, Dt_StockInfoDetail stockDetail,
+ string orderNo, string palletCode, string barcode, decimal actualQty)
{
decimal stockQuantity = stockDetail.StockQuantity;
var result = new PickingResult
@@ -562,35 +565,29 @@
ActualPickedQty = actualQty
};
- decimal finalPickedQty = actualQty;
-
if (actualQty < stockQuantity)
{
- // 鎷嗗寘鍦烘櫙
await HandleSplitPacking(lockInfo, stockDetail, actualQty, stockQuantity, result);
- finalPickedQty = actualQty;
+ // 鎷嗗寘鍦烘櫙杩斿洖瀹為檯鎷ｉ�夋暟閲�
+ result.ActualPickedQty = actualQty;
}
else if (actualQty == stockQuantity)
{
- // 鏁村寘鎷ｉ��
await HandleFullPicking(lockInfo, stockDetail, actualQty, result);
- finalPickedQty = actualQty;
+ // 鏁村寘鎷ｉ�夎繑鍥炲疄闄呮嫞閫夋暟閲�
+ result.ActualPickedQty = actualQty;
}
else
{
- // 閮ㄥ垎鎷ｉ�夛紙搴撳瓨涓嶈冻锛�
await HandlePartialPicking(lockInfo, stockDetail, actualQty, stockQuantity, result);
- finalPickedQty = result.ActualPickedQty; // 鍙兘琚皟鏁�
+ // 閮ㄥ垎鎷ｉ�夎繑鍥炶皟鏁村悗鐨勬暟閲�
+ result.ActualPickedQty = result.ActualPickedQty; // 宸茬粡鍦ㄦ柟娉曞唴璋冩暣
}
-
- // 缁熶竴鏇存柊璁㈠崟鏁版嵁锛堟墍鏈夊垎鏀兘浠庤繖閲屾洿鏂帮級
- await UpdateOrderRelatedData(lockInfo.OrderDetailId, finalPickedQty, orderNo);
return result;
}
-
private async Task HandleSplitPacking(Dt_OutStockLockInfo lockInfo, Dt_StockInfoDetail stockDetail,
- decimal actualQty, decimal stockQuantity, PickingResult result)
+ decimal actualQty, decimal stockQuantity, PickingResult result)
{
decimal remainingStockQty = stockQuantity - actualQty;
@@ -599,10 +596,10 @@
stockDetail.OutboundQuantity = remainingStockQty;
await _stockInfoDetailService.Db.Updateable(stockDetail).ExecuteCommandAsync();
- //鐢熸垚鏂版潯鐮�
+ // 鐢熸垚鏂版潯鐮�
string newBarcode = await GenerateNewBarcode();
- //鍒涘缓鏂伴攣瀹氫俊鎭�
+ // 鍒涘缓鏂伴攣瀹氫俊鎭�
var newLockInfo = await CreateSplitLockInfo(lockInfo, actualQty, newBarcode);
// 璁板綍鎷嗗寘鍘嗗彶
@@ -619,10 +616,10 @@
result.FinalBarcode = newBarcode;
result.SplitResults.AddRange(CreateSplitResults(lockInfo, actualQty, remainingStockQty, newBarcode, stockDetail.Barcode));
-
- _logger.LogInformation($"鎷嗗寘鍒嗘嫞鏇存柊璁㈠崟鏄庣粏 - OrderDetailId: {lockInfo.OrderDetailId}, 鍒嗘嫞鏁伴噺: {actualQty}");
- }
+
+ _logger.LogInformation($"鎷嗗寘鍒嗘嫞瀹屾垚 - OrderDetailId: {lockInfo.OrderDetailId}, 鍒嗘嫞鏁伴噺: {actualQty}");
+ }
private async Task HandleFullPicking(Dt_OutStockLockInfo lockInfo, Dt_StockInfoDetail stockDetail,
decimal actualQty, PickingResult result)
{
--
Gitblit v1.9.3