Browse Source

更新版本

master
赵新宇 2 years ago
parent
commit
b998322fad
  1. 2
      code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/BQ/BBAC_CAN_SA_SERVICE.cs
  2. 3
      code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/BQ/HBPO_CAN_SA_SERVICE.cs
  3. 2
      code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/BQ/PUB_CAN_SA_SERVICE.cs
  4. 6
      code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/BQ/Syncs/PendingDeductionService.cs
  5. 4
      code/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/BQ/Managers/PUB_NOT_SA_MNG.cs

2
code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/BQ/BBAC_CAN_SA_SERVICE.cs

@ -165,7 +165,7 @@ namespace Win.Sfs.SettleAccount.Entities.BQ
} }
else else
{ {
return new JsonResult(new { Code = 400, Message = "不存在发票记录" }); return new JsonResult(new { Code = 400, Message = "不存在可结算单记录" });
} }
return new JsonResult(new { Code = 200, Message = "生成成功" }); return new JsonResult(new { Code = 200, Message = "生成成功" });
} }

3
code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/BQ/HBPO_CAN_SA_SERVICE.cs

@ -84,7 +84,6 @@ namespace Win.Sfs.SettleAccount.Entities.BQ
{ {
if (main.State != SettleBillState.) if (main.State != SettleBillState.)
{ {
return new JsonResult(new { Code = 400, Message = "已创建发票不能重复创建" }); return new JsonResult(new { Code = 400, Message = "已创建发票不能重复创建" });
} }
@ -162,7 +161,7 @@ namespace Win.Sfs.SettleAccount.Entities.BQ
} }
else else
{ {
return new JsonResult(new { Code = 400, Message = "不存在发票记录" }); return new JsonResult(new { Code = 400, Message = "不存在可结算单记录" });
} }
return new JsonResult(new { Code = 200, Message = "生成成功" }); return new JsonResult(new { Code = 200, Message = "生成成功" });
} }

2
code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/BQ/PUB_CAN_SA_SERVICE.cs

@ -144,7 +144,7 @@ namespace Win.Sfs.SettleAccount.Entities.BQ
} }
else else
{ {
return new JsonResult(new { Code = 400, Message = "不存在发票记录" }); return new JsonResult(new { Code = 400, Message = "不存在可结算单记录" });
} }
return new JsonResult(new { Code = 200, Message = "生成成功" }); return new JsonResult(new { Code = 200, Message = "生成成功" });

6
code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/BQ/Syncs/PendingDeductionService.cs

@ -57,9 +57,6 @@ public class PendingDeductionService : ITransientDependency, IExportJob
if (type == "JisBBAC") if (type == "JisBBAC")
{ {
var jisdetail = _bbacRepository.Where(p => list.Contains(p.BillNum) && p.IsMaiDan==false); var jisdetail = _bbacRepository.Where(p => list.Contains(p.BillNum) && p.IsMaiDan==false);
var mdetail = _bbacRepository.Where(p => list.Contains(p.BillNum) && p.IsMaiDan ==true); var mdetail = _bbacRepository.Where(p => list.Contains(p.BillNum) && p.IsMaiDan ==true);
var query = from itm in jisdetail var query = from itm in jisdetail
@ -244,9 +241,6 @@ public class PendingDeductionService : ITransientDependency, IExportJob
}).ConfigureAwait(false); }).ConfigureAwait(false);
} }
} }
break; break;
case "MaiDanJianBBAC": case "MaiDanJianBBAC":

4
code/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/BQ/Managers/PUB_NOT_SA_MNG.cs

@ -72,8 +72,10 @@ namespace Win.Sfs.SettleAccount.Entities.BQ.Managers
var ls = p_list.Select(p => p.GroupNum).Distinct().ToList(); var ls = p_list.Select(p => p.GroupNum).Distinct().ToList();
var notlist = _notRepository.Where(p => ls.Contains(p.GroupNum)).ToList();//JIT_ASN整发 var notlist = _notRepository.Where(p => ls.Contains(p.GroupNum)).ToList();//JIT_ASN整发
List<PUB_NOT_SA_DETAIL> priceErrors = new List<PUB_NOT_SA_DETAIL>(); List<PUB_NOT_SA_DETAIL> priceErrors = new List<PUB_NOT_SA_DETAIL>();
string name = "ASN单号或发运ID";
if (first.BusinessType == EnumBusinessType.BeiJian) if (first.BusinessType == EnumBusinessType.BeiJian)
{ {
name = "备件";
priceErrors = await _service.CheckPriceList(notlist,true); priceErrors = await _service.CheckPriceList(notlist,true);
} }
else else
@ -87,7 +89,7 @@ namespace Win.Sfs.SettleAccount.Entities.BQ.Managers
{ {
foreach (var itm in priceErrors) foreach (var itm in priceErrors)
{ {
errors.Add($"发货单号或交付识别号零件{itm.LU}结算日期{itm.SettleDate}无价格区间数据"); errors.Add($"{name}零件{itm.LU}结算日期{itm.SettleDate}无价格区间数据");
} }
} }
if (errors.Count > 0) if (errors.Count > 0)

Loading…
Cancel
Save