From cd3dbff4275b3454a6966774dfb1b87ef6ead054 Mon Sep 17 00:00:00 2001 From: linfso Date: Fri, 14 Mar 2025 16:58:40 +0800 Subject: [PATCH] md --- .../impl/EmisWaybillAjustApplyServiceImpl.java | 18 ++++++++++++++++-- 1 file changed, 16 insertions(+), 2 deletions(-) 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 dfe452b16..17faf4904 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 @@ -221,18 +221,32 @@ public class EmisWaybillAjustApplyServiceImpl extends EmisBaseService implements String newDataStr=emisWaybillAjustApply.getJsonData(); JSONObject jObj = JSONObject.parseObject(newDataStr); -// JSONObject jobjOldValue=jObj.getJSONObject("oldValue"); + JSONObject jobjOldValue=jObj.getJSONObject("oldValue"); JSONObject jobjNewValue=jObj.getJSONObject("newValue"); + String oldPaymentType = jobjOldValue.getString("paymentType"); + String oldCustNo = jobjOldValue.getString("custNo"); String oldPayee=emisSettleSubBill.getPayee(); String oldSalesmen=emisSettleSubBill.getSalesmen(); + String newPaymentType = jobjNewValue.getString("paymentType"); + String newCustNo = jobjNewValue.getString("custNo"); String newPayee=jobjNewValue.getString("payee"); String newSalesmen=jobjNewValue.getString("salesmen"); - if(!oldPayee.equals(newPayee) || !oldSalesmen.equals(newSalesmen) ){ + if( !oldPayee.equals(newPayee) || !oldSalesmen.equals(newSalesmen) ){ throw new EmisBizError(EmisBizErrorType.FAIL,"已定制账单，销售联系/回款联系人发生改变，请从原账单移除，单号:"+emisSettleSubBill.getBillNo()); } + + // bug: 1412 支付方式发生改变,月结客户发生改变，都需要从账单中移除 + if( !oldPaymentType.equals(newPaymentType)){ + throw new EmisBizError(EmisBizErrorType.FAIL,"已定制账单，支付方式发生改变，请从原账单移除，单号:"+emisSettleSubBill.getBillNo()); + } + + if( !oldCustNo.equals(newCustNo)){ + throw new EmisBizError(EmisBizErrorType.FAIL,"已定制账单，客户发生改变，请从原账单移除，单号:"+emisSettleSubBill.getBillNo()); + } + } }