Merge branch 'v24.8_pendingWeight_20240905'

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

@@ -74,6 +74,7 @@ public class OrderGoodsDtsListener {
             if(Objects.equals(updateType,DtsOperationTypeEnum.UPDATE.getCode())
             && (!Objects.equals(before.getOrderGoodsStatus(),after.getOrderGoodsStatus())
                 || !Objects.equals(before.getSeniorLogisticsManagerId(),after.getSeniorLogisticsManagerId())
+                || !Objects.equals(before.getExtractWeight(),after.getExtractWeight())
                 || !Objects.equals(before.getPendingOrderFreight(),after.getPendingOrderFreight())
             )){
                 isSend = true;

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

@@ -39,6 +39,7 @@ public interface OrderGoodsMapper extends BaseMapper<OrderGoods> {
 
     @Update(" update order_goods set " +
             " already_transport_weight = already_transport_weight - #{residueWeight}," +
+            " extract_weight = already_transport_weight," +
             "order_goods_status = #{orderGoodsStatus} " +
             " where id = #{id}")
     void updateOrderGoodsWeightAlreadyAndStatus(@Param("id") Integer id, @Param("residueWeight") BigDecimal residueWeight, @Param("orderGoodsStatus") Integer orderGoodsStatus);

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

@@ -19,10 +19,7 @@ import com.clx.performance.dao.OrderGoodsDao;
 import com.clx.performance.dao.PerformanceProgressDao;
 import com.clx.performance.dao.PerformanceProgressLogDao;
 import com.clx.performance.dto.gd.GdRouteDTO;
-import com.clx.performance.enums.OrderChildEnum;
-import com.clx.performance.enums.OrderEnum;
-import com.clx.performance.enums.PerformanceProgressEnum;
-import com.clx.performance.enums.ResultEnum;
+import com.clx.performance.enums.*;
 import com.clx.performance.extranal.user.AddressService;
 import com.clx.performance.extranal.user.OrderService;
 import com.clx.performance.model.OrderChild;
@@ -452,7 +449,7 @@ public class PerformanceProgressServiceImpl  implements PerformanceProgressServi
             //最后一个挂单中的货单的挂单时间为最早的挂单时间
             firstPendingTime = item.getPendingOrderTime();
 
-            pendingWeight = pendingWeight.add(item.getExtractWeight());
+            pendingWeight = pendingWeight.add(calcPendingWeight(item));
 
         }
         PerformanceProgress update = new PerformanceProgress();
@@ -463,6 +460,17 @@ public class PerformanceProgressServiceImpl  implements PerformanceProgressServi
         update.setPendingWeight(pendingWeight);
         performanceProgressDao.updateEntityByKey(update);
     }
+
+    //计算履约进度表货单的挂单吨数
+    private BigDecimal calcPendingWeight(OrderGoods item){
+        if(Objects.equals(item.getOrderGoodsStatus(), OrderGoodsStatusEnum.Status.CANCEL.getCode())){
+            return Objects.nonNull(item.getAlreadyTransportWeight())?item.getAlreadyTransportWeight():BigDecimal.ZERO;
+        }
+        return item.getExtractWeight();
+    }
+
+
+
     //履约进度表----运单部分
     @Override
     public void dealPerformanceProgress4OrderChild(OrderChild data) {