Merge branch 'dev' into 'test'

条款新增bug修复

See merge request jygk/dsc-base!10

zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/controller/admin/templtp/vo/TemplateInstanceItemSaveReqVO.java

@@ -21,7 +21,7 @@ public class TemplateInstanceItemSaveReqVO {
     private String itmId;
 
     @Schema(description = "用户填写的值", requiredMode = Schema.RequiredMode.REQUIRED)
-    @NotEmpty(message = "用户填写的值不能为空")
+//    @NotEmpty(message = "用户填写的值不能为空")
     private String val;
 
 }

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

@@ -17,5 +17,6 @@ public interface ErrorCodeConstants {
     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, "{}合同不允许修改");
+    ErrorCode CONTRACT_STATUS_NOT_UPDATE = new ErrorCode(1_027_000_005, "{}合同不允许修改");
+    ErrorCode CONTRACT_DATA_NOT_EXISTS = new ErrorCode(1_027_000_006, "{}不存在");
 }

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

@@ -0,0 +1,7 @@
+package com.zt.plat.module.contractorder.enums;
+
+public class ProcessConstants {
+
+    // 合同审批流程
+    public static String CONTRACT_APPROVAL_PROCESS = "contract_approval_process";
+}

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

@@ -13,12 +13,86 @@ public class TableFieldConstants {
     /* 合同主信息表 */
     // 合同名称;与ERP(HTMC)对应，校验唯一
     public static final String BSE_CTRT_MAIN_CTRT_NAME = "CTRT_NAME";
+    public static final String BSE_CTRT_MAIN_CTRT_NAME_LABEL = "合同名称";
     // 合同编号;与ERP(HTBH)对应，校验唯一
     public static final String BSE_CTRT_MAIN_CTRT_PPR_NUM = "CTRT_PPR_NUM";
+    public static final String BSE_CTRT_MAIN_CTRT_PPR_NUM_LABEL = "合同编号";
+    // 甲方公司编号
+    public static final String BSE_CTRT_MAIN_PRCH_CPN_NUM_LABEL = "甲方公司编号";
+    // 甲方公司名称
+    public static final String BSE_CTRT_MAIN_PRCH_CPN_NAME_LABEL = "甲方公司名称";
+    // 甲方地址
+    public static final String BSE_CTRT_MAIN_PRCH_ADR_LABEL = "甲方地址";
+    // 甲方法定代表人
+    public static final String BSE_CTRT_MAIN_PRCH_LDR_LABEL = "甲方法定代表人";
+    // 乙方公司编号
+    public static final String BSE_CTRT_MAIN_SALE_CPN_NUM_LABEL = "乙方公司编号";
+    // 乙方公司名称
+    public static final String BSE_CTRT_MAIN_SALE_CPN_NAME_LABEL = "乙方公司名称";
+    // 乙方地址
+    public static final String BSE_CTRT_MAIN_SALE_ADR_LABEL = "乙方地址";
+    // 乙方法定代表人
+    public static final String BSE_CTRT_MAIN_SALE_PRCH_LDR_LABEL = "乙方法定代表人";
+    // 类别
+    public static final String BSE_CTRT_MAIN_CTGR_LABEL = "类别";
+    // 收支性质
+    public static final String BSE_CTRT_MAIN_DRCT_LABEL = "收支性质";
+    // 签署日期
+    public static final String BSE_CTRT_MAIN_SGN_DT_LABEL = "签署日期";
+    // 开始日期
+    public static final String BSE_CTRT_MAIN_STRT_DT_LABEL = "开始日期";
+    // 结束日期
+    public static final String BSE_CTRT_MAIN_END_DT_LABEL = "结束日期";
+    // 签署地
+    public static final String BSE_CTRT_MAIN_SGN_PLCE_LABEL = "签署地";
+    // 币种
+    public static final String BSE_CTRT_MAIN_CUR_LABEL = "币种";
+    // 本币金额
+    public static final String BSE_CTRT_MAIN_BSC_AMT_LABEL = "本币金额";
+    // 原币金额
+    public static final String BSE_CTRT_MAIN_COO_AMT_LABEL = "原币金额";
+    // 是否有履约保证金
+    public static final String BSE_CTRT_MAIN_HS_DPST_LABEL = "是否有履约保证金";
+    // 原币履约保证金
+    public static final String BSE_CTRT_MAIN_COO_AMT_DPST_LABEL = "原币履约保证金";
+    // 本币履约保证金
+    public static final String BSE_CTRT_MAIN_BSC_AMT_DPST_LABEL = "本币履约保证金";
+    // 是否有预付款
+    public static final String BSE_CTRT_MAIN_HS_PPYM_LABEL = "是否有预付款";
+    // 预付款比例
+    public static final String BSE_CTRT_MAIN_PPYM_RTIO_LABEL = "预付款比例";
+    // 预付款金额
+    public static final String BSE_CTRT_MAIN_PPYM_AMT_LABEL = "预付款金额";
+    // 是否有质保金
+    public static final String BSE_CTRT_MAIN_HS_QLT_AMT_LABEL = "是否有质保金";
+    // 质保金比例
+    public static final String BSE_CTRT_MAIN_QLT_RTIO_LABEL = "质保金比例";
+    // 质保金金额
+    public static final String BSE_CTRT_MAIN_QLT_AMT_LABEL = "质保金金额";
+    // 是否先款后货
+    public static final String BSE_CTRT_MAIN_HS_PYBL_LABEL = "是否先款后贷";
+    // 是否框架合同
+    public static final String BSE_CTRT_MAIN_IS_FMWK_LABEL = "是否框架合同";
+    // 境内/境外
+    public static final String BSE_CTRT_MAIN_IS_DOM_LABEL = "境内/境外";
+    // 施工类型编号
+    public static final String BSE_CTRT_MAIN_CON_TP_NUM_LABEL = "施工类型编号";
+    // 施工类型名称
+    public static final String BSE_CTRT_MAIN_CON_TP_NAME_LABEL = "施工类型名称";
+    // 代理方
+    public static final String BSE_CTRT_MAIN_AGT_LABEL = "代理方";
+    // 是否虚拟合同
+    public static final String BSE_CTRT_MAIN_CTRT_VRTL_LABEL = "是否虚拟合同";
 
     /* 合同明细表 */
     // 合同主信息主键
     public static final String BSE_CTRT_DTL_CTRT_MAIN_ID = "CTRT_MAIN_ID";
+    // 物料名称
+    public static final String BSE_CTRT_DTL_MTRL_NAME_LABEL = "物料名称";
+    // 数量
+    public static final String BSE_CTRT_DTL_QTY_LABEL = "数量";
+    // 计量单位
+    public static final String BSE_CTRT_DTL_UNT_LABEL = "计量单位";
 
     /* 交货计划条款表 */
     // 合同明细主键

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

@@ -0,0 +1,47 @@
+package com.zt.plat.module.contractorder.enums.contract;
+
+/**
+ * ERP是否枚举
+ */
+public enum ErpCtrtYesNoEnum {
+
+    /**
+     * 是
+     */
+    YES("是","1",null),
+    /**
+     * 否
+     */
+    NO("否","0",null);
+
+    ErpCtrtYesNoEnum(String label, String code, String remark) {
+        this.label = label;
+        this.code = code;
+        this.remark = remark;
+    }
+
+    /**
+     * 字典标签
+     */
+    private final String label;
+    /**
+     * 字典编码
+     */
+    private final String code;
+    /**
+     * 备注
+     */
+    private final String remark;
+
+    public String getLabel() {
+        return label;
+    }
+
+    public String getCode() {
+        return code;
+    }
+
+    public String getRemark() {
+        return remark;
+    }
+}

zt-module-contract-order/zt-module-contract-order-server/pom.xml

@@ -129,8 +129,12 @@
         <dependency>
             <groupId>com.zt.plat</groupId>
             <artifactId>zt-module-base-server</artifactId>
-            <version>3.0.41</version>
+            <version>${revision}</version>
-            <scope>compile</scope>
+        </dependency>
+        <dependency>
+            <groupId>com.zt.plat</groupId>
+            <artifactId>zt-module-bpm-api</artifactId>
+            <version>${revision}</version>
         </dependency>
     </dependencies>
 

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

@@ -102,10 +102,11 @@ public class ContractController implements BusinessControllerMarker {
     }
 
     // TODO
-    @PostMapping("/submit/approval")
+    @GetMapping("/submit/approval")
-    @Operation(summary = "提交审批")
+    @Operation(summary = "合同提交审批")
     @PreAuthorize("@ss.hasPermission('system:contract:approval')")
-    public void submitApproval() {
+    public CommonResult<String> submitApproval(@RequestParam("id") Long id) {
+        return success(contractService.submitApproval(id));
     }
 
     // TODO

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

@@ -28,6 +28,9 @@ public class ContractDetailSaveReqVO {
     @Schema(description = "含税单价", example = "28579")
     private BigDecimal inTaxUnitPrice;
 
+    @Schema(description = "含税总价")
+    private BigDecimal allInTaxUnitPrice;
+
     @Schema(description = "金属元素缩写", example = "金属元素缩写")
     private String elementAbbreviation;
 

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

@@ -209,6 +209,14 @@ public class ContractSaveReqVO {
     @ExcelProperty("达到收款条件金额;与ERP(DDSKJE)对应，拓展信息，销售合同，且类型为SAP02COSR必填")
     private BigDecimal payeeConditionAmount;
 
+    @Schema(description = "附件对象存储")
+    @ExcelProperty("附件对象存储")
+    private String fileObject;
+
+    @Schema(description = "其它附件对象存储")
+    @ExcelProperty("其它附件对象存储")
+    private String fileObjectOther;
+
     // 模板部分查询
     @Schema(description = "模板实例主键", example = "10196")
     @ExcelProperty("模板实例主键")

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

@@ -73,4 +73,9 @@ public class ContractDetailDO extends BusinessBaseDO {
      */
     @TableField("ELEM_NUM")
     private String elementNumber;
+    /**
+     * 含税总价
+     */
+    @TableField("ALL_IN_TAX_UPRC")
+    private BigDecimal allInTaxUnitPrice;
 }