aike/emis-service
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

md

Browse Source
This commit is contained in:
linfso 2024-11-26 15:28:33 +08:00
parent 1aef08cd2e
commit 22c0572339
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisSettleBillController.java
View File

@ -372,6 +372,10 @@ public class EmisSettleBillController extends BaseController
return AjaxResult.error("账单不存在"); return AjaxResult.error("账单不存在");
} }
if("3".equals(old.getOpenBillStatus())){
return AjaxResult.error("重复操作！");
}
if(!"0".equals(old.getOpenBillStatus())){ if(!"0".equals(old.getOpenBillStatus())){
return AjaxResult.error("已存在开票记录"); return AjaxResult.error("已存在开票记录");
} }
@ -410,7 +414,7 @@ public class EmisSettleBillController extends BaseController
return AjaxResult.error("账单不存在"); return AjaxResult.error("账单不存在");
} }
if(!"0".equals(old.getOpenBillStatus())){ if(!"0".equals(old.getOpenBillStatus())&&!"3".equals(old.getOpenBillStatus())){
return AjaxResult.error("已存在开票记录"); return AjaxResult.error("已存在开票记录");
} }

2
emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisSettlePayRecordServiceImpl.java
View File

@ -133,8 +133,6 @@ public class EmisSettlePayRecordServiceImpl extends EmisBaseService implements I
String payId= WaybillHelper.genPayId(); String payId= WaybillHelper.genPayId();
emisSettlePayRecord.setPayId(payId); emisSettlePayRecord.setPayId(payId);
// 记录收款运单号 // 记录收款运单号
List<EmisSettlePayRel> listRel=emisSettlePayRecord.getPayRelList(); List<EmisSettlePayRel> listRel=emisSettlePayRecord.getPayRelList();
if(!CollectionUtils.isEmpty(listRel)){ if(!CollectionUtils.isEmpty(listRel)){