Merge branch 'refs/heads/v16.3_line_warn_20240528' into test

performance-web/src/main/java/com/clx/performance/mapper/OrderChildMapper.java

@@ -118,13 +118,13 @@ public interface OrderChildMapper extends BaseMapper<OrderChild> {
                           Integer sendSystemAddressId, Integer receiveSystemAddressId,
                           String beginTime);
 
-    @Select("select sum(weight) from order_child where order_goods_no=#{orderGoodsNo} and status in(10,20,30,40,50,60,70,80,90,100)")
+    @Select("select sum(if (unload_net>load_net, load_net, unload_net)) from order_child where order_goods_no=#{orderGoodsNo} and status in(10,20,30,40,50,60,70,80,90,100)")
     BigDecimal sumTakeWeightByOrderGoodsNo(String orderGoodsNo);
 
-    @Select("select sum(weight) from order_child where order_goods_no=#{orderGoodsNo} and status in(50,60,70,80,90,100)")
+    @Select("select sum(load_net) from order_child where order_goods_no=#{orderGoodsNo} and status in(50,60,70,80,90,100)")
     BigDecimal sumLoadWeightByOrderGoodsNo(String orderGoodsNo);
 
-    @Select("select sum(weight) from order_child where order_goods_no=#{orderGoodsNo} and status in(80,90,100)")
+    @Select("select sum(unload_net) from order_child where order_goods_no=#{orderGoodsNo} and status in(80,90,100)")
     BigDecimal sumUnloadWeightByOrderGoodsNo(String orderGoodsNo);