From 568bc00098bd2c614f6161efe8432180f44098bc Mon Sep 17 00:00:00 2001 From: linfso Date: Thu, 24 Apr 2025 09:39:20 +0800 Subject: [PATCH] md --- .../com/xdadan/erp/web/emis/EmisCommonController.java | 1 - .../erp/emis/service/impl/EmisSettleBillServiceImpl.java | 8 +++----- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisCommonController.java b/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisCommonController.java index 0b4229590..39cbcffad 100644 --- a/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisCommonController.java +++ b/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisCommonController.java @@ -586,7 +586,6 @@ public class EmisCommonController extends EmisBaseController } - @GetMapping("/autoQueryInvoiceStatusTrigger") public AjaxResult autoQueryInvoiceStatusTrigger(){ String lockKey="autoQueryInvoiceStatusTrigger"; diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisSettleBillServiceImpl.java b/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisSettleBillServiceImpl.java index 11f5f606a..39e9abd69 100644 --- a/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisSettleBillServiceImpl.java +++ b/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisSettleBillServiceImpl.java @@ -147,13 +147,12 @@ public class EmisSettleBillServiceImpl extends EmisBaseService implements IEmisS @Override public int insertEmisSettleBill(EmisSettleBill emisSettleBill) throws EmisBizError { // 检查子账单是否可加入 - if(CollectionUtil.isEmpty(emisSettleBill.getSubBillList())){ throw new EmisBizError(EmisBizErrorType.FAIL,"合账失败,未选择子账单"); } - int cnt=emisSettleBillMapper.checkUnique(emisSettleBill); - if(cnt>1){ + int cnt = emisSettleBillMapper.checkUnique(emisSettleBill); + if( cnt > 1 ){ throw new EmisBizError(EmisBizErrorType.FAIL,"账单名称重复"); } @@ -174,8 +173,7 @@ public class EmisSettleBillServiceImpl extends EmisBaseService implements IEmisS Date sendDate = null; - for (EmisSettleSubBill subBill: emisSettleBill.getSubBillList() - ) { + for ( EmisSettleSubBill subBill: emisSettleBill.getSubBillList() ) { EmisSettleSubBill subBllOld = getSettleSubBillBySubBillNo(subBill.getBillNo()); if(subBllOld==null){ throw new EmisBizError(EmisBizErrorType.FAIL,"合账失败,子账单["+subBllOld.getBillCode()+"]不存在");