diff --git a/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/BQ/PUB_BA_SERVICE.cs b/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/BQ/PUB_BA_SERVICE.cs index b5313962..29bf0b18 100644 --- a/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/BQ/PUB_BA_SERVICE.cs +++ b/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/BQ/PUB_BA_SERVICE.cs @@ -339,11 +339,8 @@ namespace Win.Sfs.SettleAccount.Entities.BQ else { var dfirst = publist.FirstOrDefault(); - foreach (var itm in adjlist) { - - var entity = new PUB_CAN_SA_DETAIL( guid: GuidGenerator.Create(), keyCode: itm.KeyCode, @@ -532,7 +529,6 @@ namespace Win.Sfs.SettleAccount.Entities.BQ { priceList.Add(new PriceList() { LU = itm.LU, BeginTime = itm.BeginDate, EndTime = itm.EndDate, Price = itm.Price, ClientCode = "1041", ContractNo = itm.ContractNo }); } - break; default: priceList = _priceRepository.Where(p => p.IsCancel == false && p.ClientCode == inv.Site).ToList();//价格单 diff --git a/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/BQ/Syncs/PendingDeductionService.cs b/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/BQ/Syncs/PendingDeductionService.cs index 90478e8d..2d854c5c 100644 --- a/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/BQ/Syncs/PendingDeductionService.cs +++ b/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/BQ/Syncs/PendingDeductionService.cs @@ -207,7 +207,7 @@ namespace Win.Sfs.SettleAccount.Entities.BQ.Syncs ChangedTime = DateTime.Now, Qty = itm.Qty, RealPartCode = itm.RELU,//替换件 结算数据 RealPartCode->RELU - RealCode = itm.RELU, + RealCode = itm.PN, LogType = Entities.BQ.Vmi.VmiLogType.Type200, ChangedQty = (flag == true) ? -itm.Qty : itm.Qty, ChangedType = VmiType.Out, diff --git a/code/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/BQ/Managers/INV_MNG.cs b/code/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/BQ/Managers/INV_MNG.cs index fe8c4e41..7a6bc745 100644 --- a/code/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/BQ/Managers/INV_MNG.cs +++ b/code/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/BQ/Managers/INV_MNG.cs @@ -1304,7 +1304,6 @@ namespace Win.Sfs.SettleAccount.Entities.BQ.Managers var adjdetails = p_adjlist.Where(p => ls.Contains(p.GroupNum)).ToList(); foreach (var detail in adjdetails) { - detail.InvBillNum = key; adjlist.Add(detail); } @@ -1627,7 +1626,6 @@ namespace Win.Sfs.SettleAccount.Entities.BQ.Managers on new { LU = itm.LU, itm.PartCode, itm.BeginDate, itm.EndDate } equals new { itm1.LU, itm1.PartCode, itm1.BeginDate, itm1.EndDate } join itm2 in p_adjlist on new { itm.LU, itm.SettleDate } equals new { itm2.LU, itm2.SettleDate } select itm2; - foreach (var itm in query1) { itm.InvBillNum = key; @@ -1656,16 +1654,13 @@ namespace Win.Sfs.SettleAccount.Entities.BQ.Managers { groupList.AddRange(mapList); } - if (p_first == true) { - var settleBillnum = string.Empty; - if (businessType == EnumBusinessType.ZhiGongJianHBPO) { - var mng = await _pubMng.GetMainAsync(p_InvGroupNum); - settleBillnum=mng.SettleBillNum; + var mng = await _pubMng.GetMainAsync(p_InvGroupNum); + settleBillnum = mng.SettleBillNum; var notsettle = _nothbpoRepository.Where(p => p.SettleBillNum == settleBillnum);//一次开票时查找不可结数据,追加需求 if (notsettle != null && notsettle.Count() > 0) { @@ -1751,7 +1746,6 @@ namespace Win.Sfs.SettleAccount.Entities.BQ.Managers if (p_first == true) { var notsettle = _nothbpoRepository.Where(p => p.SettleBillNum == p_InvGroupNum);//一次开票时查找不可结数据,追加需求 - if (notsettle != null && notsettle.Count() > 0) { var innotls = new List(); @@ -1894,7 +1888,6 @@ namespace Win.Sfs.SettleAccount.Entities.BQ.Managers var invlist = new List(); var salist = new List(); var adjlist = new List(); - foreach (var itm in invoiceMap)//分组影响和 { var key = itm.Key;//发票票号