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

更新版本

master
学 赵 1 year ago
parent
6502c43bf5
commit
4536a5c66c
9 changed files with 61 additions and 61 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. 8
      code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/BQ/HBPO_BA_SERVICE.cs
  2. 2
      code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/BQ/HBPO_PD_SERVICE.cs
  3. 12
      code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/BQ/PUB_BA_SERVICE.cs
  4. 2
      code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/BQ/PUB_PD_SERVICE.cs
  5. 22
      code/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/BQ/Managers/BBAC_CAN_SA_MNG.cs
  6. 22
      code/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/BQ/Managers/HBPO_CAN_SA_MNG.cs
  7. 26
      code/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/BQ/Managers/INV_MNG.cs
  8. 4
      code/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/BQ/Managers/INV_MNG_EXT.cs
  9. 24
      code/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/BQ/Managers/PUB_CAN_SA_MNG.cs

8
code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/BQ/HBPO_BA_SERVICE.cs
View File

@ -325,18 +325,18 @@ namespace Win.Sfs.SettleAccount.Entities.BQ
if (settle == null) if (settle == null)
{ {
throw new UserFriendlyException($"选择发票:{invbillnum}对应的可结算单不在请检查！"); throw new UserFriendlyException($"选择发票:{invbillnum}对应的可结算单不在请检查！","400");
} }
version = settle.Version; version = settle.Version;
if (inv != null) if (inv != null)
{ {
if (inv.InvoiceState == InvoiceBillState.报废) if (inv.InvoiceState == InvoiceBillState.报废)
{ {
throw new UserFriendlyException($"选择发票:{invbillnum}状态为报废状态不能重开！"); throw new UserFriendlyException($"选择发票:{invbillnum}状态为报废状态不能重开！","400");
} }
if (inv.State == SettleBillState.商务已审核 || inv.State == SettleBillState.已开票) if (inv.State == SettleBillState.商务已审核 || inv.State == SettleBillState.已开票)
{ {
throw new UserFriendlyException($"选择发票:{invbillnum}状态在财务审核后可以报废重开,之前请退回重开！"); throw new UserFriendlyException($"选择发票:{invbillnum}状态在财务审核后可以报废重开,之前请退回重开！","400");
} }
var bbaclist = await _hbpoMng.GetContainsAsync(inv.InvbillNum);//结算分组对应结算零件 var bbaclist = await _hbpoMng.GetContainsAsync(inv.InvbillNum);//结算分组对应结算零件
@ -423,7 +423,7 @@ namespace Win.Sfs.SettleAccount.Entities.BQ
} }
else else
{ {
throw new UserFriendlyException($"不存发票号为:{invbillnum}发票"); throw new UserFriendlyException($"不存发票号为:{invbillnum}发票","400");
} }
//} //}
//else //else

2
code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/BQ/HBPO_PD_SERVICE.cs
View File

