1、4.2物流订单关联运单查询报错修复；

sckw-modules/sckw-transport/src/main/java/com/sckw/transport/service/KwtWaybillOrderV1Service.java

@@ -378,10 +378,10 @@ public class KwtWaybillOrderV1Service {
             waybillOrder.setFirmName(ents.get(waybillOrder.getEntId()) != null ? ents.get(waybillOrder.getEntId()).getFirmName() : null);
             waybillOrder.setCreateByName(usersMap.get(waybillOrder.getCreateBy()) != null ? usersMap.get(waybillOrder.getCreateBy()).getName() : null);
             waybillOrder.setCreateByPhone(usersMap.get(waybillOrder.getCreateBy()) != null ? usersMap.get(waybillOrder.getCreateBy()).getPhone() : null);
-            waybillOrder.setSendCarWeigh(new BigDecimal(waybillOrder.getEntrustAmount().toString()));
-            waybillOrder.setDefectiveWeigh(new BigDecimal(waybillOrder.getDeficitAmount().toString()));
-            waybillOrder.setDeduct(deficitPrice(new BigDecimal(waybillOrder.getLoadAmount().toString()),
-                                                new BigDecimal(waybillOrder.getDeficitAmount().toString()),
+            waybillOrder.setSendCarWeigh(NumberUtils.parseBigDecimal(waybillOrder.getEntrustAmount()));
+            waybillOrder.setDefectiveWeigh(NumberUtils.parseBigDecimal(waybillOrder.getDeficitAmount()));
+            waybillOrder.setDeduct(deficitPrice(NumberUtils.parseBigDecimal(waybillOrder.getLoadAmount(), null),
+                                                NumberUtils.parseBigDecimal(waybillOrder.getDeficitAmount(), null),
                                                 waybillOrder.getLoss(),
                                                 waybillOrder.getLossLabel(),
                                                 waybillOrder.getGoodsPrice()));
@@ -2742,7 +2742,7 @@ public class KwtWaybillOrderV1Service {
     public static BigDecimal deficitPrice(BigDecimal loadAmount, BigDecimal deficitAmount, BigDecimal loss,
                                           String lossUnit, BigDecimal goodsPrice) {
         //亏吨<=0
-        if (deficitAmount == null && deficitAmount.compareTo(new BigDecimal(Global.AMOUNT)) <= 0) {
+        if (deficitAmount == null || deficitAmount.doubleValue() <= 0) {
             return new BigDecimal(Global.AMOUNT);
         }
         //承运订单亏吨扣款=（承运订单亏吨量 -（承运订单装货量 * 承运订单合理损耗））* 扣亏货值