From e0de0f486e5f52987d42982adf5da4c241cdc92d Mon Sep 17 00:00:00 2001 From: wangxinhui <wangxinhui@hnkhzn.com> Date: 星期三, 19 二月 2025 09:04:06 +0800 Subject: [PATCH] 1 --- 代码管理/WMS/WIDESEA_WMSServer/WIDESEA_RecordService/Service/StockQuantityChangeRecordService.cs | 18 +++++++++++------- 1 files changed, 11 insertions(+), 7 deletions(-) diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_RecordService/Service/StockQuantityChangeRecordService.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_RecordService/Service/StockQuantityChangeRecordService.cs" index fd0185e..adf306a 100644 --- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_RecordService/Service/StockQuantityChangeRecordService.cs" +++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_RecordService/Service/StockQuantityChangeRecordService.cs" @@ -28,7 +28,7 @@ { x.PalleCode = stockInfo.PalletCode; x.BeforeQuantity = beforeQuantity; - if (totalQuantity > beforeQuantity) + if (totalQuantity >= beforeQuantity) { x.ChangeQuantity = stockInfoDetails[index].StockQuantity; currentQuantity += stockInfoDetails[index].StockQuantity; @@ -54,7 +54,7 @@ } } - public void AddStockChangeRecord(Dt_StockInfo stockInfo, List<Dt_StockInfoDetail> updateDetails, List<Dt_StockInfoDetail> deleteDetails, StockChangeTypeEnum changeType, int? taskNum = null) + public void AddStockChangeRecord(Dt_StockInfo stockInfo, List<Dt_StockInfoDetail> residueDetailList, List<Dt_StockInfoDetail> updateDetails, List<Dt_StockInfoDetail> deleteDetails, StockChangeTypeEnum changeType, int? taskNum = null) { try { @@ -62,12 +62,15 @@ int index1 = 0; List<Dt_StockQuantityChangeRecord> records1 = _mapper.Map<List<Dt_StockQuantityChangeRecord>>(updateDetails); + float beforeQuantity = updateDetails.Sum(x => x.OutboundQuantity + x.StockQuantity) + deleteDetails.Sum(x => x.StockQuantity) + residueDetailList.Sum(x => x.StockQuantity); + records1.ForEach(x => { x.PalleCode = stockInfo.PalletCode; - x.BeforeQuantity = deleteDetails[index1].StockQuantity + deleteDetails[index1].OutboundQuantity; - x.ChangeQuantity = -deleteDetails[index1].OutboundQuantity; - x.AfterQuantity = deleteDetails[index1].StockQuantity; + x.BeforeQuantity = beforeQuantity; + x.ChangeQuantity = -updateDetails[index1].OutboundQuantity; + x.AfterQuantity = beforeQuantity + x.ChangeQuantity; + beforeQuantity -= updateDetails[index1].OutboundQuantity; index1++; }); stockQuantityChangeRecords.AddRange(records1); @@ -76,9 +79,10 @@ records2.ForEach(x => { x.PalleCode = stockInfo.PalletCode; - x.BeforeQuantity = deleteDetails[index2].StockQuantity; + x.BeforeQuantity = beforeQuantity; x.ChangeQuantity = -deleteDetails[index2].StockQuantity; - x.AfterQuantity = 0; + x.AfterQuantity = beforeQuantity + x.ChangeQuantity; + beforeQuantity -= deleteDetails[index2].StockQuantity; index2++; }); stockQuantityChangeRecords.AddRange(records2); -- Gitblit v1.9.3