Merge remote-tracking branch 'origin/dev' into dev

zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/api/ContractApiImpl.java

@@ -19,7 +19,6 @@ public class ContractApiImpl implements ContractApi {
 
     @Override
     public List<ContractFormulaRespDTO> getFormulas(String contractPaperNumber) {
-        System.out.println("contract feign" + contractPaperNumber);
-        return List.of();
+        return contractService.getFormulasByPaperNumber(contractPaperNumber);
     }
 }

zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/controller/admin/contract/ContractController.java

@@ -148,6 +148,7 @@ public class ContractController implements BusinessControllerMarker {
     @PostMapping("/submit/erp")
     @Operation(summary = "提交ERP")
     @PreAuthorize("@ss.hasPermission('base:contract:erp')")
-    public void submitErp() {
+    public void submitErp(@RequestBody List<Long> ids) {
+        contractService.submitErp(ids);
     }
 }

zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/controller/admin/contract/vo/contract/GradeRespVO.java

@@ -1,20 +1,18 @@
 package com.zt.plat.module.contractorder.controller.admin.contract.vo.contract;
 
 import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.validation.constraints.NotEmpty;
 import lombok.Data;
 
 import java.math.BigDecimal;
+import java.time.LocalDateTime;
 
 @Schema(description = "管理后台 - 品位等级价配置 Response VO")
 @Data
 public class GradeRespVO {
+
     @Schema(description = "主键")
     private Long id;
 
-    @Schema(description = "配置主键")
-    private Long parameterId;
-
     @Schema(description = "条款主键")
     private Long formulaId;
 
@@ -36,28 +34,30 @@ public class GradeRespVO {
     @Schema(description = "品位下限")
     private BigDecimal gradeDown;
 
-    @Schema(description = "是否包含上限;包含则是大于等于，不包含则是大于")
-    private String isInUp;
+    @Schema(description = "区间方式(字典:STLM_RNG_WY)")
+    private String rangeWay;
 
-    @Schema(description = "是否包含下限;包含则是小于等于，不包含则是小于")
-    private String isInDown;
-
-    @Schema(description = "默认计价品位;计价方式为加时，默认为为下限，计价方式为减时，默认为为上限，可手动填写")
+    @Schema(description = "默认计价品位")
     private BigDecimal gradeDefault;
 
-    @Schema(description = "系数;计价类型为阶梯价使用，标识没上升多少系数进行加款还是减款")
+    @Schema(description = "系数值")
     private BigDecimal settlementCoefficient;
 
-    @Schema(description = "不足系数值按比例计算")
+    @Schema(description = "是否比例计算(字典:ERP_CTRT_YN)")
     private String useCoefficient;
 
-    @Schema(description = "计价类型")
+    @Schema(description = "计价类型(字典:STLM_GRD_TP)")
     private String priceType;
 
-    @Schema(description = "是否省内")
-    @NotEmpty(message = "是否省内不能为空")
+    @Schema(description = "是否省内(字典:ERP_CTRT_YN)")
     private String inState;
 
-    @Schema(description = "等级单价")
+    @Schema(description = "等级单价", example = "3565")
     private BigDecimal unitPrice;
+
+    @Schema(description = "创建时间")
+    private LocalDateTime createTime;
+
+    @Schema(description = "数据项类型(字典:GRD_CFG_TP)")
+    private String configType;
 }

zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/controller/admin/contract/vo/contract/GradeSaveReqVO.java

@@ -1,21 +1,18 @@
 package com.zt.plat.module.contractorder.controller.admin.contract.vo.contract;
 
 import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.validation.constraints.NotEmpty;
 import lombok.Data;
+
 import java.math.BigDecimal;
 
 @Schema(description = "管理后台 - 品位等级价配置新增/修改 Request VO")
 @Data
 public class GradeSaveReqVO {
 
-    @Schema(description = "主键", requiredMode = Schema.RequiredMode.REQUIRED, example = "15414")
+    @Schema(description = "主键", requiredMode = Schema.RequiredMode.REQUIRED, example = "6211")
     private Long id;
 
-    @Schema(description = "配置主键", example = "16734")
-    private Long parameterId;
-
-    @Schema(description = "条款主键", example = "15344")
+    @Schema(description = "条款主键", example = "2426")
     private Long formulaId;
 
     @Schema(description = "金属元素编码")
@@ -24,7 +21,7 @@ public class GradeSaveReqVO {
     @Schema(description = "金属元素缩写")
     private String elementAbbreviation;
 
-    @Schema(description = "金属元素名称", example = "芋艿")
+    @Schema(description = "金属元素名称", example = "王五")
     private String elementName;
 
     @Schema(description = "品位单位")
@@ -36,28 +33,27 @@ public class GradeSaveReqVO {
     @Schema(description = "品位下限")
     private BigDecimal gradeDown;
 
-    @Schema(description = "是否包含上限;包含则是大于等于，不包含则是大于")
-    private String isInUp;
+    @Schema(description = "区间方式(字典:STLM_RNG_WY)")
+    private String rangeWay;
 
-    @Schema(description = "是否包含下限;包含则是小于等于，不包含则是小于")
-    private String isInDown;
-
-    @Schema(description = "默认计价品位;计价方式为加时，默认为为下限，计价方式为减时，默认为为上限，可手动填写")
+    @Schema(description = "默认计价品位")
     private BigDecimal gradeDefault;
 
-    @Schema(description = "系数;计价类型为阶梯价使用，标识没上升多少系数进行加款还是减款")
+    @Schema(description = "系数值")
     private BigDecimal settlementCoefficient;
 
-    @Schema(description = "不足系数值按比例计算")
+    @Schema(description = "是否比例计算(字典:ERP_CTRT_YN)")
     private String useCoefficient;
 
-    @Schema(description = "计价类型", example = "2")
+    @Schema(description = "计价类型(字典:STLM_GRD_TP)", example = "2")
     private String priceType;
 
-    @Schema(description = "是否省内", requiredMode = Schema.RequiredMode.REQUIRED)
-    @NotEmpty(message = "是否省内不能为空")
+    @Schema(description = "是否省内(字典:ERP_CTRT_YN)")
     private String inState;
 
-    @Schema(description = "等级单价", example = "26237")
+    @Schema(description = "等级单价", example = "3565")
     private BigDecimal unitPrice;
+
+    @Schema(description = "数据项类型(字典:GRD_CFG_TP)", example = "1")
+    private String configType;
 }

zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/controller/admin/contract/vo/contract/PriceRespVO.java

@@ -12,9 +12,6 @@ public class PriceRespVO {
     @Schema(description = "主键")
     private Long id;
 
-    @Schema(description = "配置主键")
-    private Long parameterId;
-
     @Schema(description = "条款主键")
     private Long formulaId;
 

zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/controller/admin/contract/vo/contract/PriceSaveReqVO.java

@@ -12,9 +12,6 @@ public class PriceSaveReqVO {
     @Schema(description = "主键", requiredMode = Schema.RequiredMode.REQUIRED, example = "13654")
     private Long id;
 
-    @Schema(description = "配置主键", example = "1590")
-    private Long parameterId;
-
     @Schema(description = "条款主键", example = "24677")
     private Long formulaId;
 

zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/dal/dataobject/contract/ContractGradeDO.java

@@ -29,11 +29,6 @@ public class ContractGradeDO extends BusinessBaseDO {
      */
     @TableId(type = IdType.ASSIGN_ID)
     private Long id;
-    /**
-     * 配置主键
-     */
-    @TableField("PRM_ID")
-    private Long parameterId;
     /**
      * 条款主键
      */
@@ -70,37 +65,32 @@ public class ContractGradeDO extends BusinessBaseDO {
     @TableField("GRD_DOWN")
     private BigDecimal gradeDown;
     /**
-     * 是否包含上限;包含则是大于等于，不包含则是大于
+     * 区间方式(字典:STLM_RNG_WY)
      */
-    @TableField("IS_IN_UP")
-    private String isInUp;
+    @TableField("RNG_WY")
+    private String rangeWay;
     /**
-     * 是否包含下限;包含则是小于等于，不包含则是小于
-     */
-    @TableField("IS_IN_DOWN")
-    private String isInDown;
-    /**
-     * 默认计价品位;计价方式为加时，默认为为下限，计价方式为减时，默认为为上限，可手动填写
+     * 默认计价品位
      */
     @TableField("GRD_DFT")
     private BigDecimal gradeDefault;
     /**
-     * 系数;计价类型为阶梯价使用，标识没上升多少系数进行加款还是减款
+     * 系数值
      */
     @TableField("STLM_COEF")
     private BigDecimal settlementCoefficient;
     /**
-     * 不足系数值按比例计算
+     * 是否比例计算(字典:ERP_CTRT_YN)
      */
     @TableField("USE_COEF")
     private String useCoefficient;
     /**
-     * 计价类型
+     * 计价类型(字典:STLM_GRD_TP)
      */
     @TableField("PRC_TP")
     private String priceType;
     /**
-     * 是否省内
+     * 是否省内(字典:ERP_CTRT_YN)
      */
     @TableField("IN_STA")
     private String inState;
@@ -109,4 +99,9 @@ public class ContractGradeDO extends BusinessBaseDO {
      */
     @TableField("UPRC")
     private BigDecimal unitPrice;
+    /**
+     * 数据项类型(字典:GRD_CFG_TP)
+     */
+    @TableField("CFG_TP")
+    private String configType;
 }

zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/dal/dataobject/contract/ContractPriceDO.java

@@ -30,11 +30,6 @@ public class ContractPriceDO extends BusinessBaseDO {
      */
     @TableId(type = IdType.ASSIGN_ID)
     private Long id;
-    /**
-     * 配置主键
-     */
-    @TableField("PRM_ID")
-    private Long parameterId;
     /**
      * 条款主键
      */

zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/service/contract/ContractService.java

@@ -1,6 +1,7 @@
 package com.zt.plat.module.contractorder.service.contract;
 
 import com.zt.plat.framework.common.pojo.PageResult;
+import com.zt.plat.module.contractorder.api.dto.ContractFormulaRespDTO;
 import com.zt.plat.module.contractorder.controller.admin.contract.vo.contract.*;
 import com.zt.plat.module.contractorder.dal.dataobject.contract.ContractMainDO;
 import jakarta.validation.Valid;
@@ -85,4 +86,20 @@ public interface ContractService {
      * @return 结算公式列表
      */
     List<FormulaRespVO> getFormulas(FormulasQueryReqVO queryReqVO);
+
+    /**
+     * 通过合同编号获取对应的结算条款数据
+     *
+     * @param contractPaperNumber 合同编号
+     * @return 结算条款数据
+     */
+    List<ContractFormulaRespDTO> getFormulasByPaperNumber(String contractPaperNumber);
+
+    /**
+     * 提交ERP
+     *
+     * @param ids 合同ID集合
+     * @return
+     */
+    void submitErp(List<Long> ids);
 }