修改合同接口

zt-module-contract-order/zt-module-contract-order-api/src/main/java/com/zt/plat/module/contractorder/enums/DateConstants.java

@@ -1,4 +1,4 @@
-package com.zt.plat.module.contractorder.enums.contract;
+package com.zt.plat.module.contractorder.enums;
 
 public class DateConstants {
 

zt-module-contract-order/zt-module-contract-order-api/src/main/java/com/zt/plat/module/contractorder/enums/DictTypeConstants.java

@@ -1,11 +1,11 @@
-package com.zt.plat.module.contractorder.enums.contract;
+package com.zt.plat.module.contractorder.enums;
 
 /**
  * 合同字典类型常量
  *
  * @author ZT
  */
-public class ContractDictTypeConstants {
+public class DictTypeConstants {
 
     // 合同状态
     public static String BSE_CTRT_STS = "BSE_CTRT_STS";

zt-module-contract-order/zt-module-contract-order-api/src/main/java/com/zt/plat/module/contractorder/enums/ErrorCodeConstants.java

@@ -16,4 +16,6 @@ public interface ErrorCodeConstants {
     ErrorCode CONTRACT_NAME_EXISTS = new ErrorCode(1_027_000_001, "合同名已存在");
     ErrorCode CONTRACT_PAPER_NUMBER_EXISTS = new ErrorCode(1_027_000_002, "合同编号已存在");
     ErrorCode CONTRACT_NOT_EXISTS = new ErrorCode(1_027_000_003, "合同不存在");
+    ErrorCode CONTRACT_ID_NOT_EXISTS = new ErrorCode(1_027_000_004, "合同主键为空");
+    ErrorCode CONTRACT_STATUS_NOT_UPDATE = new ErrorCode(1_027_000_004, "{}合同不允许修改");
 }

zt-module-contract-order/zt-module-contract-order-api/src/main/java/com/zt/plat/module/contractorder/enums/TableFieldConstants.java

@@ -0,0 +1,58 @@
+package com.zt.plat.module.contractorder.enums;
+
+/**
+ * 表字段常量
+ *
+ * @author ZT
+ */
+public class TableFieldConstants {
+
+    // 表主键
+    public static final String ID = "ID";
+
+    /* 合同主信息表 */
+    // 合同名称;与ERP(HTMC)对应，校验唯一
+    public static final String BSE_CTRT_MAIN_CTRT_NAME = "CTRT_NAME";
+    // 合同编号;与ERP(HTBH)对应，校验唯一
+    public static final String BSE_CTRT_MAIN_CTRT_PPR_NUM = "CTRT_PPR_NUM";
+
+    /* 合同明细表 */
+    // 合同主信息主键
+    public static final String BSE_CTRT_DTL_CTRT_MAIN_ID = "CTRT_MAIN_ID";
+
+    /* 交货计划条款表 */
+    // 合同明细主键
+    public static final String BSE_CTRT_PLN_CTRT_DTL_ID = "CTRT_DTL_ID";
+
+    /* 价款结算条款表 */
+    // 合同明细主键
+    public static final String BSE_CTRT_FMU_CTRT_DTL_ID = "CTRT_DTL_ID";
+
+    /* 基础系数配置表 */
+    // 条款主键
+    public static final String BSE_CTRT_COEF_FMU_ID = "FMU_ID";
+
+    /* 品位等级价配置表 */
+    // 条款主键
+    public static final String BSE_CTRT_GRD_FMU_ID = "FMU_ID";
+
+    /* 调整价配置表 */
+    // 条款主键
+    public static final String BSE_CTRT_DDCT_FMU_ID = "FMU_ID";
+
+    /* 市场价配置表 */
+    // 条款主键
+    public static final String BSE_CTRT_PRC_FMU_ID = "FMU_ID";
+
+    /* 品位不计价配置表 */
+    // 条款主键
+    public static final String BSE_CTRT_NT_FMU_ID = "FMU_ID";
+
+    /* 实例字段值表 */
+    // 关联实例主键
+    public static final String BSE_TMPL_INSC_DAT_INSC_ID = "INSC_ID";
+
+    /* 实例条款值表 */
+    // 关联实例主键
+    public static final String BSE_TMPL_INSC_ITM_INSC_ID = "INSC_ID";
+}

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

@@ -57,12 +57,11 @@ public class ContractController implements BusinessControllerMarker {
         return success(contractViewRespVO);
     }
 
-    // TODO
     @PutMapping("update")
     @Operation(summary = "修改合同")
     @PreAuthorize("@ss.hasPermission('system:contract:update')")
     public CommonResult<Boolean> update(@Valid @RequestBody ContractSaveReqVO reqVO) {
-        return success(true);
+        return success(contractService.update(reqVO));
     }
 
     // TODO

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

@@ -33,7 +33,7 @@ public class ContractFormulaSaveReqVO {
     private String materialNumber;
 
     @Schema(description = "计算小数位")
-    private Long decimalBit;
+    private Long decimalPoint;
 
     @Schema(description = "金属元素编码")
     private String elementNumber;
@@ -44,6 +44,9 @@ public class ContractFormulaSaveReqVO {
     @Schema(description = "金属元素名称", example = "金属元素名称")
     private String elementName;
 
+    @Schema(description = "结算类型，多条使用逗号分隔（字典：PRCH_STLM_TP）", example = "LST")
+    private String settlementType;
+
     // 基础系数配置
     private List<ContractCoefficientSaveReqVO> coefficients;
     // 品位等级价配置

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

@@ -49,5 +49,5 @@ public class ContractPriceSaveReqVO {
     private String averageType;
 
     @Schema(description = "网价小数位")
-    private BigDecimal decimalBit;
+    private BigDecimal decimalPoint;
 }

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

@@ -15,7 +15,7 @@ import java.util.List;
 @Data
 public class ContractSaveReqVO {
 
-    @Schema(description = "主键")
+    @Schema(description = "主键，新增时为空，修改时需要有值")
     @ExcelProperty("主键")
     private Long id;
 

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

@@ -30,7 +30,7 @@ public class ContractViewFormulaRespVO {
     private String materialNumber;
 
     @Schema(description = "计算小数位")
-    private Long decimalBit;
+    private Long decimalPoint;
 
     @Schema(description = "金属元素编码")
     private String elementNumber;

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

@@ -49,5 +49,5 @@ public class ContractViewPriceRespVO {
     private String averageType;
 
     @Schema(description = "网价小数位")
-    private BigDecimal decimalBit;
+    private BigDecimal decimalPoint;
 }