BoXu.Zheng
/
BeiJinSettleAccount
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

up
continuous-integration/drone/push Build is failing
Details

master
mahao 1 year ago
parent
4d8b5fa842
commit
1ad946dc80
4 changed files with 41 additions and 38 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 24
      code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/BQ/BBAC_SA_SERVICE.cs
  2. 25
      code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/BQ/HBPO_SA_SERVICE.cs
  3. 27
      code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/BQ/PUB_SA_SERVICE.cs
  4. 3
      code/src/Modules/SettleAccount/src/SettleAccount.Application/SettleAccountApplicationAutoMapperProfile.cs

24
code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/BQ/BBAC_SA_SERVICE.cs
View File

@ -176,18 +176,18 @@ namespace Win.Sfs.SettleAccount.Entities.BQ
} }
} }
if (!checkList.Any()) //if (!checkList.Any())
{ //{
//验证客户对应厂内零件号是否存在 // //验证客户对应厂内零件号是否存在
if (jisSaDetails.Any()) // if (jisSaDetails.Any())
{ // {
checkList.AddRange(await CheckAsync(jisSaDetails, EnumBusinessType.JisBBAC).ConfigureAwait(false)); // checkList.AddRange(await CheckAsync(jisSaDetails, EnumBusinessType.JisBBAC).ConfigureAwait(false));
} // }
if (maiDanSaDetails.Any()) // if (maiDanSaDetails.Any())
{ // {
checkList.AddRange(await CheckAsync(maiDanSaDetails, EnumBusinessType.MaiDanJianBBAC).ConfigureAwait(false)); // checkList.AddRange(await CheckAsync(maiDanSaDetails, EnumBusinessType.MaiDanJianBBAC).ConfigureAwait(false));
} // }
} //}
if (checkList.Count > 0) if (checkList.Count > 0)
{ {

25
code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/BQ/HBPO_SA_SERVICE.cs
View File

@ -486,7 +486,6 @@ namespace Win.Sfs.SettleAccount.Entities.BQ
/// </summary> /// </summary>
/// <remarks> /// <remarks>
/// 验证结算分组号是否已存在 /// 验证结算分组号是否已存在
/// 验证导入的零件号在客户-厂内零件号关系表中是否存在
/// </remarks> /// </remarks>
private async Task<List<ErrorExportDto>> CheckAsync(List<HBPO_SA_DETAIL> hbpoSaDetails) private async Task<List<ErrorExportDto>> CheckAsync(List<HBPO_SA_DETAIL> hbpoSaDetails)
{ {
@ -507,18 +506,18 @@ namespace Win.Sfs.SettleAccount.Entities.BQ
if (!checkList.Any()) if (!checkList.Any())
{ {
//验证客户对应厂内零件号是否存在 ////验证客户对应厂内零件号是否存在
//导入的零件号集合 ////导入的零件号集合
var importSaLUs = hbpoSaDetails.Select(t => t.LU).Distinct(); //var importSaLUs = hbpoSaDetails.Select(t => t.LU).Distinct();
var materialRelationshipEntitys = await _materialRelationshipRepository.GetListAsync(t => t.BusinessType == BusinessType && importSaLUs.Contains(t.SettleMaterialCode)).ConfigureAwait(false); //var materialRelationshipEntitys = await _materialRelationshipRepository.GetListAsync(t => t.BusinessType == BusinessType && importSaLUs.Contains(t.SettleMaterialCode)).ConfigureAwait(false);
var materialRelationshipEntitySettleMaterialCodes = materialRelationshipEntitys.Select(t => t.SettleMaterialCode).Distinct(); //var materialRelationshipEntitySettleMaterialCodes = materialRelationshipEntitys.Select(t => t.SettleMaterialCode).Distinct();
//不存在的客户零件号（差集） ////不存在的客户零件号（差集）
var noExistSettleMaterialCodes = importSaLUs.Except(materialRelationshipEntitySettleMaterialCodes); //var noExistSettleMaterialCodes = importSaLUs.Except(materialRelationshipEntitySettleMaterialCodes);
noExistSettleMaterialCodes.ForEach(t => //noExistSettleMaterialCodes.ForEach(t =>
{ //{
checkList.Add(new ErrorExportDto(string.Empty, string.Empty, string.Empty, string.Empty, string.Empty, string.Empty, $"客户零件号【{t}】对应厂内零件号系统中不存在", string.Empty)); // checkList.Add(new ErrorExportDto(string.Empty, string.Empty, string.Empty, string.Empty, string.Empty, string.Empty, $"客户零件号【{t}】对应厂内零件号系统中不存在", string.Empty));
}); //});
} }
return checkList; return checkList;

27
code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/BQ/PUB_SA_SERVICE.cs
View File

@ -382,7 +382,7 @@ namespace Win.Sfs.SettleAccount.Entities.BQ
/// </summary> /// </summary>
/// <remarks> /// <remarks>
/// 验证结算分组号是否已存在 /// 验证结算分组号是否已存在
/// 验证导入的零件号在客户-厂内零件号关系表中是否存在 /// 只有备件验证导入的零件号在客户-厂内零件号关系表中是否存在
/// </remarks> /// </remarks>
private async Task<List<ErrorExportDto>> CheckAsync(List<PUB_SA_DETAIL> pubSaDetails) private async Task<List<ErrorExportDto>> CheckAsync(List<PUB_SA_DETAIL> pubSaDetails)
{ {
@ -403,18 +403,21 @@ namespace Win.Sfs.SettleAccount.Entities.BQ
if (!checkList.Any()) if (!checkList.Any())
{ {
//验证客户对应厂内零件号是否存在 if (businessType == EnumBusinessType.BeiJian)
//导入的零件号集合
var importPubSaLUs = pubSaDetails.Select(t => t.LU).Distinct();
var materialRelationshipEntitys = await _materialRelationshipRepository.GetListAsync(t => t.BusinessType == businessType && importPubSaLUs.Contains(t.SettleMaterialCode)).ConfigureAwait(false);
var materialRelationshipEntitySettleMaterialCodes = materialRelationshipEntitys.Select(t => t.SettleMaterialCode).Distinct();
//不存在的客户零件号（差集）
var noExistSettleMaterialCodes = importPubSaLUs.Except(materialRelationshipEntitySettleMaterialCodes);
noExistSettleMaterialCodes.ForEach(t =>
{ {
checkList.Add(new ErrorExportDto(string.Empty, string.Empty, string.Empty, string.Empty, string.Empty, string.Empty, $"客户零件号【{t}】对应厂内零件号系统中不存在", string.Empty)); //验证客户对应厂内零件号是否存在
}); //导入的零件号集合
var importPubSaLUs = pubSaDetails.Select(t => t.LU).Distinct();
var materialRelationshipEntitys = await _materialRelationshipRepository.GetListAsync(t => t.BusinessType == businessType && importPubSaLUs.Contains(t.SettleMaterialCode)).ConfigureAwait(false);
var materialRelationshipEntitySettleMaterialCodes = materialRelationshipEntitys.Select(t => t.SettleMaterialCode).Distinct();
//不存在的客户零件号（差集）
var noExistSettleMaterialCodes = importPubSaLUs.Except(materialRelationshipEntitySettleMaterialCodes);
noExistSettleMaterialCodes.ForEach(t =>
{
checkList.Add(new ErrorExportDto(string.Empty, string.Empty, string.Empty, string.Empty, string.Empty, string.Empty, $"客户零件号【{t}】对应厂内零件号系统中不存在", string.Empty));
});
}
} }
return checkList; return checkList;

3
code/src/Modules/SettleAccount/src/SettleAccount.Application/SettleAccountApplicationAutoMapperProfile.cs
View File

@ -996,7 +996,8 @@ namespace Win.Sfs.SettleAccount
{ "Total", d.Total}, { "Total", d.Total},
{ "ProtocolNumber", d.ProtocolNumber}, { "ProtocolNumber", d.ProtocolNumber},
{ "Remark", d.Remark}, { "Remark", d.Remark},
{ "CommodityGroup", d.CommodityGroup} { "CommodityGroup", d.CommodityGroup},
{ "PO", d.Extend3}
})); }));
CreateMap<YinDuJianImportDto, PUB_SA_DETAIL>(); CreateMap<YinDuJianImportDto, PUB_SA_DETAIL>();
} }

Write Preview
Loading…
Cancel
Save