diff --git a/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisSettleBillController.java b/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisSettleBillController.java index 083c52c0a..f48eec396 100644 --- a/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisSettleBillController.java +++ b/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisSettleBillController.java @@ -372,6 +372,10 @@ public class EmisSettleBillController extends BaseController return AjaxResult.error("账单不存在"); } + if("3".equals(old.getOpenBillStatus())){ + return AjaxResult.error("重复操作!"); + } + if(!"0".equals(old.getOpenBillStatus())){ return AjaxResult.error("已存在开票记录"); } @@ -410,7 +414,7 @@ public class EmisSettleBillController extends BaseController return AjaxResult.error("账单不存在"); } - if(!"0".equals(old.getOpenBillStatus())){ + if(!"0".equals(old.getOpenBillStatus())&&!"3".equals(old.getOpenBillStatus())){ return AjaxResult.error("已存在开票记录"); } diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisSettlePayRecordServiceImpl.java b/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisSettlePayRecordServiceImpl.java index 18e875f47..6323f0065 100644 --- a/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisSettlePayRecordServiceImpl.java +++ b/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisSettlePayRecordServiceImpl.java @@ -133,8 +133,6 @@ public class EmisSettlePayRecordServiceImpl extends EmisBaseService implements I String payId= WaybillHelper.genPayId(); emisSettlePayRecord.setPayId(payId); - - // 记录收款运单号 List listRel=emisSettlePayRecord.getPayRelList(); if(!CollectionUtils.isEmpty(listRel)){