From 8dc2427e1c5e5e349bce2d72759034c406eb0848 Mon Sep 17 00:00:00 2001
From: wangxinhui <wangxinhui@hnkhzn.com>
Date: 星期五, 13 三月 2026 01:15:27 +0800
Subject: [PATCH] 合并
---
项目代码/WMS/WMSServices/WIDESEA_OutboundService/OutSGOrderDetailService.cs | 50 ++++++++++++++++++++++++++++++++++++++------------
1 files changed, 38 insertions(+), 12 deletions(-)
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSServices/WIDESEA_OutboundService/OutSGOrderDetailService.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSServices/WIDESEA_OutboundService/OutSGOrderDetailService.cs"
index 374b95b..907c163 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSServices/WIDESEA_OutboundService/OutSGOrderDetailService.cs"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSServices/WIDESEA_OutboundService/OutSGOrderDetailService.cs"
@@ -5,8 +5,10 @@
using System.Text;
using System.Threading.Tasks;
using WIDESEA_Common.LocationEnum;
+using WIDESEA_Common.StockEnum;
using WIDESEA_Core;
using WIDESEA_Core.BaseServices;
+using WIDESEA_Core.Helper;
using WIDESEA_IBasicRepository;
using WIDESEA_IBasicService;
using WIDESEA_IOutboundRepository;
@@ -43,13 +45,13 @@
/// <summary>
/// 鍒嗛厤搴撳瓨
/// </summary>
- public (List<Dt_StockInfo>, List<Dt_OutSGOrderDetail>, List<Dt_OutStockLockInfo>, List<Dt_LocationInfo>) AssignStockOutbound(List<Dt_OutSGOrderDetail> outboundOrderDetails)
+ public (List<Dt_StockInfo>, List<Dt_OutSGOrderDetail>, List<Dt_OutStockLockInfo>, List<Dt_LocationInfo>,string) AssignStockOutbound(List<Dt_OutSGOrderDetail> outboundOrderDetails)
{
if (!outboundOrderDetails.Any())
{
throw new Exception($"鏈壘鍒板嚭搴撳崟鏄庣粏淇℃伅");
}
-
+ string message = "";
//鑾峰彇鎵�鏈夋帓绋嬩富琛�
List<Dt_OutSGOrder> outBSTOrders = _outboundRepository.OutSGOrderRepository.QueryData(x => outboundOrderDetails.Select(x=>x.OutSGOrderId).Distinct().Contains(x.Id));
List<Dt_StockInfo> outStocks = new List<Dt_StockInfo>();
@@ -72,14 +74,20 @@
foreach (var item in groupDetails)
{
decimal needQuantity = item.XqLen;
- //鑾峰彇鍙敤搴撳瓨
- List<Dt_StockInfo> stockInfos = _stockService.StockInfoService.GetUseableStocks(item.MaterialNo, item.Width, outBSTOrders.FirstOrDefault().WarehouseId);
+ //鑾峰彇鎵�鏈夋潯鐮�
+ List<string> palletCodes = outStocks.Select(x => x.PalletCode).ToList();
+ //鑾峰彇鑰佸巶缂撳瓨鍙敤搴撳瓨
+ List<Dt_StockInfo> stockInfos = _stockService.StockInfoService.GetUseOldCacheStocks(item.MaterialNo, item.Width).Where(x => !palletCodes.Contains(x.PalletCode)).ToList() ?? new List<Dt_StockInfo>();
+ //鑾峰彇绔嬪簱鍙敤搴撳瓨
+ stockInfos.AddRange(_stockService.StockInfoService.GetUseableStocks(item.MaterialNo, item.Width, outBSTOrders.FirstOrDefault().WarehouseId).Where(x=>!palletCodes.Contains(x.PalletCode)).ToList());
if (!stockInfos.Any())
{
- throw new Exception($"鏈壘鍒板彲鍒嗛厤搴撳瓨");
+ message += $"鐗╂枡锛歿item.MaterialNo},骞呭锛歿item.Width}鏃犲簱瀛橈紱";
+ continue;
}
+
//鍒嗛厤瀹為檯搴撳瓨
- List<Dt_StockInfo> autoAssignStocks = _stockService.StockInfoService.GetOutboundStocks(stockInfos, needQuantity).OrderBy(x => x.StockLength - x.StockOutLength).ToList();
+ List<Dt_StockInfo> autoAssignStocks = _stockService.StockInfoService.GetOutOldStocks(stockInfos, needQuantity).ToList();
//娣诲姞搴撳瓨鍒嗛厤
outStocks.AddRange(autoAssignStocks);
//鑾峰彇鎵�鏈夎鐗╂枡鍗曟嵁
@@ -90,7 +98,11 @@
});
for (int i = 0; i < details.Count; i++)
{
- //璁㈠崟鏁伴噺
+ ////璁㈠崟鏁伴噺
+ //if ((details.Count-1) == i)
+ //{
+
+ //}
decimal orderQuantity = details[i].XqLen;
bool assignStop = true;
while (assignStop)
@@ -100,17 +112,20 @@
decimal orderDetailNeedQuantity = details[i].XqLen - detailAssignQuantity;
+ if (autoAssignStocks.Count==0)
+ {
+ break;
+ }
+
decimal useStockLength = autoAssignStocks[0].StockLength- autoAssignStocks[0].StockOutLength;
Dt_OutSGOrder? sGOrder = outBSTOrders.FirstOrDefault(x => x.Id == details[i].OutSGOrderId);
if (orderDetailNeedQuantity > useStockLength)
{
-
//鐢熸垚璇︽儏
Dt_OutStockLockInfo outStockLockInfo = _outStockLockInfoService.GetOutStockLockInfo(sGOrder, details[i], autoAssignStocks[0], useStockLength);
outStockLockInfos.Add(outStockLockInfo);
details[i].AssignTotalUsage += useStockLength;
autoAssignStocks.Remove(autoAssignStocks[0]);
-
}
else
{
@@ -118,17 +133,21 @@
Dt_OutStockLockInfo outStockLockInfo = _outStockLockInfoService.GetOutStockLockInfo(sGOrder, details[i], autoAssignStocks[0], orderDetailNeedQuantity);
outStockLockInfos.Add(outStockLockInfo);
details[i].AssignTotalUsage = orderQuantity;
- autoAssignStocks[0].StockOutLength-= orderDetailNeedQuantity;
+ autoAssignStocks[0].StockOutLength+= orderDetailNeedQuantity;
+ if (autoAssignStocks[0].StockOutLength== autoAssignStocks[0].StockLength)
+ {
+ autoAssignStocks.Remove(autoAssignStocks[0]);
+ }
assignStop =false;
}
}
}
- locationInfos.AddRange(_basicRepository.LocationInfoRepository.GetLocationInfos(outStocks.Select(x => x.LocationCode).ToList()));
+ locationInfos.AddRange(_basicRepository.LocationInfoRepository.GetLocationInfos(outStocks.Where(x=>!x.LocationCode.IsNullOrEmpty() && !locationInfos.Select(x=>x.LocationCode).Contains(x.LocationCode)).Select(x => x.LocationCode).ToList()));
}
- return (outStocks, outboundOrderDetails, outStockLockInfos, locationInfos);
+ return (outStocks, outboundOrderDetails, outStockLockInfos, locationInfos, message);
}
/// <summary>
/// 鍑哄簱搴撳瓨鍒嗛厤鍚庯紝鏇存柊鏁版嵁搴撴暟鎹�
@@ -137,6 +156,10 @@
{
try
{
+ stockInfos.Where(x => x.LocationCode.IsNullOrEmpty()).ToList().ForEach(x =>
+ {
+ x.StockStatus = StockStatusEmun.鍑哄簱瀹屾垚.ObjToInt();
+ });
_stockService.StockInfoService.Repository.UpdateData(stockInfos);
BaseDal.UpdateData(outboundOrderDetails);
@@ -152,6 +175,9 @@
}
_outStockLockInfoService.Repository.AddData(addOutStockLockInfos);
+ List<Dt_OutStockLockInfo> addOutCacheInfos = addOutStockLockInfos.Where(x => x.LocationCode.Contains("鑰佸巶缂撳瓨鍖�")).ToList();
+ List<Dt_OutLineView> outLineViewsAdd = addOutCacheInfos.Select(x => _mapper.Map<Dt_OutLineView>(x)).ToList();
+ _outboundRepository.OutLineViewRepository.AddData(outLineViewsAdd);
}
List<Dt_OutStockLockInfo> updateOutStockLockInfos = outStockLockInfos.Where(x => x.Id > 0).ToList();
if (updateOutStockLockInfos != null && updateOutStockLockInfos.Any())
--
Gitblit v1.9.3