From 70aa9b5ca249a84e5867912d551cdafbec76e54e Mon Sep 17 00:00:00 2001
From: 647556386 <647556386@qq.com>
Date: 星期五, 05 十二月 2025 09:45:17 +0800
Subject: [PATCH] Merge branch 'master' of http://115.159.85.185:8098/r/ZhongRui/ALDbanyunxiangmu
---
项目代码/WMS无仓储版/WIDESEA_WMSServer/WIDESEA_OutboundService/OutboundOrderDetailService.cs | 143 +++++++++++++++++++++++++++++++++++++++++------
1 files changed, 124 insertions(+), 19 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 a47f0c3..bf49e91 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"
@@ -1,4 +1,5 @@
-锘縰sing Microsoft.Extensions.Logging;
+锘縰sing Autofac.Core;
+using Microsoft.Extensions.Logging;
using SqlSugar;
using WIDESEA_Common.LocationEnum;
using WIDESEA_Common.OrderEnum;
@@ -123,6 +124,10 @@
// 鏇存柊鍑哄簱鍗曟槑缁嗙姸鎬�
UpdateOrderDetailStatus(item.Details, allocatedQuantity, needQuantity);
+
+
+ // 鏇存柊搴撳瓨鍜屾墭鐩樼姸鎬�
+ UpdateNormalStocksAndPalletsStatus(autoAssignStocks, stockAllocations);
}
if (outStocks.Any())
@@ -133,7 +138,27 @@
return (outStocks, outboundOrderDetails, outStockLockInfos, locationInfos);
}
+ /// <summary>
+ /// 鏇存柊搴撳瓨鍜屾墭鐩樼姸鎬�
+ /// </summary>
+ private void UpdateNormalStocksAndPalletsStatus(List<Dt_StockInfo> stocks, Dictionary<int, decimal> stockAllocations)
+ {
+ foreach (var stock in stocks)
+ {
+ var stockDetail = stock.Details.First();
+ if (stockAllocations.TryGetValue(stockDetail.Id, out decimal allocatedQty) && allocatedQty > 0)
+ {
+ _stockService.StockInfoService.Db.Updateable<Dt_StockInfo>()
+ .SetColumns(x => new Dt_StockInfo
+ {
+ StockStatus = (int)StockStatusEmun.鍑哄簱閿佸畾,
+ })
+ .Where(x => x.Id == stock.Id)
+ .ExecuteCommand();
+ }
+ }
+ }
/// <summary>
/// 妫�鏌ヨ鍗曟槸鍚﹀厑璁搁噸鏂板垎閰�
/// </summary>
@@ -331,6 +356,9 @@
// 鏇存柊鍑哄簱鍗曟槑缁嗙姸鎬�
UpdateOrderDetailStatus(item.Details, allocatedQuantity, needQuantity);
+
+ // 鏇存柊搴撳瓨鍜屾墭鐩樼姸鎬佷负鍑哄簱閿佸畾
+ await UpdateStocksAndPalletsStatus(autoAssignStocks, stockAllocations);
}
if (outStocks.Any())
@@ -343,7 +371,27 @@
return (outStocks, groupDetails.SelectMany(x => x.Details).ToList(), outStockLockInfos, locationInfos);
}
-
+ /// <summary>
+ /// 鏇存柊搴撳瓨鍜屾墭鐩樼姸鎬�
+ /// </summary>
+ private async Task UpdateStocksAndPalletsStatus(List<Dt_StockInfo> stocks, Dictionary<int, decimal> stockAllocations)
+ {
+ foreach (var stock in stocks)
+ {
+ var stockDetail = stock.Details.First();
+ if (stockAllocations.TryGetValue(stockDetail.Id, out decimal allocatedQty) && allocatedQty > 0)
+ {
+
+ await _stockService.StockInfoService.Db.Updateable<Dt_StockInfo>()
+ .SetColumns(x => new Dt_StockInfo
+ {
+ StockStatus = (int)StockStatusEmun.鍑哄簱閿佸畾,
+ })
+ .Where(x => x.Id == stock.Id)
+ .ExecuteCommandAsync();
+ }
+ }
+ }
/// <summary>
/// 鎸夊厛杩涘厛鍑哄師鍒欏垎閰嶉攣瀹氭暟閲�
/// </summary>
@@ -588,24 +636,25 @@
if (userSelection == null) continue;
// 璁＄畻璇ユ墭鐩樺疄闄呭彲鐢ㄦ暟閲�
- var availableQuantity = CalculateAvailableQuantity(stock, outboundOrderDetail.MaterielCode,
- outboundOrderDetail.BatchNo, outboundOrderDetail.SupplyCode);
+ var availableQuantity = CalculateAvailableQuantityByBarcode(stock, outboundOrderDetail.MaterielCode,
+ outboundOrderDetail.BatchNo, outboundOrderDetail.SupplyCode, userSelection.Barcode);
// 纭畾鍒嗛厤鏁伴噺锛氬彇鐢ㄦ埛閫夋嫨鏁伴噺銆佸彲鐢ㄦ暟閲忓拰鍓╀綑闇�姹傜殑鏈�灏忓��
- var assignQuantity = Math.Min(Math.Min(userSelection.UseableQuantity, availableQuantity),remainingNeedQuantity);
+ var assignQuantity = Math.Min(Math.Min(userSelection.UseableQuantity, availableQuantity), remainingNeedQuantity);
if (assignQuantity <= 0) continue;
- // 鎵ц鍒嗛厤
- var actualAssigned = AssignStockQuantity(stock, outboundOrderDetail, assignQuantity);
+ // 鎵ц鍒嗛厤锛屼娇鐢ㄧ敤鎴烽�夋嫨鐨勬潯鐮�
+ var actualAssigned = AssignStockQuantity(stock, outboundOrderDetail, assignQuantity, userSelection.Barcode);
+
if (actualAssigned > 0)
{
outStocks.Add(stock);
totalAssignedFromUserSelection += actualAssigned;
remainingNeedQuantity -= actualAssigned;
- // 鍒涘缓閿佸畾璁板綍
- var lockInfo = CreateOutStockLockInfo(outboundOrder, outboundOrderDetail, stock, actualAssigned);
+ // 鍒涘缓閿佸畾璁板綍锛屼娇鐢ㄧ敤鎴烽�夋嫨鐨勬潯鐮�
+ var lockInfo = CreateOutStockLockInfo(outboundOrder, outboundOrderDetail, stock, actualAssigned, userSelection.Barcode);
outStockLockInfos.Add(lockInfo);
}
}
@@ -664,7 +713,7 @@
}
// 鏇存柊閿佸畾鏁伴噺
- outboundOrderDetail.LockQuantity += totalAssignedFromUserSelection + totalAssignedFromUserSelection;
+ outboundOrderDetail.LockQuantity += totalAssignedFromUserSelection;
// 鏇存柊鐘舵��
UpdateOrderDetailStatus(outboundOrderDetail, remainingNeedQuantity);
@@ -673,7 +722,25 @@
return (outStocks, outboundOrderDetail, outStockLockInfos, locationInfos);
}
+ private decimal CalculateAvailableQuantityByBarcode(Dt_StockInfo stock, string materielCode, string batchNo, string supplyCode, string barcode)
+ {
+ var query = stock.Details.AsQueryable()
+ .Where(d => d.MaterielCode == materielCode &&
+ (d.StockQuantity - d.OutboundQuantity) > 0 &&
+ d.Barcode == barcode);
+ if (!string.IsNullOrEmpty(batchNo))
+ {
+ query = query.Where(x => x.BatchNo == batchNo);
+ }
+
+ if (!string.IsNullOrEmpty(supplyCode))
+ {
+ query = query.Where(d => d.SupplyCode == supplyCode);
+ }
+
+ return query.Sum(d => d.StockQuantity - d.OutboundQuantity);
+ }
// 杈呭姪鏂规硶
private decimal CalculateAvailableQuantity(Dt_StockInfo stock, string materielCode, string batchNo, string supplyCode)
{
@@ -686,9 +753,45 @@
return relevantDetails.Sum(d => d.StockQuantity - d.OutboundQuantity);
}
- private decimal AssignStockQuantity(Dt_StockInfo stock, Dt_OutboundOrderDetail detail, decimal assignQuantity)
+ private decimal AssignStockQuantity(Dt_StockInfo stock, Dt_OutboundOrderDetail detail, decimal assignQuantity, string barcode)
{
decimal remainingAssign = assignQuantity;
+
+ // 鎸夊厛杩涘厛鍑哄垎閰嶆寚瀹氭潯鐮佺殑搴撳瓨鏄庣粏
+ var query = stock.Details.AsQueryable()
+ .Where(d => d.MaterielCode == detail.MaterielCode &&
+ (d.StockQuantity - d.OutboundQuantity) > 0 &&
+ d.Barcode == barcode); // 鍙垎閰嶆寚瀹氭潯鐮�
+
+ 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)
+ {
+ if (remainingAssign <= 0) break;
+
+ var available = stockDetail.StockQuantity - stockDetail.OutboundQuantity;
+ var assign = Math.Min(available, remainingAssign);
+
+ stockDetail.OutboundQuantity += assign;
+ remainingAssign -= assign;
+ }
+
+ return assignQuantity - remainingAssign; // 杩斿洖瀹為檯鍒嗛厤鏁伴噺
+ }
+
+ private (decimal assignedQuantity, string barcode) AssignStockQuantity(Dt_StockInfo stock, Dt_OutboundOrderDetail detail, decimal assignQuantity)
+ {
+ decimal remainingAssign = assignQuantity;
+ string assignedBarcode = string.Empty;
// 鎸夊厛杩涘厛鍑哄垎閰嶅簱瀛樻槑缁�
var query = stock.Details.AsQueryable()
@@ -717,18 +820,20 @@
stockDetail.OutboundQuantity += assign;
remainingAssign -= assign;
+ if (string.IsNullOrEmpty(assignedBarcode) && assign > 0)
+ {
+ assignedBarcode = stockDetail.Barcode;
+ }
}
- return assignQuantity - remainingAssign; // 杩斿洖瀹為檯鍒嗛厤鏁伴噺
+
+ return (assignQuantity - remainingAssign, assignedBarcode);
}
private Dt_OutStockLockInfo CreateOutStockLockInfo(Dt_OutboundOrder outboundOrder, Dt_OutboundOrderDetail detail,
- Dt_StockInfo stock, decimal quantity)
+ Dt_StockInfo stock, decimal quantity,string barcode="")
{
- var barcode = stock.Details
- .Where(d => !string.IsNullOrEmpty(d.Barcode))
- .Select(d => d.Barcode)
- .FirstOrDefault();
+
return _outStockLockInfoService.GetOutStockLockInfo(outboundOrder, detail, stock, quantity, barcode);
}
@@ -792,8 +897,8 @@
return (false, $"鎵樼洏[{selection.PalletCode}]涓嶅瓨鍦�");
}
- var available = CalculateAvailableQuantity(stock, outboundOrderDetail.MaterielCode,
- outboundOrderDetail.BatchNo, outboundOrderDetail.SupplyCode);
+ var available = CalculateAvailableQuantityByBarcode(stock, outboundOrderDetail.MaterielCode,
+ outboundOrderDetail.BatchNo, outboundOrderDetail.SupplyCode,selection.Barcode);
if (available <= 0)
{
--
Gitblit v1.9.3