diff --git a/BWP.B3_YunKen.Web/Pages/B3YunKen/B3YunKenSaleOutStoreToCustomerAccept.cs b/BWP.B3_YunKen.Web/Pages/B3YunKen/B3YunKenSaleOutStoreToCustomerAccept.cs index d230dd6..9d029f5 100644 --- a/BWP.B3_YunKen.Web/Pages/B3YunKen/B3YunKenSaleOutStoreToCustomerAccept.cs +++ b/BWP.B3_YunKen.Web/Pages/B3YunKen/B3YunKenSaleOutStoreToCustomerAccept.cs @@ -164,10 +164,15 @@ namespace BWP.Web.Pages.B3YunKen { foreach (SaleOutStore_Detail detail in _detailGrid.GetSelectedItems()) { if (detail.AcceptUnitNum > detail.UnitNum) throw new ApplicationException("【"+detail.Goods_Name+"】转验收报价数量不能大于报价数量"); + var outUnitNum = detail.UnitNum; detail.UnitNum = detail.AcceptUnitNum; detail.Number = detail.UnitNum / detail.LeftRatio * detail.RightRatio; detail.SecondNumber = detail.AcceptSecondNumber; - detail.Money = (detail.UnitNum * detail.Price); + if ((detail.AcceptUnitNum + detail.AlreadyAcceptUnitNum) == outUnitNum) { + detail.Money = detail.Money - (detail.AlreadyAcceptUnitNum * detail.Price); + } else { + detail.Money = (detail.UnitNum * detail.Price); + } detail.RebateMoney = detail.Money * (detail.Rebate / 100); details.Add(detail); }