zgty/zt-base
9
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'refs/heads/dev' into test

Browse Source
This commit is contained in:
liss
2025-10-17 18:01:18 +08:00
parent 599e2a56ef 5604fd596a
commit fe6720a473
84 changed files with 4307 additions and 874 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
zt-module-contract-order/zt-module-contract-order-api/src/main/java/com/zt/plat/module/contractorder/api/dto/contract/DeductRespDTO.java
View File

@@ -16,6 +16,9 @@ public class DeductRespDTO {
@Schema(description = "条款主键")
private Long formulaId;
@Schema(description = "金属元素缩写")
private String elementAbbreviation;
@Schema(description = "数据项类型(字典:GRD_CFG_TP)")
private String configType;
@@ -25,6 +28,18 @@ public class DeductRespDTO {
@Schema(description = "调整价")
private BigDecimal gradeAmount;
@Schema(description = "区间方式(字典：STLM_RNG_WY)")
private String rangeWay;
@Schema(description = "上限")
private String up;
@Schema(description = "下限")
private String down;
@Schema(description = "类型(字典：STLM_COEF)")
private String type;
@Schema(description = "创建时间")
private LocalDateTime createTime;
}

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

@@ -25,4 +25,5 @@ public interface ErrorCodeConstants {
ErrorCode CONTRACT_STATUS_NOT_DELETE = new ErrorCode(1_027_000_010, "{}状态合同不允许删除");
ErrorCode CONTRACT_ERP_RCV_DLVY_NOT_EXISTS = new ErrorCode(1_027_000_011, "不存在的收支类型或收支类型为空");
ErrorCode CONTRACT_STATUS_NOT_ARCHIVE = new ErrorCode(1_027_000_012, "{}状态合同不允许归档");
ErrorCode CONTRACT_STATUS_NOT_SUBMIT_ERP = new ErrorCode(1_027_000_013, "{}状态合同不允许提交ERP");
}

5
zt-module-contract-order/zt-module-contract-order-api/src/main/java/com/zt/plat/module/contractorder/enums/contract/DictEnum.java
View File

@@ -5,6 +5,11 @@ package com.zt.plat.module.contractorder.enums.contract;
*/
public enum DictEnum {
/** ERP请求状态 */
ERP_REQ_STS_RLBK("失败","RLBK",null),
ERP_REQ_STS_RCVG("执行中","RCVG",null),
ERP_REQ_STS_FIND("成功","FIND",null),
ERP_REQ_STS_WAIT("待上传","WAIT",null),
/** 业务关联类型 */
BSE_SYS_REL_TP_ORDER("订单","ORDER",null),
BSE_SYS_REL_TP_CONTRACT("合同","CONTRACT",null),

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

@@ -135,18 +135,17 @@ public class ContractController implements BusinessControllerMarker {
return success(contractService.submitApproval(id));
}
// TODO
@PostMapping("/approval")
@Operation(summary = "合同审批 TODO")
@Operation(summary = "合同审批")
@PreAuthorize("@ss.hasPermission('base:contract:approval')")
public CommonResult<String> approval(@Valid @RequestBody ApprovalReqVO reqVO) {
public CommonResult<Boolean> approval(@Valid @RequestBody ApprovalReqVO reqVO) {
return success(contractService.approval(reqVO));
}
@PostMapping("/submit/erp")
@Operation(summary = "提交ERP")
@PreAuthorize("@ss.hasPermission('base:contract:erp')")
public CommonResult<List<String>> submitErp(@RequestBody List<Long> ids) {
public CommonResult<Boolean> submitErp(@RequestBody List<Long> ids) {
return success(contractService.submitErp(ids));
}

8
zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/controller/admin/contract/vo/contract/ApprovalReqVO.java
View File

@@ -13,11 +13,11 @@ public class ApprovalReqVO {
@NotNull(message = "合同主键ID不能为空")
private Long id;
@Schema(description = "审核结果(通过：PASS，驳回：REJECT)", requiredMode = Schema.RequiredMode.REQUIRED)
@NotBlank(message = "审核结果不能为空")
private String auditResult;
@Schema(description = "审批意见", requiredMode = Schema.RequiredMode.REQUIRED)
@NotBlank(message = "审核意见不能为空")
private String reviewOpinion;
@Schema(description = "状态：待推送 WAIT_PUSH，已驳回 REJECTED", requiredMode = Schema.RequiredMode.REQUIRED)
@NotBlank(message = "审核状态不能为空")
private String status;
}

15
zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/controller/admin/contract/vo/contract/DeductRespVO.java
View File

@@ -15,6 +15,9 @@ public class DeductRespVO {
@Schema(description = "条款主键")
private Long formulaId;
@Schema(description = "金属元素缩写")
private String elementAbbreviation;
@Schema(description = "数据项类型(字典:GRD_CFG_TP)")
private String configType;
@@ -24,6 +27,18 @@ public class DeductRespVO {
@Schema(description = "调整价")
private BigDecimal gradeAmount;
@Schema(description = "区间方式(字典：STLM_RNG_WY)")
private String rangeWay;
@Schema(description = "上限")
private String up;
@Schema(description = "下限")
private String down;
@Schema(description = "类型(字典：STLM_COEF)")
private String type;
@Schema(description = "创建时间")
private LocalDateTime createTime;
}

15
zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/controller/admin/contract/vo/contract/DeductSaveReqVO.java
View File

@@ -15,6 +15,9 @@ public class DeductSaveReqVO {
@Schema(description = "条款主键")
private Long formulaId;
@Schema(description = "金属元素缩写")
private String elementAbbreviation;
@Schema(description = "数据项类型(字典:GRD_CFG_TP)")
private String configType;
@@ -23,4 +26,16 @@ public class DeductSaveReqVO {
@Schema(description = "调整价")
private BigDecimal gradeAmount;
@Schema(description = "区间方式(字典：STLM_RNG_WY)")
private String rangeWay;
@Schema(description = "上限")
private String up;
@Schema(description = "下限")
private String down;
@Schema(description = "类型(字典：STLM_COEF)")
private String type;
}

25
zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/dal/dataobject/contract/ContractDeductDO.java
View File

@@ -34,6 +34,11 @@ public class ContractDeductDO extends BusinessBaseDO {
*/
@TableField("FMU_ID")
private Long formulaId;
/**
* 金属元素缩写（Cu\Au\Ag）
*/
@TableField("ELEM_ABBR")
private String elementAbbreviation;
/**
* 数据项类型(字典:GRD_CFG_TP)
*/
@@ -49,4 +54,24 @@ public class ContractDeductDO extends BusinessBaseDO {
*/
@TableField("GRD_AMT")
private BigDecimal gradeAmount;
/**
* 区间方式(字典：STLM_RNG_WY)
*/
@TableField("RNG_WY")
private String rangeWay;
/**
* 上限
*/
@TableField("UP")
private String up;
/**
* 下限
*/
@TableField("DOWN")
private String down;
/**
* 类型(字典：STLM_COEF)
*/
@TableField("TP")
private String type;
}

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

@@ -64,7 +64,7 @@ public interface ContractService {
* @param reqVO 审批信息
* @return 审批结果
*/
String approval(@Valid ApprovalReqVO reqVO);
Boolean approval(@Valid ApprovalReqVO reqVO);
/**
* 查询不计价规则列表
@@ -104,7 +104,7 @@ public interface ContractService {
* @param ids 合同ID集合
* @return
*/
List<String> submitErp(List<Long> ids);
Boolean submitErp(List<Long> ids);
/**
* 删除合同

434
zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/service/contract/ContractServiceImpl.java
View File

File diff suppressed because it is too large Load Diff