md
This commit is contained in:
parent
bcd33d76ff
commit
fb2d28c28a
@ -3168,8 +3168,16 @@ public class EmisWaybillServiceImpl extends EmisBaseService implements IEmisWayb
|
|||||||
// 取重方式
|
// 取重方式
|
||||||
String carryType=emisTransProduct.getCarryType();
|
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){
|
if(emisSpecialCalcWeight!=null){
|
||||||
carryType=emisSpecialCalcWeight.getCarryType();
|
carryType=emisSpecialCalcWeight.getCarryType();
|
||||||
}
|
}
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user