物流合同增加派车方式字段

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

@@ -97,6 +97,8 @@ 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,6 +53,7 @@ public enum DictTypeEnum {
     CONSIGNMENT_WAY("consignment_way", "托运方式"),
     SETTLEMENT_WAY(" settlement_way", "结算方式"),
     LOAD_UNLOAD_WAY("load_unload_way", "装卸方式"),
+    DISPATCHING_TYPE("dispatching_type", "派车方式"),
     ;
 
     private final String type;

sckw-modules/sckw-contract/src/main/java/com/sckw/contract/model/entity/KwcContractLogistics.java

@@ -52,6 +52,10 @@ public class KwcContractLogistics implements Serializable {
      */
     private Integer trading;
 
+    /**
+     * 派车方式(1手动派车、2自动派车)
+     */
+    private Integer dispatching;
     /**
      * 开始日期
      */

sckw-modules/sckw-contract/src/main/java/com/sckw/contract/model/vo/req/LogisticListReq.java

@@ -128,6 +128,13 @@ public class LogisticListReq implements Serializable {
         @Schema(description = "签约方式")
         private Integer signingWay;
 
+        /**
+         * 派车方式（1手动派车、2自动派车）
+         */
+        @NotNull(message = "派车方式不能为空")
+        @Schema(description = "签约方式,1-手动派车,2-自动派车",example = "1",defaultValue = "1")
+        private Integer dispatching;
+
         /**
          * 生效时间
          */

sckw-modules/sckw-contract/src/main/java/com/sckw/contract/model/vo/res/QueryLogisticDetailResp.java

@@ -134,6 +134,17 @@ public class QueryLogisticDetailResp implements Serializable {
         @Schema(description = "签约方式描述")
         private String signingWayDesc;
 
+        /**
+         * 派车方式（1手动派车、2自动派车）
+         */
+        @Schema(description = "派车方式")
+        private Integer dispatching;
+        /**
+         * 派车方式描述
+         */
+        @Schema(description = "派车方式描述")
+        private String dispatchingDesc;
+
         /**
          * 生效时间
          */

sckw-modules/sckw-contract/src/main/java/com/sckw/contract/model/vo/res/QueryLogisticListResp.java

@@ -76,6 +76,16 @@ public class QueryLogisticListResp implements Serializable {
      */
     @Schema(description = "签约方式描述")
     private String signWayDesc;
+    /**
+     * 派车方式
+     */
+    @Schema(description = "派车方式")
+    private Integer dispatching;
+    /**
+     * 派车方式描述
+     */
+    @Schema(description = "派车方式描述")
+    private String dispatchingDesc;
     /**
      * 合同运输总量
      */

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

@@ -1169,7 +1169,9 @@ public class KwcContractLogisticsService {
         queryLogisticListResp.setSignWay(r.getSigningWay());
         queryLogisticListResp.setSignWayDesc(DictEnum.getLabel(DictTypeEnum.SIGNING_TYPE.getType(),
                 String.valueOf( r.getSigningWay())));
-
+        //设置派车方式和派车方式描述字段
+        queryLogisticListResp.setDispatching(r.getDispatching());
+        queryLogisticListResp.setDispatchingDesc(DictEnum.getLabel(DictTypeEnum.DISPATCHING_TYPE.getType(),String.valueOf(r.getDispatching())));
         queryLogisticListResp.setPerformedAmount(Objects.nonNull(r.getPerformedAmount())
                 ? r.getPerformedAmount().toPlainString() : null);
         List<KwcContractLogisticsGoods> goods = finalContractIdAndGoodsMap.get(r.getId());
@@ -1246,6 +1248,7 @@ public class KwcContractLogisticsService {
         saveContractLogistics.setContractNo(baseInfo.getContractCode());
         saveContractLogistics.setName(baseInfo.getContractName());
         saveContractLogistics.setSigningWay(baseInfo.getSigningWay());
+        saveContractLogistics.setDispatching(baseInfo.getDispatching());
         saveContractLogistics.setStartTime(baseInfo.getStartTime());
         if (Objects.isNull(baseInfo.getEndTime())){
             LocalDate localDate = LocalDate.of(9999, 12, 30);
@@ -1466,6 +1469,11 @@ public class KwcContractLogisticsService {
         tradeBaseInfo.setSigningWay(logistics.getSigningWay());
         tradeBaseInfo.setSigningWayDesc(DictEnum.getLabel(DictTypeEnum.SIGNING_TYPE.getType(),
                 String.valueOf(logistics.getSigningWay())));
+
+        //派车方式
+        tradeBaseInfo.setDispatching(logistics.getDispatching());
+        tradeBaseInfo.setDispatchingDesc(DictEnum.getLabel(DictTypeEnum.DISPATCHING_TYPE.getType(),String.valueOf(logistics.getDispatching())));
+
         tradeBaseInfo.setStartTime(logistics.getStartTime());
         tradeBaseInfo.setCommonPrice(logistics.getCommonPrice());
         tradeBaseInfo.setContractStatus(String.valueOf(logistics.getStatus()));