From 7dcd8da0f2467d077551ddd39f33be5836dd80a9 Mon Sep 17 00:00:00 2001
From: liulijun <liulijun@hnkhzn.com>
Date: 星期四, 12 三月 2026 10:04:25 +0800
Subject: [PATCH] 取消老厂排程单信息中物料编号的合并
---
项目代码/WMS/WMSServices/WIDESEA_OutboundService/OutSGOrderDetailService.cs | 23 +++++++++++++++++++----
1 files changed, 19 insertions(+), 4 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 eb116ca..59292fb 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;
@@ -72,8 +74,10 @@
foreach (var item in groupDetails)
{
decimal needQuantity = item.XqLen;
- //鑾峰彇鍙敤搴撳瓨
- List<Dt_StockInfo> stockInfos = _stockService.StockInfoService.GetUseableStocks(item.MaterialNo, item.Width, outBSTOrders.FirstOrDefault().WarehouseId).Where(x=>!outStocks.Select(x=>x.PalletCode).Contains(x.PalletCode)).ToList();
+ //鑾峰彇鑰佸巶缂撳瓨鍙敤搴撳瓨
+ List<Dt_StockInfo> stockInfos = _stockService.StockInfoService.GetUseOldCacheStocks(item.MaterialNo, item.Width) ?? new List<Dt_StockInfo>();
+ //鑾峰彇绔嬪簱鍙敤搴撳瓨
+ stockInfos.AddRange(_stockService.StockInfoService.GetUseableStocks(item.MaterialNo, item.Width, outBSTOrders.FirstOrDefault().WarehouseId).Where(x=>!outStocks.Select(x=>x.PalletCode).Contains(x.PalletCode)).ToList());
if (!stockInfos.Any())
{
continue;
@@ -90,7 +94,11 @@
});
for (int i = 0; i < details.Count; i++)
{
- //璁㈠崟鏁伴噺
+ ////璁㈠崟鏁伴噺
+ //if ((details.Count-1) == i)
+ //{
+
+ //}
decimal orderQuantity = details[i].XqLen;
bool assignStop = true;
while (assignStop)
@@ -132,7 +140,7 @@
}
- 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);
@@ -144,6 +152,10 @@
{
try
{
+ stockInfos.Where(x => x.LocationCode.IsNullOrEmpty()).ToList().ForEach(x =>
+ {
+ x.StockStatus = StockStatusEmun.鍑哄簱瀹屾垚.ObjToInt();
+ });
_stockService.StockInfoService.Repository.UpdateData(stockInfos);
BaseDal.UpdateData(outboundOrderDetails);
@@ -159,6 +171,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