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 17faf4904..ea357184c 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 @@ -238,13 +238,14 @@ public class EmisWaybillAjustApplyServiceImpl extends EmisBaseService implements throw new EmisBizError(EmisBizErrorType.FAIL,"已定制账单,销售联系/回款联系人发生改变,请从原账单移除,单号:"+emisSettleSubBill.getBillNo()); } - // bug: 1412 支付方式发生改变,月结客户发生改变,都需要从账单中移除 + // bug: 1412 支付方式发生改变,需要从账单中移除 if( !oldPaymentType.equals(newPaymentType)){ throw new EmisBizError(EmisBizErrorType.FAIL,"已定制账单,支付方式发生改变,请从原账单移除,单号:"+emisSettleSubBill.getBillNo()); } + // bug: 1412 月结客户发生改变,都需要从账单中移除 if( !oldCustNo.equals(newCustNo)){ - throw new EmisBizError(EmisBizErrorType.FAIL,"已定制账单,客户发生改变,请从原账单移除,单号:"+emisSettleSubBill.getBillNo()); + throw new EmisBizError(EmisBizErrorType.FAIL,"已定制账单,月结客户发生改变,请从原账单移除,单号:"+emisSettleSubBill.getBillNo()); } }