diff --git a/code/src/Modules/SettleAccount/src/SettleAccount.Application/Bases/ADJ_SERVICE.cs b/code/src/Modules/SettleAccount/src/SettleAccount.Application/Bases/ADJ_SERVICE.cs index 84b26047..f23a920b 100644 --- a/code/src/Modules/SettleAccount/src/SettleAccount.Application/Bases/ADJ_SERVICE.cs +++ b/code/src/Modules/SettleAccount/src/SettleAccount.Application/Bases/ADJ_SERVICE.cs @@ -162,10 +162,6 @@ public class ADJ_SERVICE : BASE_SERVICE oldinv: itm.InvBillNum, inv: string.Empty, partcode: itm.PartCode - - - - ); await _repository.DbContext.BulkDeleteAsync(deletels);//删除发票下所有调整明细 await _repository.DbContext.BulkInsertAsync(query.ToList()); @@ -173,18 +169,6 @@ public class ADJ_SERVICE : BASE_SERVICE } - - - - - - - - - - - - /// /// 导入文件 /// diff --git a/code/src/Modules/SettleAccount/src/SettleAccount.Application/Bases/BASE_SERVICE.cs b/code/src/Modules/SettleAccount/src/SettleAccount.Application/Bases/BASE_SERVICE.cs index a98616eb..2955da47 100644 --- a/code/src/Modules/SettleAccount/src/SettleAccount.Application/Bases/BASE_SERVICE.cs +++ b/code/src/Modules/SettleAccount/src/SettleAccount.Application/Bases/BASE_SERVICE.cs @@ -40,7 +40,6 @@ namespace Win.Sfs.SettleAccount.Bases _excelImportService = excelImportService; _snowflakeIdGenerator = snowflakeIdGenerator; _commonManager = commonManager; - } @@ -57,15 +56,12 @@ namespace Win.Sfs.SettleAccount.Bases { return ApplicationConsts.SuccessStr; } - if (string.IsNullOrEmpty(fileName)) { //导出文件名称 fileName = CommonMethod.GetExcelFileNameByUserID(ApplicationConsts.CheckErroFileName, _snowflakeIdGenerator.Create().ToString(), ApplicationConsts.FileExtension); } - errorList = errorList.Distinct().OrderBy(p => p.Type).ThenBy(p => p.Model).ThenBy(p => p.ItemCode).ToList(); - //声明导出容器 ExportImporter _exportImporter = new ExportImporter(); diff --git a/code/src/Modules/SettleAccount/src/SettleAccount.Application/Bases/BA_SERVICE.cs b/code/src/Modules/SettleAccount/src/SettleAccount.Application/Bases/BA_SERVICE.cs index 1195a69c..463b242c 100644 --- a/code/src/Modules/SettleAccount/src/SettleAccount.Application/Bases/BA_SERVICE.cs +++ b/code/src/Modules/SettleAccount/src/SettleAccount.Application/Bases/BA_SERVICE.cs @@ -115,7 +115,7 @@ namespace Win.Sfs.SettleAccount.Bases /// /// [HttpPost] - public virtual async Task ReissueInvoice(string input) + public virtual async Task ReissueInvoice([FromBody] string input) { // await _invMng.SetForwardState(input.InvGroupNum, SettleBillState.商务已审核); @@ -204,7 +204,7 @@ namespace Win.Sfs.SettleAccount.Bases /// 主表查询条件 /// [HttpPost] - public virtual async Task RejectAsync(string p_invGroupNum) + public virtual async Task RejectAsync([FromBody] string p_invGroupNum) { bool issuc= await _invMng.Reject(p_invGroupNum); if (issuc == true) @@ -228,7 +228,7 @@ namespace Win.Sfs.SettleAccount.Bases } - return new JsonResult(new { Code = 200, Message = "收票成功" }); + return new JsonResult(new { Code = 400, Message = "收票失败" }); } protected virtual async Task> GetMapGroupAsync(INVOICE_GRP_REQ_DTO input) { @@ -249,7 +249,7 @@ namespace Win.Sfs.SettleAccount.Bases return sdtos; } - protected virtual async Task> GetNotDetailAsync(string p_invbillNum) + protected virtual async Task> GetNotDetailAsync( string p_invbillNum) { List filters = new List(); diff --git a/code/src/Modules/SettleAccount/src/SettleAccount.Application/Bases/CAN_SA_SERVICE.cs b/code/src/Modules/SettleAccount/src/SettleAccount.Application/Bases/CAN_SA_SERVICE.cs index 033b0b4b..3e6a4ca0 100644 --- a/code/src/Modules/SettleAccount/src/SettleAccount.Application/Bases/CAN_SA_SERVICE.cs +++ b/code/src/Modules/SettleAccount/src/SettleAccount.Application/Bases/CAN_SA_SERVICE.cs @@ -133,7 +133,7 @@ namespace Win.Sfs.SettleAccount.Bases /// [HttpPost] //[Route("generateinvoice")] - public virtual async Task GenerateInvoice(string input) + public virtual async Task GenerateInvoice([FromBody] string input) { return new JsonResult(new { Code = 200, Message = "创建成功" }); ; diff --git a/code/src/Modules/SettleAccount/src/SettleAccount.Application/Bases/PD_SERVICE.cs b/code/src/Modules/SettleAccount/src/SettleAccount.Application/Bases/PD_SERVICE.cs index bb4a0db4..90b38257 100644 --- a/code/src/Modules/SettleAccount/src/SettleAccount.Application/Bases/PD_SERVICE.cs +++ b/code/src/Modules/SettleAccount/src/SettleAccount.Application/Bases/PD_SERVICE.cs @@ -138,170 +138,7 @@ namespace Win.Sfs.SettleAccount.Bases public virtual async Task ApprovalPassed(List p_list) { - //_repository.Where(p => p_list.Contains(p.BillNum)); - //public VmiLog() - //{ - //} - //public VmiLog(Guid id) - //{ - // this.Id = id; - //} - - ///// - ///// 分组编号 - ///// - //public string GroupId { get; set; } - - // /// - // /// 库存事务分类 - // /// - // public VmiLogType LogType { get; set; } - - // [Display(Name = "库存变动")] - // public decimal ChangedQty { get; set; } - - // [Display(Name = "变动单号")] - // public string ChangedNumber { get; set; } - - // [Display(Name = "变动时间")] - // public DateTime ChangedTime { get; set; } = DateTime.Now; - - // [Display(Name = "变动类型")] - // public VmiType ChangedType { get; set; } - - // [Display(Name = "便动人")] - // public string ChangedBy { get; set; } - - // [Display(Name = "是否补货")] - // public bool? IsReplenished { get; set; } - - // #region 附加信息 - - // //[Display(Name = "实扣厂内零件号")] - // //public string PartCode { get; set; } - - // [Display(Name = "结算厂内零件号")] - // public string PartCode2 { get; set; } - - // //[Display(Name = "结算客户零件号")] - // //public string CustomerPartCode { get; set; } - - // //[Display(Name = "EDI订单生产码")] - // //public string VinCode { get; set; } - - // [Display(Name = "结算生产码")] - // public string SettlementVinCode { get; set; } - - // #endregion 附加信息 - - // #region 库存备份 - - // /// - // /// LU零件号 - // /// - // [Display(Name = "LU零件号")] - // public string PartCode { get; set; } - - // [Display(Name = "生产码")] - // public string VinCode { get; set; } - - // /// - // /// 根据零件关系表匹配 - // /// - // [Display(Name = "客户零件号")] - // public string CustomerPartCode { get; set; } - - // [Display(Name = "生产码类型")] - // public string CodeType { get; set; } - - // [Display(Name = "发货类型")] - // public EnumDeliverBjBmpBillType BillType { get; set; } - - // [Display(Name = "数量")] - // public decimal Qty { get; set; } - - // [Display(Name = "发运日期")] - // public DateTime BillTime { get; set; } - - // [Display(Name = "订单日期")] - // public DateTime DeliverTime { get; set; } - - // /// - // /// ERP库位 - // /// - // [Display(Name = "ERP库位")] - // public string ErpToLoc { get; set; } - - // [Display(Name = "EDI顺序号")] - // public string Seq { get; set; } - - // [Display(Name = "客户订单号")] - // public string OrderNum { get; set; } - - // [Display(Name = "塑件唯一码")] - // public string UniqueCode { get; set; } - - // [Display(Name = "EDI总成号")] - // public string MatchNumber { get; set; } - - // [Display(Name = "PJIS生产顺序号")] - // public string PjsNum { get; set; } - - // [Display(Name = "配置码")] - // public string Configcode { get; set; } - - // [Display(Name = "工厂")] - // public string factory { get; set; } - - // [Display(Name = "发货子类型")] - // public EnumDeliverSubBillType SubBillType { get; set; } - - // [Display(Name = "WMS实发生产码")] - // public string RealCode { get; set; } - - // [Display(Name = "备注")] - // public string ReMark { get; set; } - - // #endregion 库存备份 - - // public enum VmiLogType - //{ - // /// - // /// 发运入库 - // /// - // [Display(Name = "发运入库")] - // Type100 = 100, - - // /// - // /// 结算出库 - // /// - // [Display(Name = "结算出库")] - // Type200 = 200, - - // /// - // /// 反结入库 - // /// - // [Display(Name = "反结入库")] - // Type300 = 300, - - // /// - // /// 退货出库 - // /// - // [Display(Name = "退货出库")] - // Type400 = 400, - - // /// - // /// 调整入库 - // /// - // [Display(Name = "调整入库")] - // Type500 = 500, - - // /// - // /// 调整出库 - // /// - // [Display(Name = "调整出库")] - // Type600 = 600, - //} + return ApplicationConsts.SuccessStr; } /// @@ -342,12 +179,12 @@ namespace Win.Sfs.SettleAccount.Bases return ApplicationConsts.SuccessStr; } - public virtual async Task GetMainAsync(string billNum) + public virtual async Task GetMainAsync([FromBody] string billNum) { return await _repository.Where(p=>p.InvGroupNum == billNum).FirstOrDefaultAsync(); } - public virtual async Task> GetDetailAsync(string billNum) + public virtual async Task> GetDetailAsync([FromBody] string billNum) { return await _detailRepository.Where(p => p.InvGroupNum == billNum).ToListAsync(); } diff --git a/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/BQ/BBAC_BA_SERVICE.cs b/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/BQ/BBAC_BA_SERVICE.cs index 292ed17d..04140267 100644 --- a/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/BQ/BBAC_BA_SERVICE.cs +++ b/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/BQ/BBAC_BA_SERVICE.cs @@ -66,7 +66,7 @@ namespace Win.Sfs.SettleAccount.Entities.BQ /// /// /// - public override async Task ReissueInvoice(string p_invbillnum) + public override async Task ReissueInvoice([FromBody] string p_invbillnum) { //var mappingList= await GetMapGroupAsync(p_invbillnum);//发票对应结算分组 //if (mappingList != null && mappingList.Count() > 0) diff --git a/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/BQ/BBAC_CAN_SA_SERVICE.cs b/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/BQ/BBAC_CAN_SA_SERVICE.cs index e9eff054..ba258f8a 100644 --- a/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/BQ/BBAC_CAN_SA_SERVICE.cs +++ b/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/BQ/BBAC_CAN_SA_SERVICE.cs @@ -82,7 +82,7 @@ namespace Win.Sfs.SettleAccount.Entities.BQ /// [HttpPost] - public async override Task GenerateInvoice(string invbillNum) + public async override Task GenerateInvoice([FromBody] string invbillNum) { var main =await _bbacMng.GetMainAsync(invbillNum); diff --git a/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/BQ/BBAC_PD_SERVICE.cs b/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/BQ/BBAC_PD_SERVICE.cs index 940af115..687a26d4 100644 --- a/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/BQ/BBAC_PD_SERVICE.cs +++ b/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/BQ/BBAC_PD_SERVICE.cs @@ -51,13 +51,9 @@ namespace Win.Sfs.SettleAccount.Entities.BQ List customConditionList = new List(); - //var billList = property.Where(p => p.Name == "BillNumList").FirstOrDefault().Value; - //var type = property.Where(p => p.Name == "Type").FirstOrDefault().Value; - customConditionList.Add(new CustomCondition() { Name = "BillNumList", Value =string.Join(",",p_list) }); customConditionList.Add(new CustomCondition() { Name = "Type", Value = EnumBusinessType.JisBBAC.ToString() }); - //customConditionList.Add(new CustomCondition() { Name = "MaterialGroup", Value = string.IsNullOrEmpty(input.MaterialGroup) ? string.Empty : input.MaterialGroup }); - //customConditionList.Add(new CustomCondition() { Name = "State", Value = string.IsNullOrEmpty(input.State) ? string.Empty : input.State }); + var _taskid = await _service.ExportEnqueueAsync("BBAC待扣减任务", ExportExtentsion.Excel, DateTime.Now.ToString("yyyyMM"), string.Empty, CurrentUser, typeof(PendingDeductionService), customConditionList, (rs) => { }); @@ -65,39 +61,6 @@ namespace Win.Sfs.SettleAccount.Entities.BQ - - - - // _bbacSecRepository.Where(p=>) - - //if (detailist != null && detailist.Count > 0) - //{ - // foreach (var itm in detailist) - // { - // await _vimservice.Out(Entities.BQ.Vmi.VmiLogType.Type200, "1", new Entities.BQ.Vmi.VmiLog() - // { - // BillTime = itm.CreationTime, - // ChangedTime = DateTime.Now, - // Qty = itm.Qty, - // DeliverTime = itm.CreationTime, - // LogType = Entities.BQ.Vmi.VmiLogType.Type200, - // ChangedQty = itm.Qty, - // ChangedType = VmiType.Out, - // SubBillType = EnumDeliverSubBillType.小件BBAC, - // BillType = EnumDeliverBjBmpBillType.JIS件, - // PartCode = itm.LU, - // SettlementVinCode = itm.PN, - // PartCode2 = itm.LU, - // CustomerPartCode = itm.LU, - // VinCode = itm.PN, - // OrderNum = itm.GroupNum, - // ErpToLoc = "C0001" - // }); - // } - //} - // return ApplicationConsts.SuccessStr; - - } } } diff --git a/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/BQ/HBPO_BA_SERVICE.cs b/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/BQ/HBPO_BA_SERVICE.cs index c829b40e..2b418fbd 100644 --- a/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/BQ/HBPO_BA_SERVICE.cs +++ b/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/BQ/HBPO_BA_SERVICE.cs @@ -54,7 +54,7 @@ namespace Win.Sfs.SettleAccount.Entities.BQ /// /// /// - public override async Task ReissueInvoice(string p_invbillnum) + public override async Task ReissueInvoice([FromBody] string p_invbillnum) { //var mappingList = await GetMapGroupAsync(p_invbillnum);//发票对应结算分组 //if (mappingList != null && mappingList.Count() > 0) diff --git a/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/BQ/HBPO_CAN_SA_SERVICE.cs b/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/BQ/HBPO_CAN_SA_SERVICE.cs index ff25379e..ee8bcbcf 100644 --- a/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/BQ/HBPO_CAN_SA_SERVICE.cs +++ b/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/BQ/HBPO_CAN_SA_SERVICE.cs @@ -75,7 +75,7 @@ namespace Win.Sfs.SettleAccount.Entities.BQ /// [HttpPost] //[Route("generateinvoice")] - public async override Task GenerateInvoice(string invbillnum) + public async override Task GenerateInvoice([FromBody] string invbillnum) { var main =await _hbpoMng.GetMainAsync(invbillnum); diff --git a/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/BQ/INVOICE_SERVICE.cs b/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/BQ/INVOICE_SERVICE.cs index 4b892728..b182031b 100644 --- a/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/BQ/INVOICE_SERVICE.cs +++ b/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/BQ/INVOICE_SERVICE.cs @@ -207,7 +207,7 @@ namespace Win.Sfs.SettleAccount.Entities.BQ } [HttpPost] - public virtual async Task RejectAsync(string p_invGroupNum) + public virtual async Task RejectAsync([FromBody] string p_invGroupNum) { bool state = await _invMng.Reject(p_invGroupNum); diff --git a/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/BQ/PUB_BA_SERVICE.cs b/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/BQ/PUB_BA_SERVICE.cs index 1ecca416..0cfc8778 100644 --- a/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/BQ/PUB_BA_SERVICE.cs +++ b/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/BQ/PUB_BA_SERVICE.cs @@ -187,7 +187,7 @@ namespace Win.Sfs.SettleAccount.Entities.BQ /// /// - public override async Task ReissueInvoice(string p_invbillnum) + public override async Task ReissueInvoice([FromBody] string p_invbillnum) { //var mappingList = await GetMapGroupAsync(p_invbillnum);//发票对应结算分组 //if (mappingList != null && mappingList.Count() > 0) diff --git a/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/BQ/PUB_CAN_SA_SERVICE.cs b/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/BQ/PUB_CAN_SA_SERVICE.cs index af2170b6..1c1e85f3 100644 --- a/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/BQ/PUB_CAN_SA_SERVICE.cs +++ b/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/BQ/PUB_CAN_SA_SERVICE.cs @@ -66,7 +66,7 @@ namespace Win.Sfs.SettleAccount.Entities.BQ _pricebjRepository = pricebjRepository; } [HttpPost] - public async override Task GenerateInvoice(string billnum) + public async override Task GenerateInvoice( [FromBody] string billnum) { var main = await _pubMng.GetMainAsync(billnum); 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 3f61f628..0a9fa5a9 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 @@ -35,6 +35,8 @@ public class PendingDeductionService : ITransientDependency, IExportJob INormalEfCoreRepository hbpoRepository, INormalEfCoreRepository pubRepository, + INormalEfCoreRepository codesetRepository, + VmiAppService vimservice @@ -47,6 +49,7 @@ public class PendingDeductionService : ITransientDependency, IExportJob _hbpoSecRepository= hbpoSecRepository; _pubSecRepository= pubSecRepository; _vimservice =vimservice; + _codesetRepository = codesetRepository; } public string ExportFile(Guid id, List exportName, List property) @@ -54,21 +57,18 @@ public class PendingDeductionService : ITransientDependency, IExportJob var billList = property.Where(p => p.Name == "BillNumList").FirstOrDefault().Value; var type = property.Where(p => p.Name == "Type").FirstOrDefault().Value; var list=billList.Split(","); - + var projectList=_codesetRepository.Where(p => p.Project == "库位"); if (type == "JisBBAC") { - + + 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 query = from itm in jisdetail - join itm1 in _bbacSecRepository - on new { itm.PN, itm.LU } equals new { itm1.PN, LU = itm1.PrimitiveLU } into temp1 - from tm in temp1 - where tm == null - select + var query = from itm in jisdetail + select new { BillTime = DateTime.Now, @@ -80,13 +80,13 @@ public class PendingDeductionService : ITransientDependency, IExportJob ChangedType = VmiType.Out, //SubBillType = EnumDeliverSubBillType.小件BBAC, //BillType = EnumDeliverBjBmpBillType.JIS件, - PartCode = tm != null ? tm.ReplaceLU : itm.LU, + PartCode = itm.LU, SettlementVinCode = itm.PN, - PartCode2 = tm != null ? tm.ReplaceLU : itm.LU, + PartCode2 = itm.LU, CustomerPartCode = string.IsNullOrEmpty(itm.Extend4) ? string.Empty : itm.Extend4, VinCode = itm.PN, OrderNum = itm.GroupNum, - ErpToLoc = "C0001" + //ErpToLoc = string.IsNullOrEmpty() }; var ls=query.ToList(); if (ls != null && ls.Count > 0) @@ -114,10 +114,55 @@ public class PendingDeductionService : ITransientDependency, IExportJob }).ConfigureAwait(false); } } - //var query1= - - - + var query1 = from itm in mdetail + select new + { + + BillTime = DateTime.Now, + ChangedTime = DateTime.Now, + Qty = itm.Qty, + DeliverTime = itm.CreationTime, + LogType = Entities.BQ.Vmi.VmiLogType.Type200, + ChangedQty = itm.Qty, + ChangedType = VmiType.Out, + //SubBillType = EnumDeliverSubBillType.小件BBAC, + //BillType = EnumDeliverBjBmpBillType.JIS件, + PartCode = itm.LU, + SettlementVinCode = itm.PN, + PartCode2 = itm.LU, + CustomerPartCode = string.IsNullOrEmpty(itm.Extend4) ? string.Empty : itm.Extend4, + VinCode = itm.PN, + OrderNum = itm.GroupNum, + ErpToLoc = "C0001" + + + }; + var ls1 = query1.ToList(); + if (ls1 != null && ls1.Count > 0) + { + foreach (var itm in ls1) + { + _vimservice.Out(Entities.BQ.Vmi.VmiLogType.Type200, "1", new Entities.BQ.Vmi.VmiLog() + { + BillTime = itm.BillTime, + ChangedTime = DateTime.Now, + Qty = itm.Qty, + DeliverTime = itm.BillTime, + LogType = Entities.BQ.Vmi.VmiLogType.Type200, + ChangedQty = itm.Qty, + ChangedType = VmiType.Out, + //SubBillType = EnumDeliverSubBillType.小件BBAC, + //BillType = EnumDeliverBjBmpBillType.JIS件, + PartCode = itm.PartCode, + SettlementVinCode = itm.VinCode, + PartCode2 = itm.PartCode2, + CustomerPartCode = itm.CustomerPartCode, + VinCode = itm.VinCode, + //OrderNum = itm.OrderNum, + ErpToLoc = "C0001" + }).ConfigureAwait(false); + } + } } else if (type == "JisHBPO") { diff --git a/code/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/BQ/Managers/PUB_NOT_SA_MNG.cs b/code/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/BQ/Managers/PUB_NOT_SA_MNG.cs index 100260da..5d01a320 100644 --- a/code/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/BQ/Managers/PUB_NOT_SA_MNG.cs +++ b/code/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/BQ/Managers/PUB_NOT_SA_MNG.cs @@ -71,7 +71,18 @@ namespace Win.Sfs.SettleAccount.Entities.BQ.Managers { var ls = p_list.Select(p => p.GroupNum).Distinct().ToList(); var notlist = _notRepository.Where(p => ls.Contains(p.GroupNum)).ToList();//JIT_ASN整发 - var priceErrors = await _service.CheckPriceList(notlist); + List priceErrors = new List(); + if (first.BusinessType == EnumBusinessType.BeiJian) + { + priceErrors = await _service.CheckPriceList(notlist,true); + } + else + { + priceErrors = await _service.CheckPriceList(notlist); + } + + + if (priceErrors.Count > 0) { foreach (var itm in priceErrors)