@ -53,7 +53,7 @@ namespace Win.Sfs.SettleAccount.Entities.BQ
var lst = ls.Where(p => (p.State == SettleBillState.已提交扣减 || p.State == SettleBillState.已扣减)); var lst = ls.Where(p => (p.State == SettleBillState.已提交扣减 || p.State == SettleBillState.已扣减));
if (lst.Count() > 0) if (lst.Count() > 0)
{ {
throw new UserFriendlyException("当前状态是已提交状态，不能重复已提交"); throw new UserFriendlyException("当前状态是已提交状态，不能重复已提交","400");
} }
foreach (var item in ls) foreach (var item in ls)
{ {

12
code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/BQ/PUB_BA_SERVICE.cs
View File

@ -61,7 +61,7 @@ namespace Win.Sfs.SettleAccount.Entities.BQ
var adjlist = ObjectMapper.Map<List<PUB_ADJ_DETAIL_DTO>, List<PUB_ADJ_DETAIL>>(p_list); var adjlist = ObjectMapper.Map<List<PUB_ADJ_DETAIL_DTO>, List<PUB_ADJ_DETAIL>>(p_list);
if (adjlist == null && adjlist.Count == 0) if (adjlist == null && adjlist.Count == 0)
{ {
throw new UserFriendlyException($"调整表无数据!"); throw new UserFriendlyException($"调整表无数据!","400");
} }
//var mappingList = await GetMapGroupAsync(p_invbillnum);//发票对应结算分组 //var mappingList = await GetMapGroupAsync(p_invbillnum);//发票对应结算分组
//if (mappingList != null && mappingList.Count() > 0) //if (mappingList != null && mappingList.Count() > 0)
@ -317,7 +317,7 @@ namespace Win.Sfs.SettleAccount.Entities.BQ
var adjlist = ObjectMapper.Map<List<PUB_ADJ_DETAIL_DTO>, List<PUB_ADJ_DETAIL>>(p_list); var adjlist = ObjectMapper.Map<List<PUB_ADJ_DETAIL_DTO>, List<PUB_ADJ_DETAIL>>(p_list);
if (adjlist == null && adjlist.Count == 0) if (adjlist == null && adjlist.Count == 0)
{ {
throw new UserFriendlyException($"调整表无数据!"); throw new UserFriendlyException($"调整表无数据!", "400");
} }
//var mappingList = await GetMapGroupAsync(invbillnum);//发票对应结算分组 //var mappingList = await GetMapGroupAsync(invbillnum);//发票对应结算分组
@ -331,18 +331,18 @@ namespace Win.Sfs.SettleAccount.Entities.BQ
if (settle == null) if (settle == null)
{ {
throw new UserFriendlyException($"选择发票:{invbillnum}对应的可结算单不在请检查！"); throw new UserFriendlyException($"选择发票:{invbillnum}对应的可结算单不在请检查！", "400");
} }
version = settle.Version; version = settle.Version;
if (inv != null) if (inv != null)
{ {
if (inv.InvoiceState == InvoiceBillState.报废) if (inv.InvoiceState == InvoiceBillState.报废)
{ {
throw new UserFriendlyException($"选择发票:{invbillnum}状态为报废状态不能重开！"); throw new UserFriendlyException($"选择发票:{invbillnum}状态为报废状态不能重开！", "400");
} }
if (inv.State == SettleBillState.商务已审核 || inv.State == SettleBillState.已开票) if (inv.State == SettleBillState.商务已审核 || inv.State == SettleBillState.已开票)
{ {
throw new UserFriendlyException($"选择发票:{invbillnum}状态在财务审核后可以报废重开,之前请退回重开！"); throw new UserFriendlyException($"选择发票:{invbillnum}状态在财务审核后可以报废重开,之前请退回重开！", "400");
} }
var bbaclist = await _pubMng.GetContainsAsync(inv.InvbillNum);//结算分组对应结算零件 var bbaclist = await _pubMng.GetContainsAsync(inv.InvbillNum);//结算分组对应结算零件
@ -430,7 +430,7 @@ namespace Win.Sfs.SettleAccount.Entities.BQ
} }
else else
{ {
throw new UserFriendlyException($"不存发票号为:{invbillnum}发票"); throw new UserFriendlyException($"不存发票号为:{invbillnum}发票", "400");
} }
//} //}
//else //else

2
code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/BQ/PUB_PD_SERVICE.cs
View File

@ -49,7 +49,7 @@ namespace Win.Sfs.SettleAccount.Entities.BQ
var lst = ls.Where(p => (p.State == SettleBillState.已提交扣减 || p.State == SettleBillState.已扣减)); var lst = ls.Where(p => (p.State == SettleBillState.已提交扣减 || p.State == SettleBillState.已扣减));
if (lst.Count() > 0) if (lst.Count() > 0)
{ {
throw new UserFriendlyException("当前状态是已提交状态，不能重复已提交"); throw new UserFriendlyException("当前状态是已提交状态，不能重复已提交", "400");
} }
foreach (var item in ls) foreach (var item in ls)
{ {

22
code/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/BQ/Managers/BBAC_CAN_SA_MNG.cs
View File

@ -77,7 +77,7 @@ namespace Win.Sfs.SettleAccount.Entities.BQ.Managers
} }
else else
{ {
throw new UserFriendlyException("当前状态不是【商务已审核】,无法设置成【财务已审核】状态"); throw new UserFriendlyException("当前状态不是【商务已审核】,无法设置成【财务已审核】状态", "400");
} }
break; break;
case SettleBillState.商务已审核: case SettleBillState.商务已审核:
@ -87,7 +87,7 @@ namespace Win.Sfs.SettleAccount.Entities.BQ.Managers
} }
else else
{ {
throw new UserFriendlyException("当前状态不是【已开票】状态,无法设置成【商务已审核】"); throw new UserFriendlyException("当前状态不是【已开票】状态,无法设置成【商务已审核】", "400");
} }
break; break;
case SettleBillState.已开票: case SettleBillState.已开票:
@ -97,7 +97,7 @@ namespace Win.Sfs.SettleAccount.Entities.BQ.Managers
} }
else else
{ {
throw new UserFriendlyException("当前状态不是【未结状态】状态,无法设置成【已开票】"); throw new UserFriendlyException("当前状态不是【未结状态】状态,无法设置成【已开票】", "400");
} }
break; break;
case SettleBillState.已扣减: case SettleBillState.已扣减:
@ -107,7 +107,7 @@ namespace Win.Sfs.SettleAccount.Entities.BQ.Managers
} }
else else
{ {
throw new UserFriendlyException("当前状态不是[客户收票],无法设置成【财务已审核】状态"); throw new UserFriendlyException("当前状态不是[客户收票],无法设置成【财务已审核】状态", "400");
} }
break; break;
case SettleBillState.客户已收票: case SettleBillState.客户已收票:
@ -117,7 +117,7 @@ namespace Win.Sfs.SettleAccount.Entities.BQ.Managers
} }
else else
{ {
throw new UserFriendlyException("当前状态不是[财务已审核],无法设置成【客户已收票】状态"); throw new UserFriendlyException("当前状态不是[财务已审核],无法设置成【客户已收票】状态", "400");
} }
break; break;
} }
@ -140,7 +140,7 @@ namespace Win.Sfs.SettleAccount.Entities.BQ.Managers
var ls = _repository.Where(p => p.InvGroupNum == p_billNum).ToList(); var ls = _repository.Where(p => p.InvGroupNum == p_billNum).ToList();
if (ls == null && ls.Count == 0) if (ls == null && ls.Count == 0)
{ {
throw new UserFriendlyException(string.Format("不存在发票分组号为{0}的可结算单", p_billNum)); throw new UserFriendlyException(string.Format("不存在发票分组号为{0}的可结算单", p_billNum),"400");
} }
foreach (BBAC_CAN_SA p_entiy in ls) foreach (BBAC_CAN_SA p_entiy in ls)
{ {
@ -154,7 +154,7 @@ namespace Win.Sfs.SettleAccount.Entities.BQ.Managers
} }
else else
{ {
throw new UserFriendlyException("当前状态不是【财务已审核】,无法设置成【商务已审核】状态"); throw new UserFriendlyException("当前状态不是【财务已审核】,无法设置成【商务已审核】状态", "400");
} }
break; break;
case SettleBillState.已开票: case SettleBillState.已开票:
@ -164,7 +164,7 @@ namespace Win.Sfs.SettleAccount.Entities.BQ.Managers
} }
else else
{ {
throw new UserFriendlyException("当前状态不是【商务已审核】状态,无法设置成【已开票】"); throw new UserFriendlyException("当前状态不是【商务已审核】状态,无法设置成【已开票】","400");
} }
break; break;
case SettleBillState.未结状态: case SettleBillState.未结状态:
@ -174,7 +174,7 @@ namespace Win.Sfs.SettleAccount.Entities.BQ.Managers
} }
else else
{ {
throw new UserFriendlyException("当前状态不是【已开票】状态,无法设置成【未结状态】"); throw new UserFriendlyException("当前状态不是【已开票】状态,无法设置成【未结状态】", "400");
} }
break; break;
case SettleBillState.客户已收票: case SettleBillState.客户已收票:
@ -184,7 +184,7 @@ namespace Win.Sfs.SettleAccount.Entities.BQ.Managers
} }
else else
{ {
throw new UserFriendlyException("当前状态不是[财务已审核],无法设置成【财务已审核客户收票】状态"); throw new UserFriendlyException("当前状态不是[财务已审核],无法设置成【财务已审核客户收票】状态", "400");
} }
break; break;
case SettleBillState.财务已审核: case SettleBillState.财务已审核:
@ -194,7 +194,7 @@ namespace Win.Sfs.SettleAccount.Entities.BQ.Managers
} }
else else
{ {
throw new UserFriendlyException("当前状态不是[客户已收票],无法设置成【财务已审核】状态"); throw new UserFriendlyException("当前状态不是[客户已收票],无法设置成【财务已审核】状态","400");
} }
break; break;
} }

