Merge remote-tracking branch 'origin/v5.5_settlement_20231011' into v5.5_settlement_20231011

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

@@ -1184,8 +1184,12 @@ public class OrderChildServiceImpl implements OrderChildService {
      * 运单拉运吨数计算
      */
     private BigDecimal orderChildWeightCalc(OrderChild orderChild){
-        if (orderChild.getLoadNet() == null) {return orderChild.getTruckLoad();}
-        else {return orderChild.getLoadNet();}
+        if (orderChild.getUnloadNet() != null) {
+            return orderChild.getUnloadNet().compareTo(orderChild.getLoadNet()) < 0? orderChild.getUnloadNet() : orderChild.getLoadNet();
+        }
+        if (orderChild.getLoadNet() != null) {return orderChild.getLoadNet();}
+
+        return orderChild.getTruckLoad();
     }
 
     /**