From dc06f58d8ed537555fd529551180f43a0586ec3f Mon Sep 17 00:00:00 2001
From: helongyang <647556386@qq.com>
Date: 星期日, 22 六月 2025 11:44:43 +0800
Subject: [PATCH] Merge branch 'master' of http://115.159.85.185:8098/r/MeiRuiAn/HuaiAn
---
代码管理/WMS/WIDESEA_WMSServer/WIDESEA_CheckService/CheckOrderResultService.cs | 15 +++++++++++++--
1 files changed, 13 insertions(+), 2 deletions(-)
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_CheckService/CheckOrderResultService.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_CheckService/CheckOrderResultService.cs"
index 1ecc986..607da70 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_CheckService/CheckOrderResultService.cs"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_CheckService/CheckOrderResultService.cs"
@@ -206,7 +206,8 @@
{
return content.Error($"鏁伴噺瓒呭嚭");
}
- if (checkResult.Result == InspectResultEnum.Return.ToString())//閫�璐�
+ //鍒ゆ柇妫�楠岀粨鏋�
+ if (checkResult.Result == InspectResultEnum.Return.ToString())
{
checkOrder.DefectedNote = checkResult.Note;
checkOrder.ReturnQuantity += checkResult.Quantity;
@@ -248,8 +249,9 @@
}
else if(checkResult.Quantity< item.StockQuantity)
{
- checkResult.Quantity = 0;
item.StockQuantity -= checkResult.Quantity;
+ item.OutboundQuantity = 0;
+ checkResult.Quantity = 0;
stockInfoDetails.Add(item);
}
else if (checkResult.Quantity >= item.StockQuantity)
@@ -287,6 +289,7 @@
checkOrder.QualifiedQuantity = checkOrder.ReceivedQuantity;
}
checkOrder.CheckUserName = App.User.UserName;
+ List<Dt_StockInfoDetail> initialStockDetails = stockInfo.Details.Where(x=> !(stockInfoDetails.Select(v=>v.Id).ToList()).Contains(x.Id)).ToList();
_unitOfWorkManage.BeginTran();
if (checkOrderResult != null)
@@ -298,6 +301,14 @@
{
_stockRepository.StockInfoDetailRepository.UpdateData(stockInfoDetails);
}
+ if (initialStockDetails.Count>0)
+ {
+ initialStockDetails.ForEach(x =>
+ {
+ x.OutboundQuantity = 0;
+ });
+ _stockRepository.StockInfoDetailRepository.UpdateData(initialStockDetails);
+ }
if (DelStockDetails.Count>0)
{
_stockRepository.StockInfoDetailRepository.DeleteAndMoveIntoHty(DelStockDetails, App.User.UserId == 0 ? OperateTypeEnum.鑷姩瀹屾垚 : OperateTypeEnum.浜哄伐瀹屾垚);
--
Gitblit v1.9.3