Merge remote-tracking branch 'origin/v12.0_last_truck_20240306' into test

performance-web/src/main/java/com/clx/performance/service/impl/LastTruckServiceImpl.java

@@ -49,10 +49,10 @@ public class LastTruckServiceImpl implements LastTruckService {
             return null;
         }
         BigDecimal weight = orderChildDao.listAfterArrayReceiveChild(orderNo);
-        //判断当前订单下所有到达目的地之后的运单的装车吨数 + 向下浮动量 >= 订单拉运吨数
-        log.info("订单号:{} ,计算是否到达可计算最后一车标准，运单累计拉运吨数：{}, 向下浮动量:{},订单拉运吨数:{}",
-                orderNo,weight,orderInfo.getDownFloatWeight(),orderInfo.getTransportWeight());
-        if(Objects.nonNull(weight) && weight.add(new BigDecimal(orderInfo.getDownFloatWeight())).compareTo(orderInfo.getTransportWeight()) >= 0){
+        //判断当前订单下所有到达目的地之后的运单的装车吨数  >= （订单拉运吨数 -35吨）
+        log.info("订单号:{} ,计算是否到达可计算最后一车标准，运单累计拉运吨数：{}, 订单拉运吨数:{}",
+                orderNo,weight,orderInfo.getTransportWeight());
+        if(Objects.nonNull(weight) && weight.compareTo(orderInfo.getTransportWeight().subtract(new BigDecimal("35"))) >= 0){
             //查询最后一车的运单
             OrderChild child = orderChildDao.getLastTruckChild(orderNo);
             log.info("当前订单计算出最后一车，运单编号：{} ", child.getChildNo());