增加派车方式枚举类

sckw-common/sckw-common-core/src/main/java/com/sckw/core/common/enums/enums/DictEnum.java

@@ -97,8 +97,6 @@ public enum DictEnum {
     SETTLEMENT_WAY_2("settlement_way", "2", "线下结算"),
     LOAD_UNLOAD_WAY_1("load_unload_way", "1", "按装货量"),
     LOAD_UNLOAD_WAY_2("load_unload_way", "2", "按卸货量"),
-    DISPATCHING_TYPE_1("dispatching_type", "1", "手动派车"),
-    DISPATCHING_TYPE_2("dispatching_type", "2", "自动派车"),
     ;
 
     private final String type;

sckw-common/sckw-common-core/src/main/java/com/sckw/core/common/enums/enums/DictTypeEnum.java

@@ -53,7 +53,6 @@ public enum DictTypeEnum {
     CONSIGNMENT_WAY("consignment_way", "托运方式"),
     SETTLEMENT_WAY(" settlement_way", "结算方式"),
     LOAD_UNLOAD_WAY("load_unload_way", "装卸方式"),
-    DISPATCHING_TYPE("dispatching_type", "派车方式"),
     GOODS_SPEC("goods_spec", "商品规格"),
     ;
 

sckw-common/sckw-common-core/src/main/java/com/sckw/core/common/enums/enums/DispatchingTypeEnum.java

@@ -0,0 +1,29 @@
+package com.sckw.core.common.enums.enums;
+
+
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+
+/**
+ * @Author: tangyishan
+ * @CreateTime: 2025-12-11  14:13
+ * @Description: 派车方式枚举类
+ */
+@Getter
+@AllArgsConstructor
+public enum DispatchingTypeEnum {
+    MANUAL(1,"手动派车"),
+    AUTO(2,"自动派车");
+
+    private final Integer value;
+    private final String label;
+
+    public static String getLabel(Integer value) {
+        for (DispatchingTypeEnum ele : DispatchingTypeEnum.values()) {
+            if (ele.getValue().equals(value)) {
+                return ele.getLabel();
+            }
+        }
+        return null;
+    }
+}

sckw-modules/sckw-contract/src/main/java/com/sckw/contract/service/operateService/KwcContractLogisticsService.java

@@ -23,6 +23,7 @@ import com.sckw.contract.repository.KwcContractLogisticsUnitRepository;
 import com.sckw.contract.service.*;
 import com.sckw.core.common.enums.enums.DictEnum;
 import com.sckw.core.common.enums.enums.DictTypeEnum;
+import com.sckw.core.common.enums.enums.DispatchingTypeEnum;
 import com.sckw.core.exception.BusinessException;
 import com.sckw.core.exception.SystemException;
 import com.sckw.core.model.constant.Global;
@@ -1181,7 +1182,7 @@ public class KwcContractLogisticsService {
                 String.valueOf( r.getSigningWay())));
         //设置派车方式和派车方式描述字段
         queryLogisticListResp.setDispatching(r.getDispatching());
-        queryLogisticListResp.setDispatchingDesc(DictEnum.getLabel(DictTypeEnum.DISPATCHING_TYPE.getType(),String.valueOf(r.getDispatching())));
+        queryLogisticListResp.setDispatchingDesc(DispatchingTypeEnum.getLabel(r.getDispatching()));
         queryLogisticListResp.setPerformedAmount(Objects.nonNull(r.getPerformedAmount())
                 ? r.getPerformedAmount().toPlainString() : null);
         List<KwcContractLogisticsGoods> goods = finalContractIdAndGoodsMap.get(r.getId());
@@ -1299,14 +1300,14 @@ public class KwcContractLogisticsService {
         saveLogisticListUnit(entIdList, baseInfo, saveContractLogistics.getId(), date,entCacheResDtoMap);
 
         //如果是自动派单合同需要初始化物流企业评分记录和评分记录明细
-        if(Objects.equals(Integer.parseInt(DictEnum.DISPATCHING_TYPE_2.getValue()), baseInfo.getDispatching())){
+        if(DispatchingTypeEnum.AUTO.getValue().equals(baseInfo.getDispatching())){
             logisticsScoreService.initLogisticsScore(baseInfo,entCacheResDtoMap);
         }
         return Boolean.TRUE;
     }
 
     private void checkAutoDispatchingContractEntType(LogisticListReq.TradeBaseInfo baseInfo,Map<Long, EntCacheResDto> entCacheResDtoMap) {
-        if (Objects.equals(Integer.parseInt(DictEnum.DISPATCHING_TYPE_2.getValue()), baseInfo.getDispatching())) {
+        if(DispatchingTypeEnum.AUTO.getValue().equals(baseInfo.getDispatching())){
             EntCacheResDto entCacheResDto = entCacheResDtoMap.get(baseInfo.getProvideEntId());
             if (entCacheResDto != null && !entCacheResDto.getEntTypes().contains(String.valueOf(EntTypeEnum.SUPPLIER.getCode()))) {
                 throw new BusinessException("自动派车合同的托运单位必须为供应商");
@@ -1318,7 +1319,7 @@ public class KwcContractLogisticsService {
         List<KwcContractLogisticsUnit> units = kwcContractLogisticsUnitRepository.queryByEntIdAndEntType(baseInfo.getPurchaseEntId(), EntTypeEnum.LOGISTICS4.getCode());
         if (CollectionUtils.isNotEmpty(units)) {
             Set<Long> contractIdList = units.stream().map(KwcContractLogisticsUnit::getContractId).collect(Collectors.toSet());
-            KwcContractLogistics kwcContractLogistics = kwcContractLogisticsRepository.queryBy(contractIdList,baseInfo.getStartTime(),baseInfo.getEndTime(),Integer.parseInt(DictEnum.DISPATCHING_TYPE_2.getValue()));
+            KwcContractLogistics kwcContractLogistics = kwcContractLogisticsRepository.queryBy(contractIdList,baseInfo.getStartTime(),baseInfo.getEndTime(),DispatchingTypeEnum.AUTO.getValue());
             if (Objects.nonNull(kwcContractLogistics)){
                 throw new BusinessException("当前物流企业在合同时间段内已存在自动派车合同");
             }
@@ -1511,7 +1512,7 @@ public class KwcContractLogisticsService {
 
         //派车方式
         tradeBaseInfo.setDispatching(logistics.getDispatching());
-        tradeBaseInfo.setDispatchingDesc(DictEnum.getLabel(DictTypeEnum.DISPATCHING_TYPE.getType(),String.valueOf(logistics.getDispatching())));
+        tradeBaseInfo.setDispatchingDesc(DispatchingTypeEnum.getLabel(logistics.getDispatching()));
 
         tradeBaseInfo.setStartTime(logistics.getStartTime());
         tradeBaseInfo.setCommonPrice(logistics.getCommonPrice());