From b4dfb1c5a0a3e6a682a98483e80ff372086aee8d Mon Sep 17 00:00:00 2001
From: heshaofeng <heshaofeng@hnkhzn.com>
Date: 星期三, 03 十二月 2025 10:04:31 +0800
Subject: [PATCH] Merge branch 'master' of http://115.159.85.185:8098/r/ZhongRui/ALDbanyunxiangmu
---
项目代码/WMS无仓储版/WIDESEA_WMSServer/WIDESEA_OutboundService/OutboundOrderDetailService.cs | 156 +++++++++++++++++++++++++++++++++++----------------
1 files changed, 107 insertions(+), 49 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/OutboundOrderDetailService.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/OutboundOrderDetailService.cs"
index 450ce11..a47f0c3 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/OutboundOrderDetailService.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/OutboundOrderDetailService.cs"
@@ -66,6 +66,11 @@
var outboundOrder = _outboundOrderService.Db.Queryable<Dt_OutboundOrder>()
.First(x => x.Id == orderId);
+ if (!CanReassignOrder(outboundOrder))
+ {
+ throw new Exception($"璁㈠崟{outboundOrder.OrderNo}鐘舵�佷笉鍏佽閲嶆柊鍒嗛厤搴撳瓨");
+ }
+
List<Dt_StockInfo> outStocks = new List<Dt_StockInfo>();
List<Dt_OutStockLockInfo> outStockLockInfos = new List<Dt_OutStockLockInfo>();
List<Dt_LocationInfo> locationInfos = new List<Dt_LocationInfo>();
@@ -79,7 +84,7 @@
BatchNo = x.Key.BatchNo,
SupplyCode = x.Key.SupplyCode,
Details = x.ToList(),
- TotalNeedQuantity = x.Sum(v => v.OrderQuantity - v.OverOutQuantity - v.LockQuantity - v.MoveQty)
+ TotalNeedQuantity = CalculateReassignNeedQuantity(x.ToList())
})
.Where(x => x.TotalNeedQuantity > 0)
.ToList();
@@ -93,7 +98,7 @@
if (!stockInfos.Any())
{
- throw new Exception($"鐗╂枡[{item.MaterielCode}]鎵规[{item.BatchNo}]鏈壘鍒板彲鍒嗛厤搴撳瓨");
+ throw new Exception($"鐗╂枡[{item.MaterielCode}]鎵规[{item.BatchNo}]渚涘簲鍟哰{item.SupplyCode}]鏈壘鍒板彲鍒嗛厤搴撳瓨");
}
// 鍒嗛厤搴撳瓨锛堟寜鍏堣繘鍏堝嚭锛�
@@ -127,6 +132,39 @@
}
return (outStocks, outboundOrderDetails, outStockLockInfos, locationInfos);
+ }
+
+ /// <summary>
+ /// 妫�鏌ヨ鍗曟槸鍚﹀厑璁搁噸鏂板垎閰�
+ /// </summary>
+ private bool CanReassignOrder(Dt_OutboundOrder outboundOrder)
+ {
+ // 鍏佽閲嶆柊鍒嗛厤鐨勭姸鎬�
+ var allowedStatus = new[] { OutOrderStatusEnum.鏈紑濮�, OutOrderStatusEnum.鍑哄簱涓�, OutOrderStatusEnum.閮ㄥ垎瀹屾垚 };
+
+ return allowedStatus.Contains((OutOrderStatusEnum)outboundOrder.OrderStatus);
+ }
+
+ /// <summary>
+ /// 閲嶆柊璁＄畻闇�姹傛暟閲忥紙鑰冭檻閲嶆柊鍒嗛厤鐨勫満鏅級
+ /// </summary>
+ private decimal CalculateReassignNeedQuantity(List<Dt_OutboundOrderDetail> details)
+ {
+ decimal totalNeed = 0;
+
+ foreach (var detail in details)
+ {
+ // 鍏抽敭淇敼锛氶噸鏂板垎閰嶆椂锛屽彧鑰冭檻鏈嚭搴撶殑閮ㄥ垎锛屽拷鐣ラ攣瀹氭暟閲�
+ // 鍥犱负閿佸畾鏁伴噺鍦ㄥ洖搴撴椂宸茬粡琚噸缃�
+ decimal remainingNeed = detail.OrderQuantity - detail.OverOutQuantity - detail.MoveQty;
+
+ if (remainingNeed > 0)
+ {
+ totalNeed += remainingNeed;
+ }
+ }
+
+ return totalNeed;
}
private (bool success, string message) DistributeLockQuantityByFIFO(
List<Dt_OutboundOrderDetail> details,
@@ -231,7 +269,7 @@
/// <summary>
/// 涓哄垎鎵瑰垎閰嶅簱瀛�
/// </summary>
- public async Task<(List<Dt_StockInfo>, List<Dt_OutboundOrderDetail>, List<Dt_OutStockLockInfo>, List<Dt_LocationInfo>)>
+ public async Task<(List<Dt_StockInfo>, List<Dt_OutboundOrderDetail>, List<Dt_OutStockLockInfo>, List<Dt_LocationInfo>)>
AssignStockForBatch(Dt_OutboundOrderDetail orderDetail, decimal batchQuantity, string batchNo)
{
if (orderDetail == null)
@@ -263,7 +301,7 @@
foreach (var item in groupDetails)
{
var needQuantity = item.TotalNeedQuantity;
-
+
// 鑾峰彇鍙敤搴撳瓨锛堟寜鍏堣繘鍏堝嚭鎺掑簭锛�
List<Dt_StockInfo> stockInfos = _stockService.StockInfoService.GetUseableStocks(item.MaterielCode, item.BatchNo, item.SupplyCode);
if (!stockInfos.Any())
@@ -272,7 +310,7 @@
}
// 鍒嗛厤搴撳瓨锛堟寜鍏堣繘鍏堝嚭锛�
- var (autoAssignStocks, stockAllocations) = _stockService.StockInfoService.GetOutboundStocks (stockInfos, item.MaterielCode, needQuantity, out decimal residueQuantity);
+ var (autoAssignStocks, stockAllocations) = _stockService.StockInfoService.GetOutboundStocks(stockInfos, item.MaterielCode, needQuantity, out decimal residueQuantity);
// 妫�鏌ュ垎閰嶇粨鏋�
decimal allocatedQuantity = needQuantity - residueQuantity;
@@ -300,7 +338,7 @@
locationInfos.AddRange(_locationInfoService.GetLocationInfos(
outStocks.Select(x => x.LocationCode).Distinct().ToList()));
-
+
}
return (outStocks, groupDetails.SelectMany(x => x.Details).ToList(), outStockLockInfos, locationInfos);
@@ -370,15 +408,16 @@
{
return (false, $"搴撳瓨鏄庣粏ID[{stockDetail.Id}]鐨勬潯鐮佷负绌�");
}
-
+
// 鍒涘缓鍑哄簱閿佸畾淇℃伅
var lockInfo = _outStockLockInfoService.GetOutStockLockInfo(
- outboundOrder, detail, stockInfo, assignQuantity, stockDetail.Barcode,batchNo);
+ outboundOrder, detail, stockInfo, assignQuantity, stockDetail.Barcode, batchNo);
outStockLockInfos.Add(lockInfo);
-
+
// 鏇存柊鏄庣粏鐨勫凡鍒嗛厤鏁伴噺
detail.AllocatedQuantity += assignQuantity;
+ detail.LockQuantity = detail.AllocatedQuantity;
remainingAllocate -= assignQuantity;
allocatedQuantity += assignQuantity;
}
@@ -519,8 +558,7 @@
}
- public (List<Dt_StockInfo>, Dt_OutboundOrderDetail, List<Dt_OutStockLockInfo>, List<Dt_LocationInfo>)
- AssignStockOutbound(Dt_OutboundOrderDetail outboundOrderDetail, List<StockSelectViewDTO> stockSelectViews)
+ public (List<Dt_StockInfo>, Dt_OutboundOrderDetail, List<Dt_OutStockLockInfo>, List<Dt_LocationInfo>)AssignStockOutbound(Dt_OutboundOrderDetail outboundOrderDetail, List<StockSelectViewDTO> stockSelectViews)
{
// 楠岃瘉鐢ㄦ埛閫夋嫨
(bool, string) checkResult = CheckSelectStockDeital(outboundOrderDetail, stockSelectViews);
@@ -536,12 +574,9 @@
decimal totalAssignedFromUserSelection = 0;
// 鎸夊厛杩涘厛鍑烘帓搴忕敤鎴烽�夋嫨鐨勫簱瀛�
- var userSelectedStocks = _stockService.StockInfoService.GetStockInfosByPalletCodes(
- stockSelectViews.Select(x => x.PalletCode).ToList());
+ var userSelectedStocks = _stockService.StockInfoService.GetStockInfosByPalletCodes(stockSelectViews.Select(x => x.PalletCode).ToList());
- var sortedUserSelectedStocks = userSelectedStocks
- .OrderBy(x => x.CreateDate)
- .ToList();
+ var sortedUserSelectedStocks = userSelectedStocks.OrderBy(x => x.CreateDate).ToList();
// 鍒嗛厤鐢ㄦ埛閫夋嫨鐨勫簱瀛�
foreach (var stock in sortedUserSelectedStocks)
@@ -557,9 +592,7 @@
outboundOrderDetail.BatchNo, outboundOrderDetail.SupplyCode);
// 纭畾鍒嗛厤鏁伴噺锛氬彇鐢ㄦ埛閫夋嫨鏁伴噺銆佸彲鐢ㄦ暟閲忓拰鍓╀綑闇�姹傜殑鏈�灏忓��
- var assignQuantity = Math.Min(
- Math.Min(userSelection.UseableQuantity, availableQuantity),
- remainingNeedQuantity);
+ var assignQuantity = Math.Min(Math.Min(userSelection.UseableQuantity, availableQuantity),remainingNeedQuantity);
if (assignQuantity <= 0) continue;
@@ -584,42 +617,57 @@
}
// 濡傛灉鐢ㄦ埛閫夋嫨鐨勫簱瀛樹笉澶燂紝鑷姩鍒嗛厤鍓╀綑閮ㄥ垎
- decimal autoAssignedQuantity = 0;
+
if (remainingNeedQuantity > 0)
{
- List<Dt_StockInfo> autoStocks = _stockService.StockInfoService.GetUseableStocks(
- outboundOrderDetail.MaterielCode, outboundOrderDetail.BatchNo, "");
+ //// 鍙�夛細杩欓噷鍙互鏍规嵁涓氬姟闇�姹傚喅瀹氭槸鍚﹀厑璁歌嚜鍔ㄥ垎閰�
+ //// 濡傛灉瑕佹眰涓ユ牸鎸夌敤鎴烽�夋嫨鍑哄簱锛屽彲浠ユ姏鍑哄紓甯�
+ //// throw new Exception($"鐢ㄦ埛閫夋嫨鐨勫簱瀛樻暟閲忎笉瓒筹紝杩橀渶{remainingNeedQuantity}锛岃閲嶆柊閫夋嫨");
- // 鎺掗櫎鐢ㄦ埛宸查�夋嫨鐨勬墭鐩�
- autoStocks = autoStocks
- .Where(x => !stockSelectViews.Select(v => v.PalletCode).Contains(x.PalletCode))
- .ToList();
+ //// 濡傛灉闇�瑕佽嚜鍔ㄥ垎閰嶏紝璁板綍鏃ュ織
+ //_logger.LogInformation($"鐢ㄦ埛閫夋嫨鐨勫簱瀛樻暟閲忎笉瓒筹紝杩橀渶{remainingNeedQuantity}锛岀郴缁熷皢鑷姩鍒嗛厤");
- var (autoAssignStocks, stockAllocations) = _stockService.StockInfoService.GetOutboundStocks(
- autoStocks, outboundOrderDetail.MaterielCode, remainingNeedQuantity, out decimal residueQuantity);
+ //List<Dt_StockInfo> autoStocks = _stockService.StockInfoService.GetUseableStocks(
+ // outboundOrderDetail.MaterielCode,
+ // outboundOrderDetail.BatchNo,
+ // "");
- // 妫�鏌ヨ嚜鍔ㄥ垎閰嶇粨鏋�
- autoAssignedQuantity = remainingNeedQuantity - residueQuantity;
- if (autoAssignedQuantity <= 0 && remainingNeedQuantity > 0)
- {
- // 閮ㄥ垎鍒嗛厤鏄彲浠ユ帴鍙楃殑锛岃褰曡鍛婁絾涓嶆姤閿�
- _logger.LogWarning($"鑷姩鍒嗛厤澶辫触锛屽墿浣欓渶姹倇remainingNeedQuantity}鏃犳硶婊¤冻");
- }
- else if (autoAssignedQuantity > 0)
- {
- outStocks.AddRange(autoAssignStocks);
+ //// 鎺掗櫎鐢ㄦ埛宸查�夋嫨涓斿凡鍒嗛厤鐨勬墭鐩�
+ //var assignedPalletCodes = outStocks.Select(x => x.PalletCode).ToList();
+ //autoStocks = autoStocks
+ // .Where(x => !assignedPalletCodes.Contains(x.PalletCode))
+ // .ToList();
- // 涓鸿嚜鍔ㄥ垎閰嶇殑搴撳瓨鍒涘缓閿佸畾璁板綍
- var autoLockInfos = CreateLockInfosForAutoAssign(outboundOrder, outboundOrderDetail, autoAssignStocks, stockAllocations);
- outStockLockInfos.AddRange(autoLockInfos);
- }
+ //var (autoAssignStocks, stockAllocations) = _stockService.StockInfoService.GetOutboundStocks(
+ // autoStocks,
+ // outboundOrderDetail.MaterielCode,
+ // remainingNeedQuantity,
+ // out decimal residueQuantity);
+
+ //if (autoAssignStocks != null && autoAssignStocks.Any())
+ //{
+ // outStocks.AddRange(autoAssignStocks);
+
+ // // 涓鸿嚜鍔ㄥ垎閰嶇殑搴撳瓨鍒涘缓閿佸畾璁板綍
+ // var autoLockInfos = CreateLockInfosForAutoAssign(outboundOrder, outboundOrderDetail, autoAssignStocks, stockAllocations);
+ // outStockLockInfos.AddRange(autoLockInfos);
+
+ // // 鏇存柊宸插垎閰嶆暟閲�
+ // decimal autoAssignedQuantity = remainingNeedQuantity - residueQuantity;
+ // totalAssignedFromUserSelection += autoAssignedQuantity;
+ // remainingNeedQuantity = residueQuantity; // 鏇存柊鍓╀綑闇�姹�
+ //}
+ //else if (remainingNeedQuantity > 0)
+ //{
+ // _logger.LogWarning($"鑷姩鍒嗛厤澶辫触锛屽墿浣欓渶姹倇remainingNeedQuantity}鏃犳硶婊¤冻");
+ //}
}
// 鏇存柊閿佸畾鏁伴噺
- outboundOrderDetail.LockQuantity += totalAssignedFromUserSelection + autoAssignedQuantity;
+ outboundOrderDetail.LockQuantity += totalAssignedFromUserSelection + totalAssignedFromUserSelection;
// 鏇存柊鐘舵��
- UpdateOrderDetailStatus(outboundOrderDetail, remainingNeedQuantity - autoAssignedQuantity);
+ UpdateOrderDetailStatus(outboundOrderDetail, remainingNeedQuantity);
List<Dt_LocationInfo> locationInfos = _locationInfoService.GetLocationInfos(outStocks.Select(x => x.LocationCode).ToList());
@@ -643,12 +691,22 @@
decimal remainingAssign = assignQuantity;
// 鎸夊厛杩涘厛鍑哄垎閰嶅簱瀛樻槑缁�
- var sortedDetails = stock.Details
+ var query = stock.Details.AsQueryable()
.Where(d => d.MaterielCode == detail.MaterielCode &&
- d.BatchNo == detail.BatchNo &&
- (d.StockQuantity - d.OutboundQuantity) > 0)
- .OrderBy(d => d.CreateDate)
- .ToList();
+ (d.StockQuantity - d.OutboundQuantity) > 0);
+ // .OrderBy(d => d.CreateDate);
+
+ if (!string.IsNullOrEmpty(detail.BatchNo))
+ {
+ query = query.Where(x => x.BatchNo == detail.BatchNo);
+ }
+ // 濡傛灉鍑哄簱鍗曟湁渚涘簲鍟嗚姹傦紝鎸変緵搴斿晢杩囨护
+ if (!string.IsNullOrEmpty(detail.SupplyCode))
+ {
+ query = query.Where(d => d.SupplyCode == detail.SupplyCode);
+ }
+ var sortedDetails= query.ToList().OrderBy(d => d.CreateDate);
+
foreach (var stockDetail in sortedDetails)
{
--
Gitblit v1.9.3