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 b442e8ef7..a0f2c4ae8 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 @@ -3168,8 +3168,16 @@ public class EmisWaybillServiceImpl extends EmisBaseService implements IEmisWayb // 取重方式 String carryType=emisTransProduct.getCarryType(); + + // 获取特殊取重 - EmisSpecialCalcWeight emisSpecialCalcWeight=getValidSpecialCalcWeight(emisTransProduct.getProdCode(),new Date(),BigDecimal.valueOf(maxWeight)); + Date calcDate = emisWaybill.getSendDate(); + if(calcDate==null){ + calcDate=new Date(); + } + + + EmisSpecialCalcWeight emisSpecialCalcWeight=getValidSpecialCalcWeight(emisTransProduct.getProdCode(),calcDate,BigDecimal.valueOf(maxWeight)); if(emisSpecialCalcWeight!=null){ carryType=emisSpecialCalcWeight.getCarryType(); }