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 | 868 ++++++++++++++++++++++++++++++++++++++++++++++-----------
1 files changed, 702 insertions(+), 166 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 826d45a..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,9 +1,14 @@
-锘縰sing Microsoft.Extensions.Logging;
+锘縰sing Autofac.Core;
+using Microsoft.Extensions.Logging;
+using SqlSugar;
using WIDESEA_Common.LocationEnum;
+using WIDESEA_Common.OrderEnum;
using WIDESEA_Common.StockEnum;
using WIDESEA_Core;
using WIDESEA_Core.BaseRepository;
using WIDESEA_Core.BaseServices;
+using WIDESEA_Core.Helper;
+using WIDESEA_DTO.Stock;
using WIDESEA_IBasicService;
using WIDESEA_IOutboundService;
using WIDESEA_IRecordService;
@@ -17,8 +22,9 @@
private readonly IUnitOfWorkManage _unitOfWorkManage;
public IRepository<Dt_OutboundOrderDetail> Repository => BaseDal;
-
+
private readonly IStockService _stockService;
+
private readonly IOutStockLockInfoService _outStockLockInfoService;
private readonly ILocationInfoService _locationInfoService;
private readonly IBasicService _basicService;
@@ -37,13 +43,15 @@
_locationStatusChangeRecordService = locationStatusChangeRecordService;
_outboundOrderService = outboundOrderService;
_logger = logger;
+
}
/// <summary>
/// 鍒嗛厤鍑哄簱搴撳瓨 鎸夊厛杩涘厛鍑哄師鍒欏垎閰�
/// </summary>
- public (List<Dt_StockInfo>, List<Dt_OutboundOrderDetail>, List<Dt_OutStockLockInfo>, List<Dt_LocationInfo>) AssignStockOutbound(List<Dt_OutboundOrderDetail> outboundOrderDetails)
+ public (List<Dt_StockInfo>, List<Dt_OutboundOrderDetail>, List<Dt_OutStockLockInfo>, List<Dt_LocationInfo>)
+ AssignStockOutbound(List<Dt_OutboundOrderDetail> outboundOrderDetails)
{
if (!outboundOrderDetails.Any())
{
@@ -55,8 +63,14 @@
throw new Exception("璇峰嬁鍚屾椂鎿嶄綔澶氫釜鍗曟嵁鏄庣粏");
}
+ var orderId = outboundOrderDetails.First().OrderId;
var outboundOrder = _outboundOrderService.Db.Queryable<Dt_OutboundOrder>()
- .First(x => x.Id == outboundOrderDetails.First().OrderId);
+ .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>();
@@ -64,13 +78,14 @@
// 鎸夌墿鏂欏拰鎵规鍒嗙粍澶勭悊
var groupDetails = outboundOrderDetails
- .GroupBy(x => new { x.MaterielCode, x.BatchNo })
+ .GroupBy(x => new { x.MaterielCode, x.BatchNo, x.SupplyCode })
.Select(x => new
{
MaterielCode = x.Key.MaterielCode,
BatchNo = x.Key.BatchNo,
+ SupplyCode = x.Key.SupplyCode,
Details = x.ToList(),
- TotalNeedQuantity = x.Sum(v => v.OrderQuantity - v.OverOutQuantity - v.LockQuantity)
+ TotalNeedQuantity = CalculateReassignNeedQuantity(x.ToList())
})
.Where(x => x.TotalNeedQuantity > 0)
.ToList();
@@ -80,68 +95,145 @@
var needQuantity = item.TotalNeedQuantity;
// 鑾峰彇鍙敤搴撳瓨锛堟寜鍏堣繘鍏堝嚭鎺掑簭锛�
- List<Dt_StockInfo> stockInfos = _stockService.StockInfoService.GetUseableStocks(item.MaterielCode, item.BatchNo);
+ List<Dt_StockInfo> stockInfos = _stockService.StockInfoService.GetUseableStocks(item.MaterielCode, item.BatchNo, item.SupplyCode);
+
if (!stockInfos.Any())
{
- throw new Exception($"鐗╂枡[{item.MaterielCode}]鎵规[{item.BatchNo}]鏈壘鍒板彲鍒嗛厤搴撳瓨");
+ throw new Exception($"鐗╂枡[{item.MaterielCode}]鎵规[{item.BatchNo}]渚涘簲鍟哰{item.SupplyCode}]鏈壘鍒板彲鍒嗛厤搴撳瓨");
}
// 鍒嗛厤搴撳瓨锛堟寜鍏堣繘鍏堝嚭锛�
- 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);
- if (residueQuantity > 0 && residueQuantity == needQuantity)
+ // 妫�鏌ュ垎閰嶇粨鏋滐細濡傛灉瀹屽叏鏃犳硶鍒嗛厤锛堝垎閰嶆暟閲忎负0锛夛紝鍒欐姤閿�
+ decimal allocatedQuantity = needQuantity - residueQuantity;
+ if (allocatedQuantity <= 0)
{
- throw new Exception($"鐗╂枡[{item.MaterielCode}]搴撳瓨涓嶈冻锛岄渶瑕亄needQuantity}锛屽彲鐢▄needQuantity - residueQuantity}");
+ throw new Exception($"鐗╂枡[{item.MaterielCode}]鎵规[{item.BatchNo}]搴撳瓨涓嶈冻锛岄渶瑕亄needQuantity}锛屼絾鏃犳硶鍒嗛厤浠讳綍搴撳瓨");
}
outStocks.AddRange(autoAssignStocks);
// 鎸夊厛杩涘厛鍑哄師鍒欏垎閰嶉攣瀹氭暟閲忓埌鍚勪釜鏄庣粏
- DistributeLockQuantityByFIFO(item.Details, autoAssignStocks, stockAllocations, outStockLockInfos, outboundOrder);
+ var distributionResult = DistributeLockQuantityByFIFO(item.Details, autoAssignStocks, stockAllocations, outStockLockInfos, outboundOrder);
+
+ if (!distributionResult.success)
+ {
+ throw new Exception(distributionResult.message);
+ }
+
+ // 鏇存柊鍑哄簱鍗曟槑缁嗙姸鎬�
+ UpdateOrderDetailStatus(item.Details, allocatedQuantity, needQuantity);
+
+
+ // 鏇存柊搴撳瓨鍜屾墭鐩樼姸鎬�
+ UpdateNormalStocksAndPalletsStatus(autoAssignStocks, stockAllocations);
}
- locationInfos.AddRange(_locationInfoService.GetLocationInfos(outStocks.Select(x => x.LocationCode).Distinct().ToList()));
+ if (outStocks.Any())
+ {
+ locationInfos.AddRange(_locationInfoService.GetLocationInfos(
+ outStocks.Select(x => x.LocationCode).Distinct().ToList()));
+ }
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>
+ private bool CanReassignOrder(Dt_OutboundOrder outboundOrder)
+ {
+ // 鍏佽閲嶆柊鍒嗛厤鐨勭姸鎬�
+ var allowedStatus = new[] { OutOrderStatusEnum.鏈紑濮�, OutOrderStatusEnum.鍑哄簱涓�, OutOrderStatusEnum.閮ㄥ垎瀹屾垚 };
+
+ return allowedStatus.Contains((OutOrderStatusEnum)outboundOrder.OrderStatus);
+ }
/// <summary>
- /// 鎸夊厛杩涘厛鍑哄師鍒欏垎閰嶉攣瀹氭暟閲忓埌鍚勪釜鏄庣粏 - 淇鐗堟湰
+ /// 閲嶆柊璁＄畻闇�姹傛暟閲忥紙鑰冭檻閲嶆柊鍒嗛厤鐨勫満鏅級
/// </summary>
- private void DistributeLockQuantityByFIFO(
- List<Dt_OutboundOrderDetail> details,
- List<Dt_StockInfo> assignStocks,
- Dictionary<int, decimal> stockAllocations,
- List<Dt_OutStockLockInfo> outStockLockInfos,
- Dt_OutboundOrder outboundOrder)
+ 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,
+ List<Dt_StockInfo> assignStocks,
+ Dictionary<int, decimal> stockAllocations,
+ List<Dt_OutStockLockInfo> outStockLockInfos,
+ Dt_OutboundOrder outboundOrder)
+ {
+ // 鎸夊厛杩涘厛鍑烘帓搴忓嚭搴撳崟鏄庣粏锛圛d灏忕殑浼樺厛锛�
var sortedDetails = details
- .Where(d => d.OrderQuantity - d.OverOutQuantity - d.LockQuantity > 0) // 鍙鐞嗚繕闇�瑕佸垎閰嶇殑鏁伴噺
+ .Where(d => d.OrderQuantity - d.OverOutQuantity - d.LockQuantity - d.MoveQty > 0)
.OrderBy(x => x.Id)
.ToList();
- if (!sortedDetails.Any()) return;
+ if (!sortedDetails.Any())
+ return (true, "鏃犻渶鍒嗛厤");
// 鑾峰彇鎵�鏈夊垎閰嶄簡搴撳瓨鐨勬槑缁嗭紝鎸夊厛杩涘厛鍑烘帓搴�
var allocatedStockDetails = assignStocks
.SelectMany(x => x.Details)
- .Where(x => stockAllocations.ContainsKey(x.Id))
- .OrderBy(x => x.ProductionDate)
+ .Where(x => stockAllocations.ContainsKey(x.Id) && stockAllocations[x.Id] > 0)
+ .OrderBy(x => x.CreateDate)
.ThenBy(x => x.StockId)
.ToList();
+
+ if (!allocatedStockDetails.Any())
+ {
+ return (false, "娌℃湁鍙垎閰嶇殑搴撳瓨鏄庣粏");
+ }
+
+ decimal totalNeedQuantity = sortedDetails.Sum(d =>
+ d.OrderQuantity - d.OverOutQuantity - d.LockQuantity - d.MoveQty);
+ decimal allocatedQuantity = 0;
// 涓烘瘡涓簱瀛樻槑缁嗗垱寤哄垎閰嶈褰�
foreach (var stockDetail in allocatedStockDetails)
{
- if (!stockAllocations.TryGetValue(stockDetail.Id, out decimal allocatedQuantity))
+ if (!stockAllocations.TryGetValue(stockDetail.Id, out decimal allocatedQuantityForStock))
continue;
- if (allocatedQuantity <= 0) continue;
+ if (allocatedQuantityForStock <= 0) continue;
var stockInfo = assignStocks.First(x => x.Id == stockDetail.StockId);
- decimal remainingAllocate = allocatedQuantity;
+ decimal remainingAllocate = allocatedQuantityForStock;
// 鎸夐『搴忓垎閰嶇粰鍚勪釜鍑哄簱鍗曟槑缁�
foreach (var detail in sortedDetails)
@@ -149,7 +241,7 @@
if (remainingAllocate <= 0) break;
// 璁＄畻杩欎釜鏄庣粏杩橀渶瑕佸垎閰嶇殑鏁伴噺
- var detailNeed = detail.OrderQuantity - detail.OverOutQuantity - detail.LockQuantity;
+ var detailNeed = detail.OrderQuantity - detail.OverOutQuantity - detail.LockQuantity - detail.MoveQty;
if (detailNeed <= 0) continue;
// 鍒嗛厤鏁伴噺
@@ -158,7 +250,7 @@
// 楠岃瘉鏉＄爜鏄惁瀛樺湪
if (string.IsNullOrEmpty(stockDetail.Barcode))
{
- throw new Exception($"搴撳瓨鏄庣粏ID[{stockDetail.Id}]鐨勬潯鐮佷负绌�");
+ return (false, $"搴撳瓨鏄庣粏ID[{stockDetail.Id}]鐨勬潯鐮佷负绌�");
}
// 鍒涘缓鍑哄簱閿佸畾淇℃伅
@@ -169,152 +261,263 @@
// 鏇存柊鏄庣粏鐨勯攣瀹氭暟閲�
detail.LockQuantity += assignQuantity;
remainingAllocate -= assignQuantity;
+ allocatedQuantity += assignQuantity;
}
- // 濡傛灉杩樻湁鍓╀綑鍒嗛厤鏁伴噺锛岄噸鏂板垎閰嶆垨璁板綍璀﹀憡
+ // 濡傛灉杩樻湁鍓╀綑鍒嗛厤鏁伴噺锛岃褰曡鍛�
if (remainingAllocate > 0)
{
- // 閲嶆柊鍒嗛厤缁欏叾浠栭渶瑕佸垎閰嶇殑鏄庣粏
- foreach (var detail in sortedDetails)
- {
- if (remainingAllocate <= 0) break;
-
- var detailNeed = detail.OrderQuantity - detail.OverOutQuantity - detail.LockQuantity;
- if (detailNeed <= 0) continue;
-
- var assignQuantity = Math.Min(remainingAllocate, detailNeed);
-
- var lockInfo = _outStockLockInfoService.GetOutStockLockInfo(
- outboundOrder, detail, stockInfo, assignQuantity, stockDetail.Barcode);
- outStockLockInfos.Add(lockInfo);
-
- detail.LockQuantity += assignQuantity;
- remainingAllocate -= assignQuantity;
- }
-
- // 濡傛灉杩樻湁鍓╀綑锛岃褰曡鍛婁絾涓嶆姏鍑哄紓甯�
- if (remainingAllocate > 0)
- {
- _logger.LogWarning($"搴撳瓨鍒嗛厤鍚庝粛鏈夊墿浣欐暟閲忔湭鍒嗛厤: {remainingAllocate}, 鏉＄爜: {stockDetail.Barcode}");
- }
- }
- }
- }
-
-
-/// <summary>
- /// 鍒涘缓鍑哄簱閿佸畾淇℃伅
- /// </summary>
- private void CreateOutStockLockInfos(Dt_OutboundOrder outboundOrder,List<Dt_OutboundOrderDetail> details,
- List<Dt_StockInfo> assignStocks,List<Dt_OutStockLockInfo> outStockLockInfos)
- {
- foreach (var stock in assignStocks)
- {
- // 鑾峰彇璇ュ簱瀛樹腑鐩稿叧鐗╂枡鐨勫彲鐢ㄦ潯鐮佷俊鎭�
- var stockDetails = stock.Details
- .Where(x => details.Any(d => d.MaterielCode == x.MaterielCode) &&
- x.StockQuantity > x.OutboundQuantity)
- .OrderBy(x => x.ProductionDate) // 鍏堣繘鍏堝嚭
- .ToList();
- if (!stockDetails.Any()) continue;
-
- var stockAssignQuantity = stockDetails.Sum(x => x.OutboundQuantity);
-
-
- // 鏌ユ壘杩欎釜搴撳瓨宸茬粡鍒嗛厤鐨勬暟閲�
- var existingAssign = outStockLockInfos
- .Where(x => x.StockId == stock.Id &&
- details.Any(d => d.Id == x.OrderDetailId))
- .Sum(x => x.AssignQuantity);
-
- var availableAssign = stockAssignQuantity - existingAssign;
-
- if (availableAssign <= 0) continue;
-
- // 鎸夊厛杩涘厛鍑哄師鍒欏垎閰嶆潯鐮�
- var barcodeAllocation = AllocateBarcodes(stockDetails, availableAssign);
-
-
- // 鍒嗛厤缁欏悇涓槑缁�
- foreach (var detail in details.Where(d => d.LockQuantity > 0))
- {
- var alreadyAssigned = outStockLockInfos
- .Where(x => x.OrderDetailId == detail.Id && x.StockId == stock.Id)
- .Sum(x => x.AssignQuantity);
-
- var canAssign = Math.Min(detail.LockQuantity - alreadyAssigned, availableAssign);
-
- if (canAssign > 0)
- {
- // 涓鸿繖涓垎閰嶇‘瀹氭潯鐮�
- var (barcode, barcodeQuantity) = GetBarcodeForAllocation(barcodeAllocation, canAssign);
-
- var lockInfo = _outStockLockInfoService.GetOutStockLockInfo(
- outboundOrder, detail, stock, canAssign, barcode);
- outStockLockInfos.Add(lockInfo);
-
- availableAssign -= canAssign;
-
- // 鏇存柊鏉＄爜鍒嗛厤璁板綍
- UpdateBarcodeAllocation(barcodeAllocation, barcode, barcodeQuantity);
- }
-
- if (availableAssign <= 0) break;
- }
- }
- }
-
- /// <summary>
- /// 鎸夊厛杩涘厛鍑哄師鍒欏垎閰嶆潯鐮�
- /// </summary>
- private Dictionary<string, decimal> AllocateBarcodes(List<Dt_StockInfoDetail> stockDetails, decimal totalQuantity)
- {
- var allocation = new Dictionary<string, decimal>();
- decimal remainingQuantity = totalQuantity;
-
- foreach (var detail in stockDetails.OrderBy(x => x.ProductionDate))
- {
- if (remainingQuantity <= 0) break;
-
- decimal available = detail.StockQuantity - detail.OutboundQuantity;
- decimal allocate = Math.Min(available, remainingQuantity);
-
- allocation[detail.Barcode] = allocate;
- remainingQuantity -= allocate;
- }
-
- return allocation;
- }
-
- /// <summary>
- /// 涓哄垎閰嶈幏鍙栧悎閫傜殑鏉＄爜
- /// </summary>
- private (string barcode, decimal quantity) GetBarcodeForAllocation(Dictionary<string, decimal> barcodeAllocation, decimal requiredQuantity)
- {
- foreach (var (barcode, quantity) in barcodeAllocation)
- {
- if (quantity >= requiredQuantity)
- {
- return (barcode, requiredQuantity);
+ _logger.LogWarning($"搴撳瓨鍒嗛厤鍚庝粛鏈夊墿浣欐暟閲忔湭鍒嗛厤: {remainingAllocate}, 鏉＄爜: {stockDetail.Barcode}");
}
}
- // 濡傛灉鍗曚釜鏉＄爜鏁伴噺涓嶈冻锛屼娇鐢ㄧ涓�涓潯鐮�
- var first = barcodeAllocation.First();
- return (first.Key, Math.Min(first.Value, requiredQuantity));
+ // 楠岃瘉鏄惁鑷冲皯鍒嗛厤浜嗕竴閮ㄥ垎
+ if (allocatedQuantity <= 0)
+ {
+ return (false, "搴撳瓨鍒嗛厤澶辫触锛屾棤娉曞垎閰嶄换浣曟暟閲�");
+ }
+
+ // 璁板綍鍒嗛厤缁撴灉
+ if (allocatedQuantity < totalNeedQuantity)
+ {
+ _logger.LogWarning($"搴撳瓨閮ㄥ垎鍒嗛厤锛岄渶瑕亄totalNeedQuantity}锛屽疄闄呭垎閰峽allocatedQuantity}");
+ }
+ else
+ {
+ _logger.LogInformation($"搴撳瓨瀹屽叏鍒嗛厤锛屽垎閰嶆暟閲弡allocatedQuantity}");
+ }
+
+ return (true, "鍒嗛厤鎴愬姛");
}
+
/// <summary>
- /// 鏇存柊鏉＄爜鍒嗛厤璁板綍
+ /// 涓哄垎鎵瑰垎閰嶅簱瀛�
/// </summary>
- private void UpdateBarcodeAllocation(Dictionary<string, decimal> barcodeAllocation, string barcode, decimal usedQuantity)
+ public async Task<(List<Dt_StockInfo>, List<Dt_OutboundOrderDetail>, List<Dt_OutStockLockInfo>, List<Dt_LocationInfo>)>
+ AssignStockForBatch(Dt_OutboundOrderDetail orderDetail, decimal batchQuantity, string batchNo)
{
- if (barcodeAllocation.ContainsKey(barcode))
+ if (orderDetail == null)
{
- barcodeAllocation[barcode] -= usedQuantity;
- if (barcodeAllocation[barcode] <= 0)
+ throw new Exception("鏈壘鍒板嚭搴撳崟鏄庣粏淇℃伅");
+ }
+
+ var outboundOrder = await _outboundOrderService.Db.Queryable<Dt_OutboundOrder>()
+ .FirstAsync(x => x.Id == orderDetail.OrderId);
+
+ List<Dt_StockInfo> outStocks = new List<Dt_StockInfo>();
+ List<Dt_OutStockLockInfo> outStockLockInfos = new List<Dt_OutStockLockInfo>();
+ List<Dt_LocationInfo> locationInfos = new List<Dt_LocationInfo>();
+
+ // 鎸夌墿鏂欏拰鎵规鍒嗙粍澶勭悊锛堣繖閲屽彧鏈変竴涓槑缁嗭級
+ var groupDetails = new List<Dt_OutboundOrderDetail> { orderDetail }
+ .GroupBy(x => new { x.MaterielCode, x.BatchNo, x.SupplyCode })
+ .Select(x => new
{
- barcodeAllocation.Remove(barcode);
+ MaterielCode = x.Key.MaterielCode,
+ BatchNo = x.Key.BatchNo,
+ SupplyCode = x.Key.SupplyCode,
+ Details = x.ToList(),
+ TotalNeedQuantity = batchQuantity // 浣跨敤鍒嗘壒鏁伴噺
+ })
+ .Where(x => x.TotalNeedQuantity > 0)
+ .ToList();
+
+ 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())
+ {
+ throw new Exception($"鐗╂枡[{item.MaterielCode}]鎵规[{item.BatchNo}]鏈壘鍒板彲鍒嗛厤搴撳瓨");
+ }
+
+ // 鍒嗛厤搴撳瓨锛堟寜鍏堣繘鍏堝嚭锛�
+ var (autoAssignStocks, stockAllocations) = _stockService.StockInfoService.GetOutboundStocks(stockInfos, item.MaterielCode, needQuantity, out decimal residueQuantity);
+
+ // 妫�鏌ュ垎閰嶇粨鏋�
+ decimal allocatedQuantity = needQuantity - residueQuantity;
+ if (allocatedQuantity <= 0)
+ {
+ throw new Exception($"鐗╂枡[{item.MaterielCode}]鎵规[{item.BatchNo}]搴撳瓨涓嶈冻锛岄渶瑕亄needQuantity}锛屼絾鏃犳硶鍒嗛厤浠讳綍搴撳瓨");
+ }
+
+ outStocks.AddRange(autoAssignStocks);
+
+ // 鎸夊厛杩涘厛鍑哄師鍒欏垎閰嶉攣瀹氭暟閲忓埌鍚勪釜鏄庣粏
+ var distributionResult = DistributeLockQuantityByFIFO(item.Details, autoAssignStocks, stockAllocations, outStockLockInfos, outboundOrder, batchNo);
+
+ if (!distributionResult.success)
+ {
+ throw new Exception(distributionResult.message);
+ }
+
+ // 鏇存柊鍑哄簱鍗曟槑缁嗙姸鎬�
+ UpdateOrderDetailStatus(item.Details, allocatedQuantity, needQuantity);
+
+ // 鏇存柊搴撳瓨鍜屾墭鐩樼姸鎬佷负鍑哄簱閿佸畾
+ await UpdateStocksAndPalletsStatus(autoAssignStocks, stockAllocations);
+ }
+
+ if (outStocks.Any())
+ {
+ locationInfos.AddRange(_locationInfoService.GetLocationInfos(
+ outStocks.Select(x => x.LocationCode).Distinct().ToList()));
+
+
+ }
+
+ 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>
+ private (bool success, string message) DistributeLockQuantityByFIFO(
+ List<Dt_OutboundOrderDetail> details,
+ List<Dt_StockInfo> assignStocks,
+ Dictionary<int, decimal> stockAllocations,
+ List<Dt_OutStockLockInfo> outStockLockInfos,
+ Dt_OutboundOrder outboundOrder,
+ string batchNo)
+ {
+ var sortedDetails = details
+ .Where(d => d.OrderQuantity - d.OverOutQuantity - d.AllocatedQuantity > 0)
+ .OrderBy(x => x.Id)
+ .ToList();
+
+ if (!sortedDetails.Any())
+ return (true, "鏃犻渶鍒嗛厤");
+
+ // 鑾峰彇鎵�鏈夊垎閰嶄簡搴撳瓨鐨勬槑缁嗭紝鎸夊厛杩涘厛鍑烘帓搴�
+ var allocatedStockDetails = assignStocks
+ .SelectMany(x => x.Details)
+ .Where(x => stockAllocations.ContainsKey(x.Id) && stockAllocations[x.Id] > 0)
+ .OrderBy(x => x.CreateDate)
+ .ThenBy(x => x.StockId)
+ .ToList();
+
+ if (!allocatedStockDetails.Any())
+ {
+ return (false, "娌℃湁鍙垎閰嶇殑搴撳瓨鏄庣粏");
+ }
+
+ decimal totalNeedQuantity = sortedDetails.Sum(d =>
+ d.OrderQuantity - d.OverOutQuantity - d.AllocatedQuantity);
+ decimal allocatedQuantity = 0;
+
+ // 涓烘瘡涓簱瀛樻槑缁嗗垱寤哄垎閰嶈褰�
+ foreach (var stockDetail in allocatedStockDetails)
+ {
+ if (!stockAllocations.TryGetValue(stockDetail.Id, out decimal allocatedQuantityForStock))
+ continue;
+
+ if (allocatedQuantityForStock <= 0) continue;
+
+ var stockInfo = assignStocks.First(x => x.Id == stockDetail.StockId);
+ decimal remainingAllocate = allocatedQuantityForStock;
+
+ // 鎸夐『搴忓垎閰嶇粰鍚勪釜鍑哄簱鍗曟槑缁�
+ foreach (var detail in sortedDetails)
+ {
+ if (remainingAllocate <= 0) break;
+
+ // 璁＄畻杩欎釜鏄庣粏杩橀渶瑕佸垎閰嶇殑鏁伴噺
+ var detailNeed = detail.OrderQuantity - detail.OverOutQuantity - detail.AllocatedQuantity;
+ if (detailNeed <= 0) continue;
+
+ // 鍒嗛厤鏁伴噺
+ var assignQuantity = Math.Min(remainingAllocate, detailNeed);
+
+ // 楠岃瘉鏉＄爜鏄惁瀛樺湪
+ if (string.IsNullOrEmpty(stockDetail.Barcode))
+ {
+ return (false, $"搴撳瓨鏄庣粏ID[{stockDetail.Id}]鐨勬潯鐮佷负绌�");
+ }
+
+
+ // 鍒涘缓鍑哄簱閿佸畾淇℃伅
+ var lockInfo = _outStockLockInfoService.GetOutStockLockInfo(
+ outboundOrder, detail, stockInfo, assignQuantity, stockDetail.Barcode, batchNo);
+ outStockLockInfos.Add(lockInfo);
+
+ // 鏇存柊鏄庣粏鐨勫凡鍒嗛厤鏁伴噺
+ detail.AllocatedQuantity += assignQuantity;
+ detail.LockQuantity = detail.AllocatedQuantity;
+ remainingAllocate -= assignQuantity;
+ allocatedQuantity += assignQuantity;
+ }
+
+ // 濡傛灉杩樻湁鍓╀綑鍒嗛厤鏁伴噺锛岃褰曡鍛�
+ if (remainingAllocate > 0)
+ {
+ _logger.LogWarning($"搴撳瓨鍒嗛厤鍚庝粛鏈夊墿浣欐暟閲忔湭鍒嗛厤: {remainingAllocate}, 鏉＄爜: {stockDetail.Barcode}");
+ }
+ }
+
+ // 楠岃瘉鏄惁鑷冲皯鍒嗛厤浜嗕竴閮ㄥ垎
+ if (allocatedQuantity <= 0)
+ {
+ return (false, "搴撳瓨鍒嗛厤澶辫触锛屾棤娉曞垎閰嶄换浣曟暟閲�");
+ }
+
+ // 璁板綍鍒嗛厤缁撴灉
+ if (allocatedQuantity < totalNeedQuantity)
+ {
+ _logger.LogWarning($"搴撳瓨閮ㄥ垎鍒嗛厤锛岄渶瑕亄totalNeedQuantity}锛屽疄闄呭垎閰峽allocatedQuantity}");
+ }
+ else
+ {
+ _logger.LogInformation($"搴撳瓨瀹屽叏鍒嗛厤锛屽垎閰嶆暟閲弡allocatedQuantity}");
+ }
+
+ return (true, "鍒嗛厤鎴愬姛");
+ }
+
+
+ private void UpdateOrderDetailStatus(List<Dt_OutboundOrderDetail> details,
+ decimal allocatedQuantity, decimal needQuantity)
+ {
+ foreach (var detail in details)
+ {
+ var detailNeed = detail.OrderQuantity - detail.LockQuantity - detail.OverOutQuantity - detail.MoveQty;
+
+ if (detailNeed <= 0)
+ {
+ // 璇ユ槑缁嗗凡瀹屽叏鍒嗛厤
+ detail.OrderDetailStatus = OrderDetailStatusEnum.AssignOver.ObjToInt();
+ }
+ else if (allocatedQuantity < needQuantity)
+ {
+ // 鏁翠綋閮ㄥ垎鍒嗛厤锛岃鏄庣粏鍙兘杩樻湁闇�姹�
+ detail.OrderDetailStatus = OrderDetailStatusEnum.AssignOverPartial.ObjToInt();
+ }
+ else
+ {
+ // 鏁翠綋瀹屽叏鍒嗛厤
+ detail.OrderDetailStatus = OrderDetailStatusEnum.AssignOver.ObjToInt();
}
}
}
@@ -328,8 +531,8 @@
/// <param name="locationStatus"></param>
/// <param name="tasks"></param>
/// <returns></returns>
- public WebResponseContent LockOutboundStockDataUpdate(List<Dt_StockInfo> stockInfos, List<Dt_OutboundOrderDetail> outboundOrderDetails,
- List<Dt_OutStockLockInfo> outStockLockInfos, List<Dt_LocationInfo> locationInfos,
+ public WebResponseContent LockOutboundStockDataUpdate(List<Dt_StockInfo> stockInfos, List<Dt_OutboundOrderDetail> outboundOrderDetails,
+ List<Dt_OutStockLockInfo> outStockLockInfos, List<Dt_LocationInfo> locationInfos,
LocationStatusEnum locationStatus = LocationStatusEnum.Lock, List<Dt_Task>? tasks = null)
{
try
@@ -337,7 +540,7 @@
// 鏇存柊搴撳瓨鐘舵��
stockInfos.ForEach(x => x.StockStatus = (int)StockStatusEmun.鍑哄簱閿佸畾);
_stockService.StockInfoService.Repository.UpdateData(stockInfos);
-
+
// 鏇存柊搴撳瓨鏄庣粏
var stockDetails = stockInfos.SelectMany(x => x.Details).ToList();
_stockService.StockInfoDetailService.Repository.UpdateData(stockDetails);
@@ -372,5 +575,338 @@
}
}
+
+
+ public override PageGridData<Dt_OutboundOrderDetail> GetPageData(PageDataOptions options)
+ {
+ //var pageGridData = base.GetPageData(options);
+
+ ISugarQueryable<Dt_OutboundOrderDetail> sugarQueryable1 = BaseDal.Db.Queryable<Dt_OutboundOrderDetail>();
+ if (!string.IsNullOrEmpty(options.Wheres))
+ {
+
+ List<SearchParameters> searchParametersList = options.Wheres.DeserializeObject<List<SearchParameters>>();
+ int totalCount = 0;
+ if (searchParametersList.Count > 0)
+ {
+ {
+ SearchParameters? searchParameters = searchParametersList.FirstOrDefault(x => x.Name == nameof(Dt_InboundOrderDetail.OrderId).FirstLetterToLower());
+ if (searchParameters != null)
+ {
+ sugarQueryable1 = sugarQueryable1.Where(x => x.OrderId == searchParameters.Value.ObjToInt());
+ var dataList = sugarQueryable1.ToPageList(options.Page, options.Rows, ref totalCount);
+ return new PageGridData<Dt_OutboundOrderDetail>(totalCount, dataList);
+ }
+ }
+
+
+ }
+ }
+ return new PageGridData<Dt_OutboundOrderDetail>();
+ }
+
+
+ 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);
+ if (!checkResult.Item1) throw new Exception(checkResult.Item2);
+
+ Dt_OutboundOrder outboundOrder = _outboundOrderService.Repository.QueryFirst(x => x.Id == outboundOrderDetail.OrderId);
+ var originalNeedQuantity = outboundOrderDetail.OrderQuantity - outboundOrderDetail.LockQuantity - outboundOrderDetail.MoveQty;
+
+ List<Dt_StockInfo> outStocks = new List<Dt_StockInfo>();
+ List<Dt_OutStockLockInfo> outStockLockInfos = new List<Dt_OutStockLockInfo>();
+
+ decimal remainingNeedQuantity = originalNeedQuantity;
+ decimal totalAssignedFromUserSelection = 0;
+
+ // 鎸夊厛杩涘厛鍑烘帓搴忕敤鎴烽�夋嫨鐨勫簱瀛�
+ var userSelectedStocks = _stockService.StockInfoService.GetStockInfosByPalletCodes(stockSelectViews.Select(x => x.PalletCode).ToList());
+
+ var sortedUserSelectedStocks = userSelectedStocks.OrderBy(x => x.CreateDate).ToList();
+
+ // 鍒嗛厤鐢ㄦ埛閫夋嫨鐨勫簱瀛�
+ foreach (var stock in sortedUserSelectedStocks)
+ {
+ if (remainingNeedQuantity <= 0) break;
+
+ // 鑾峰彇鐢ㄦ埛瀵硅鎵樼洏鐨勯�夋嫨鏁伴噺
+ var userSelection = stockSelectViews.FirstOrDefault(x => x.PalletCode == stock.PalletCode);
+ if (userSelection == null) continue;
+
+ // 璁＄畻璇ユ墭鐩樺疄闄呭彲鐢ㄦ暟閲�
+ var availableQuantity = CalculateAvailableQuantityByBarcode(stock, outboundOrderDetail.MaterielCode,
+ outboundOrderDetail.BatchNo, outboundOrderDetail.SupplyCode, userSelection.Barcode);
+
+ // 纭畾鍒嗛厤鏁伴噺锛氬彇鐢ㄦ埛閫夋嫨鏁伴噺銆佸彲鐢ㄦ暟閲忓拰鍓╀綑闇�姹傜殑鏈�灏忓��
+ var assignQuantity = Math.Min(Math.Min(userSelection.UseableQuantity, availableQuantity), remainingNeedQuantity);
+
+ if (assignQuantity <= 0) continue;
+
+ // 鎵ц鍒嗛厤锛屼娇鐢ㄧ敤鎴烽�夋嫨鐨勬潯鐮�
+ 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, userSelection.Barcode);
+ outStockLockInfos.Add(lockInfo);
+ }
+ }
+
+ // 妫�鏌ョ敤鎴烽�夋嫨鏄惁鑷冲皯鍒嗛厤浜嗕竴閮ㄥ垎
+ if (totalAssignedFromUserSelection <= 0)
+ {
+ throw new Exception("鐢ㄦ埛閫夋嫨鐨勫簱瀛樻棤娉曞垎閰嶄换浣曟暟閲�");
+ }
+
+ // 濡傛灉鐢ㄦ埛閫夋嫨鐨勫簱瀛樹笉澶燂紝鑷姩鍒嗛厤鍓╀綑閮ㄥ垎
+
+ if (remainingNeedQuantity > 0)
+ {
+ //// 鍙�夛細杩欓噷鍙互鏍规嵁涓氬姟闇�姹傚喅瀹氭槸鍚﹀厑璁歌嚜鍔ㄥ垎閰�
+ //// 濡傛灉瑕佹眰涓ユ牸鎸夌敤鎴烽�夋嫨鍑哄簱锛屽彲浠ユ姏鍑哄紓甯�
+ //// throw new Exception($"鐢ㄦ埛閫夋嫨鐨勫簱瀛樻暟閲忎笉瓒筹紝杩橀渶{remainingNeedQuantity}锛岃閲嶆柊閫夋嫨");
+
+ //// 濡傛灉闇�瑕佽嚜鍔ㄥ垎閰嶏紝璁板綍鏃ュ織
+ //_logger.LogInformation($"鐢ㄦ埛閫夋嫨鐨勫簱瀛樻暟閲忎笉瓒筹紝杩橀渶{remainingNeedQuantity}锛岀郴缁熷皢鑷姩鍒嗛厤");
+
+ //List<Dt_StockInfo> autoStocks = _stockService.StockInfoService.GetUseableStocks(
+ // outboundOrderDetail.MaterielCode,
+ // outboundOrderDetail.BatchNo,
+ // "");
+
+ //// 鎺掗櫎鐢ㄦ埛宸查�夋嫨涓斿凡鍒嗛厤鐨勬墭鐩�
+ //var assignedPalletCodes = outStocks.Select(x => x.PalletCode).ToList();
+ //autoStocks = autoStocks
+ // .Where(x => !assignedPalletCodes.Contains(x.PalletCode))
+ // .ToList();
+
+ //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;
+
+ // 鏇存柊鐘舵��
+ UpdateOrderDetailStatus(outboundOrderDetail, remainingNeedQuantity);
+
+ List<Dt_LocationInfo> locationInfos = _locationInfoService.GetLocationInfos(outStocks.Select(x => x.LocationCode).ToList());
+
+ 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)
+ {
+ var relevantDetails = stock.Details
+ .Where(d => d.MaterielCode == materielCode &&
+ (string.IsNullOrEmpty(batchNo) || d.BatchNo == batchNo) &&
+ (string.IsNullOrEmpty(supplyCode) || d.SupplyCode == supplyCode))
+ .ToList();
+
+ return relevantDetails.Sum(d => d.StockQuantity - d.OutboundQuantity);
+ }
+
+ 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()
+ .Where(d => d.MaterielCode == detail.MaterielCode &&
+ (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)
+ {
+ if (remainingAssign <= 0) break;
+
+ var available = stockDetail.StockQuantity - stockDetail.OutboundQuantity;
+ var assign = Math.Min(available, remainingAssign);
+
+ stockDetail.OutboundQuantity += assign;
+ remainingAssign -= assign;
+ if (string.IsNullOrEmpty(assignedBarcode) && assign > 0)
+ {
+ assignedBarcode = stockDetail.Barcode;
+ }
+ }
+
+
+ return (assignQuantity - remainingAssign, assignedBarcode);
+ }
+
+ private Dt_OutStockLockInfo CreateOutStockLockInfo(Dt_OutboundOrder outboundOrder, Dt_OutboundOrderDetail detail,
+ Dt_StockInfo stock, decimal quantity,string barcode="")
+ {
+
+
+ return _outStockLockInfoService.GetOutStockLockInfo(outboundOrder, detail, stock, quantity, barcode);
+ }
+
+ private List<Dt_OutStockLockInfo> CreateLockInfosForAutoAssign(Dt_OutboundOrder outboundOrder,
+ Dt_OutboundOrderDetail detail, List<Dt_StockInfo> stocks, Dictionary<int, decimal> allocations)
+ {
+ var lockInfos = new List<Dt_OutStockLockInfo>();
+
+ foreach (var stock in stocks.OrderBy(x => x.CreateDate))
+ {
+ if (allocations.TryGetValue(stock.Id, out decimal quantity) && quantity > 0)
+ {
+ var lockInfo = CreateOutStockLockInfo(outboundOrder, detail, stock, quantity);
+ lockInfos.Add(lockInfo);
+ }
+ }
+
+ return lockInfos;
+ }
+
+ private void UpdateOrderDetailStatus(Dt_OutboundOrderDetail detail, decimal remainingQuantity)
+ {
+ if (remainingQuantity <= 0)
+ {
+ detail.OrderDetailStatus = OrderDetailStatusEnum.AssignOver.ObjToInt();
+ }
+ else
+ {
+ detail.OrderDetailStatus = OrderDetailStatusEnum.AssignOverPartial.ObjToInt();
+ }
+ }
+
+ private (bool, string) CheckSelectStockDeital(Dt_OutboundOrderDetail outboundOrderDetail, List<StockSelectViewDTO> stockSelectViews)
+ {
+ var needQuantity = outboundOrderDetail.OrderQuantity - outboundOrderDetail.LockQuantity - outboundOrderDetail.MoveQty;
+
+ if (needQuantity <= 0)
+ {
+ return (false, "鍑哄簱鍗曟槑缁嗘棤闇�鍒嗛厤搴撳瓨");
+ }
+
+ // 妫�鏌ユ�婚�夋嫨鏁伴噺鏄惁澶т簬0
+ var totalSelected = stockSelectViews.Sum(x => x.UseableQuantity);
+ if (totalSelected <= 0)
+ {
+ return (false, "鐢ㄦ埛閫夋嫨鐨勫簱瀛樻暟閲忓繀椤诲ぇ浜�0");
+ }
+
+ // 妫�鏌ユ瘡涓墭鐩樼殑鍙敤鏁伴噺
+ foreach (var selection in stockSelectViews)
+ {
+ if (selection.UseableQuantity <= 0)
+ {
+ return (false, $"鎵樼洏[{selection.PalletCode}]鐨勯�夋嫨鏁伴噺蹇呴』澶т簬0");
+ }
+
+ var stock = _stockService.StockInfoService.GetStockInfoByPalletCode(selection.PalletCode);
+ if (stock == null)
+ {
+ return (false, $"鎵樼洏[{selection.PalletCode}]涓嶅瓨鍦�");
+ }
+
+ var available = CalculateAvailableQuantityByBarcode(stock, outboundOrderDetail.MaterielCode,
+ outboundOrderDetail.BatchNo, outboundOrderDetail.SupplyCode,selection.Barcode);
+
+ if (available <= 0)
+ {
+ return (false, $"鎵樼洏[{selection.PalletCode}]娌℃湁鍙敤搴撳瓨");
+ }
+ }
+
+ return (true, "楠岃瘉閫氳繃");
+ }
}
}
--
Gitblit v1.9.3