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 f71b927c..e874ad77 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 @@ -43,6 +43,13 @@ namespace Win.Sfs.SettleAccount.Entities.BQ.Syncs var list = billList.Split(","); var projectList = _dbcontext.Set().Where(p => p.Project == "库位").ToList(); + + var jisbbac= projectList.FirstOrDefault(p => p.Value == "JisBBAC").Description; + var jisbbac_sy= projectList.FirstOrDefault(p => p.Value == "JisBBAC顺义").Description; + var yindujian= projectList.FirstOrDefault(p => p.Value == "YinDuJian").Description; + var beijian= projectList.FirstOrDefault(p => p.Value == "BeiJian").Description; + + if (type == "JisBBAC" || type == "ZhiGongJianBBAC" || type == "MaiDanJianBBAC" || type == "BeiJian" || type== "YinDuJian") { var jisdetail = _dbcontext.Set().Where(p => list.Contains(p.BillNum) && p.BusinessType == EnumBusinessType.JisBBAC);//jis @@ -52,13 +59,13 @@ namespace Win.Sfs.SettleAccount.Entities.BQ.Syncs { if (itm.Site == "1040" && string.IsNullOrEmpty(itm.Extend2)) { - itm.Extend2 = projectList.FirstOrDefault(p => p.Value == "JisBBAC").Description; + itm.Extend2 =jisbbac; itm.Extend3 = "有结算无发运"; } if (itm.Site == "1046" && string.IsNullOrEmpty(itm.Extend2)) { - itm.Extend2 = projectList.FirstOrDefault(p => p.Value == "JisBBAC顺义").Description; + itm.Extend2 =jisbbac_sy; itm.Extend3 = "有结算无发运"; } @@ -72,13 +79,13 @@ namespace Win.Sfs.SettleAccount.Entities.BQ.Syncs { if (itm.Site == "1040" && string.IsNullOrEmpty(itm.Extend2)) { - itm.Extend2 = projectList.FirstOrDefault(p => p.Value == "JisBBAC").Description; + itm.Extend2 = jisbbac; itm.Extend3 = "有结算无发运"; } if (itm.Site == "1046" && string.IsNullOrEmpty(itm.Extend2)) { - itm.Extend2 = projectList.FirstOrDefault(p => p.Value == "JisBBAC顺义").Description; + itm.Extend2 =jisbbac_sy; itm.Extend3 = "有结算无发运"; } } @@ -92,12 +99,12 @@ namespace Win.Sfs.SettleAccount.Entities.BQ.Syncs { if (itm.Site == "1040" && string.IsNullOrEmpty(itm.Extend2)) { - itm.Extend2 = projectList.FirstOrDefault(p => p.Value == "JisBBAC").Description; + itm.Extend2 = jisbbac; itm.Extend3 = "有结算无发运"; } if (itm.Site == "1046" && string.IsNullOrEmpty(itm.Extend2)) { - itm.Extend2 = projectList.FirstOrDefault(p => p.Value == "JisBBAC顺义").Description; + itm.Extend2 = jisbbac_sy; itm.Extend3 = "有结算无发运"; } } @@ -109,7 +116,7 @@ namespace Win.Sfs.SettleAccount.Entities.BQ.Syncs { if (string.IsNullOrEmpty(itm.Extend2)) { - itm.Extend2 = projectList.FirstOrDefault(p => p.Value == "YinDuJian").Description; + itm.Extend2 =yindujian; itm.Extend3 = "有结算无发运"; } } @@ -122,7 +129,7 @@ namespace Win.Sfs.SettleAccount.Entities.BQ.Syncs { if (string.IsNullOrEmpty(itm.Extend2)) { - itm.Extend2 = projectList.FirstOrDefault(p => p.Value == "BeiJian").Description; + itm.Extend2 = beijian; itm.Extend3 = "有结算无发运"; } }