提交贸易合同新增计量方式

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", "按卸货量"),
+    MEASUREMENT_WAY_1("measurement_way", "1", "地磅自动计算"),
+    MEASUREMENT_WAY_2("measurement_way", "2", "司机填报"),
     ;
 
     private final String type;

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

@@ -205,6 +205,17 @@ public class ContractDetailResp implements Serializable {
          */
         @Schema(description = "销售联系电话")
         private String salesmanPhone;
+
+        /**
+         * 计量方式
+         */
+        @Schema(description = "计量方式 1-地磅自动计算，2-司机填报")
+        private Integer measurementWay;
+        /**
+         * 计量方式描述
+         */
+        @Schema(description = "计量方式描述")
+        private String measurementWayDesc;
     }
     @Data
     public static class TradeGoodsInfo implements Serializable{

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

@@ -1571,6 +1571,8 @@ public class KwcContractTradeService {
                 String.valueOf(kwcContractTrade.getUnloadWay())));
         tradeBaseInfo.setSalesmanId(kwcContractTrade.getSalesmanId());
         tradeBaseInfo.setSalesmanPhone(kwcContractTrade.getSalesmanPhone());
+        tradeBaseInfo.setMeasurementWay(Objects.equals(kwcContractTrade.getMeasurementWay(),-1) ? null:kwcContractTrade.getMeasurementWay());
+        tradeBaseInfo.setMeasurementWayDesc(Objects.equals(kwcContractTrade.getMeasurementWay(),-1) ? "" : DictEnum.getLabel(String.valueOf(kwcContractTrade.getMeasurementWay())));
         tradeBaseInfo.setDispatchWay(kwcContractTrade.getDispatchWay());
         tradeBaseInfo.setDispatchWayDesc(Optional.ofNullable(kwcContractTrade.getDispatchWay()).map(DispatchWayEnums::getDesc).orElse(""));
         return tradeBaseInfo;