Browse Source

更新版本

master
学 赵 1 year ago
parent
commit
6127f83cd1
  1. 2
      .drone.yml
  2. 11
      code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/BQ/Syncs/PendingDeductionService.cs

2
.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

11
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<CodeSetting>().Where(p => p.Project == "库位").ToList();
var projectList = _dbcontext.Set<CodeSetting>().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<BBAC_PD_DETAIL>().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);
}

Loading…
Cancel
Save