From 436e57f726d1d9ddef88128af5cea56849eafb30 Mon Sep 17 00:00:00 2001 From: linfso Date: Mon, 24 Mar 2025 13:08:14 +0800 Subject: [PATCH] md --- .../java/com/xdadan/erp/emis/service/EmisBaseService.java | 3 ++- .../service/impl/EmisWaybillAjustApplyServiceImpl.java | 7 +++++-- 2 files changed, 7 insertions(+), 3 deletions(-) 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 6ab256dcb..efd4543c0 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 @@ -3693,8 +3693,9 @@ public class EmisBaseService { String kdQueryChannelJsonStr="{\n" + "\"doora\":{\"chId\":\"17track\",\"comId\":\"100702\"},\n" + - "\"Vietelpost\":{\"chId\":\"17track\",\"comId\":\"100611\"}\n" + + "\"Viettelpost\":{\"chId\":\"17track\",\"comId\":\"100611\"}\n" + "}"; + JSONObject jobjKdQ = JSONObject.parseObject(kdQueryChannelJsonStr); JSONObject kdQObj = jobjKdQ.getJSONObject("Vietelpost"); diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisWaybillAjustApplyServiceImpl.java b/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisWaybillAjustApplyServiceImpl.java index c7f9ae090..db212a41f 100644 --- a/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisWaybillAjustApplyServiceImpl.java +++ b/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisWaybillAjustApplyServiceImpl.java @@ -244,10 +244,13 @@ public class EmisWaybillAjustApplyServiceImpl extends EmisBaseService implements } // bug: 1412 月结客户发生改变，都需要从账单中移除 - if( !oldCustNo.equals(newCustNo)){ - throw new EmisBizError(EmisBizErrorType.FAIL,"已定制账单，月结客户发生改变，请从原账单移除，单号:"+emisSettleSubBill.getBillNo()); + if(!StringUtils.isEmpty(newCustNo)){ + if( !newCustNo.equals(oldCustNo)){ + throw new EmisBizError(EmisBizErrorType.FAIL,"已定制账单，月结客户发生改变，请从原账单移除，单号:"+emisSettleSubBill.getBillNo()); + } } + } }