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-04-24 09:39:20 +08:00
parent 0ee73c4001
commit 568bc00098
2 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisCommonController.java
View File

@ -586,7 +586,6 @@ public class EmisCommonController extends EmisBaseController
} }
@GetMapping("/autoQueryInvoiceStatusTrigger") @GetMapping("/autoQueryInvoiceStatusTrigger")
public AjaxResult autoQueryInvoiceStatusTrigger(){ public AjaxResult autoQueryInvoiceStatusTrigger(){
String lockKey="autoQueryInvoiceStatusTrigger"; String lockKey="autoQueryInvoiceStatusTrigger";

8
emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisSettleBillServiceImpl.java
View File

@ -147,13 +147,12 @@ public class EmisSettleBillServiceImpl extends EmisBaseService implements IEmisS
@Override @Override
public int insertEmisSettleBill(EmisSettleBill emisSettleBill) throws EmisBizError { public int insertEmisSettleBill(EmisSettleBill emisSettleBill) throws EmisBizError {
// 检查子账单是否可加入 // 检查子账单是否可加入
if(CollectionUtil.isEmpty(emisSettleBill.getSubBillList())){ if(CollectionUtil.isEmpty(emisSettleBill.getSubBillList())){
throw new EmisBizError(EmisBizErrorType.FAIL,"合账失败,未选择子账单"); throw new EmisBizError(EmisBizErrorType.FAIL,"合账失败,未选择子账单");
} }
int cnt=emisSettleBillMapper.checkUnique(emisSettleBill); int cnt = emisSettleBillMapper.checkUnique(emisSettleBill);
if(cnt>1){ if( cnt > 1 ){
throw new EmisBizError(EmisBizErrorType.FAIL,"账单名称重复"); throw new EmisBizError(EmisBizErrorType.FAIL,"账单名称重复");
} }
@ -174,8 +173,7 @@ public class EmisSettleBillServiceImpl extends EmisBaseService implements IEmisS
Date sendDate = null; Date sendDate = null;
for (EmisSettleSubBill subBill: emisSettleBill.getSubBillList() for ( EmisSettleSubBill subBill: emisSettleBill.getSubBillList() ) {
) {
EmisSettleSubBill subBllOld = getSettleSubBillBySubBillNo(subBill.getBillNo()); EmisSettleSubBill subBllOld = getSettleSubBillBySubBillNo(subBill.getBillNo());
if(subBllOld==null){ if(subBllOld==null){
throw new EmisBizError(EmisBizErrorType.FAIL,"合账失败,子账单["+subBllOld.getBillCode()+"]不存在"); throw new EmisBizError(EmisBizErrorType.FAIL,"合账失败,子账单["+subBllOld.getBillCode()+"]不存在");