This commit is contained in:
linfso 2024-04-29 17:53:31 +08:00
parent fbb725e4be
commit 3dfef50536

View File

@ -356,7 +356,7 @@ public class EmisWaybillServiceImpl extends EmisBaseService implements IEmisWayb
* 计算逻辑,获取表达式进行计算 * 计算逻辑,获取表达式进行计算
*/ */
if(isAnyEmpty(emisWaybill.getProductType(), if(StringUtils.isAnyEmpty(emisWaybill.getProductType(),
emisWaybill.getSendSiteCode(), emisWaybill.getSendSiteCode(),
emisWaybill.getDispatchUnderlingSiteCode(), emisWaybill.getDispatchUnderlingSiteCode(),
emisWaybill.getCalcFeeType() emisWaybill.getCalcFeeType()
@ -460,14 +460,14 @@ public class EmisWaybillServiceImpl extends EmisBaseService implements IEmisWayb
@Override @Override
public void calcSettledWeight(EmisWaybill emisWaybill) throws CalcException { public void calcSettledWeight(EmisWaybill emisWaybill) throws CalcException {
if( if (
isAnyEmpty(emisWaybill.getProductType(), StringUtils.isAnyEmpty(emisWaybill.getProductType(), emisWaybill.getTransLineType())
emisWaybill.getTransLineType(), || emisWaybill.getBillWeight() == null
emisWaybill.getBillWeight(), || emisWaybill.getTotalVolume() == null
emisWaybill.getTotalVolume()
) )
){ {
throw new CalcException("E2001","参数不完整");
throw new CalcException("E2001", "参数不完整");
} }
double billWeight=emisWaybill.getBillWeight().doubleValue(); double billWeight=emisWaybill.getBillWeight().doubleValue();