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 2025-05-05 15:07:57 +08:00
parent 5a0168a9de
commit 51164a0fb9
1 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -127,15 +127,20 @@ public class EmisSettlePayRecordServiceImpl extends EmisBaseService implements I
} }
} }
EmisSettleBill emisSettleBill=emisSettleBillMapper.selectSettleBillBySettleBillNo(emisSettlePayRecord.getSettleBillNo());
if(!"1".equals(emisSettleBill.getBlConfirmSite()) ){
throw new EmisBizError(EmisBizErrorType.FAIL,"业务账单未确认，不允许收款！");
}
emisSettlePayRecord.setSettleBillNo(WaybillHelper.formatQueryValue(emisSettlePayRecord.getSettleBillNo())); emisSettlePayRecord.setSettleBillNo(WaybillHelper.formatQueryValue(emisSettlePayRecord.getSettleBillNo()));
// 多账单合并收款 // 多账单合并收款
String [] settleBillNoArr = emisSettlePayRecord.getSettleBillNo().split(","); String [] settleBillNoArr = emisSettlePayRecord.getSettleBillNo().split(",");
for(int i=0;i<settleBillNoArr.length;i++) {
String settleBillNo = settleBillNoArr[i];
if(!StringUtils.isEmpty(settleBillNo)) {
EmisSettleBill emisSettleBill=emisSettleBillMapper.selectSettleBillBySettleBillNo(settleBillNo);
if(!"1".equals(emisSettleBill.getBlConfirmSite()) ){
throw new EmisBizError(EmisBizErrorType.FAIL,"业务账单未确认，不允许收款！");
}
}
}
// 不重复的 id流水号 // 不重复的 id流水号
String payId= WaybillHelper.genPayId(); String payId= WaybillHelper.genPayId();
emisSettlePayRecord.setPayId(payId); emisSettlePayRecord.setPayId(payId);
@ -152,6 +157,7 @@ public class EmisSettlePayRecordServiceImpl extends EmisBaseService implements I
for(int i=0;i<settleBillNoArr.length;i++) { for(int i=0;i<settleBillNoArr.length;i++) {
String settleBillNo = settleBillNoArr[i]; String settleBillNo = settleBillNoArr[i];
if(!StringUtils.isEmpty(settleBillNo)) { if(!StringUtils.isEmpty(settleBillNo)) {
EmisSettlePayBillRel emisSettlePayBillRel = new EmisSettlePayBillRel(); EmisSettlePayBillRel emisSettlePayBillRel = new EmisSettlePayBillRel();
emisSettlePayBillRel.setPayId(payId); emisSettlePayBillRel.setPayId(payId);
emisSettlePayBillRel.setSettleBillNo(settleBillNo); emisSettlePayBillRel.setSettleBillNo(settleBillNo);