Merge branch 'v19.6_carrier_optimization_20240717' into test

performance-web/src/main/java/com/clx/performance/listener/OrderChildDtsListener.java

@@ -263,7 +263,9 @@ public class OrderChildDtsListener  {
         BigDecimal loadNet = after.getLoadNet();//装车净重
         String orderGoodsNo = after.getOrderGoodsNo();//货单号
         log.info("装车净重:{},货单号:{}",loadNet,orderGoodsNo);
-        if(Objects.nonNull(loadNet)) {//装车吨数不为空处理
+        if(Objects.nonNull(loadNet) &&
+                (Objects.equals(after.getStatus(),OrderChildEnum.Status.LOAD.getCode())
+                        || OrderChildEnum.DTS_LISTEN_CANCEL_lIST.contains(after.getStatus()))) {//装车吨数不为空处理
             if (OrderChildEnum.DTS_LISTEN_CANCEL_lIST.contains(after.getStatus())) {
                 //运单取消,货单装车吨数需要减掉
                 loadNet = loadNet.negate();

performance-web/src/main/java/com/clx/performance/sqlProvider/OrderGoodsSqlProvider.java

@@ -384,7 +384,7 @@ public class OrderGoodsSqlProvider {
     public String updateAlreadyLoadWeight(@Param(value = "alreadyLoadWeight") BigDecimal alreadyLoadWeight,@Param(value = "orderGoodsNo") String orderGoodsNo){
         String sql = new SQL() {{
             UPDATE("order_goods")
-                    .SET("already_load_weight = already_load_weight + #{alreadyLoadWeight}")
+                    .SET("already_load_weight = IFNULL(already_load_weight,0) + #{alreadyLoadWeight}")
                     .WHERE("order_goods_no = #{orderGoodsNo}");
 
         }}.toString();