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 dace4961e..296898334 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 @@ -259,7 +259,9 @@ public class EmisBaseService { String newSettleType=getWaybillSettleType(newBill); // 结算方式相同,判断增加的额度是否在范围内 - if (oldSettleType.equals(newSettleType) && oldBill.getCustNo().equals(newBill.getCustNo())) { + if (oldSettleType.equals(newSettleType) && + (oldBill.getPayee().equals(newBill.getPayee()) || + oldBill.getCustNo().equals(newBill.getCustNo()))) { BigDecimal changeMoney=newBill.getFreight().subtract(oldBill.getFreight()); if(changeMoney.compareTo(BigDecimal.ZERO)>0){ if("2".equals(newSettleType)){