From 0f354b1feb21d6812e054a0531d0978ebbdca479 Mon Sep 17 00:00:00 2001
From: pan <antony1029@163.com>
Date: 星期一, 24 十一月 2025 11:57:32 +0800
Subject: [PATCH] 提交
---
项目代码/WMS无仓储版/WIDESEA_WMSServer/WIDESEA_OutboundService/OutboundPickingService.cs | 27 ++++++++++++++++++++-------
1 files changed, 20 insertions(+), 7 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 9032fc6..14ac400 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"
@@ -8,6 +8,7 @@
using System.Collections.Generic;
using System.Linq;
using System.Text;
+using System.Text.Json;
using System.Threading.Tasks;
using WIDESEA_Common.CommonEnum;
using WIDESEA_Common.LocationEnum;
@@ -189,9 +190,7 @@
// 鎵ц鍒嗘嫞閫昏緫
var pickingResult = await ExecutePickingLogic(lockInfo, orderDetail, stockDetail, orderNo, palletCode, barcode, actualQty);
- // 鏇存柊鐩稿叧鏁版嵁
- await UpdateOrderRelatedData(orderDetail.Id, pickingResult.ActualPickedQty, orderNo);
-
+
// 璁板綍鎿嶄綔鍘嗗彶
await RecordPickingHistory(pickingResult, orderNo, palletCode);
@@ -548,9 +547,11 @@
return ValidationResult<bool>.Success(true);
}
+
+
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
@@ -561,18 +562,29 @@
ActualPickedQty = actualQty
};
+ decimal finalPickedQty = actualQty;
+
if (actualQty < stockQuantity)
{
+ // 鎷嗗寘鍦烘櫙
await HandleSplitPacking(lockInfo, stockDetail, actualQty, stockQuantity, result);
+ finalPickedQty = actualQty;
}
else if (actualQty == stockQuantity)
{
+ // 鏁村寘鎷ｉ��
await HandleFullPicking(lockInfo, stockDetail, actualQty, result);
+ finalPickedQty = actualQty;
}
else
{
+ // 閮ㄥ垎鎷ｉ�夛紙搴撳瓨涓嶈冻锛�
await HandlePartialPicking(lockInfo, stockDetail, actualQty, stockQuantity, result);
+ finalPickedQty = result.ActualPickedQty; // 鍙兘琚皟鏁�
}
+
+ // 缁熶竴鏇存柊璁㈠崟鏁版嵁锛堟墍鏈夊垎鏀兘浠庤繖閲屾洿鏂帮級
+ await UpdateOrderRelatedData(lockInfo.OrderDetailId, finalPickedQty, orderNo);
return result;
}
@@ -607,8 +619,7 @@
result.FinalBarcode = newBarcode;
result.SplitResults.AddRange(CreateSplitResults(lockInfo, actualQty, remainingStockQty, newBarcode, stockDetail.Barcode));
- await UpdateOrderRelatedData(lockInfo.OrderDetailId, actualQty, lockInfo.OrderNo);
-
+
_logger.LogInformation($"鎷嗗寘鍒嗘嫞鏇存柊璁㈠崟鏄庣粏 - OrderDetailId: {lockInfo.OrderDetailId}, 鍒嗘嫞鏁伴噺: {actualQty}");
}
@@ -1533,6 +1544,8 @@
.Where(x => x.OrderNo == orderNo)
.ExecuteCommandAsync();
}
+
+ _logger.LogError($"FeedbackOutbound鎴愬姛 - OrderNo: {orderNo}, {JsonSerializer.Serialize(result)}");
}
catch (Exception ex)
{
--
Gitblit v1.9.3