22
code/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/BQ/Managers/HBPO_CAN_SA_MNG.cs
View File

@ -85,7 +85,7 @@ namespace Win.Sfs.SettleAccount.Entities.BQ.Managers
} }
else else
{ {
throw new UserFriendlyException("当前状态不是【商务已审核】,无法设置成【财务已审核】状态"); throw new UserFriendlyException("当前状态不是【商务已审核】,无法设置成【财务已审核】状态", "400");
} }
break; break;
case SettleBillState.商务已审核: case SettleBillState.商务已审核:
@ -95,7 +95,7 @@ namespace Win.Sfs.SettleAccount.Entities.BQ.Managers
} }
else else
{ {
throw new UserFriendlyException("当前状态不是【已开票】状态,无法设置成【商务已审核】"); throw new UserFriendlyException("当前状态不是【已开票】状态,无法设置成【商务已审核】", "400");
} }
break; break;
case SettleBillState.已开票: case SettleBillState.已开票:
@ -105,7 +105,7 @@ namespace Win.Sfs.SettleAccount.Entities.BQ.Managers
} }
else else
{ {
throw new UserFriendlyException("当前状态不是【未结状态】状态,无法设置成【已开票】"); throw new UserFriendlyException("当前状态不是【未结状态】状态,无法设置成【已开票】","400");
} }
break; break;
case SettleBillState.已扣减: case SettleBillState.已扣减:
@ -115,7 +115,7 @@ namespace Win.Sfs.SettleAccount.Entities.BQ.Managers
} }
else else
{ {
throw new UserFriendlyException("当前状态不是[客户收票],无法设置成【财务已审核】状态"); throw new UserFriendlyException("当前状态不是[客户收票],无法设置成【财务已审核】状态", "400");
} }
break; break;
case SettleBillState.客户已收票: case SettleBillState.客户已收票:
@ -125,7 +125,7 @@ namespace Win.Sfs.SettleAccount.Entities.BQ.Managers
} }
else else
{ {
throw new UserFriendlyException("当前状态不是[财务已审核],无法设置成【客户已收票】状态"); throw new UserFriendlyException("当前状态不是[财务已审核],无法设置成【客户已收票】状态", "400");
} }
break; break;
} }
@ -147,7 +147,7 @@ namespace Win.Sfs.SettleAccount.Entities.BQ.Managers
var ls = _repository.Where(p => p.InvGroupNum == p_billNum).ToList(); var ls = _repository.Where(p => p.InvGroupNum == p_billNum).ToList();
if (ls == null && ls.Count == 0) if (ls == null && ls.Count == 0)
{ {
throw new UserFriendlyException(string.Format("不存在发票分组号为{0}的可结算单", p_billNum)); throw new UserFriendlyException(string.Format("不存在发票分组号为{0}的可结算单", p_billNum), "400");
} }
foreach (HBPO_CAN_SA p_entiy in ls) foreach (HBPO_CAN_SA p_entiy in ls)
{ {
@ -161,7 +161,7 @@ namespace Win.Sfs.SettleAccount.Entities.BQ.Managers
} }
else else
{ {
throw new UserFriendlyException("当前状态不是【财务已审核】,无法设置成【商务已审核】状态"); throw new UserFriendlyException("当前状态不是【财务已审核】,无法设置成【商务已审核】状态", "400");
} }
break; break;
case SettleBillState.已开票: case SettleBillState.已开票:
@ -171,7 +171,7 @@ namespace Win.Sfs.SettleAccount.Entities.BQ.Managers
} }
else else
{ {
throw new UserFriendlyException("当前状态不是【商务已审核】状态,无法设置成【已开票】"); throw new UserFriendlyException("当前状态不是【商务已审核】状态,无法设置成【已开票】", "400");
} }
break; break;
case SettleBillState.未结状态: case SettleBillState.未结状态:
@ -181,7 +181,7 @@ namespace Win.Sfs.SettleAccount.Entities.BQ.Managers
} }
else else
{ {
throw new UserFriendlyException("当前状态不是【已开票】状态,无法设置成【未结状态】"); throw new UserFriendlyException("当前状态不是【已开票】状态,无法设置成【未结状态】", "400");
} }
break; break;
case SettleBillState.客户已收票: case SettleBillState.客户已收票:
@ -191,7 +191,7 @@ namespace Win.Sfs.SettleAccount.Entities.BQ.Managers
} }
else else
{ {
throw new UserFriendlyException("当前状态不是[财务已审核],无法设置成【财务已审核客户收票】状态"); throw new UserFriendlyException("当前状态不是[财务已审核],无法设置成【财务已审核客户收票】状态", "400");
} }
break; break;
case SettleBillState.财务已审核: case SettleBillState.财务已审核:
@ -201,7 +201,7 @@ namespace Win.Sfs.SettleAccount.Entities.BQ.Managers
} }
else else
{ {
throw new UserFriendlyException("当前状态不是[客户已收票],无法设置成【财务已审核】状态"); throw new UserFriendlyException("当前状态不是[客户已收票],无法设置成【财务已审核】状态", "400");
} }
break; break;
} }

