diff --git a/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/BQ/Syncs/MakeCanSettlementService.cs b/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/BQ/Syncs/MakeCanSettlementService.cs index 8dd6b4da..52839e8b 100644 --- a/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/BQ/Syncs/MakeCanSettlementService.cs +++ b/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/BQ/Syncs/MakeCanSettlementService.cs @@ -136,9 +136,7 @@ namespace Win.Sfs.SettleAccount.Entities.BQ.Syncs details = new List(); sum = 0; } - else - { - var _detailEntity = new BBAC_CAN_SA_DETAIL( + var _detailEntity = new BBAC_CAN_SA_DETAIL( guid: GuidGenerator.Create(), keyCode: itm1.KeyCode, version: itm1.Version, @@ -158,9 +156,9 @@ namespace Win.Sfs.SettleAccount.Entities.BQ.Syncs invbillnum: string.Empty, partcode: itm1.PartCode ); - _detailEntity.RealPartCode = itm1.RealPartCode; - details.Add(_detailEntity); - } + _detailEntity.RealPartCode = itm1.RealPartCode; + details.Add(_detailEntity); + } var billNum1 = OrderNumberGenerator.GenerateOrderNumber("N"); var bbac_sa1 = new BBAC_CAN_SA(); @@ -273,8 +271,7 @@ namespace Win.Sfs.SettleAccount.Entities.BQ.Syncs List details = new List(); foreach (var itm1 in ls) { - - sum += (itm1.Qty * itm1.Price); + if (sum > 10000000) { var billNum = OrderNumberGenerator.GenerateOrderNumber("N"); @@ -296,33 +293,32 @@ namespace Win.Sfs.SettleAccount.Entities.BQ.Syncs } details = new List(); sum = 0; + } - else - { - var _detailEntity = new BBAC_CAN_SA_DETAIL( - guid: GuidGenerator.Create(), - keyCode: itm1.KeyCode, - version: itm1.Version, - billNum: string.Empty, - settleBillNum: itm1.SettleBillNum, - lU: itm1.LU, - pN: itm1.PN, - site: itm1.Site, - qty: itm1.Qty, - price: itm1.Price, - category: itm1.BusinessType, - isReturn: itm1.IsReturn, - settleDate: itm1.SettleDate, - groupNum: itm1.GroupNum, - invGroupNum: string.Empty, - contactid: itm1.ContractDocID, - invbillnum: string.Empty, - partcode: itm1.PartCode - ); - _detailEntity.RealPartCode = itm1.RealPartCode; - details.Add(_detailEntity); - - } + sum += (itm1.Qty * itm1.Price); + var _detailEntity = new BBAC_CAN_SA_DETAIL( + guid: GuidGenerator.Create(), + keyCode: itm1.KeyCode, + version: itm1.Version, + billNum: string.Empty, + settleBillNum: itm1.SettleBillNum, + lU: itm1.LU, + pN: itm1.PN, + site: itm1.Site, + qty: itm1.Qty, + price: itm1.Price, + category: itm1.BusinessType, + isReturn: itm1.IsReturn, + settleDate: itm1.SettleDate, + groupNum: itm1.GroupNum, + invGroupNum: string.Empty, + contactid: itm1.ContractDocID, + invbillnum: string.Empty, + partcode: itm1.PartCode + ); + _detailEntity.RealPartCode = itm1.RealPartCode; + details.Add(_detailEntity); + } var billNum1 = OrderNumberGenerator.GenerateOrderNumber("N"); var bbac_sa1 = new BBAC_CAN_SA(); @@ -510,7 +506,6 @@ namespace Win.Sfs.SettleAccount.Entities.BQ.Syncs List details = new List(); foreach (var itm1 in ls) { - sum += (itm1.Qty * itm1.Price); if (sum > 10000000) { @@ -534,30 +529,26 @@ namespace Win.Sfs.SettleAccount.Entities.BQ.Syncs details = new List(); sum = 0; } - else - { - var _detailEntity = new HBPO_CAN_SA_DETAIL( - guid: GuidGenerator.Create(), - keyCode: itm1.KeyCode, - version: itm1.Version, - billNum: string.Empty, - settleBillNum: itm1.SettleBillNum, - lU: itm1.LU, - pN: itm1.PN, - site: itm1.Site, - qty: itm1.Qty, - price: itm1.Price, - businessType: itm1.BusinessType, - settleDate: itm1.SettleDate, - groupNum: itm1.GroupNum, - invGroupNum: string.Empty, - invbillnum: string.Empty, - partcode: itm1.PartCode - ); - _detailEntity.RealPartCode = itm1.RealPartCode; - details.Add(_detailEntity); - } - + var _detailEntity = new HBPO_CAN_SA_DETAIL( + guid: GuidGenerator.Create(), + keyCode: itm1.KeyCode, + version: itm1.Version, + billNum: string.Empty, + settleBillNum: itm1.SettleBillNum, + lU: itm1.LU, + pN: itm1.PN, + site: itm1.Site, + qty: itm1.Qty, + price: itm1.Price, + businessType: itm1.BusinessType, + settleDate: itm1.SettleDate, + groupNum: itm1.GroupNum, + invGroupNum: string.Empty, + invbillnum: string.Empty, + partcode: itm1.PartCode + ); + _detailEntity.RealPartCode = itm1.RealPartCode; + details.Add(_detailEntity); } var billNum1 = OrderNumberGenerator.GenerateOrderNumber("N"); var bbac_sa1 = new HBPO_CAN_SA();