From 6127f83cd18fb162ed73c185ce3a7400c0f4b14d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AD=A6=20=E8=B5=B5?= <89237069@qq.com> Date: Tue, 31 Oct 2023 11:03:09 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E7=89=88=E6=9C=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .drone.yml | 2 +- .../Entities/BQ/Syncs/PendingDeductionService.cs | 11 +++-------- 2 files changed, 4 insertions(+), 9 deletions(-) diff --git a/.drone.yml b/.drone.yml index 4abf5eaf..9604ec9e 100644 --- a/.drone.yml +++ b/.drone.yml @@ -11,7 +11,7 @@ steps: - name: 分析 image: aosapps/drone-sonar-plugin settings: - sonar_host: http://dev.ccwin-in.com:3005 + sonar_host: http://dev.ccwin-in.com:3007 sonar_token: sqa_a1da3cf5984f39d9a256493acbae857c6624e954 - name: 构建 image: mcr.microsoft.com/dotnet/sdk:6.0 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 e874ad77..90478e8d 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 @@ -39,18 +39,15 @@ namespace Win.Sfs.SettleAccount.Entities.BQ.Syncs var type = property.Where(p => p.Name == "Type").FirstOrDefault().Value; var isout = property.Where(p => p.Name == "IsOut").FirstOrDefault().Value; var email = string.Empty; - // property.Where(p => p.Name == "CurrentUserEmail").FirstOrDefault().Value; + // property.Where(p => p.Name == "CurrentUserEmail").FirstOrDefault().Value; var list = billList.Split(","); - var projectList = _dbcontext.Set().Where(p => p.Project == "库位").ToList(); - + 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") + 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 if (jisdetail != null && jisdetail.Count() > 0) @@ -62,13 +59,11 @@ namespace Win.Sfs.SettleAccount.Entities.BQ.Syncs itm.Extend2 =jisbbac; itm.Extend3 = "有结算无发运"; } - if (itm.Site == "1046" && string.IsNullOrEmpty(itm.Extend2)) { itm.Extend2 =jisbbac_sy; itm.Extend3 = "有结算无发运"; } - } Sync(jisdetail.ToList(), EnumDeliverBjBmpBillType.JIS件, email, isout == "out" ? true : false); }