26
code/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/BQ/Managers/INV_MNG.cs
View File

@ -216,7 +216,7 @@ namespace Win.Sfs.SettleAccount.Entities.BQ.Managers
} }
if (errors.Count > 0) if (errors.Count > 0)
{ {
throw new UserFriendlyException($"发票{string.Join(",", errors)}当前状态不是【商务已审核】,无法设置成【财务已审核】状态"); throw new UserFriendlyException($"发票{string.Join(",", errors)}当前状态不是【商务已审核】,无法设置成【财务已审核】状态", "400");
} }
break; break;
case SettleBillState.商务已审核: case SettleBillState.商务已审核:
@ -235,7 +235,7 @@ namespace Win.Sfs.SettleAccount.Entities.BQ.Managers
} }
if (errors.Count > 0) if (errors.Count > 0)
{ {
throw new UserFriendlyException($"发票{string.Join(",", errors)}当前状态不是【已开票】,无法设置成【商务已审核】状态"); throw new UserFriendlyException($"发票{string.Join(",", errors)}当前状态不是【已开票】,无法设置成【商务已审核】状态", "400");
} }
break; break;
case SettleBillState.已扣减: case SettleBillState.已扣减:
@ -254,7 +254,7 @@ namespace Win.Sfs.SettleAccount.Entities.BQ.Managers
} }
if (errors.Count > 0) if (errors.Count > 0)
{ {
throw new UserFriendlyException($"发票{string.Join(",", errors)}当前状态不是【客户已收票】,无法设置成【已扣减】状态"); throw new UserFriendlyException($"发票{string.Join(",", errors)}当前状态不是【客户已收票】,无法设置成【已扣减】状态", "400");
} }
break; break;
} }
@ -265,7 +265,7 @@ namespace Win.Sfs.SettleAccount.Entities.BQ.Managers
} }
else else
{ {
throw new UserFriendlyException($"选择发票不存在"); throw new UserFriendlyException($"选择发票不存在", "400");
} }
} }
@ -286,7 +286,7 @@ namespace Win.Sfs.SettleAccount.Entities.BQ.Managers
var count = appls.Select(p => p.State).Distinct().Count(); var count = appls.Select(p => p.State).Distinct().Count();
if (count > 1) if (count > 1)
{ {
throw new UserFriendlyException($"提交发票状态不一致"); throw new UserFriendlyException($"提交发票状态不一致", "400");
} }
var nols = appls.Where(p => p.InvoiceState == InvoiceBillState.报废 || p.State == SettleBillState.客户已收票).ToList(); var nols = appls.Where(p => p.InvoiceState == InvoiceBillState.报废 || p.State == SettleBillState.客户已收票).ToList();
if (nols.Count > 0) if (nols.Count > 0)
@ -312,7 +312,7 @@ namespace Win.Sfs.SettleAccount.Entities.BQ.Managers
} }
if (errors.Count > 0) if (errors.Count > 0)
{ {
throw new UserFriendlyException($"发票{string.Join(",", errors)}当前状态不是【财务已审核】,无法设置成【商务已审核】状态"); throw new UserFriendlyException($"发票{string.Join(",", errors)}当前状态不是【财务已审核】,无法设置成【商务已审核】状态", "400");
} }
break; break;
case SettleBillState.已开票: case SettleBillState.已开票:
@ -331,7 +331,7 @@ namespace Win.Sfs.SettleAccount.Entities.BQ.Managers
} }
if (errors.Count > 0) if (errors.Count > 0)
{ {
throw new UserFriendlyException($"发票{string.Join(",", errors)}当前状态不是【商务已审核】,无法设置成【已开票】状态"); throw new UserFriendlyException($"发票{string.Join(",", errors)}当前状态不是【商务已审核】,无法设置成【已开票】状态", "400");
} }
break; break;
case SettleBillState.客户已收票: case SettleBillState.客户已收票:
@ -350,7 +350,7 @@ namespace Win.Sfs.SettleAccount.Entities.BQ.Managers
} }
if (errors.Count > 0) if (errors.Count > 0)
{ {
throw new UserFriendlyException($"发票{string.Join(",", errors)}当前状态不是【已扣减】,无法设置成【客户已收票】状态"); throw new UserFriendlyException($"发票{string.Join(",", errors)}当前状态不是【已扣减】,无法设置成【客户已收票】状态", "400");
} }
break; break;
} }
@ -361,7 +361,7 @@ namespace Win.Sfs.SettleAccount.Entities.BQ.Managers
} }
else else
{ {
throw new UserFriendlyException($"选择发票不存在"); throw new UserFriendlyException($"选择发票不存在", "400");
} }
} }
@ -598,7 +598,7 @@ namespace Win.Sfs.SettleAccount.Entities.BQ.Managers
if (pdlist != null && pdlist.Count > 0) if (pdlist != null && pdlist.Count > 0)
{ {
var invs = pdlist.Select(p => p.BillNum).ToList(); var invs = pdlist.Select(p => p.BillNum).ToList();
throw new UserFriendlyException($"发票{string.Join(",", invs)}已经生成待扣减过不能再次提交"); throw new UserFriendlyException($"发票{string.Join(",", invs)}已经生成待扣减过不能再次提交", "400");
} }
var parentList = invList.Select(p => p.ParentInvbillNum).ToList();//所有发票存在父发票号 var parentList = invList.Select(p => p.ParentInvbillNum).ToList();//所有发票存在父发票号
List<string> oldinvs = new List<string>(); List<string> oldinvs = new List<string>();
@ -748,7 +748,7 @@ namespace Win.Sfs.SettleAccount.Entities.BQ.Managers
if (pdlist != null && pdlist.Count > 0) if (pdlist != null && pdlist.Count > 0)
{ {
var invs = pdlist.Select(p => p.BillNum).ToList(); var invs = pdlist.Select(p => p.BillNum).ToList();
throw new UserFriendlyException($"发票{string.Join(",", invs)}已经生成待扣减过不能再次提交"); throw new UserFriendlyException($"发票{string.Join(",", invs)}已经生成待扣减过不能再次提交", "400");
} }
var parentList = invList.Select(p => p.ParentInvbillNum).ToList();//所有发票存在父发票号 var parentList = invList.Select(p => p.ParentInvbillNum).ToList();//所有发票存在父发票号
List<string> oldinvs = new List<string>(); List<string> oldinvs = new List<string>();
@ -920,12 +920,12 @@ namespace Win.Sfs.SettleAccount.Entities.BQ.Managers
var count=ls.Select(p => p.State).Distinct().Count(); var count=ls.Select(p => p.State).Distinct().Count();
if (count > 1) if (count > 1)
{ {
throw new UserFriendlyException($"发票分组{groupbillNum}包含发票不是同一状态不能退回"); throw new UserFriendlyException($"发票分组{groupbillNum}包含发票不是同一状态不能退回", "400");
} }
var first = ls.FirstOrDefault(); var first = ls.FirstOrDefault();
if (first.State == SettleBillState.客户已收票 || first.State == SettleBillState.已扣减) if (first.State == SettleBillState.客户已收票 || first.State == SettleBillState.已扣减)
{ {
throw new UserFriendlyException( $"发票分组{groupbillNum}客户已经是客户已收票不能退回"); throw new UserFriendlyException( $"发票分组{groupbillNum}客户已经是客户已收票不能退回", "400");
} }
foreach (var p_entity in ls) foreach (var p_entity in ls)
{ {

4
code/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/BQ/Managers/INV_MNG_EXT.cs
View File

@ -923,11 +923,11 @@ namespace Win.Sfs.SettleAccount.Entities.BQ.Managers
if (inv == null) if (inv == null)
{ {
throw new UserFriendlyException( $"找不到选择要重开发票号{p_OldInvBillNum}不能重开"); throw new UserFriendlyException( $"找不到选择要重开发票号{p_OldInvBillNum}不能重开", "400");
} }
if (inv.InvoiceState == InvoiceBillState.报废) if (inv.InvoiceState == InvoiceBillState.报废)
{ {
throw new UserFriendlyException($"选择要重开发票号{p_OldInvBillNum}已经作废不能重开"); throw new UserFriendlyException($"选择要重开发票号{p_OldInvBillNum}已经作废不能重开", "400");
} }
//inv.InvoiceState = InvoiceBillState.报废; //inv.InvoiceState = InvoiceBillState.报废;

24
code/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/BQ/Managers/PUB_CAN_SA_MNG.cs
View File

@ -67,7 +67,7 @@ namespace Win.Sfs.SettleAccount.Entities.BQ.Managers
var ls = _repository.Where(p => p.InvGroupNum == p_billNum).ToList(); var ls = _repository.Where(p => p.InvGroupNum == p_billNum).ToList();
if (ls == null && ls.Count ==0) if (ls == null && ls.Count ==0)
{ {
throw new UserFriendlyException( string.Format("不存在编号为{0}",p_billNum)); throw new UserFriendlyException( string.Format("不存在编号为{0}",p_billNum), "400");
} }
foreach (PUB_CAN_SA p_entiy in ls) foreach (PUB_CAN_SA p_entiy in ls)
{ {
@ -80,7 +80,7 @@ namespace Win.Sfs.SettleAccount.Entities.BQ.Managers
} }
else else
{ {
throw new UserFriendlyException( "当前状态不是【商务已审核】,无法设置成【财务已审核】状态"); throw new UserFriendlyException( "当前状态不是【商务已审核】,无法设置成【财务已审核】状态", "400");
} }
break; break;
case SettleBillState.商务已审核: case SettleBillState.商务已审核:
@ -90,7 +90,7 @@ namespace Win.Sfs.SettleAccount.Entities.BQ.Managers
} }
else else
{ {
throw new UserFriendlyException( "当前状态不是【已开票】状态,无法设置成【商务已审核】"); throw new UserFriendlyException( "当前状态不是【已开票】状态,无法设置成【商务已审核】", "400");
} }
break; break;
case SettleBillState.已开票: case SettleBillState.已开票:
@ -100,7 +100,7 @@ namespace Win.Sfs.SettleAccount.Entities.BQ.Managers
} }
else else
{ {
throw new UserFriendlyException( "当前状态不是【未结状态】状态,无法设置成【已开票】"); throw new UserFriendlyException( "当前状态不是【未结状态】状态,无法设置成【已开票】", "400");
} }
break; break;
case SettleBillState.已扣减: case SettleBillState.已扣减:
@ -110,7 +110,7 @@ namespace Win.Sfs.SettleAccount.Entities.BQ.Managers
} }
else else
{ {
throw new UserFriendlyException( "当前状态不是[客户收票],无法设置成【财务已审核】状态"); throw new UserFriendlyException( "当前状态不是[客户收票],无法设置成【财务已审核】状态", "400");
} }
break; break;
case SettleBillState.客户已收票: case SettleBillState.客户已收票:
@ -120,7 +120,7 @@ namespace Win.Sfs.SettleAccount.Entities.BQ.Managers
} }
else else
{ {
throw new UserFriendlyException( "当前状态不是[财务已审核],无法设置成【客户已收票】状态"); throw new UserFriendlyException( "当前状态不是[财务已审核],无法设置成【客户已收票】状态", "400");
} }
break; break;
} }
@ -142,7 +142,7 @@ namespace Win.Sfs.SettleAccount.Entities.BQ.Managers
var ls = _repository.Where(p => p.InvGroupNum == p_billNum).ToList(); var ls = _repository.Where(p => p.InvGroupNum == p_billNum).ToList();
if (ls == null && ls.Count == 0) if (ls == null && ls.Count == 0)
{ {
throw new UserFriendlyException( string.Format("不存在发票分组号为{0}的可结算单", p_billNum)); throw new UserFriendlyException( string.Format("不存在发票分组号为{0}的可结算单", p_billNum), "400");
} }
foreach (PUB_CAN_SA p_entiy in ls) foreach (PUB_CAN_SA p_entiy in ls)
{ {
@ -156,7 +156,7 @@ namespace Win.Sfs.SettleAccount.Entities.BQ.Managers
} }
else else
{ {
throw new UserFriendlyException( "当前状态不是【财务已审核】,无法设置成【商务已审核】状态"); throw new UserFriendlyException( "当前状态不是【财务已审核】,无法设置成【商务已审核】状态", "400");
} }
break; break;
case SettleBillState.已开票: case SettleBillState.已开票:
@ -166,7 +166,7 @@ namespace Win.Sfs.SettleAccount.Entities.BQ.Managers
} }
else else
{ {
throw new UserFriendlyException( "当前状态不是【商务已审核】状态,无法设置成【已开票】"); throw new UserFriendlyException( "当前状态不是【商务已审核】状态,无法设置成【已开票】", "400");
} }
break; break;
case SettleBillState.未结状态: case SettleBillState.未结状态:
@ -176,7 +176,7 @@ namespace Win.Sfs.SettleAccount.Entities.BQ.Managers
} }
else else
{ {
throw new UserFriendlyException( "当前状态不是【已开票】状态,无法设置成【未结状态】"); throw new UserFriendlyException( "当前状态不是【已开票】状态,无法设置成【未结状态】", "400");
} }
break; break;
case SettleBillState.客户已收票: case SettleBillState.客户已收票:
@ -186,7 +186,7 @@ namespace Win.Sfs.SettleAccount.Entities.BQ.Managers
} }
else else
{ {
throw new UserFriendlyException( "当前状态不是[财务已审核],无法设置成【财务已审核客户收票】状态"); throw new UserFriendlyException( "当前状态不是[财务已审核],无法设置成【财务已审核客户收票】状态", "400");
} }
break; break;
case SettleBillState.财务已审核: case SettleBillState.财务已审核:
@ -196,7 +196,7 @@ namespace Win.Sfs.SettleAccount.Entities.BQ.Managers
} }
else else
{ {
throw new UserFriendlyException( "当前状态不是[客户已收票],无法设置成【财务已审核】状态"); throw new UserFriendlyException( "当前状态不是[客户已收票],无法设置成【财务已审核】状态", "400");
} }
break; break;
} }

Write Preview
Loading…
Cancel
Save