From a6ca0d8350e4f751c3e6a701fc0d03d6e9d95865 Mon Sep 17 00:00:00 2001 From: linfso Date: Sat, 20 Jul 2024 16:30:50 +0800 Subject: [PATCH] md --- .../java/com/xdadan/erp/emis/service/EmisBaseService.java | 3 ++- .../erp/emis/service/impl/EmisWaybillServiceImpl.java | 7 +++++++ 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/service/EmisBaseService.java b/emis-biz/src/main/java/com/xdadan/erp/emis/service/EmisBaseService.java index 21b6bf514..e95179a97 100644 --- a/emis-biz/src/main/java/com/xdadan/erp/emis/service/EmisBaseService.java +++ b/emis-biz/src/main/java/com/xdadan/erp/emis/service/EmisBaseService.java @@ -1059,7 +1059,8 @@ public class EmisBaseService { if(querySubBill!=null) { if (!"0".equals(querySubBill.getBlConfirmCenter())) { log.error("===>账单财务确认不允许出账！"); - throw new EmisBizError(EmisBizErrorType.FAIL, "账单财务确认不允许出账"); + return; +// throw new EmisBizError(EmisBizErrorType.FAIL, "账单财务确认不允许出账"); } } diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisWaybillServiceImpl.java b/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisWaybillServiceImpl.java index cb5c4c76e..80bd565a2 100644 --- a/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisWaybillServiceImpl.java +++ b/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisWaybillServiceImpl.java @@ -1567,6 +1567,13 @@ public class EmisWaybillServiceImpl extends EmisBaseService implements IEmisWayb // 占用进仓单号 useWarehouseInNo(emisWaybillSave.getBillCode(),oldEmisWaybill.getWarehouseInNo(),emisWaybillSave.getWarehouseInNo()); + // 运单修改需要重新出账 + try { + redoGenerateBill(emisWaybillSave.getBillCode()); + }catch (Exception ex){ + ex.printStackTrace(); + } + } /**