From 3487385995098b8b16e7dc6a46a341400b9a3ad9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AD=A6=20=E8=B5=B5?= <89237069@qq.com> Date: Mon, 11 Sep 2023 15:33:43 +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 --- .../Bases/ADJ_SERVICE.cs | 2 +- .../Entities/BQ/BBAC_BA_SERVICE.cs | 40 +++++++++---------- .../Entities/BQ/BBAC_PD_SERVICE.cs | 2 +- .../Entities/BQ/HBPO_BA_SERVICE.cs | 7 +--- .../Entities/BQ/PUB_BA_SERVICE.cs | 6 ++- 5 files changed, 27 insertions(+), 30 deletions(-) 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 21ff965b..10192c0c 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 @@ -182,7 +182,7 @@ public class ADJ_SERVICE : BASE_SERVICE { if (p_list.Count == 0) { - throw new UserFriendlyException($"导入数据为空"); + throw new UserFriendlyException($"导入数据为空","400"); } foreach (var itm in p_list) 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 19a8939b..a5a73071 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 @@ -105,7 +105,7 @@ namespace Win.Sfs.SettleAccount.Entities.BQ if (settle == null) { - throw new UserFriendlyException($"选择发票:{p_invbillnum}对应的可结算单不在请检查！"); + throw new UserFriendlyException($"选择发票:{p_invbillnum}对应的可结算单不在请检查！","400"); } version = settle.Version; @@ -113,11 +113,11 @@ namespace Win.Sfs.SettleAccount.Entities.BQ { if (inv.InvoiceState == InvoiceBillState.报废) { - throw new UserFriendlyException($"选择发票:{p_invbillnum}状态为报废状态不能重开！"); + throw new UserFriendlyException($"选择发票:{p_invbillnum}状态为报废状态不能重开！", "400"); } if (inv.State == SettleBillState.商务已审核 || inv.State == SettleBillState.已开票) { - throw new UserFriendlyException($"选择发票:{p_invbillnum}状态在财务审核后可以报废重开,之前不能重开可以退回！"); + throw new UserFriendlyException($"选择发票:{p_invbillnum}状态在财务审核后可以报废重开,之前不能重开可以退回！", "400"); } var bbaclist = await _bbacMng.GetContainsAsync(inv.InvbillNum);//结算分组对应结算零件 var adjlist = await _adjRepository.Where(p => p.OldInvBillNum == inv.InvbillNum).ToListAsync();//调整表明细 @@ -206,7 +206,7 @@ namespace Win.Sfs.SettleAccount.Entities.BQ } else { - throw new UserFriendlyException($"不存发票号为:{p_invbillnum}发票"); + throw new UserFriendlyException($"不存发票号为:{p_invbillnum}发票", "400"); } //} //else @@ -228,7 +228,7 @@ namespace Win.Sfs.SettleAccount.Entities.BQ var adjlist = ObjectMapper.Map, List>(p_list); if (adjlist == null && adjlist.Count == 0) { - throw new UserFriendlyException($"调整表无数据!"); + throw new UserFriendlyException($"调整表无数据!", "400"); } var first = p_list.FirstOrDefault(); var invbillnum = first.InvBillNum; @@ -241,7 +241,7 @@ namespace Win.Sfs.SettleAccount.Entities.BQ if(settle==null) { - throw new UserFriendlyException( $"选择发票:{invbillnum}对应的可结算单不粗拿在在请检查！"); + throw new UserFriendlyException( $"选择发票:{invbillnum}对应的可结算单不粗拿在在请检查！", "400"); } version=settle.Version; @@ -249,11 +249,11 @@ namespace Win.Sfs.SettleAccount.Entities.BQ { if (inv.InvoiceState == InvoiceBillState.报废) { - throw new UserFriendlyException( $"选择发票:{invbillnum}状态为报废状态不能重开！"); + throw new UserFriendlyException( $"选择发票:{invbillnum}状态为报废状态不能重开！", "400"); } if (inv.State == SettleBillState.商务已审核 || inv.State == SettleBillState.已开票) { - throw new UserFriendlyException( $"选择发票:{invbillnum}状态在财务审核后可以报废重开,之前不能重开可以退回！"); + throw new UserFriendlyException( $"选择发票:{invbillnum}状态在财务审核后可以报废重开,之前不能重开可以退回！", "400"); } var bbaclist = await _bbacMng.GetContainsAsync(inv.InvbillNum);//发票对应结算零件 // var adjlist = await _adjRepository.Where(p => p.OldInvBillNum == inv.InvbillNum).ToListAsync();//调整表明细 @@ -334,7 +334,7 @@ namespace Win.Sfs.SettleAccount.Entities.BQ } else { - throw new UserFriendlyException( $"不存发票号为:{invbillnum}发票"); + throw new UserFriendlyException( $"不存发票号为:{invbillnum}发票", "400"); } //} //else @@ -364,7 +364,7 @@ namespace Win.Sfs.SettleAccount.Entities.BQ var adjlist=ObjectMapper.Map, List>(p_list); if (adjlist == null && adjlist.Count==0) { - throw new UserFriendlyException($"调整表无数据!"); + throw new UserFriendlyException($"调整表无数据!", "400"); } var first = p_list.FirstOrDefault(); var invbillnum = first.InvBillNum; @@ -379,21 +379,21 @@ namespace Win.Sfs.SettleAccount.Entities.BQ if (settle == null) { - throw new UserFriendlyException($"选择发票:{invbillnum}对应的可结算单不在请检查！"); + throw new UserFriendlyException($"选择发票:{invbillnum}对应的可结算单不在请检查！", "400"); } version = settle.Version; if (inv != null) { if (inv.InvoiceState == InvoiceBillState.报废) { - throw new UserFriendlyException($"选择发票:{invbillnum}状态为报废状态不能重开！"); + throw new UserFriendlyException($"选择发票:{invbillnum}状态为报废状态不能重开！", "400"); } if (inv.State == SettleBillState.商务已审核 || inv.State == SettleBillState.已开票) { - throw new UserFriendlyException($"选择发票:{invbillnum}状态在财务审核后可以报废重开,之前请退回重开！"); + throw new UserFriendlyException($"选择发票:{invbillnum}状态在财务审核后可以报废重开,之前请退回重开！", "400"); } - var bbaclist = await _bbacMng.GetContainsAsync(inv.InvbillNum);//结算分组对应结算零件 + var bbaclist = await _bbacMng.GetContainsAsync(inv.InvbillNum, "400");//结算分组对应结算零件 //var adjlist = await _adjRepository.Where(p => p.OldInvBillNum == inv.InvbillNum).ToListAsync();//调整表明细 if (adjlist != null && adjlist.Count() > 0) { @@ -473,7 +473,7 @@ namespace Win.Sfs.SettleAccount.Entities.BQ } else { - throw new UserFriendlyException($"不存发票号为:{invbillnum}发票"); + throw new UserFriendlyException($"不存发票号为:{invbillnum}发票", "400"); } } @@ -499,7 +499,7 @@ namespace Win.Sfs.SettleAccount.Entities.BQ var adjlist = ObjectMapper.Map, List>(p_list); if (adjlist == null && adjlist.Count == 0) { - throw new UserFriendlyException($"调整表无数据!"); + throw new UserFriendlyException($"调整表无数据!", "400"); } var first = p_list.FirstOrDefault(); var invbillnum = first.InvBillNum; @@ -514,18 +514,18 @@ namespace Win.Sfs.SettleAccount.Entities.BQ if (settle == null) { - throw new UserFriendlyException($"选择发票:{invbillnum}对应的可结算单不在请检查！"); + throw new UserFriendlyException($"选择发票:{invbillnum}对应的可结算单不在请检查！", "400"); } version = settle.Version; if (inv != null) { if (inv.InvoiceState == InvoiceBillState.报废) { - throw new UserFriendlyException($"选择发票:{invbillnum}状态为报废状态不能重开！"); + throw new UserFriendlyException($"选择发票:{invbillnum}状态为报废状态不能重开！", "400"); } if (inv.State == SettleBillState.商务已审核 || inv.State == SettleBillState.已开票) { - throw new UserFriendlyException($"选择发票:{invbillnum}状态在财务审核后可以报废重开,之前请退回重开！"); + throw new UserFriendlyException($"选择发票:{invbillnum}状态在财务审核后可以报废重开,之前请退回重开！", "400"); } var bbaclist = await _bbacMng.GetContainsAsync(inv.InvbillNum);//结算分组对应结算零件 //var adjlist = await _adjRepository.Where(p => p.OldInvBillNum == inv.InvbillNum).ToListAsync();//调整表明细 if (adjlist != null && adjlist.Count() > 0) @@ -641,7 +641,7 @@ namespace Win.Sfs.SettleAccount.Entities.BQ } else { - throw new UserFriendlyException($"不存发票号为:{invbillnum}发票"); + throw new UserFriendlyException($"不存发票号为:{invbillnum}发票", "400"); } //} //else 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 08ceebf3..f0f6b483 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 @@ -58,7 +58,7 @@ namespace Win.Sfs.SettleAccount.Entities.BQ var lst = ls.Where(p => (p.State == SettleBillState.已提交扣减 || p.State == SettleBillState.已扣减)); if (lst.Count() > 0) { - throw new UserFriendlyException("当前状态是已提交状态，不能重复已提交"); + throw new UserFriendlyException("当前状态是已提交状态，不能重复已提交", "400"); } foreach (var item in ls) { 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 1979b445..02a3ebc5 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 @@ -367,7 +367,6 @@ namespace Win.Sfs.SettleAccount.Entities.BQ qty: itm.Qty, price: itm.Price, businessType: itm.BusinessType, - settleDate: itm.SettleDate, groupNum: itm.GroupNum, invGroupNum: itm.InvGroupNum, @@ -618,11 +617,7 @@ namespace Win.Sfs.SettleAccount.Entities.BQ { throw new UserFriendlyException($"不存发票号为:{invbillnum}发票", "400"); } - //} - //else - //{ - // throw new UserFriendlyException($"不存发票号:{invbillnum}对应的结算分组号"); - //} + return new JsonResult(new { Code = 200, Message = "生成成功", Data = invBilllist }); 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 55f78ad9..cb8c1ffb 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 @@ -49,7 +49,6 @@ namespace Win.Sfs.SettleAccount.Entities.BQ _priceRepository = priceRepository; _pricebjRepository = pricebjRepository; _adjservice= adjservice; - } /// @@ -217,7 +216,8 @@ namespace Win.Sfs.SettleAccount.Entities.BQ /// /// /// - + [HttpPost] + [UnitOfWork(false)] public override async Task ReissueInvoice([FromBody] string p_invbillnum) { //var mappingList = await GetMapGroupAsync(p_invbillnum);//发票对应结算分组 @@ -331,6 +331,7 @@ namespace Win.Sfs.SettleAccount.Entities.BQ return new JsonResult(new { Code = 200, Message = "发票重开成功" }); ; } [HttpPost] + [UnitOfWork(false)] /// 发票重开列表 /// /// @@ -512,6 +513,7 @@ namespace Win.Sfs.SettleAccount.Entities.BQ [HttpPost] + [UnitOfWork(false)] public virtual async Task ReissueInvoiceList(List p_list) {