From aed0f21b6345d10d94126b63f6bb4b854e0531a1 Mon Sep 17 00:00:00 2001
From: wankeda <Administrator@DESKTOP-HAU3ST3>
Date: 星期三, 28 一月 2026 09:49:03 +0800
Subject: [PATCH] 1
---
WMS/WIDESEA_WMSServer/WIDESEA_StockService/Service/StockInfoService.cs | 145 ++++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 144 insertions(+), 1 deletions(-)
diff --git a/WMS/WIDESEA_WMSServer/WIDESEA_StockService/Service/StockInfoService.cs b/WMS/WIDESEA_WMSServer/WIDESEA_StockService/Service/StockInfoService.cs
index b617a84..ee20837 100644
--- a/WMS/WIDESEA_WMSServer/WIDESEA_StockService/Service/StockInfoService.cs
+++ b/WMS/WIDESEA_WMSServer/WIDESEA_StockService/Service/StockInfoService.cs
@@ -194,7 +194,13 @@
return outStocks;
}
- //浣庢俯銆佽嵂姘村垎閰嶅簱瀛�
+ /// <summary>
+ /// 浣庢俯銆佽嵂姘村垎閰嶅簱瀛�
+ /// </summary>
+ /// <param name="stockInfos"></param>
+ /// <param name="dt_OutboundOrderDetails"></param>
+ /// <param name="residueQuantitys"></param>
+ /// <returns></returns>
public List<Dt_StockInfo> DWANDYSGetOutboundStocks(List<Dt_StockInfo> stockInfos,List<Dt_OutboundOrderDetail> dt_OutboundOrderDetails, out List<IStockInfoService.residueQuantity> residueQuantitys)
{
List<Dt_StockInfo> outStocks = new List<Dt_StockInfo>();
@@ -323,6 +329,143 @@
}
return outStocks;
}
+
+
+ /// <summary>
+ /// 鎴愬搧鍒嗛厤搴撳瓨
+ /// </summary>
+ /// <param name="stockInfos"></param>
+ /// <param name="dt_OutboundOrderDetails"></param>
+ /// <param name="residueQuantitys"></param>
+ /// <returns></returns>
+ public List<Dt_StockInfo> CPGetOutboundStocks(List<Dt_StockInfo> stockInfos, List<Dt_NewOutboundOrderDetail> dt_OutboundOrderDetails, out List<IStockInfoService.residueQuantity> residueQuantitys)
+ {
+ List<Dt_StockInfo> outStocks = new List<Dt_StockInfo>();
+ List<IStockInfoService.residueQuantity> newresidueQantity = new List<IStockInfoService.residueQuantity>();
+ List<Dt_StockInfo> notStocks = new List<Dt_StockInfo>(); ;
+ foreach (var dt_OutboundOrderDetail in dt_OutboundOrderDetails)
+ {
+ notStocks = stockInfos.Where(x => x.Details.Any(x => x.BatchNo == dt_OutboundOrderDetail.BatchNo && x.MaterielCode == dt_OutboundOrderDetail.MaterielCode)).OrderBy(x => x.Id).ToList();
+ if (notStocks.Count > 0)
+ {
+ decimal stockTotalQuantity = stockInfos.SelectMany(x => x.Details).Where(d => d.BatchNo == dt_OutboundOrderDetail.BatchNo).Sum(v => v.StockQuantity - v.OutboundQuantity);
+ decimal needQuantity = dt_OutboundOrderDetail.OrderQuantity - dt_OutboundOrderDetail.LockQuantity;
+ if (stockTotalQuantity >= needQuantity)//搴撳瓨澶�
+ {
+ int index = 0;
+ while (needQuantity > 0)
+ {
+
+ Dt_StockInfo stockInfo = stockInfos[index];
+ Dt_StockInfoDetail dt_StockInfoDetail = new Dt_StockInfoDetail();
+ foreach (var detail in stockInfo.Details)
+ {
+ if (detail.BatchNo == dt_OutboundOrderDetail.BatchNo && detail.MaterielCode == dt_OutboundOrderDetail.MaterielCode)
+ {
+ dt_StockInfoDetail = detail;
+ }
+ }
+ decimal useableStockQuantity = dt_StockInfoDetail.StockQuantity - dt_StockInfoDetail.OutboundQuantity;
+ if (useableStockQuantity < needQuantity)
+ {
+ stockInfo.Details.ForEach(x =>
+ {
+ if (x.MaterielCode == dt_OutboundOrderDetail.MaterielCode && x.BatchNo == dt_OutboundOrderDetail.BatchNo)
+ {
+ x.OutboundQuantity = x.StockQuantity;
+ }
+ });
+ needQuantity -= useableStockQuantity;
+ }
+ else
+ {
+
+ stockInfo.Details.ForEach(x =>
+ {
+ if (x.StockQuantity > x.OutboundQuantity && x.MaterielCode == dt_OutboundOrderDetail.MaterielCode && x.BatchNo == dt_OutboundOrderDetail.BatchNo)
+ {
+ if (x.StockQuantity - x.OutboundQuantity >= needQuantity)
+ {
+ x.OutboundQuantity += needQuantity;
+ needQuantity = 0;
+ }
+ else
+ {
+ needQuantity -= (x.StockQuantity - x.OutboundQuantity);
+ x.OutboundQuantity = x.StockQuantity;
+ }
+ }
+ });
+ }
+ outStocks.Add(stockInfo);
+ index++;
+ }
+ }
+ else
+ {
+ for (int i = 0; i < stockInfos.Count; i++)
+ {
+ Dt_StockInfo stockInfo = stockInfos[i];
+ decimal useableStockQuantity = 0;
+ foreach (var detail in stockInfo.Details)
+ {
+ if (detail.MaterielCode == dt_OutboundOrderDetail.MaterielCode && detail.BatchNo == dt_OutboundOrderDetail.BatchNo)
+ {
+ useableStockQuantity = detail.StockQuantity - detail.OutboundQuantity;
+ }
+ }
+
+ if (useableStockQuantity < needQuantity)
+ {
+ stockInfo.Details.ForEach(x => {
+ if (x.MaterielCode == dt_OutboundOrderDetail.MaterielCode && x.BatchNo == dt_OutboundOrderDetail.BatchNo)
+ {
+ x.OutboundQuantity = x.StockQuantity;
+ }
+ });
+ needQuantity -= useableStockQuantity;
+ }
+ else
+ {
+ stockInfo.Details.ForEach(x =>
+ {
+ if (x.StockQuantity > x.OutboundQuantity && x.MaterielCode == dt_OutboundOrderDetail.MaterielCode && x.BatchNo == dt_OutboundOrderDetail.BatchNo)
+ {
+ if (x.StockQuantity - x.OutboundQuantity >= needQuantity)
+ {
+ x.OutboundQuantity += needQuantity;
+ needQuantity = 0;
+ }
+ else
+ {
+ needQuantity -= (x.StockQuantity - x.OutboundQuantity);
+ x.OutboundQuantity = x.StockQuantity;
+ }
+ }
+ });
+ }
+ outStocks.Add(stockInfo);
+ }
+ }
+ IStockInfoService.residueQuantity newResidueQuantity = new IStockInfoService.residueQuantity();
+ newResidueQuantity.MaterielCode = dt_OutboundOrderDetail.MaterielCode;
+ newResidueQuantity.BatchNo = dt_OutboundOrderDetail.BatchNo;
+ newResidueQuantity.NewNeendQuantity = needQuantity;
+ newresidueQantity.Add(newResidueQuantity);
+ }
+ else
+ {
+ continue;
+ }
+
+ }
+ residueQuantitys = newresidueQantity;
+ if (outStocks.Count() > 1)
+ {
+ outStocks.RemoveRange(0, outStocks.Count - 1);
+ }
+ return outStocks;
+ }
//瀵煎嚭
public override WebResponseContent Export(PageDataOptions options)
{
--
Gitblit v1.9.3