diff --git a/zt-module-contract-order/zt-module-contract-order-api/src/main/java/com/zt/plat/module/contractorder/api/ContractApi.java b/zt-module-contract-order/zt-module-contract-order-api/src/main/java/com/zt/plat/module/contractorder/api/ContractApi.java new file mode 100644 index 0000000..8856ccf --- /dev/null +++ b/zt-module-contract-order/zt-module-contract-order-api/src/main/java/com/zt/plat/module/contractorder/api/ContractApi.java @@ -0,0 +1,22 @@ +package com.zt.plat.module.contractorder.api; + + +import com.zt.plat.module.contractorder.api.dto.ContractFormulaRespDTO; +import com.zt.plat.module.contractorder.enums.ApiConstants; +import io.swagger.v3.oas.annotations.Operation; +import io.swagger.v3.oas.annotations.tags.Tag; +import org.springframework.cloud.openfeign.FeignClient; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RequestParam; + +import java.util.List; + +@FeignClient(name = ApiConstants.NAME) +@Tag(name = "RPC 服务 - 合同") +public interface ContractApi { + String PREFIX = ApiConstants.PREFIX + "/contract"; + + @GetMapping(PREFIX + "/formulas") + @Operation(summary = "通过合同编号获取对应的结算条款数据") + List getFormulas(@RequestParam("contractPaperNumber") String contractPaperNumber); +} diff --git a/zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/controller/admin/contract/vo/contract/ContractViewCoefficientRespVO.java b/zt-module-contract-order/zt-module-contract-order-api/src/main/java/com/zt/plat/module/contractorder/api/dto/ContractCoefficientRespDTO.java similarity index 58% rename from zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/controller/admin/contract/vo/contract/ContractViewCoefficientRespVO.java rename to zt-module-contract-order/zt-module-contract-order-api/src/main/java/com/zt/plat/module/contractorder/api/dto/ContractCoefficientRespDTO.java index 65938f4..6a5b9c6 100644 --- a/zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/controller/admin/contract/vo/contract/ContractViewCoefficientRespVO.java +++ b/zt-module-contract-order/zt-module-contract-order-api/src/main/java/com/zt/plat/module/contractorder/api/dto/ContractCoefficientRespDTO.java @@ -1,4 +1,4 @@ -package com.zt.plat.module.contractorder.controller.admin.contract.vo.contract; +package com.zt.plat.module.contractorder.api.dto; import io.swagger.v3.oas.annotations.media.Schema; import jakarta.validation.constraints.NotEmpty; @@ -6,16 +6,17 @@ import lombok.Data; import java.math.BigDecimal; -@Schema(description = "管理后台 - 基础系数配置 Response VO") +@Schema(description = "RPC 服务 - 基础系数配置 Response DTO") @Data -public class ContractViewCoefficientRespVO { - @Schema(description = "主键", requiredMode = Schema.RequiredMode.REQUIRED, example = "31657") +public class ContractCoefficientRespDTO { + + @Schema(description = "主键") private Long id; - @Schema(description = "配置主键", requiredMode = Schema.RequiredMode.REQUIRED, example = "6534") + @Schema(description = "配置主键") private Long parameterId; - @Schema(description = "条款主键", example = "29652") + @Schema(description = "条款主键") private Long formulaId; @Schema(description = "金属元素编码") @@ -24,7 +25,7 @@ public class ContractViewCoefficientRespVO { @Schema(description = "金属元素缩写") private String elementAbbreviation; - @Schema(description = "金属元素名称", example = "芋艿") + @Schema(description = "金属元素名称") private String elementName; @Schema(description = "系数值") @@ -42,10 +43,10 @@ public class ContractViewCoefficientRespVO { @Schema(description = "是否包含下限") private String isInDown; - @Schema(description = "是否省内", requiredMode = Schema.RequiredMode.REQUIRED) + @Schema(description = "是否省内") @NotEmpty(message = "是否省内不能为空") private String inState; - @Schema(description = "类型", example = "1") + @Schema(description = "类型") private String type; -} +} \ No newline at end of file diff --git a/zt-module-contract-order/zt-module-contract-order-api/src/main/java/com/zt/plat/module/contractorder/api/dto/ContractDeductRespDTO.java b/zt-module-contract-order/zt-module-contract-order-api/src/main/java/com/zt/plat/module/contractorder/api/dto/ContractDeductRespDTO.java new file mode 100644 index 0000000..eb3c09d --- /dev/null +++ b/zt-module-contract-order/zt-module-contract-order-api/src/main/java/com/zt/plat/module/contractorder/api/dto/ContractDeductRespDTO.java @@ -0,0 +1,50 @@ +package com.zt.plat.module.contractorder.api.dto; + +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.Data; + +import java.math.BigDecimal; + +@Schema(description = "RPC 服务 - 调整价配置 Response DTO") +@Data +public class ContractDeductRespDTO { + + @Schema(description = "主键") + private Long id; + + @Schema(description = "配置主键") + private Long parameterId; + + @Schema(description = "条款主键") + private Long formulaId; + + @Schema(description = "物料编码;推送ERP") + private String materialNumber; + + @Schema(description = "物料名称") + private String materialName; + + @Schema(description = "上限") + private BigDecimal gradeUp; + + @Schema(description = "下限") + private BigDecimal gradeDown; + + @Schema(description = "是否包含上限") + private String isInUp; + + @Schema(description = "是否包含下限") + private String isInDown; + + @Schema(description = "方式") + private String way; + + @Schema(description = "类型") + private String type; + + @Schema(description = "是否省内") + private String inState; + + @Schema(description = "调整价") + private BigDecimal gradeAmount; +} \ No newline at end of file diff --git a/zt-module-contract-order/zt-module-contract-order-api/src/main/java/com/zt/plat/module/contractorder/api/dto/ContractFormulaRespDTO.java b/zt-module-contract-order/zt-module-contract-order-api/src/main/java/com/zt/plat/module/contractorder/api/dto/ContractFormulaRespDTO.java new file mode 100644 index 0000000..1d47fa1 --- /dev/null +++ b/zt-module-contract-order/zt-module-contract-order-api/src/main/java/com/zt/plat/module/contractorder/api/dto/ContractFormulaRespDTO.java @@ -0,0 +1,56 @@ +package com.zt.plat.module.contractorder.api.dto; + +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.Data; + +import java.util.List; + +@Schema(description = "RPC 服务 - 价款结算条款 Response DTO") +@Data +public class ContractFormulaRespDTO { + + @Schema(description = "主键") + private Long id; + + @Schema(description = "合同主键") + private Long contractId; + + @Schema(description = "公式类型;单价/总价/水扣款/加工费") + private String formulaType; + + @Schema(description = "公式") + private String formulaCalculate; + + @Schema(description = "编码公式") + private String numberFormula; + + @Schema(description = "物料名称") + private String materialName; + + @Schema(description = "物料编码") + private String materialNumber; + + @Schema(description = "计算小数位") + private Long decimalPoint; + + @Schema(description = "金属元素编码") + private String elementNumber; + + @Schema(description = "金属元素缩写") + private String elementAbbreviation; + + @Schema(description = "金属元素名称") + private String elementName; + + @Schema(description = "结算类型，多条使用逗号分隔（字典：PRCH_STLM_TP）") + private String settlementType; + + // 基础系数配置 + private List coefficients; + // 品位等级价配置 + private List grades; + // 调整价配置 + private List deducts; + // 市场价配置 + private List prices; +} diff --git a/zt-module-contract-order/zt-module-contract-order-api/src/main/java/com/zt/plat/module/contractorder/api/dto/ContractGradeRespDTO.java b/zt-module-contract-order/zt-module-contract-order-api/src/main/java/com/zt/plat/module/contractorder/api/dto/ContractGradeRespDTO.java new file mode 100644 index 0000000..ea97fde --- /dev/null +++ b/zt-module-contract-order/zt-module-contract-order-api/src/main/java/com/zt/plat/module/contractorder/api/dto/ContractGradeRespDTO.java @@ -0,0 +1,62 @@ +package com.zt.plat.module.contractorder.api.dto; + +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.Data; + +import java.math.BigDecimal; + +@Schema(description = "RPC 服务 - 品位等级价配置 Response DTO") +@Data +public class ContractGradeRespDTO { + + @Schema(description = "主键") + private Long id; + + @Schema(description = "配置主键") + private Long parameterId; + + @Schema(description = "条款主键") + private Long formulaId; + + @Schema(description = "金属元素编码") + private String elementNumber; + + @Schema(description = "金属元素缩写") + private String elementAbbreviation; + + @Schema(description = "金属元素名称") + private String elementName; + + @Schema(description = "品位单位") + private String gradeUnit; + + @Schema(description = "品位上限") + private BigDecimal gradeUp; + + @Schema(description = "品位下限") + private BigDecimal gradeDown; + + @Schema(description = "是否包含上限;包含则是大于等于，不包含则是大于") + private String isInUp; + + @Schema(description = "是否包含下限;包含则是小于等于，不包含则是小于") + private String isInDown; + + @Schema(description = "默认计价品位;计价方式为加时，默认为为下限，计价方式为减时，默认为为上限，可手动填写") + private BigDecimal gradeDefault; + + @Schema(description = "系数;计价类型为阶梯价使用，标识没上升多少系数进行加款还是减款") + private BigDecimal settlementCoefficient; + + @Schema(description = "不足系数值按比例计算") + private String useCoefficient; + + @Schema(description = "计价类型") + private String priceType; + + @Schema(description = "是否省内") + private String inState; + + @Schema(description = "等级单价") + private BigDecimal unitPrice; +} \ No newline at end of file diff --git a/zt-module-contract-order/zt-module-contract-order-api/src/main/java/com/zt/plat/module/contractorder/api/dto/ContractPriceRespDTO.java b/zt-module-contract-order/zt-module-contract-order-api/src/main/java/com/zt/plat/module/contractorder/api/dto/ContractPriceRespDTO.java new file mode 100644 index 0000000..40f3469 --- /dev/null +++ b/zt-module-contract-order/zt-module-contract-order-api/src/main/java/com/zt/plat/module/contractorder/api/dto/ContractPriceRespDTO.java @@ -0,0 +1,54 @@ +package com.zt.plat.module.contractorder.api.dto; + +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.Data; + +import java.math.BigDecimal; +import java.time.LocalDateTime; + +@Schema(description = "RPC 服务 - 市场价配置 Response DTO") +@Data +public class ContractPriceRespDTO { + + @Schema(description = "主键") + private Long id; + + @Schema(description = "配置主键") + private Long parameterId; + + @Schema(description = "条款主键") + private Long formulaId; + + @Schema(description = "市场价") + private BigDecimal value; + + @Schema(description = "计算方式;均价/高位价/地位价") + private String calculateWay; + + @Schema(description = "数据来源网价代码;数据字典") + private String dataOrigin; + + @Schema(description = "计价开始日期") + private LocalDateTime calculateStartDate; + + @Schema(description = "计价截止日期") + private LocalDateTime calculateEndDate; + + @Schema(description = "包含开始日期") + private String inStartDate; + + @Schema(description = "包含结束日期") + private String inEndDate; + + @Schema(description = "价格品种元素的明细分类") + private String priceGrade; + + @Schema(description = "品种分类") + private String gradeType; + + @Schema(description = "取价方式;区间价/固定价") + private String averageType; + + @Schema(description = "网价小数位") + private BigDecimal decimalPoint; +} \ No newline at end of file diff --git a/zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/api/ContractApiImpl.java b/zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/api/ContractApiImpl.java new file mode 100644 index 0000000..9bdaccd --- /dev/null +++ b/zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/api/ContractApiImpl.java @@ -0,0 +1,25 @@ +package com.zt.plat.module.contractorder.api; + +import com.zt.plat.module.contractorder.api.dto.ContractFormulaRespDTO; +import com.zt.plat.module.contractorder.service.contract.ContractService; +import jakarta.annotation.Resource; +import lombok.extern.slf4j.Slf4j; +import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.RestController; + +import java.util.List; + +@RestController +@Validated +@Slf4j +public class ContractApiImpl implements ContractApi { + + @Resource + private ContractService contractService; + + @Override + public List getFormulas(String contractPaperNumber) { + System.out.println("contract feign" + contractPaperNumber); + return List.of(); + } +} diff --git a/zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/controller/admin/contract/ContractController.java b/zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/controller/admin/contract/ContractController.java index 545fce1..b55de61 100644 --- a/zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/controller/admin/contract/ContractController.java +++ b/zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/controller/admin/contract/ContractController.java @@ -18,6 +18,8 @@ import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; +import java.util.List; + import static com.zt.plat.framework.common.pojo.CommonResult.success; @Slf4j @@ -38,9 +40,30 @@ public class ContractController implements BusinessControllerMarker { return success(BeanUtils.toBean(pageResult, ContractRespVO.class)); } + @GetMapping("/nots") + @Operation(summary = "查询不计价规则列表") + @PreAuthorize("@ss.hasPermission('base:contract:query')") + public CommonResult> getNots(NotsQueryReqVO queryReqVO) { + return success(contractService.getNots(queryReqVO)); + } + + @GetMapping("/demotes") + @Operation(summary = "查询参数降级规则列表") + @PreAuthorize("@ss.hasPermission('base:contract:query')") + public CommonResult> getDemotes(DemotesQueryReqVO queryReqVO) { + return success(contractService.getDemotes(queryReqVO)); + } + + @GetMapping("/formulas") + @Operation(summary = "查询结算公式列表") + @PreAuthorize("@ss.hasPermission('base:contract:query')") + public CommonResult> getFormulas(FormulasQueryReqVO queryReqVO) { + return success(contractService.getFormulas(queryReqVO)); + } + @PostMapping("/create") @Operation(summary = "新增合同") - @PreAuthorize("@ss.hasPermission('system:contract:create')") + @PreAuthorize("@ss.hasPermission('base:contract:create')") public CommonResult create(@Valid @RequestBody ContractSaveReqVO reqVO) { Long id = contractService.createContract(reqVO); return success(new JSONObject().putOnce("id", id)); @@ -49,15 +72,15 @@ public class ContractController implements BusinessControllerMarker { @GetMapping("/get") @Operation(summary = "获得合同详情") @Parameter(name = "id", description = "合同ID", required = true, example = "1024") - @PreAuthorize("@ss.hasPermission('system:contract:get')") - public CommonResult get(@RequestParam("id") Long id) { - ContractViewRespVO contractViewRespVO = contractService.get(id); - return success(contractViewRespVO); + @PreAuthorize("@ss.hasPermission('base:contract:get')") + public CommonResult get(@RequestParam("id") Long id) { + ContractRespVO contractRespVO = contractService.get(id); + return success(contractRespVO); } @PutMapping("update") @Operation(summary = "修改合同") - @PreAuthorize("@ss.hasPermission('system:contract:update')") + @PreAuthorize("@ss.hasPermission('base:contract:update')") public CommonResult update(@Valid @RequestBody ContractSaveReqVO reqVO) { return success(contractService.update(reqVO)); } @@ -66,7 +89,7 @@ public class ContractController implements BusinessControllerMarker { @DeleteMapping("/delete") @Operation(summary = "删除合同") @Parameter(name = "ids", description = "合同ID集合", required = true, example = "1024") - @PreAuthorize("@ss.hasPermission('system:contract:delete')") + @PreAuthorize("@ss.hasPermission('base:contract:delete')") public CommonResult delete(@RequestParam("ids") Long[] ids) { return success(true); } @@ -74,34 +97,34 @@ public class ContractController implements BusinessControllerMarker { // TODO @PostMapping("/download") @Operation(summary = "下载文件") - @PreAuthorize("@ss.hasPermission('system:contract:download')") + @PreAuthorize("@ss.hasPermission('base:contract:download')") public void download() { } // TODO @PostMapping("/preview") @Operation(summary = "预览文件") - @PreAuthorize("@ss.hasPermission('system:contract:preview')") + @PreAuthorize("@ss.hasPermission('base:contract:preview')") public void preview() { } // TODO @PostMapping("/complete") @Operation(summary = "完结") - @PreAuthorize("@ss.hasPermission('system:contract:complete')") + @PreAuthorize("@ss.hasPermission('base:contract:complete')") public void complete() { } // TODO @PostMapping("/archive") @Operation(summary = "归档") - @PreAuthorize("@ss.hasPermission('system:contract:archive')") + @PreAuthorize("@ss.hasPermission('base:contract:archive')") public void archive() { } @GetMapping("/submit/approval") @Operation(summary = "合同提交审批") - @PreAuthorize("@ss.hasPermission('system:contract:approval')") + @PreAuthorize("@ss.hasPermission('base:contract:approval')") public CommonResult submitApproval(@RequestParam("id") Long id) { return success(contractService.submitApproval(id)); } @@ -109,22 +132,22 @@ public class ContractController implements BusinessControllerMarker { // TODO @PostMapping("/approval") @Operation(summary = "合同审批") - @PreAuthorize("@ss.hasPermission('system:contract:approval')") - public CommonResult approval(@Valid @RequestBody ContractApprovalReqVO reqVO) { + @PreAuthorize("@ss.hasPermission('base:contract:approval')") + public CommonResult approval(@Valid @RequestBody ApprovalReqVO reqVO) { return success(contractService.approval(reqVO)); } // TODO @PostMapping("/view/approval") @Operation(summary = "查看审批") - @PreAuthorize("@ss.hasPermission('system:contract:approval')") + @PreAuthorize("@ss.hasPermission('base:contract:approval')") public void viewApproval() { } // TODO @PostMapping("/submit/erp") @Operation(summary = "提交ERP") - @PreAuthorize("@ss.hasPermission('system:contract:erp')") + @PreAuthorize("@ss.hasPermission('base:contract:erp')") public void submitErp() { } } diff --git a/zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/controller/admin/contract/vo/contract/ContractApprovalReqVO.java b/zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/controller/admin/contract/vo/contract/ApprovalReqVO.java similarity index 95% rename from zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/controller/admin/contract/vo/contract/ContractApprovalReqVO.java rename to zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/controller/admin/contract/vo/contract/ApprovalReqVO.java index 5e14731..4d59d2e 100644 --- a/zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/controller/admin/contract/vo/contract/ContractApprovalReqVO.java +++ b/zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/controller/admin/contract/vo/contract/ApprovalReqVO.java @@ -7,7 +7,7 @@ import lombok.Data; @Schema(description = "管理后台 - 合同审核请求对象 Request VO") @Data -public class ContractApprovalReqVO { +public class ApprovalReqVO { @Schema(description = "合同主键ID", requiredMode = Schema.RequiredMode.REQUIRED) @NotNull(message = "合同主键ID不能为空") diff --git a/zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/controller/admin/contract/vo/contract/CoefficientRespVO.java b/zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/controller/admin/contract/vo/contract/CoefficientRespVO.java new file mode 100644 index 0000000..cd5c769 --- /dev/null +++ b/zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/controller/admin/contract/vo/contract/CoefficientRespVO.java @@ -0,0 +1,43 @@ +package com.zt.plat.module.contractorder.controller.admin.contract.vo.contract; + +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.Data; + +import java.math.BigDecimal; + +@Schema(description = "管理后台 - 基础系数配置 Response VO") +@Data +public class CoefficientRespVO { + @Schema(description = "主键") + private Long id; + + @Schema(description = "条款主键") + private Long formulaId; + + @Schema(description = "金属元素编码") + private String elementNumber; + + @Schema(description = "金属元素缩写") + private String elementAbbreviation; + + @Schema(description = "金属元素名称") + private String elementName; + + @Schema(description = "系数上限") + private BigDecimal coefficientUp; + + @Schema(description = "系数下限") + private BigDecimal coefficientDown; + + @Schema(description = "区间方式(字典：STLM_RNG_WY)") + private String rangeWay; + + @Schema(description = "是否省内") + private String inState; + + @Schema(description = "类型") + private String type; + + @Schema(description = "系数值") + private BigDecimal settlementCoefficient; +} diff --git a/zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/controller/admin/contract/vo/contract/ContractCoefficientSaveReqVO.java b/zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/controller/admin/contract/vo/contract/CoefficientSaveReqVO.java similarity index 53% rename from zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/controller/admin/contract/vo/contract/ContractCoefficientSaveReqVO.java rename to zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/controller/admin/contract/vo/contract/CoefficientSaveReqVO.java index 77402c0..91c91bc 100644 --- a/zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/controller/admin/contract/vo/contract/ContractCoefficientSaveReqVO.java +++ b/zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/controller/admin/contract/vo/contract/CoefficientSaveReqVO.java @@ -1,23 +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 jakarta.validation.constraints.NotNull; import lombok.Data; + import java.math.BigDecimal; @Schema(description = "管理后台 - 基础系数配置新增/修改 Request VO") @Data -public class ContractCoefficientSaveReqVO { +public class CoefficientSaveReqVO { - @Schema(description = "主键", requiredMode = Schema.RequiredMode.REQUIRED, example = "31657") + @Schema(description = "主键", requiredMode = Schema.RequiredMode.REQUIRED, example = "27478") private Long id; - @Schema(description = "配置主键", requiredMode = Schema.RequiredMode.REQUIRED, example = "6534") - @NotNull(message = "配置主键不能为空") - private Long parameterId; - - @Schema(description = "条款主键", example = "29652") + @Schema(description = "条款主键", example = "13898") private Long formulaId; @Schema(description = "金属元素编码") @@ -29,25 +24,21 @@ public class ContractCoefficientSaveReqVO { @Schema(description = "金属元素名称", example = "芋艿") private String elementName; - @Schema(description = "系数值") - private String settlementCoefficient; - @Schema(description = "系数上限") private BigDecimal coefficientUp; @Schema(description = "系数下限") private BigDecimal coefficientDown; - @Schema(description = "是否包含上限") - private String isInUp; + @Schema(description = "区间方式(字典：STLM_RNG_WY)") + private String rangeWay; - @Schema(description = "是否包含下限") - private String isInDown; - - @Schema(description = "是否省内", requiredMode = Schema.RequiredMode.REQUIRED) - @NotEmpty(message = "是否省内不能为空") + @Schema(description = "是否省内(字典：ERP_CTRT_YN)") private String inState; - @Schema(description = "类型", example = "1") + @Schema(description = "类型(字典：STLM_COEF)", example = "1") private String type; + + @Schema(description = "系数值") + private BigDecimal settlementCoefficient; } \ No newline at end of file diff --git a/zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/controller/admin/contract/vo/contract/ContractDeductSaveReqVO.java b/zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/controller/admin/contract/vo/contract/ContractDeductSaveReqVO.java deleted file mode 100644 index 1714714..0000000 --- a/zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/controller/admin/contract/vo/contract/ContractDeductSaveReqVO.java +++ /dev/null @@ -1,54 +0,0 @@ -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 jakarta.validation.constraints.NotNull; -import lombok.Data; -import java.math.BigDecimal; - -@Schema(description = "管理后台 - 调整价配置新增/修改 Request VO") -@Data -public class ContractDeductSaveReqVO { - - @Schema(description = "主键", requiredMode = Schema.RequiredMode.REQUIRED, example = "25312") - private Long id; - - @Schema(description = "配置主键", requiredMode = Schema.RequiredMode.REQUIRED, example = "21114") - @NotNull(message = "配置主键不能为空") - private Long parameterId; - - @Schema(description = "条款主键", example = "29909") - private Long formulaId; - - @Schema(description = "物料编码;推送ERP") - private String materialNumber; - - @Schema(description = "物料名称", example = "张三") - private String materialName; - - @Schema(description = "上限", requiredMode = Schema.RequiredMode.REQUIRED) - @NotNull(message = "上限不能为空") - private BigDecimal gradeUp; - - @Schema(description = "下限") - private BigDecimal gradeDown; - - @Schema(description = "是否包含上限") - private String isInUp; - - @Schema(description = "是否包含下限") - private String isInDown; - - @Schema(description = "方式") - private String way; - - @Schema(description = "类型", example = "1") - private String type; - - @Schema(description = "是否省内", requiredMode = Schema.RequiredMode.REQUIRED) - @NotEmpty(message = "是否省内不能为空") - private String inState; - - @Schema(description = "调整价") - private BigDecimal gradeAmount; -} \ No newline at end of file diff --git a/zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/controller/admin/contract/vo/contract/ContractRespVO.java b/zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/controller/admin/contract/vo/contract/ContractRespVO.java index f6bdac4..086e7c4 100644 --- a/zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/controller/admin/contract/vo/contract/ContractRespVO.java +++ b/zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/controller/admin/contract/vo/contract/ContractRespVO.java @@ -1,215 +1,242 @@ package com.zt.plat.module.contractorder.controller.admin.contract.vo.contract; import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; -import com.alibaba.excel.annotation.ExcelProperty; +import com.zt.plat.module.base.controller.admin.templtp.vo.TemplateInstanceDataRespVO; +import com.zt.plat.module.base.controller.admin.templtp.vo.TemplateInstanceItemRespVO; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; import java.math.BigDecimal; import java.time.LocalDateTime; +import java.util.List; -@Schema(description = "管理后台 - 合同信息 Response VO") +@Schema(description = "管理后台 - 合同详情 Response VO") @Data @ExcelIgnoreUnannotated public class ContractRespVO { - @Schema(description = "主键", requiredMode = Schema.RequiredMode.REQUIRED, example = "2090") - @ExcelProperty("主键") + @Schema(description = "主键") private Long id; - @Schema(description = "模板实例主键", example = "10196") - @ExcelProperty("模板实例主键") + @Schema(description = "模板实例主键") private Long instanceId; @Schema(description = "系统合同编号;自动生成，校验唯一") - @ExcelProperty("系统合同编号;自动生成，校验唯一") private String systemContractNumber; - @Schema(description = "状态", example = "1") - @ExcelProperty("状态") + @Schema(description = "状态") private String status; - @Schema(description = "合同名称;与ERP(HTMC)对应，校验唯一", example = "芋艿") - @ExcelProperty("合同名称;与ERP(HTMC)对应，校验唯一") + @Schema(description = "合同名称;与ERP(HTMC)对应，校验唯一") private String contractName; @Schema(description = "合同编号;与ERP(HTBH)对应，校验唯一") - @ExcelProperty("合同编号;与ERP(HTBH)对应，校验唯一") private String contractPaperNumber; @Schema(description = "是否虚拟合同;与ERP(SFXNHT)对应") - @ExcelProperty("是否虚拟合同;与ERP(SFXNHT)对应") private String contractVirtual; @Schema(description = "是否先款后货") - @ExcelProperty("是否先款后货") private String hasPayable; @Schema(description = "收支性质;与ERP(SZXZ)对应") - @ExcelProperty("收支性质;与ERP(SZXZ)对应") private String direction; - @Schema(description = "合同类型", example = "1") - @ExcelProperty("合同类型") + @Schema(description = "合同类型") private String contractType; @Schema(description = "签署日期;与ERP(HTQDRQ)对应") - @ExcelProperty("签署日期;与ERP(HTQDRQ)对应") private LocalDateTime signDate; @Schema(description = "开始日期;与ERP(HTQSRQ)对应") - @ExcelProperty("开始日期;与ERP(HTQSRQ)对应") private LocalDateTime startDate; @Schema(description = "结束日期;与ERP(HTZZRQ)对应") - @ExcelProperty("结束日期;与ERP(HTZZRQ)对应") private LocalDateTime endDate; @Schema(description = "签署地") - @ExcelProperty("签署地") private String signPlace; @Schema(description = "甲方公司编号;如果是采购合同，查询组织机构自动带出，且与ERP(HTQDZTBH)对应，如果是销售合同，手动选择，且与ERP(WLDWBH)对应。") - @ExcelProperty("甲方公司编号;如果是采购合同，查询组织机构自动带出，且与ERP(HTQDZTBH)对应，如果是销售合同，手动选择，且与ERP(WLDWBH)对应。") private String purchaseCompanyNumber; - @Schema(description = "甲方公司名称", example = "王五") - @ExcelProperty("甲方公司名称") + @Schema(description = "甲方公司名称") private String purchaseCompanyName; @Schema(description = "甲方地址") - @ExcelProperty("甲方地址") private String purchaseAddress; @Schema(description = "甲方法定代表人") - @ExcelProperty("甲方法定代表人") private String purchaseLeader; @Schema(description = "乙方公司编号;如果是销售合同，查询组织机构自动带出，且与ERP(HTQDZTBH)对应，如果是采购合同，手动选择，且与ERP(WLDWBH)对应。") - @ExcelProperty("乙方公司编号;如果是销售合同，查询组织机构自动带出，且与ERP(HTQDZTBH)对应，如果是采购合同，手动选择，且与ERP(WLDWBH)对应。") private String salesCompanyNumber; - @Schema(description = "乙方公司名称", example = "王五") - @ExcelProperty("乙方公司名称") + @Schema(description = "乙方公司名称") private String salesCompanyName; @Schema(description = "乙方地址") - @ExcelProperty("乙方地址") private String salesAddress; @Schema(description = "乙方企业负责人") - @ExcelProperty("乙方企业负责人") private String salesPurchaseLeader; @Schema(description = "币种;与ERP(BZBH)对应") - @ExcelProperty("币种;与ERP(BZBH)对应") private String currency; @Schema(description = "原币金额;与ERP(HTYBZJE)对应，币种不是人民币时，显示并手动填写，如果是人民币，隐藏且等于本币金额") - @ExcelProperty("原币金额;与ERP(HTYBZJE)对应，币种不是人民币时，显示并手动填写，如果是人民币，隐藏且等于本币金额") private BigDecimal cooAmount; @Schema(description = "本币金额;与ERP(HTBWBZJE)对应") - @ExcelProperty("本币金额;与ERP(HTBWBZJE)对应") private BigDecimal basicAmount; @Schema(description = "是否有履约保证金;为是，则保证金必填。") - @ExcelProperty("是否有履约保证金;为是，则保证金必填。") private String hasDeposit; @Schema(description = "原币履约保证金;与ERP(LYBZJBGQYB)对应，币种不是人民币时，显示并手动填写，如果是人民币，隐藏且等于本币金额") - @ExcelProperty("原币履约保证金;与ERP(LYBZJBGQYB)对应，币种不是人民币时，显示并手动填写，如果是人民币，隐藏且等于本币金额") private BigDecimal cooAmountDeposit; @Schema(description = "本币履约保证金;与ERP(LYBZJBGQBWB)对应") - @ExcelProperty("本币履约保证金;与ERP(LYBZJBGQBWB)对应") private BigDecimal basicAmountDeposit; @Schema(description = "是否有预付款;与ERP(SFYYFK)对应") - @ExcelProperty("是否有预付款;与ERP(SFYYFK)对应") private String hasPrepayment; @Schema(description = "预付款比例;与ERP(YFKBL)对应") - @ExcelProperty("预付款比例;与ERP(YFKBL)对应") private BigDecimal prepaymentRatio; @Schema(description = "预付款金额;与ERP(YFKJE)对应") - @ExcelProperty("预付款金额;与ERP(YFKJE)对应") private BigDecimal prepaymentAmount; @Schema(description = "是否有质保金;与ERP(SFHZBJ)对应") - @ExcelProperty("是否有质保金;与ERP(SFHZBJ)对应") private String hasQualityAmount; @Schema(description = "质保金比例;与ERP(ZBJBL)对应") - @ExcelProperty("质保金比例;与ERP(ZBJBL)对应") private BigDecimal qualityRatio; @Schema(description = "质保金金额;与ERP(BZJJE)对应") - @ExcelProperty("质保金金额;与ERP(BZJJE)对应") private BigDecimal qualityAmount; - @Schema(description = "补充协议类型;变更协议/增加条款", example = "1") - @ExcelProperty("补充协议类型;变更协议/增加条款") + @Schema(description = "补充协议类型;变更协议/增加条款") private String replenishAgreementType; @Schema(description = "备注;与ERP(BZXX)对应") - @ExcelProperty("备注;与ERP(BZXX)对应") private String remark; @Schema(description = "施工类型编号;与ERP(HTLXBH)对应，拓展信息") - @ExcelProperty("施工类型编号;与ERP(HTLXBH)对应，拓展信息") private String constructionTypeNumber; - @Schema(description = "施工类型名称;与ERP(HTLXMC)对应，拓展信息", example = "张三") - @ExcelProperty("施工类型名称;与ERP(HTLXMC)对应，拓展信息") + @Schema(description = "施工类型名称;与ERP(HTLXMC)对应，拓展信息") private String constructionTypeName; @Schema(description = "代理方;与ERP(ZLIFNR)对应，拓展信息") - @ExcelProperty("代理方;与ERP(ZLIFNR)对应，拓展信息") private String agent; @Schema(description = "类别;与ERP(HTLB)对应，拓展信息") - @ExcelProperty("类别;与ERP(HTLB)对应，拓展信息") private String category; @Schema(description = "原币金额-变更后;与ERP(BGHHTYBZJE)对应，拓展信息") - @ExcelProperty("原币金额-变更后;与ERP(BGHHTYBZJE)对应，拓展信息") private BigDecimal changeCooAmount; @Schema(description = "本币金额-变更后;与ERP(BGHHTBWBZJE)对应，拓展信息") - @ExcelProperty("本币金额-变更后;与ERP(BGHHTBWBZJE)对应，拓展信息") private BigDecimal changeBasicAmount; @Schema(description = "原币履约保证金-变更后;与ERP(LYBZJBGHYB)对应，拓展信息") - @ExcelProperty("原币履约保证金-变更后;与ERP(LYBZJBGHYB)对应，拓展信息") private BigDecimal changeCooAmountDeposit; @Schema(description = "本币履约保证金-变更后;与ERP(LYBZJBGHBWB)对应，拓展信息") - @ExcelProperty("本币履约保证金-变更后;与ERP(LYBZJBGHBWB)对应，拓展信息") private BigDecimal changeBasicAmountDeposit; @Schema(description = "是否框架合同;与ERP(SFKJHT)对应，拓展信息") - @ExcelProperty("是否框架合同;与ERP(SFKJHT)对应，拓展信息") private String isFramework; @Schema(description = "境内/境外;与ERP(JNJW)对应，拓展信息") - @ExcelProperty("境内/境外;与ERP(JNJW)对应，拓展信息") private String isDomestic; @Schema(description = "建筑服务发生地;与ERP(JZFWFSD)对应，拓展信息，销售合同，且类型为SAP02COSR必填") - @ExcelProperty("建筑服务发生地;与ERP(JZFWFSD)对应，拓展信息，销售合同，且类型为SAP02COSR必填") private String architectureServicePlace; @Schema(description = "达到收款条件金额;与ERP(DDSKJE)对应，拓展信息，销售合同，且类型为SAP02COSR必填") - @ExcelProperty("达到收款条件金额;与ERP(DDSKJE)对应，拓展信息，销售合同，且类型为SAP02COSR必填") private BigDecimal payeeConditionAmount; @Schema(description = "创建时间") - @ExcelProperty("创建时间") private LocalDateTime createTime; @Schema(description = "步骤") - @ExcelProperty("步骤") private Integer step; -} \ No newline at end of file + + @Schema(description = "ERP请求状态") + private String erpStatus; + + @Schema(description = "ERP请求失败原因") + private String cause; + + @Schema(description = "流程实例编号") + private String processInstanceId; + + @Schema(description = "审批意见") + private String reviewOpinion; + + @Schema(description = "任务节点主键") + private String taskNodeId; + + @Schema(description = "模板附件对象存储") + private String fileObject; + + @Schema(description = "其它附件对象存储") + private String fileObjectOther; + + @Schema(description = "交货地点") + private String deliveryAddress; + + @Schema(description = "交货方式(字典:FRCST_ASN)") + private String deliveryWay; + + @Schema(description = "甲方联系人") + private String purchaseHuman; + + @Schema(description = "甲方电话") + private String purchaseTel; + + @Schema(description = "甲方邮箱") + private String purchaseEmail; + + @Schema(description = "甲方传真") + private String purchaseFax; + + @Schema(description = "甲方联系地址") + private String purchaseContactAddress; + + @Schema(description = "乙方联系人") + private String salesHuman; + + @Schema(description = "乙方电话") + private String salesTel; + + @Schema(description = "乙方邮箱") + private String salesEmail; + + @Schema(description = "乙方传真") + private String salesFax; + + @Schema(description = "乙方联系地址") + private String salesContactAddress; + + // 物料信息 + private List detail; + + // 合同动态表单 + private List dynamicsFields; + + // 合同动态条款 + private List dynamicsItems; + + // 价款结算条款 + private List formulas; + + // 参数降级规则 + private List demotes; + + // 品位不计价规则 + private List nots; +} diff --git a/zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/controller/admin/contract/vo/contract/ContractSaveReqVO.java b/zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/controller/admin/contract/vo/contract/ContractSaveReqVO.java index 361069c..75f8b08 100644 --- a/zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/controller/admin/contract/vo/contract/ContractSaveReqVO.java +++ b/zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/controller/admin/contract/vo/contract/ContractSaveReqVO.java @@ -162,7 +162,7 @@ public class ContractSaveReqVO { private String remark; // 物料信息 - private List detail; + private List detail; // 扩展信息 @Schema(description = "原币金额-变更后;与ERP(BGHHTYBZJE)对应，拓展信息") @@ -219,11 +219,11 @@ public class ContractSaveReqVO { private List dynamicsFields; // 价款结算条款 - private List formulas; + private List formulas; // 参数降级规则 - private List demotes; + private List demotes; // 品位不计价规则 - private List nots; + private List nots; } \ No newline at end of file diff --git a/zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/controller/admin/contract/vo/contract/ContractViewDeductRespVO.java b/zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/controller/admin/contract/vo/contract/ContractViewDeductRespVO.java deleted file mode 100644 index 4594537..0000000 --- a/zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/controller/admin/contract/vo/contract/ContractViewDeductRespVO.java +++ /dev/null @@ -1,54 +0,0 @@ -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 jakarta.validation.constraints.NotNull; -import lombok.Data; - -import java.math.BigDecimal; - -@Schema(description = "管理后台 - 调整价配置 Response VO") -@Data -public class ContractViewDeductRespVO { - @Schema(description = "主键", requiredMode = Schema.RequiredMode.REQUIRED, example = "25312") - private Long id; - - @Schema(description = "配置主键", requiredMode = Schema.RequiredMode.REQUIRED, example = "21114") - @NotNull(message = "配置主键不能为空") - private Long parameterId; - - @Schema(description = "条款主键", example = "29909") - private Long formulaId; - - @Schema(description = "物料编码;推送ERP") - private String materialNumber; - - @Schema(description = "物料名称", example = "张三") - private String materialName; - - @Schema(description = "上限", requiredMode = Schema.RequiredMode.REQUIRED) - @NotNull(message = "上限不能为空") - private BigDecimal gradeUp; - - @Schema(description = "下限") - private BigDecimal gradeDown; - - @Schema(description = "是否包含上限") - private String isInUp; - - @Schema(description = "是否包含下限") - private String isInDown; - - @Schema(description = "方式") - private String way; - - @Schema(description = "类型", example = "1") - private String type; - - @Schema(description = "是否省内", requiredMode = Schema.RequiredMode.REQUIRED) - @NotEmpty(message = "是否省内不能为空") - private String inState; - - @Schema(description = "调整价") - private BigDecimal gradeAmount; -} diff --git a/zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/controller/admin/contract/vo/contract/ContractViewRespVO.java b/zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/controller/admin/contract/vo/contract/ContractViewRespVO.java deleted file mode 100644 index 1ff3516..0000000 --- a/zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/controller/admin/contract/vo/contract/ContractViewRespVO.java +++ /dev/null @@ -1,312 +0,0 @@ -package com.zt.plat.module.contractorder.controller.admin.contract.vo.contract; - -import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; -import com.alibaba.excel.annotation.ExcelProperty; -import com.zt.plat.module.base.controller.admin.templtp.vo.TemplateInstanceDataRespVO; -import com.zt.plat.module.base.controller.admin.templtp.vo.TemplateInstanceItemRespVO; -import io.swagger.v3.oas.annotations.media.Schema; -import lombok.Data; - -import java.math.BigDecimal; -import java.time.LocalDateTime; -import java.util.List; - -@Schema(description = "管理后台 - 合同详情 Response VO") -@Data -@ExcelIgnoreUnannotated -public class ContractViewRespVO { - - @Schema(description = "主键", requiredMode = Schema.RequiredMode.REQUIRED, example = "2476") - @ExcelProperty("主键") - private Long id; - - @Schema(description = "模板实例主键", example = "5352") - @ExcelProperty("模板实例主键") - private Long instanceId; - - @Schema(description = "系统合同编号;自动生成，校验唯一") - @ExcelProperty("系统合同编号;自动生成，校验唯一") - private String systemContractNumber; - - @Schema(description = "状态", example = "2") - @ExcelProperty("状态") - private String status; - - @Schema(description = "合同名称;与ERP(HTMC)对应，校验唯一", example = "李四") - @ExcelProperty("合同名称;与ERP(HTMC)对应，校验唯一") - private String contractName; - - @Schema(description = "合同编号;与ERP(HTBH)对应，校验唯一") - @ExcelProperty("合同编号;与ERP(HTBH)对应，校验唯一") - private String contractPaperNumber; - - @Schema(description = "是否虚拟合同;与ERP(SFXNHT)对应") - @ExcelProperty("是否虚拟合同;与ERP(SFXNHT)对应") - private String contractVirtual; - - @Schema(description = "是否先款后货") - @ExcelProperty("是否先款后货") - private String hasPayable; - - @Schema(description = "收支性质;与ERP(SZXZ)对应") - @ExcelProperty("收支性质;与ERP(SZXZ)对应") - private String direction; - - @Schema(description = "合同类型", example = "2") - @ExcelProperty("合同类型") - private String contractType; - - @Schema(description = "签署日期;与ERP(HTQDRQ)对应") - @ExcelProperty("签署日期;与ERP(HTQDRQ)对应") - private LocalDateTime signDate; - - @Schema(description = "开始日期;与ERP(HTQSRQ)对应") - @ExcelProperty("开始日期;与ERP(HTQSRQ)对应") - private LocalDateTime startDate; - - @Schema(description = "结束日期;与ERP(HTZZRQ)对应") - @ExcelProperty("结束日期;与ERP(HTZZRQ)对应") - private LocalDateTime endDate; - - @Schema(description = "签署地") - @ExcelProperty("签署地") - private String signPlace; - - @Schema(description = "甲方公司编号;如果是采购合同，查询组织机构自动带出，且与ERP(HTQDZTBH)对应，如果是销售合同，手动选择，且与ERP(WLDWBH)对应。") - @ExcelProperty("甲方公司编号;如果是采购合同，查询组织机构自动带出，且与ERP(HTQDZTBH)对应，如果是销售合同，手动选择，且与ERP(WLDWBH)对应。") - private String purchaseCompanyNumber; - - @Schema(description = "甲方公司名称", example = "芋艿") - @ExcelProperty("甲方公司名称") - private String purchaseCompanyName; - - @Schema(description = "甲方地址") - @ExcelProperty("甲方地址") - private String purchaseAddress; - - @Schema(description = "甲方法定代表人") - @ExcelProperty("甲方法定代表人") - private String purchaseLeader; - - @Schema(description = "乙方公司编号;如果是销售合同，查询组织机构自动带出，且与ERP(HTQDZTBH)对应，如果是采购合同，手动选择，且与ERP(WLDWBH)对应。") - @ExcelProperty("乙方公司编号;如果是销售合同，查询组织机构自动带出，且与ERP(HTQDZTBH)对应，如果是采购合同，手动选择，且与ERP(WLDWBH)对应。") - private String salesCompanyNumber; - - @Schema(description = "乙方公司名称", example = "赵六") - @ExcelProperty("乙方公司名称") - private String salesCompanyName; - - @Schema(description = "乙方地址") - @ExcelProperty("乙方地址") - private String salesAddress; - - @Schema(description = "乙方企业负责人") - @ExcelProperty("乙方企业负责人") - private String salesPurchaseLeader; - - @Schema(description = "币种;与ERP(BZBH)对应") - @ExcelProperty("币种;与ERP(BZBH)对应") - private String currency; - - @Schema(description = "原币金额;与ERP(HTYBZJE)对应，币种不是人民币时，显示并手动填写，如果是人民币，隐藏且等于本币金额") - @ExcelProperty("原币金额;与ERP(HTYBZJE)对应，币种不是人民币时，显示并手动填写，如果是人民币，隐藏且等于本币金额") - private BigDecimal cooAmount; - - @Schema(description = "本币金额;与ERP(HTBWBZJE)对应") - @ExcelProperty("本币金额;与ERP(HTBWBZJE)对应") - private BigDecimal basicAmount; - - @Schema(description = "是否有履约保证金;为是，则保证金必填。") - @ExcelProperty("是否有履约保证金;为是，则保证金必填。") - private String hasDeposit; - - @Schema(description = "原币履约保证金;与ERP(LYBZJBGQYB)对应，币种不是人民币时，显示并手动填写，如果是人民币，隐藏且等于本币金额") - @ExcelProperty("原币履约保证金;与ERP(LYBZJBGQYB)对应，币种不是人民币时，显示并手动填写，如果是人民币，隐藏且等于本币金额") - private BigDecimal cooAmountDeposit; - - @Schema(description = "本币履约保证金;与ERP(LYBZJBGQBWB)对应") - @ExcelProperty("本币履约保证金;与ERP(LYBZJBGQBWB)对应") - private BigDecimal basicAmountDeposit; - - @Schema(description = "是否有预付款;与ERP(SFYYFK)对应") - @ExcelProperty("是否有预付款;与ERP(SFYYFK)对应") - private String hasPrepayment; - - @Schema(description = "预付款比例;与ERP(YFKBL)对应") - @ExcelProperty("预付款比例;与ERP(YFKBL)对应") - private BigDecimal prepaymentRatio; - - @Schema(description = "预付款金额;与ERP(YFKJE)对应") - @ExcelProperty("预付款金额;与ERP(YFKJE)对应") - private BigDecimal prepaymentAmount; - - @Schema(description = "是否有质保金;与ERP(SFHZBJ)对应") - @ExcelProperty("是否有质保金;与ERP(SFHZBJ)对应") - private String hasQualityAmount; - - @Schema(description = "质保金比例;与ERP(ZBJBL)对应") - @ExcelProperty("质保金比例;与ERP(ZBJBL)对应") - private BigDecimal qualityRatio; - - @Schema(description = "质保金金额;与ERP(BZJJE)对应") - @ExcelProperty("质保金金额;与ERP(BZJJE)对应") - private BigDecimal qualityAmount; - - @Schema(description = "补充协议类型;变更协议/增加条款", example = "2") - @ExcelProperty("补充协议类型;变更协议/增加条款") - private String replenishAgreementType; - - @Schema(description = "备注;与ERP(BZXX)对应") - @ExcelProperty("备注;与ERP(BZXX)对应") - private String remark; - - @Schema(description = "施工类型编号;与ERP(HTLXBH)对应，拓展信息") - @ExcelProperty("施工类型编号;与ERP(HTLXBH)对应，拓展信息") - private String constructionTypeNumber; - - @Schema(description = "施工类型名称;与ERP(HTLXMC)对应，拓展信息", example = "李四") - @ExcelProperty("施工类型名称;与ERP(HTLXMC)对应，拓展信息") - private String constructionTypeName; - - @Schema(description = "代理方;与ERP(ZLIFNR)对应，拓展信息") - @ExcelProperty("代理方;与ERP(ZLIFNR)对应，拓展信息") - private String agent; - - @Schema(description = "类别;与ERP(HTLB)对应，拓展信息") - @ExcelProperty("类别;与ERP(HTLB)对应，拓展信息") - private String category; - - @Schema(description = "原币金额-变更后;与ERP(BGHHTYBZJE)对应，拓展信息") - @ExcelProperty("原币金额-变更后;与ERP(BGHHTYBZJE)对应，拓展信息") - private BigDecimal changeCooAmount; - - @Schema(description = "本币金额-变更后;与ERP(BGHHTBWBZJE)对应，拓展信息") - @ExcelProperty("本币金额-变更后;与ERP(BGHHTBWBZJE)对应，拓展信息") - private BigDecimal changeBasicAmount; - - @Schema(description = "原币履约保证金-变更后;与ERP(LYBZJBGHYB)对应，拓展信息") - @ExcelProperty("原币履约保证金-变更后;与ERP(LYBZJBGHYB)对应，拓展信息") - private BigDecimal changeCooAmountDeposit; - - @Schema(description = "本币履约保证金-变更后;与ERP(LYBZJBGHBWB)对应，拓展信息") - @ExcelProperty("本币履约保证金-变更后;与ERP(LYBZJBGHBWB)对应，拓展信息") - private BigDecimal changeBasicAmountDeposit; - - @Schema(description = "是否框架合同;与ERP(SFKJHT)对应，拓展信息") - @ExcelProperty("是否框架合同;与ERP(SFKJHT)对应，拓展信息") - private String isFramework; - - @Schema(description = "境内/境外;与ERP(JNJW)对应，拓展信息") - @ExcelProperty("境内/境外;与ERP(JNJW)对应，拓展信息") - private String isDomestic; - - @Schema(description = "建筑服务发生地;与ERP(JZFWFSD)对应，拓展信息，销售合同，且类型为SAP02COSR必填") - @ExcelProperty("建筑服务发生地;与ERP(JZFWFSD)对应，拓展信息，销售合同，且类型为SAP02COSR必填") - private String architectureServicePlace; - - @Schema(description = "达到收款条件金额;与ERP(DDSKJE)对应，拓展信息，销售合同，且类型为SAP02COSR必填") - @ExcelProperty("达到收款条件金额;与ERP(DDSKJE)对应，拓展信息，销售合同，且类型为SAP02COSR必填") - private BigDecimal payeeConditionAmount; - - @Schema(description = "创建时间") - @ExcelProperty("创建时间") - private LocalDateTime createTime; - - @Schema(description = "步骤") - @ExcelProperty("步骤") - private Integer step; - - @Schema(description = "ERP请求状态", example = "1") - @ExcelProperty("ERP请求状态") - private String erpStatus; - - @Schema(description = "ERP请求失败原因") - @ExcelProperty("ERP请求失败原因") - private String cause; - - @Schema(description = "流程实例编号", example = "27511") - @ExcelProperty("流程实例编号") - private String processInstanceId; - - @Schema(description = "审批意见") - @ExcelProperty("审批意见") - private String reviewOpinion; - - @Schema(description = "任务节点主键", example = "26040") - @ExcelProperty("任务节点主键") - private String taskNodeId; - - @Schema(description = "模板附件对象存储") - @ExcelProperty("模板附件对象存储") - private String fileObject; - - @Schema(description = "其它附件对象存储") - @ExcelProperty("其它附件对象存储") - private String fileObjectOther; - - @Schema(description = "交货地点") - @ExcelProperty("交货地点") - private String deliveryAddress; - - @Schema(description = "交货方式(字典:FRCST_ASN)") - @ExcelProperty("交货方式(字典:FRCST_ASN)") - private String deliveryWay; - - @Schema(description = "甲方联系人") - @ExcelProperty("甲方联系人") - private String purchaseHuman; - - @Schema(description = "甲方电话") - @ExcelProperty("甲方电话") - private String purchaseTel; - - @Schema(description = "甲方邮箱") - @ExcelProperty("甲方邮箱") - private String purchaseEmail; - - @Schema(description = "甲方传真") - @ExcelProperty("甲方传真") - private String purchaseFax; - - @Schema(description = "甲方联系地址") - @ExcelProperty("甲方联系地址") - private String purchaseContactAddress; - - @Schema(description = "乙方联系人") - @ExcelProperty("乙方联系人") - private String salesHuman; - - @Schema(description = "乙方电话") - @ExcelProperty("乙方电话") - private String salesTel; - - @Schema(description = "乙方邮箱") - @ExcelProperty("乙方邮箱") - private String salesEmail; - - @Schema(description = "乙方传真") - @ExcelProperty("乙方传真") - private String salesFax; - - @Schema(description = "乙方联系地址") - @ExcelProperty("乙方联系地址") - private String salesContactAddress; - - // 物料信息 - private List detail; - - // 合同动态表单 - private List dynamicsFields; - - // 合同动态条款 - private List dynamicsItems; - - // 价款结算条款 - private List formulas; - - // 参数降级规则 - private List demotes; - - // 品位不计价配置 - private List nots; -} diff --git a/zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/controller/admin/contract/vo/contract/DeductRespVO.java b/zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/controller/admin/contract/vo/contract/DeductRespVO.java new file mode 100644 index 0000000..8471ee1 --- /dev/null +++ b/zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/controller/admin/contract/vo/contract/DeductRespVO.java @@ -0,0 +1,29 @@ +package com.zt.plat.module.contractorder.controller.admin.contract.vo.contract; + +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.Data; + +import java.math.BigDecimal; +import java.time.LocalDateTime; + +@Schema(description = "管理后台 - 调整价配置 Response VO") +@Data +public class DeductRespVO { + @Schema(description = "主键") + private Long id; + + @Schema(description = "条款主键") + private Long formulaId; + + @Schema(description = "数据项类型(字典:GRD_CFG_TP)") + private String configType; + + @Schema(description = "是否省内") + private String inState; + + @Schema(description = "调整价") + private BigDecimal gradeAmount; + + @Schema(description = "创建时间") + private LocalDateTime createTime; +} diff --git a/zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/controller/admin/contract/vo/contract/DeductSaveReqVO.java b/zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/controller/admin/contract/vo/contract/DeductSaveReqVO.java new file mode 100644 index 0000000..fbecdb6 --- /dev/null +++ b/zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/controller/admin/contract/vo/contract/DeductSaveReqVO.java @@ -0,0 +1,26 @@ +package com.zt.plat.module.contractorder.controller.admin.contract.vo.contract; + +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.Data; + +import java.math.BigDecimal; + +@Schema(description = "管理后台 - 调整价配置新增/修改 Request VO") +@Data +public class DeductSaveReqVO { + + @Schema(description = "主键") + private Long id; + + @Schema(description = "条款主键") + private Long formulaId; + + @Schema(description = "数据项类型(字典:GRD_CFG_TP)") + private String configType; + + @Schema(description = "是否省内") + private String inState; + + @Schema(description = "调整价") + private BigDecimal gradeAmount; +} \ No newline at end of file diff --git a/zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/controller/admin/contract/vo/contract/ContractViewDemoteRespVO.java b/zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/controller/admin/contract/vo/contract/DemoteRespVO.java similarity index 52% rename from zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/controller/admin/contract/vo/contract/ContractViewDemoteRespVO.java rename to zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/controller/admin/contract/vo/contract/DemoteRespVO.java index 26e851e..2c98340 100644 --- a/zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/controller/admin/contract/vo/contract/ContractViewDemoteRespVO.java +++ b/zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/controller/admin/contract/vo/contract/DemoteRespVO.java @@ -1,7 +1,6 @@ package com.zt.plat.module.contractorder.controller.admin.contract.vo.contract; import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; -import com.alibaba.excel.annotation.ExcelProperty; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; @@ -11,49 +10,44 @@ import java.time.LocalDateTime; @Schema(description = "管理后台 - 参数降级规则 Response VO") @Data @ExcelIgnoreUnannotated -public class ContractViewDemoteRespVO { +public class DemoteRespVO { - @Schema(description = "主键", requiredMode = Schema.RequiredMode.REQUIRED, example = "31818") - @ExcelProperty("主键") + @Schema(description = "主键") private Long id; - @Schema(description = "合同主键", requiredMode = Schema.RequiredMode.REQUIRED, example = "14971") - @ExcelProperty("合同主键") + @Schema(description = "合同主键") private Long contractId; @Schema(description = "金属元素编码") - @ExcelProperty("金属元素编码") private String elementNumber; @Schema(description = "金属元素缩写") - @ExcelProperty("金属元素缩写") private String elementAbbreviation; - @Schema(description = "金属元素名称", example = "王五") - @ExcelProperty("金属元素名称") + @Schema(description = "金属元素名称") private String elementName; @Schema(description = "上限") - @ExcelProperty("上限") private BigDecimal gradeUp; @Schema(description = "区间方式(字典：STLM_RNG_WY)") - @ExcelProperty("区间方式(字典：STLM_RNG_WY)") private String rangeWay; @Schema(description = "下限") - @ExcelProperty("下限") private BigDecimal gradeDown; - @Schema(description = "降级后物料名称", example = "李四") - @ExcelProperty("降级后物料名称") + @Schema(description = "降级后物料名称") private String materialName; @Schema(description = "降级后物料编码") - @ExcelProperty("降级后物料编码") private String materialNumber; - @Schema(description = "创建时间", requiredMode = Schema.RequiredMode.REQUIRED) - @ExcelProperty("创建时间") + @Schema(description = "创建时间") private LocalDateTime createTime; + + @Schema(description = "合同名称") + private String contractName; + + @Schema(description = "合同编码") + private String contractPaperNumber; } diff --git a/zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/controller/admin/contract/vo/contract/ContractDemoteSaveReqVO.java b/zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/controller/admin/contract/vo/contract/DemoteSaveReqVO.java similarity index 97% rename from zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/controller/admin/contract/vo/contract/ContractDemoteSaveReqVO.java rename to zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/controller/admin/contract/vo/contract/DemoteSaveReqVO.java index 007f10a..a5808f1 100644 --- a/zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/controller/admin/contract/vo/contract/ContractDemoteSaveReqVO.java +++ b/zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/controller/admin/contract/vo/contract/DemoteSaveReqVO.java @@ -8,7 +8,7 @@ import java.math.BigDecimal; @Schema(description = "管理后台 - 参数降级规则新增/修改 Request VO") @Data -public class ContractDemoteSaveReqVO { +public class DemoteSaveReqVO { @Schema(description = "主键", requiredMode = Schema.RequiredMode.REQUIRED, example = "31818") private Long id; diff --git a/zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/controller/admin/contract/vo/contract/DemotesQueryReqVO.java b/zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/controller/admin/contract/vo/contract/DemotesQueryReqVO.java new file mode 100644 index 0000000..4a2f0e0 --- /dev/null +++ b/zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/controller/admin/contract/vo/contract/DemotesQueryReqVO.java @@ -0,0 +1,18 @@ +package com.zt.plat.module.contractorder.controller.admin.contract.vo.contract; + +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.Data; + +@Schema(description = "管理后台 - 查询参数降级规则列表 Request VO") +@Data +public class DemotesQueryReqVO { + + @Schema(description = "合同名称") + private String contractName; + @Schema(description = "合同编码") + private String contractPaperNumber; + @Schema(description = "物料名称") + private String materialName; + @Schema(description = "金属元素") + private String elementName; +} diff --git a/zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/controller/admin/contract/vo/contract/ContractViewDetailRespVO.java b/zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/controller/admin/contract/vo/contract/DetailRespVO.java similarity index 53% rename from zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/controller/admin/contract/vo/contract/ContractViewDetailRespVO.java rename to zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/controller/admin/contract/vo/contract/DetailRespVO.java index 938385b..be4af9b 100644 --- a/zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/controller/admin/contract/vo/contract/ContractViewDetailRespVO.java +++ b/zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/controller/admin/contract/vo/contract/DetailRespVO.java @@ -8,34 +8,34 @@ import java.util.List; @Schema(description = "管理后台 - 合同明细 Response VO") @Data -public class ContractViewDetailRespVO { +public class DetailRespVO { @Schema(description = "主键") private Long id; - @Schema(description = "物料名称", example = "物料名称") + @Schema(description = "物料名称") private String materialName; - @Schema(description = "物料编码", example = "物料编码") + @Schema(description = "物料编码") private String materialNumber; @Schema(description = "数量") private BigDecimal quantity; - @Schema(description = "计量单位", example = "吨") + @Schema(description = "计量单位") private String unit; - @Schema(description = "含税单价", example = "28579") + @Schema(description = "含税单价") private BigDecimal inTaxUnitPrice; - @Schema(description = "金属元素缩写", example = "金属元素缩写") + @Schema(description = "金属元素缩写") private String elementAbbreviation; - @Schema(description = "金属元素名称", example = "金属元素名称") + @Schema(description = "金属元素名称") private String elementName; - @Schema(description = "金属元素编码", example = "金属元素编码") + @Schema(description = "金属元素编码") private String elementNumber; // 交货计划 - private List plans; + private List plans; } diff --git a/zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/controller/admin/contract/vo/contract/ContractDetailSaveReqVO.java b/zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/controller/admin/contract/vo/contract/DetailSaveReqVO.java similarity index 93% rename from zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/controller/admin/contract/vo/contract/ContractDetailSaveReqVO.java rename to zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/controller/admin/contract/vo/contract/DetailSaveReqVO.java index d6a9460..d6453c4 100644 --- a/zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/controller/admin/contract/vo/contract/ContractDetailSaveReqVO.java +++ b/zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/controller/admin/contract/vo/contract/DetailSaveReqVO.java @@ -8,7 +8,7 @@ import java.util.List; @Schema(description = "管理后台 - 合同明细新增/修改 Request VO") @Data -public class ContractDetailSaveReqVO { +public class DetailSaveReqVO { @Schema(description = "主键") private Long id; @@ -41,5 +41,5 @@ public class ContractDetailSaveReqVO { private String elementNumber; // 交货计划 - private List plans; + private List plans; } \ No newline at end of file diff --git a/zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/controller/admin/contract/vo/contract/ContractViewFormulaRespVO.java b/zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/controller/admin/contract/vo/contract/FormulaRespVO.java similarity index 63% rename from zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/controller/admin/contract/vo/contract/ContractViewFormulaRespVO.java rename to zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/controller/admin/contract/vo/contract/FormulaRespVO.java index fe3344d..75d20b0 100644 --- a/zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/controller/admin/contract/vo/contract/ContractViewFormulaRespVO.java +++ b/zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/controller/admin/contract/vo/contract/FormulaRespVO.java @@ -7,14 +7,14 @@ import java.util.List; @Schema(description = "管理后台 - 价款结算条款 Response VO") @Data -public class ContractViewFormulaRespVO { - @Schema(description = "主键", requiredMode = Schema.RequiredMode.REQUIRED, example = "22933") +public class FormulaRespVO { + @Schema(description = "主键") private Long id; - @Schema(description = "合同主键", requiredMode = Schema.RequiredMode.REQUIRED, example = "9162") + @Schema(description = "合同主键") private Long contractId; - @Schema(description = "公式类型;单价/总价/水扣款/加工费", example = "1") + @Schema(description = "公式类型;单价/总价/水扣款/加工费") private String formulaType; @Schema(description = "公式") @@ -23,7 +23,7 @@ public class ContractViewFormulaRespVO { @Schema(description = "编码公式") private String numberFormula; - @Schema(description = "物料名称", example = "赵六") + @Schema(description = "物料名称") private String materialName; @Schema(description = "物料编码") @@ -38,18 +38,24 @@ public class ContractViewFormulaRespVO { @Schema(description = "金属元素缩写") private String elementAbbreviation; - @Schema(description = "金属元素名称", example = "赵六") + @Schema(description = "金属元素名称") private String elementName; - @Schema(description = "结算类型，多条使用逗号分隔（字典：PRCH_STLM_TP）", example = "1") + @Schema(description = "结算类型，多条使用逗号分隔（字典：PRCH_STLM_TP）") private String settlementType; + @Schema(description = "合同名称") + private String contractName; + + @Schema(description = "合同编码") + private String contractPaperNumber; + // 基础系数配置 - private List coefficients; + private List coefficients; // 品位等级价配置 - private List grades; + private List grades; // 调整价配置 - private List deducts; + private List deducts; // 市场价配置 - private List prices; + private List prices; } diff --git a/zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/controller/admin/contract/vo/contract/ContractFormulaSaveReqVO.java b/zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/controller/admin/contract/vo/contract/FormulaSaveReqVO.java similarity index 86% rename from zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/controller/admin/contract/vo/contract/ContractFormulaSaveReqVO.java rename to zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/controller/admin/contract/vo/contract/FormulaSaveReqVO.java index b47ba7d..42026d7 100644 --- a/zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/controller/admin/contract/vo/contract/ContractFormulaSaveReqVO.java +++ b/zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/controller/admin/contract/vo/contract/FormulaSaveReqVO.java @@ -8,7 +8,7 @@ import java.util.List; @Schema(description = "管理后台 - 价款结算条款新增/修改 Request VO") @Data -public class ContractFormulaSaveReqVO { +public class FormulaSaveReqVO { @Schema(description = "主键", requiredMode = Schema.RequiredMode.REQUIRED, example = "22933") private Long id; @@ -48,11 +48,11 @@ public class ContractFormulaSaveReqVO { private String settlementType; // 基础系数配置 - private List coefficients; + private List coefficients; // 品位等级价配置 - private List grades; + private List grades; // 调整价配置 - private List deducts; + private List deducts; // 市场价配置 - private List prices; + private List prices; } \ No newline at end of file diff --git a/zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/controller/admin/contract/vo/contract/FormulasQueryReqVO.java b/zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/controller/admin/contract/vo/contract/FormulasQueryReqVO.java new file mode 100644 index 0000000..85e49d1 --- /dev/null +++ b/zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/controller/admin/contract/vo/contract/FormulasQueryReqVO.java @@ -0,0 +1,18 @@ +package com.zt.plat.module.contractorder.controller.admin.contract.vo.contract; + +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.Data; + +@Schema(description = "管理后台 - 查询结算公式列表 Request VO") +@Data +public class FormulasQueryReqVO { + + @Schema(description = "合同名称") + private String contractName; + @Schema(description = "合同编码") + private String contractPaperNumber; + @Schema(description = "物料名称") + private String materialName; + @Schema(description = "金属元素") + private String elementName; +} diff --git a/zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/controller/admin/contract/vo/contract/ContractViewGradeRespVO.java b/zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/controller/admin/contract/vo/contract/GradeRespVO.java similarity index 75% rename from zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/controller/admin/contract/vo/contract/ContractViewGradeRespVO.java rename to zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/controller/admin/contract/vo/contract/GradeRespVO.java index ccc3813..3662dca 100644 --- a/zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/controller/admin/contract/vo/contract/ContractViewGradeRespVO.java +++ b/zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/controller/admin/contract/vo/contract/GradeRespVO.java @@ -8,14 +8,14 @@ import java.math.BigDecimal; @Schema(description = "管理后台 - 品位等级价配置 Response VO") @Data -public class ContractViewGradeRespVO { - @Schema(description = "主键", requiredMode = Schema.RequiredMode.REQUIRED, example = "15414") +public class GradeRespVO { + @Schema(description = "主键") private Long id; - @Schema(description = "配置主键", example = "16734") + @Schema(description = "配置主键") private Long parameterId; - @Schema(description = "条款主键", example = "15344") + @Schema(description = "条款主键") private Long formulaId; @Schema(description = "金属元素编码") @@ -24,7 +24,7 @@ public class ContractViewGradeRespVO { @Schema(description = "金属元素缩写") private String elementAbbreviation; - @Schema(description = "金属元素名称", example = "芋艿") + @Schema(description = "金属元素名称") private String elementName; @Schema(description = "品位单位") @@ -51,13 +51,13 @@ public class ContractViewGradeRespVO { @Schema(description = "不足系数值按比例计算") private String useCoefficient; - @Schema(description = "计价类型", example = "2") + @Schema(description = "计价类型") private String priceType; - @Schema(description = "是否省内", requiredMode = Schema.RequiredMode.REQUIRED) + @Schema(description = "是否省内") @NotEmpty(message = "是否省内不能为空") private String inState; - @Schema(description = "等级单价", example = "26237") + @Schema(description = "等级单价") private BigDecimal unitPrice; } diff --git a/zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/controller/admin/contract/vo/contract/ContractGradeSaveReqVO.java b/zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/controller/admin/contract/vo/contract/GradeSaveReqVO.java similarity index 98% rename from zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/controller/admin/contract/vo/contract/ContractGradeSaveReqVO.java rename to zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/controller/admin/contract/vo/contract/GradeSaveReqVO.java index 83d23da..9c67968 100644 --- a/zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/controller/admin/contract/vo/contract/ContractGradeSaveReqVO.java +++ b/zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/controller/admin/contract/vo/contract/GradeSaveReqVO.java @@ -7,7 +7,7 @@ import java.math.BigDecimal; @Schema(description = "管理后台 - 品位等级价配置新增/修改 Request VO") @Data -public class ContractGradeSaveReqVO { +public class GradeSaveReqVO { @Schema(description = "主键", requiredMode = Schema.RequiredMode.REQUIRED, example = "15414") private Long id; diff --git a/zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/controller/admin/contract/vo/contract/ContractViewNotRespVO.java b/zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/controller/admin/contract/vo/contract/NotRespVO.java similarity index 52% rename from zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/controller/admin/contract/vo/contract/ContractViewNotRespVO.java rename to zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/controller/admin/contract/vo/contract/NotRespVO.java index 1d0f28e..1f918fa 100644 --- a/zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/controller/admin/contract/vo/contract/ContractViewNotRespVO.java +++ b/zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/controller/admin/contract/vo/contract/NotRespVO.java @@ -1,7 +1,6 @@ package com.zt.plat.module.contractorder.controller.admin.contract.vo.contract; import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; -import com.alibaba.excel.annotation.ExcelProperty; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; @@ -11,49 +10,44 @@ import java.time.LocalDateTime; @Schema(description = "管理后台 - 品位不计价规则 Response VO") @Data @ExcelIgnoreUnannotated -public class ContractViewNotRespVO { +public class NotRespVO { - @Schema(description = "主键", requiredMode = Schema.RequiredMode.REQUIRED, example = "18545") - @ExcelProperty("主键") + @Schema(description = "主键") private Long id; - @Schema(description = "合同主键", requiredMode = Schema.RequiredMode.REQUIRED, example = "5333") - @ExcelProperty("合同主键") + @Schema(description = "合同主键") private Long contractId; @Schema(description = "金属元素编码") - @ExcelProperty("金属元素编码") private String elementNumber; @Schema(description = "金属元素缩写") - @ExcelProperty("金属元素缩写") private String elementAbbreviation; - @Schema(description = "金属元素名称", example = "王五") - @ExcelProperty("金属元素名称") + @Schema(description = "金属元素名称") private String elementName; @Schema(description = "上限") - @ExcelProperty("上限") private BigDecimal gradeUp; @Schema(description = "下限") - @ExcelProperty("下限") private BigDecimal gradeDown; @Schema(description = "区间方式(字典：STLM_RNG_WY)") - @ExcelProperty("区间方式(字典：STLM_RNG_WY)") private String rangeWay; - @Schema(description = "创建时间", requiredMode = Schema.RequiredMode.REQUIRED) - @ExcelProperty("创建时间") + @Schema(description = "创建时间") private LocalDateTime createTime; - @Schema(description = "物料名称", example = "芋艿") - @ExcelProperty("物料名称") + @Schema(description = "物料名称") private String materialName; @Schema(description = "物料编码") - @ExcelProperty("物料编码") private String materialNumber; + + @Schema(description = "合同名称") + private String contractName; + + @Schema(description = "合同编码") + private String contractPaperNumber; } \ No newline at end of file diff --git a/zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/controller/admin/contract/vo/contract/ContractNotSaveReqVO.java b/zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/controller/admin/contract/vo/contract/NotSaveReqVO.java similarity index 97% rename from zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/controller/admin/contract/vo/contract/ContractNotSaveReqVO.java rename to zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/controller/admin/contract/vo/contract/NotSaveReqVO.java index 117594f..78afc87 100644 --- a/zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/controller/admin/contract/vo/contract/ContractNotSaveReqVO.java +++ b/zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/controller/admin/contract/vo/contract/NotSaveReqVO.java @@ -8,7 +8,7 @@ import java.math.BigDecimal; @Schema(description = "管理后台 - 品位不计价规则新增/修改 Request VO") @Data -public class ContractNotSaveReqVO { +public class NotSaveReqVO { @Schema(description = "主键", requiredMode = Schema.RequiredMode.REQUIRED, example = "18545") private Long id; diff --git a/zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/controller/admin/contract/vo/contract/NotsQueryReqVO.java b/zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/controller/admin/contract/vo/contract/NotsQueryReqVO.java new file mode 100644 index 0000000..e8709bf --- /dev/null +++ b/zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/controller/admin/contract/vo/contract/NotsQueryReqVO.java @@ -0,0 +1,18 @@ +package com.zt.plat.module.contractorder.controller.admin.contract.vo.contract; + +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.Data; + +@Schema(description = "管理后台 - 查询不计价规则列表 Request VO") +@Data +public class NotsQueryReqVO { + + @Schema(description = "合同名称") + private String contractName; + @Schema(description = "合同编码") + private String contractPaperNumber; + @Schema(description = "物料名称") + private String materialName; + @Schema(description = "金属元素") + private String elementName; +} diff --git a/zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/controller/admin/contract/vo/contract/ContractViewPlanRespVO.java b/zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/controller/admin/contract/vo/contract/PlanRespVO.java similarity index 81% rename from zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/controller/admin/contract/vo/contract/ContractViewPlanRespVO.java rename to zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/controller/admin/contract/vo/contract/PlanRespVO.java index 27bd099..517ca47 100644 --- a/zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/controller/admin/contract/vo/contract/ContractViewPlanRespVO.java +++ b/zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/controller/admin/contract/vo/contract/PlanRespVO.java @@ -7,14 +7,14 @@ import java.math.BigDecimal; @Schema(description = "管理后台 - 交货计划 Response VO") @Data -public class ContractViewPlanRespVO { +public class PlanRespVO { @Schema(description = "主键") private Long id; - @Schema(description = "交货年份", example = "2025") + @Schema(description = "交货年份") private Long contractDeliveryYear; - @Schema(description = "交货月份", example = "9") + @Schema(description = "交货月份") private Long contractPlanDeliveryMonth; @Schema(description = "计划交货数量") diff --git a/zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/controller/admin/contract/vo/contract/ContractPlanSaveReqVO.java b/zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/controller/admin/contract/vo/contract/PlanSaveReqVO.java similarity index 95% rename from zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/controller/admin/contract/vo/contract/ContractPlanSaveReqVO.java rename to zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/controller/admin/contract/vo/contract/PlanSaveReqVO.java index 5d39bc0..6ee919d 100644 --- a/zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/controller/admin/contract/vo/contract/ContractPlanSaveReqVO.java +++ b/zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/controller/admin/contract/vo/contract/PlanSaveReqVO.java @@ -7,7 +7,7 @@ import java.math.BigDecimal; @Schema(description = "管理后台 - 交货计划条款新增/修改 Request VO") @Data -public class ContractPlanSaveReqVO { +public class PlanSaveReqVO { @Schema(description = "主键") private Long id; diff --git a/zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/controller/admin/contract/vo/contract/ContractViewPriceRespVO.java b/zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/controller/admin/contract/vo/contract/PriceRespVO.java similarity index 75% rename from zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/controller/admin/contract/vo/contract/ContractViewPriceRespVO.java rename to zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/controller/admin/contract/vo/contract/PriceRespVO.java index ad519ee..5b82d87 100644 --- a/zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/controller/admin/contract/vo/contract/ContractViewPriceRespVO.java +++ b/zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/controller/admin/contract/vo/contract/PriceRespVO.java @@ -8,14 +8,14 @@ import java.time.LocalDateTime; @Schema(description = "管理后台 - 市场价配置新 Response VO") @Data -public class ContractViewPriceRespVO { - @Schema(description = "主键", requiredMode = Schema.RequiredMode.REQUIRED, example = "13654") +public class PriceRespVO { + @Schema(description = "主键") private Long id; - @Schema(description = "配置主键", example = "1590") + @Schema(description = "配置主键") private Long parameterId; - @Schema(description = "条款主键", example = "24677") + @Schema(description = "条款主键") private Long formulaId; @Schema(description = "市场价") @@ -42,10 +42,10 @@ public class ContractViewPriceRespVO { @Schema(description = "价格品种元素的明细分类") private String priceGrade; - @Schema(description = "品种分类", example = "1") + @Schema(description = "品种分类") private String gradeType; - @Schema(description = "取价方式;区间价/固定价", example = "2") + @Schema(description = "取价方式;区间价/固定价") private String averageType; @Schema(description = "网价小数位") diff --git a/zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/controller/admin/contract/vo/contract/ContractPriceSaveReqVO.java b/zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/controller/admin/contract/vo/contract/PriceSaveReqVO.java similarity index 97% rename from zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/controller/admin/contract/vo/contract/ContractPriceSaveReqVO.java rename to zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/controller/admin/contract/vo/contract/PriceSaveReqVO.java index 6a0c197..a47e1f5 100644 --- a/zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/controller/admin/contract/vo/contract/ContractPriceSaveReqVO.java +++ b/zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/controller/admin/contract/vo/contract/PriceSaveReqVO.java @@ -7,7 +7,7 @@ import java.time.LocalDateTime; @Schema(description = "管理后台 - 市场价配置新增/修改 Request VO") @Data -public class ContractPriceSaveReqVO { +public class PriceSaveReqVO { @Schema(description = "主键", requiredMode = Schema.RequiredMode.REQUIRED, example = "13654") private Long id; diff --git a/zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/dal/dataobject/contract/ContractCoefficientDO.java b/zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/dal/dataobject/contract/ContractCoefficientDO.java index c945db3..3e3a4e9 100644 --- a/zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/dal/dataobject/contract/ContractCoefficientDO.java +++ b/zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/dal/dataobject/contract/ContractCoefficientDO.java @@ -29,11 +29,6 @@ public class ContractCoefficientDO extends BusinessBaseDO { */ @TableId(type = IdType.ASSIGN_ID) private Long id; - /** - * 配置主键 - */ - @TableField("PRM_ID") - private Long parameterId; /** * 条款主键 */ @@ -54,11 +49,6 @@ public class ContractCoefficientDO extends BusinessBaseDO { */ @TableField("ELEM_NAME") private String elementName; - /** - * 系数值 - */ - @TableField("STLM_COEF") - private String settlementCoefficient; /** * 系数上限 */ @@ -70,23 +60,23 @@ public class ContractCoefficientDO extends BusinessBaseDO { @TableField("COEF_DOWN") private BigDecimal coefficientDown; /** - * 是否包含上限 + * 区间方式(字典：STLM_RNG_WY) */ - @TableField("IS_IN_UP") - private String isInUp; + @TableField("RNG_WY") + private String rangeWay; /** - * 是否包含下限 - */ - @TableField("IS_IN_DOWN") - private String isInDown; - /** - * 是否省内 + * 是否省内(字典：ERP_CTRT_YN) */ @TableField("IN_STA") private String inState; /** - * 类型 + * 类型(字典：STLM_COEF) */ @TableField("TP") private String type; + /** + * 系数值 + */ + @TableField("STLM_COEF") + private BigDecimal settlementCoefficient; } \ No newline at end of file diff --git a/zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/dal/dataobject/contract/ContractDeductDO.java b/zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/dal/dataobject/contract/ContractDeductDO.java index c80521e..a6ed755 100644 --- a/zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/dal/dataobject/contract/ContractDeductDO.java +++ b/zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/dal/dataobject/contract/ContractDeductDO.java @@ -29,56 +29,16 @@ public class ContractDeductDO extends BusinessBaseDO { */ @TableId(type = IdType.ASSIGN_ID) private Long id; - /** - * 配置主键 - */ - @TableField("PRM_ID") - private Long parameterId; /** * 条款主键 */ @TableField("FMU_ID") private Long formulaId; /** - * 物料编码;推送ERP + * 数据项类型(字典:GRD_CFG_TP) */ - @TableField("MTRL_NUM") - private String materialNumber; - /** - * 物料名称 - */ - @TableField("MTRL_NAME") - private String materialName; - /** - * 上限 - */ - @TableField("GRD_UP") - private BigDecimal gradeUp; - /** - * 下限 - */ - @TableField("GRD_DOWN") - private BigDecimal gradeDown; - /** - * 是否包含上限 - */ - @TableField("IS_IN_UP") - private String isInUp; - /** - * 是否包含下限 - */ - @TableField("IS_IN_DOWN") - private String isInDown; - /** - * 方式 - */ - @TableField("WY") - private String way; - /** - * 类型 - */ - @TableField("TP") - private String type; + @TableField("CFG_TP") + private String configType; /** * 是否省内 */ diff --git a/zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/dal/mysql/contract/ContractDemoteMapper.java b/zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/dal/mysql/contract/ContractDemoteMapper.java index 25ea87a..15008e8 100644 --- a/zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/dal/mysql/contract/ContractDemoteMapper.java +++ b/zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/dal/mysql/contract/ContractDemoteMapper.java @@ -1,8 +1,12 @@ package com.zt.plat.module.contractorder.dal.mysql.contract; import com.zt.plat.framework.mybatis.core.mapper.BaseMapperX; +import com.zt.plat.module.contractorder.controller.admin.contract.vo.contract.DemoteRespVO; import com.zt.plat.module.contractorder.dal.dataobject.contract.ContractDemoteDO; import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Select; + +import java.util.List; /** * 参数降级规则 Mapper @@ -12,4 +16,26 @@ import org.apache.ibatis.annotations.Mapper; @Mapper public interface ContractDemoteMapper extends BaseMapperX { + @Select({ + "" + }) + List selectDemotes(List contractIds, String materialName, String elementName); } \ No newline at end of file diff --git a/zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/dal/mysql/contract/ContractFormulaMapper.java b/zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/dal/mysql/contract/ContractFormulaMapper.java index 793e5f4..39d3d6e 100644 --- a/zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/dal/mysql/contract/ContractFormulaMapper.java +++ b/zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/dal/mysql/contract/ContractFormulaMapper.java @@ -1,8 +1,12 @@ package com.zt.plat.module.contractorder.dal.mysql.contract; import com.zt.plat.framework.mybatis.core.mapper.BaseMapperX; +import com.zt.plat.module.contractorder.controller.admin.contract.vo.contract.FormulaRespVO; import com.zt.plat.module.contractorder.dal.dataobject.contract.ContractFormulaDO; import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Select; + +import java.util.List; /** * 价款结算条款 Mapper @@ -12,4 +16,26 @@ import org.apache.ibatis.annotations.Mapper; @Mapper public interface ContractFormulaMapper extends BaseMapperX { + @Select({ + "" + }) + List selectFormulas(List contractIds, String materialName, String elementName); } \ No newline at end of file diff --git a/zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/dal/mysql/contract/ContractNotMapper.java b/zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/dal/mysql/contract/ContractNotMapper.java index 862e08e..d0ea42e 100644 --- a/zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/dal/mysql/contract/ContractNotMapper.java +++ b/zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/dal/mysql/contract/ContractNotMapper.java @@ -1,8 +1,12 @@ package com.zt.plat.module.contractorder.dal.mysql.contract; import com.zt.plat.framework.mybatis.core.mapper.BaseMapperX; +import com.zt.plat.module.contractorder.controller.admin.contract.vo.contract.NotRespVO; import com.zt.plat.module.contractorder.dal.dataobject.contract.ContractNotDO; import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Select; + +import java.util.List; /** * 品位不计价配置 Mapper @@ -11,4 +15,27 @@ import org.apache.ibatis.annotations.Mapper; */ @Mapper public interface ContractNotMapper extends BaseMapperX { + + @Select({ + "" + }) + List selectNots(List contractIds, String materialName, String elementName); } \ No newline at end of file diff --git a/zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/service/contract/ContractService.java b/zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/service/contract/ContractService.java index dc64e89..e3b6fa9 100644 --- a/zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/service/contract/ContractService.java +++ b/zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/service/contract/ContractService.java @@ -1,13 +1,12 @@ package com.zt.plat.module.contractorder.service.contract; import com.zt.plat.framework.common.pojo.PageResult; -import com.zt.plat.module.contractorder.controller.admin.contract.vo.contract.ContractApprovalReqVO; -import com.zt.plat.module.contractorder.controller.admin.contract.vo.contract.ContractPageReqVO; -import com.zt.plat.module.contractorder.controller.admin.contract.vo.contract.ContractSaveReqVO; -import com.zt.plat.module.contractorder.controller.admin.contract.vo.contract.ContractViewRespVO; +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; +import java.util.List; + /** * 后台合同编制 Service 接口 * @@ -37,7 +36,7 @@ public interface ContractService { * @param id 合同ID * @return 合同信息 */ - ContractViewRespVO get(Long id); + ContractRespVO get(Long id); /** * 修改合同 @@ -51,9 +50,39 @@ public interface ContractService { * 合同提交审批 * * @param id 合同ID - * @return 审批结果 + * @return 提交审批结果 */ String submitApproval(Long id); - String approval(@Valid ContractApprovalReqVO reqVO); + /** + * 合同审批 + * + * @param reqVO 审批信息 + * @return 审批结果 + */ + String approval(@Valid ApprovalReqVO reqVO); + + /** + * 查询不计价规则列表 + * + * @param queryReqVO 查询参数 + * @return 不计价规则列表 + */ + List getNots(NotsQueryReqVO queryReqVO); + + /** + * 查询参数降级规则列表 + * + * @param queryReqVO 查询参数 + * @return 参数降级规则列表 + */ + List getDemotes(DemotesQueryReqVO queryReqVO); + + /** + * 查询结算公式列表 + * + * @param queryReqVO 查询参数 + * @return 结算公式列表 + */ + List getFormulas(FormulasQueryReqVO queryReqVO); } diff --git a/zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/service/contract/ContractServiceImpl.java b/zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/service/contract/ContractServiceImpl.java index 616eb58..8ff71f3 100644 --- a/zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/service/contract/ContractServiceImpl.java +++ b/zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/service/contract/ContractServiceImpl.java @@ -3,6 +3,7 @@ package com.zt.plat.module.contractorder.service.contract; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.zt.plat.framework.common.pojo.PageResult; import com.zt.plat.framework.common.util.object.BeanUtils; +import com.zt.plat.framework.mybatis.core.query.LambdaQueryWrapperX; import com.zt.plat.framework.security.core.util.SecurityFrameworkUtils; import com.zt.plat.framework.tenant.core.context.CompanyContextHolder; import com.zt.plat.module.base.controller.admin.templtp.vo.TemplateInstanceDataRespVO; @@ -40,6 +41,7 @@ import java.time.LocalDate; import java.time.format.DateTimeFormatter; import java.util.ArrayList; import java.util.List; +import java.util.stream.Collectors; import static com.zt.plat.framework.common.exception.util.ServiceExceptionUtil.exception; import static com.zt.plat.module.contractorder.enums.ErrorCodeConstants.*; @@ -268,10 +270,10 @@ public class ContractServiceImpl implements ContractService { } @Override - public ContractViewRespVO get(Long id) { + public ContractRespVO get(Long id) { // 返回结果 - ContractViewRespVO respVO = new ContractViewRespVO(); + ContractRespVO respVO = new ContractRespVO(); // 查询并设置合同主信息 ContractMainDO contractMainDO = contractMainMapper.selectById(id); @@ -284,14 +286,14 @@ public class ContractServiceImpl implements ContractService { List detailDOS = contractDetailMapper .selectList(TableFieldConstants.BSE_CTRT_DTL_CTRT_MAIN_ID, contractMainDO.getId()); if (detailDOS != null && !detailDOS.isEmpty()) { - respVO.setDetail(BeanUtils.toBean(detailDOS, ContractViewDetailRespVO.class)); + respVO.setDetail(BeanUtils.toBean(detailDOS, DetailRespVO.class)); respVO.getDetail().forEach(detail -> { // 查询并设置交货计划 List planDOS = contractPlanMapper .selectList(TableFieldConstants.BSE_CTRT_PLN_CTRT_DTL_ID, detail.getId()); if (planDOS != null && !planDOS.isEmpty()) { - detail.setPlans(BeanUtils.toBean(planDOS, ContractViewPlanRespVO.class)); + detail.setPlans(BeanUtils.toBean(planDOS, PlanRespVO.class)); } }); } @@ -300,7 +302,7 @@ public class ContractServiceImpl implements ContractService { List formulaDOS = contractFormulaMapper .selectList(TableFieldConstants.BSE_CTRT_FMU_CTRT_ID, contractMainDO.getId()); if (formulaDOS != null && !formulaDOS.isEmpty()) { - respVO.setFormulas(BeanUtils.toBean(formulaDOS, ContractViewFormulaRespVO.class)); + respVO.setFormulas(BeanUtils.toBean(formulaDOS, FormulaRespVO.class)); respVO.getFormulas().forEach(formula -> { @@ -308,25 +310,25 @@ public class ContractServiceImpl implements ContractService { List coefficientDOS = contractCoefficientMapper .selectList(TableFieldConstants.BSE_CTRT_COEF_FMU_ID, formula.getId()); if (coefficientDOS != null && !coefficientDOS.isEmpty()) { - formula.setCoefficients(BeanUtils.toBean(coefficientDOS, ContractViewCoefficientRespVO.class)); + formula.setCoefficients(BeanUtils.toBean(coefficientDOS, CoefficientRespVO.class)); } // 查询并设置品位等级价配置 List gradeDOS = contractGradeMapper .selectList(TableFieldConstants.BSE_CTRT_GRD_FMU_ID, formula.getId()); if (gradeDOS != null && !gradeDOS.isEmpty()) { - formula.setGrades(BeanUtils.toBean(gradeDOS, ContractViewGradeRespVO.class)); + formula.setGrades(BeanUtils.toBean(gradeDOS, GradeRespVO.class)); } // 查询并设置调整价配置 List deductDOS = contractDeductMapper .selectList(TableFieldConstants.BSE_CTRT_DDCT_FMU_ID, formula.getId()); if (deductDOS != null && !deductDOS.isEmpty()) { - formula.setDeducts(BeanUtils.toBean(deductDOS, ContractViewDeductRespVO.class)); + formula.setDeducts(BeanUtils.toBean(deductDOS, DeductRespVO.class)); } // 查询并设置市场价配置 List priceDOS = contractPriceMapper .selectList(TableFieldConstants.BSE_CTRT_PRC_FMU_ID, formula.getId()); if (priceDOS != null && !priceDOS.isEmpty()) { - formula.setPrices(BeanUtils.toBean(priceDOS, ContractViewPriceRespVO.class)); + formula.setPrices(BeanUtils.toBean(priceDOS, PriceRespVO.class)); } }); } @@ -335,14 +337,14 @@ public class ContractServiceImpl implements ContractService { List demoteDOS = contractDemoteMapper .selectList(TableFieldConstants.BSE_CTRT_DMOT_CTRT_ID, contractMainDO.getId()); if (demoteDOS != null && !demoteDOS.isEmpty()) { - respVO.setDemotes(BeanUtils.toBean(demoteDOS, ContractViewDemoteRespVO.class)); + respVO.setDemotes(BeanUtils.toBean(demoteDOS, DemoteRespVO.class)); } // 查询并设置品位不计价规则 List notDOS = contractNotMapper .selectList(TableFieldConstants.BSE_CTRT_NT_CTRT_ID, contractMainDO.getId()); if (notDOS != null && !notDOS.isEmpty()) { - respVO.setNots(BeanUtils.toBean(notDOS, ContractViewNotRespVO.class)); + respVO.setNots(BeanUtils.toBean(notDOS, NotRespVO.class)); } // 查询并设置合同动态表单 @@ -651,7 +653,7 @@ public class ContractServiceImpl implements ContractService { } @Override - public String approval(ContractApprovalReqVO reqVO) { + public String approval(ApprovalReqVO reqVO) { // 合同主键ID Long id = reqVO.getId(); @@ -682,12 +684,55 @@ public class ContractServiceImpl implements ContractService { return ""; } + private List getContractIds(String contractName, String contractPaperNumber) { + List contractIds = new ArrayList<>(); + List contractMainDOS = contractMainMapper.selectList(new LambdaQueryWrapperX() + .likeIfPresent(ContractMainDO::getContractName, contractName) + .likeIfPresent(ContractMainDO::getContractPaperNumber, contractPaperNumber)); + if (CollectionUtils.isNotEmpty(contractMainDOS)) { + contractIds = contractMainDOS.stream() + .map(contractMainDO -> contractMainDO.getId()) + .collect(Collectors.toList()); + } + return contractIds; + } + + @Override + public List getNots(NotsQueryReqVO queryReqVO) { + // 查合同ID集合 + List contractIds = new ArrayList<>(); + if (StringUtils.isNotEmpty(queryReqVO.getContractName()) || StringUtils.isNotEmpty(queryReqVO.getContractPaperNumber())) { + contractIds = getContractIds(queryReqVO.getContractName(), queryReqVO.getContractPaperNumber()); + } + return contractNotMapper.selectNots(contractIds, queryReqVO.getMaterialName(), queryReqVO.getElementName()); + } + + @Override + public List getDemotes(DemotesQueryReqVO queryReqVO) { + // 查合同ID集合 + List contractIds = new ArrayList<>(); + if (StringUtils.isNotEmpty(queryReqVO.getContractName()) || StringUtils.isNotEmpty(queryReqVO.getContractPaperNumber())) { + contractIds = getContractIds(queryReqVO.getContractName(), queryReqVO.getContractPaperNumber()); + } + return contractDemoteMapper.selectDemotes(contractIds, queryReqVO.getMaterialName(), queryReqVO.getElementName()); + } + + @Override + public List getFormulas(FormulasQueryReqVO queryReqVO) { + // 查合同ID集合 + List contractIds = new ArrayList<>(); + if (StringUtils.isNotEmpty(queryReqVO.getContractName()) || StringUtils.isNotEmpty(queryReqVO.getContractPaperNumber())) { + contractIds = getContractIds(queryReqVO.getContractName(), queryReqVO.getContractPaperNumber()); + } + return contractFormulaMapper.selectFormulas(contractIds, queryReqVO.getMaterialName(), queryReqVO.getElementName()); + } + /** * 校验合同内容 * * @param contract 合同数据 */ - private void verifyContract(ContractViewRespVO contract) { + private void verifyContract(ContractRespVO contract) { /* 合同基本信息 */ // 甲方公司编号不能为空 diff --git a/zt-module-erp/zt-module-erp-api/src/main/java/com/zt/plat/module/erp/enums/ErrorCodeConstants.java b/zt-module-erp/zt-module-erp-api/src/main/java/com/zt/plat/module/erp/enums/ErrorCodeConstants.java index 9449fe0..b9f1f52 100644 --- a/zt-module-erp/zt-module-erp-api/src/main/java/com/zt/plat/module/erp/enums/ErrorCodeConstants.java +++ b/zt-module-erp/zt-module-erp-api/src/main/java/com/zt/plat/module/erp/enums/ErrorCodeConstants.java @@ -27,6 +27,7 @@ public interface ErrorCodeConstants { ErrorCode ERP_FACTORY_NOT_EXISTS = new ErrorCode(1_008_000_001, "ERP工厂数据不存在"); ErrorCode ERP_FACTORY_REDIS_NOT_EXISTS = new ErrorCode(1_008_000_002, "ERP工厂redis数据不存在"); + ErrorCode ERP_FACTORY_NOT_ALLOW_UPDATE = new ErrorCode(1_008_000_003, "类型为ERP的数据或启用的数据不允许编辑"); ErrorCode ERP_COSTCENTER_NOT_EXISTS = new ErrorCode(1_009_000_001, "ERP成本中心数据不存在"); diff --git a/zt-module-erp/zt-module-erp-server/src/main/java/com/zt/plat/module/erp/controller/admin/erp/ErpFactoryController.java b/zt-module-erp/zt-module-erp-server/src/main/java/com/zt/plat/module/erp/controller/admin/erp/ErpFactoryController.java index cd0d51f..5878582 100644 --- a/zt-module-erp/zt-module-erp-server/src/main/java/com/zt/plat/module/erp/controller/admin/erp/ErpFactoryController.java +++ b/zt-module-erp/zt-module-erp-server/src/main/java/com/zt/plat/module/erp/controller/admin/erp/ErpFactoryController.java @@ -88,6 +88,14 @@ public class ErpFactoryController { return success(BeanUtils.toBean(pageResult, ErpFactoryRespVO.class)); } + @GetMapping("/pageByCpn") + @Operation(summary = "获得ERP工厂分页") + @PreAuthorize("@ss.hasPermission('base:erp-factory:query')") + public CommonResult> getErpFactoryPageByCpn(@Valid ErpFactoryPageReqVO pageReqVO) { + PageResult pageResult = erpFactoryService.getErpFactoryPageByCpn(pageReqVO); + return success(BeanUtils.toBean(pageResult, ErpFactoryRespVO.class)); + } + @GetMapping("/export-excel") @Operation(summary = "导出ERP工厂 Excel") @PreAuthorize("@ss.hasPermission('base:erp-factory:export')") @@ -101,6 +109,14 @@ public class ErpFactoryController { BeanUtils.toBean(list, ErpFactoryRespVO.class)); } + @PutMapping("/enable-list") + @Operation(summary = "批量更新") + @PreAuthorize("@ss.hasPermission('base:erp-factory:update')") + public CommonResult enableFactoryList(@RequestBody List saveReqVOS) { + erpFactoryService.enableFactoryList(saveReqVOS); + return success(true); + } + @PostMapping("/getErpFactoryTask") @Operation(summary = "定时获得erp工厂数据") @PreAuthorize("@ss.hasPermission('base:erp-factory:create')") diff --git a/zt-module-erp/zt-module-erp-server/src/main/java/com/zt/plat/module/erp/controller/admin/erp/vo/ErpFactoryPageReqVO.java b/zt-module-erp/zt-module-erp-server/src/main/java/com/zt/plat/module/erp/controller/admin/erp/vo/ErpFactoryPageReqVO.java index ea7375e..bf71059 100644 --- a/zt-module-erp/zt-module-erp-server/src/main/java/com/zt/plat/module/erp/controller/admin/erp/vo/ErpFactoryPageReqVO.java +++ b/zt-module-erp/zt-module-erp-server/src/main/java/com/zt/plat/module/erp/controller/admin/erp/vo/ErpFactoryPageReqVO.java @@ -1,5 +1,6 @@ package com.zt.plat.module.erp.controller.admin.erp.vo; +import com.baomidou.mybatisplus.annotation.TableField; import com.zt.plat.framework.common.pojo.PageParam; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; @@ -14,4 +15,13 @@ public class ErpFactoryPageReqVO extends PageParam { @Schema(description = "工厂编码") private String number; + @Schema(description = "公司编号") + private String companyNumber; + + @Schema(description = "公司名称") + private String companyName; + + @Schema(description = "类型") + private String type; + } \ No newline at end of file diff --git a/zt-module-erp/zt-module-erp-server/src/main/java/com/zt/plat/module/erp/controller/admin/erp/vo/ErpFactoryRespVO.java b/zt-module-erp/zt-module-erp-server/src/main/java/com/zt/plat/module/erp/controller/admin/erp/vo/ErpFactoryRespVO.java index 8c0d4d4..9700347 100644 --- a/zt-module-erp/zt-module-erp-server/src/main/java/com/zt/plat/module/erp/controller/admin/erp/vo/ErpFactoryRespVO.java +++ b/zt-module-erp/zt-module-erp-server/src/main/java/com/zt/plat/module/erp/controller/admin/erp/vo/ErpFactoryRespVO.java @@ -22,4 +22,18 @@ public class ErpFactoryRespVO { @ExcelProperty("工厂编码") private String number; + @Schema(description = "公司编号") + private String companyNumber; + + @Schema(description = "类型") + private String type; + + @Schema(description = "绑定工厂名") + private String relName; + + @Schema(description = "绑定工厂编码") + private String relnumber; + + @Schema(description = "是否启用") + private String isEnable; } \ No newline at end of file diff --git a/zt-module-erp/zt-module-erp-server/src/main/java/com/zt/plat/module/erp/controller/admin/erp/vo/ErpFactorySaveReqVO.java b/zt-module-erp/zt-module-erp-server/src/main/java/com/zt/plat/module/erp/controller/admin/erp/vo/ErpFactorySaveReqVO.java index 3cb6f25..f93795f 100644 --- a/zt-module-erp/zt-module-erp-server/src/main/java/com/zt/plat/module/erp/controller/admin/erp/vo/ErpFactorySaveReqVO.java +++ b/zt-module-erp/zt-module-erp-server/src/main/java/com/zt/plat/module/erp/controller/admin/erp/vo/ErpFactorySaveReqVO.java @@ -19,4 +19,21 @@ public class ErpFactorySaveReqVO { @NotEmpty(message = "工厂编码不能为空") private String number; + @Schema(description = "公司编号") + private String companyNumber; + + @Schema(description = "公司编号") + private String companyName; + + @Schema(description = "类型") + private String type; + + @Schema(description = "绑定工厂名") + private String relName; + + @Schema(description = "绑定工厂编码") + private String relnumber; + + @Schema(description = "是否启用") + private String isEnable; } \ No newline at end of file diff --git a/zt-module-erp/zt-module-erp-server/src/main/java/com/zt/plat/module/erp/dal/dataobject/erp/ErpFactoryDO.java b/zt-module-erp/zt-module-erp-server/src/main/java/com/zt/plat/module/erp/dal/dataobject/erp/ErpFactoryDO.java index 491b6e9..61a613b 100644 --- a/zt-module-erp/zt-module-erp-server/src/main/java/com/zt/plat/module/erp/dal/dataobject/erp/ErpFactoryDO.java +++ b/zt-module-erp/zt-module-erp-server/src/main/java/com/zt/plat/module/erp/dal/dataobject/erp/ErpFactoryDO.java @@ -1,12 +1,14 @@ package com.zt.plat.module.erp.dal.dataobject.erp; import com.baomidou.mybatisplus.annotation.*; +import com.zt.plat.framework.mybatis.core.dataobject.BusinessBaseDO; import lombok.*; + /** -* ERP工厂 DO -* -* @author 后台管理 -*/ + * ERP工厂 DO + * + * @author 后台管理 + */ @TableName("sply_erp_fact") @KeySequence("sply_erp_fact_seq") // 用于 Oracle、PostgreSQL、Kingbase、DB2、H2 数据库的主键自增。如果是 MySQL 等数据库，可不写。 @Data @@ -16,31 +18,58 @@ import lombok.*; @NoArgsConstructor @AllArgsConstructor /** -* 支持业务基类继承：isBusiness=true 时继承 BusinessBaseDO，否则继承 BaseDO -*/ -public class ErpFactoryDO { - - + * 支持业务基类继承：isBusiness=true 时继承 BusinessBaseDO，否则继承 BaseDO + */ +public class ErpFactoryDO extends BusinessBaseDO { /** - * 主键 - */ + * 主键 + */ @TableId(type = IdType.ASSIGN_ID) private Long id; /** - * 工厂名称 - */ + * 工厂名称 + */ @TableField("NAME") private String name; /** - * 工厂编码 - */ + * 工厂编码 + */ @TableField("NUM") private String number; /** - * 公司编号 - */ + * 公司编号 + */ @TableField("CPN_ID") - private String companyId; + private String companyNumber; + /** + * 公司名称 + */ + @TableField(exist = false) + private String companyName; + + /** + * 类型 + */ + @TableField("TP") + private String type; + + /** + * 绑定工厂名 + */ + @TableField("REL_NAME") + private String relName; + + /** + * 绑定工厂编码 + */ + @TableField("REL_NUM") + private String relnumber; + + /** + * 类型 + */ + @TableField("IS_ENB") + private String isEnable; } \ No newline at end of file diff --git a/zt-module-erp/zt-module-erp-server/src/main/java/com/zt/plat/module/erp/dal/dataobject/erp/ErpWarehouseDO.java b/zt-module-erp/zt-module-erp-server/src/main/java/com/zt/plat/module/erp/dal/dataobject/erp/ErpWarehouseDO.java index 54b1577..95a54c2 100644 --- a/zt-module-erp/zt-module-erp-server/src/main/java/com/zt/plat/module/erp/dal/dataobject/erp/ErpWarehouseDO.java +++ b/zt-module-erp/zt-module-erp-server/src/main/java/com/zt/plat/module/erp/dal/dataobject/erp/ErpWarehouseDO.java @@ -41,4 +41,10 @@ public class ErpWarehouseDO { @TableField("NUM") private String number; + /** + * 类别 + */ + @TableField("TP") + private String type; + } \ No newline at end of file diff --git a/zt-module-erp/zt-module-erp-server/src/main/java/com/zt/plat/module/erp/dal/mysql/erp/ErpBomMapper.java b/zt-module-erp/zt-module-erp-server/src/main/java/com/zt/plat/module/erp/dal/mysql/erp/ErpBomMapper.java index a00e6c7..167de8b 100644 --- a/zt-module-erp/zt-module-erp-server/src/main/java/com/zt/plat/module/erp/dal/mysql/erp/ErpBomMapper.java +++ b/zt-module-erp/zt-module-erp-server/src/main/java/com/zt/plat/module/erp/dal/mysql/erp/ErpBomMapper.java @@ -25,6 +25,4 @@ public interface ErpBomMapper extends BaseMapperX { .eqIfPresent(ErpBomDO::getUnit, reqVO.getUnit()) .orderByDesc(ErpBomDO::getId)); } - - Long insertGetId(ErpBomDO aDo); } \ No newline at end of file diff --git a/zt-module-erp/zt-module-erp-server/src/main/java/com/zt/plat/module/erp/dal/mysql/erp/ErpCostcenterMapper.java b/zt-module-erp/zt-module-erp-server/src/main/java/com/zt/plat/module/erp/dal/mysql/erp/ErpCostcenterMapper.java index 5365316..de7d71e 100644 --- a/zt-module-erp/zt-module-erp-server/src/main/java/com/zt/plat/module/erp/dal/mysql/erp/ErpCostcenterMapper.java +++ b/zt-module-erp/zt-module-erp-server/src/main/java/com/zt/plat/module/erp/dal/mysql/erp/ErpCostcenterMapper.java @@ -29,6 +29,4 @@ public interface ErpCostcenterMapper extends BaseMapperX { .betweenIfPresent(ErpCostcenterDO::getEndDate, reqVO.getEndDate()) .orderByDesc(ErpCostcenterDO::getId)); } - - void updateBatchByNumber(@Param("list") List toUpdate); } \ No newline at end of file diff --git a/zt-module-erp/zt-module-erp-server/src/main/java/com/zt/plat/module/erp/dal/mysql/erp/ErpFactoryMapper.java b/zt-module-erp/zt-module-erp-server/src/main/java/com/zt/plat/module/erp/dal/mysql/erp/ErpFactoryMapper.java index a4a22a7..4661051 100644 --- a/zt-module-erp/zt-module-erp-server/src/main/java/com/zt/plat/module/erp/dal/mysql/erp/ErpFactoryMapper.java +++ b/zt-module-erp/zt-module-erp-server/src/main/java/com/zt/plat/module/erp/dal/mysql/erp/ErpFactoryMapper.java @@ -22,9 +22,11 @@ public interface ErpFactoryMapper extends BaseMapperX { return selectPage(reqVO, new LambdaQueryWrapperX() .likeIfPresent(ErpFactoryDO::getName, reqVO.getName()) .eqIfPresent(ErpFactoryDO::getNumber, reqVO.getNumber()) + .eqIfPresent(ErpFactoryDO::getType, reqVO.getType()) .orderByDesc(ErpFactoryDO::getId)); } - void updateBatch(@Param("toUpdate") List toUpdate); + String selectMaxCode(); + List getPageByReq(ErpFactoryPageReqVO pageReqVO); } \ No newline at end of file diff --git a/zt-module-erp/zt-module-erp-server/src/main/java/com/zt/plat/module/erp/service/erp/ErpContractServiceImpl.java b/zt-module-erp/zt-module-erp-server/src/main/java/com/zt/plat/module/erp/service/erp/ErpContractServiceImpl.java index c55748b..ce09950 100644 --- a/zt-module-erp/zt-module-erp-server/src/main/java/com/zt/plat/module/erp/service/erp/ErpContractServiceImpl.java +++ b/zt-module-erp/zt-module-erp-server/src/main/java/com/zt/plat/module/erp/service/erp/ErpContractServiceImpl.java @@ -77,12 +77,12 @@ public class ErpContractServiceImpl implements ErpContractService { } @Override - public void deleteErpContractListByIds(List ids) { + public void deleteErpContractListByIds(List ids) { // 校验存在 validateErpContractExists(ids); // 删除 erpContractMapper.deleteByIds(ids); - } + } private void validateErpContractExists(List ids) { List list = erpContractMapper.selectByIds(ids); @@ -177,17 +177,44 @@ public class ErpContractServiceImpl implements ErpContractService { @XxlJob("getErpContractTask") public void callErpRfcInterface() { try { - OftenEnum.FuncnrEnum funcnrEnum =OftenEnum.FuncnrEnum.合同信息; + OftenEnum.FuncnrEnum funcnrEnum = OftenEnum.FuncnrEnum.合同信息; String funcnr = funcnrEnum.getFuncnr(); + + Map req = new HashMap<>(); + JSONArray dataArrayALL = new JSONArray(); + String commanyKey = "erpMap" + OftenEnum.FuncnrEnum.公司代码.getFuncnr(); + Map redisCache = myRedisConfig.getRedisCacheMap(commanyKey); + if (CollUtil.isEmpty(redisCache)) { + return; + } + String cstmKey = "erpMap" + OftenEnum.FuncnrEnum.客商信息.getFuncnr(); + Map redisCachecstmKey = myRedisConfig.getRedisCacheMap(cstmKey); + if (CollUtil.isEmpty(redisCachecstmKey)) { + return; + } // 1. 调用ERP接口获取数据 - HashMap dataFromERP = erpConfig.fetchDataFromERP(funcnr, null); - JSONArray dataArray = (JSONArray) dataFromERP.get("E_RESP"); - if (CollUtil.isEmpty(dataArray)) { + for (String INEDR : new String[]{"1", "2"}) { + req.put("INEDR", INEDR); + for (String number : redisCache.keySet()) { + req.put("BUKRS", number); + for (String partner : redisCachecstmKey.keySet()) { + req.put("PARTNER", partner); + + // 1. 调用ERP接口获取数据 + HashMap dataFromERP = erpConfig.fetchDataFromERP(funcnr, null); + JSONArray dataArray = (JSONArray) dataFromERP.get("E_RESP"); + if (dataArray!= null) { + dataArrayALL.addAll(dataArray); + } + } + } + } + if (CollUtil.isEmpty(dataArrayALL)) { throw exception(ERP_CONTRACT_NOT_EXISTS); } // 2. 处理公司数据，区分新增和更新 - ProcessingResult result = processData(dataArray,funcnrEnum); + ProcessingResult result = processData(dataArrayALL, funcnrEnum); // 3. 批量保存数据 saveData(result); @@ -203,7 +230,7 @@ public class ErpContractServiceImpl implements ErpContractService { */ private ProcessingResult processData(JSONArray dataArray, OftenEnum.FuncnrEnum funcnr) { String key = "erp" + funcnr.getFuncnr(); - Map> numbers = myRedisConfig.numbers(dataArray, key,funcnr.getDatakey()); + Map> numbers = myRedisConfig.numbers(dataArray, key, funcnr.getDatakey()); List allnumbers = numbers.get("all"); List comnumbers = numbers.get("com"); List toUpdate = new ArrayList<>(); @@ -229,7 +256,7 @@ public class ErpContractServiceImpl implements ErpContractService { } } - return new ProcessingResult(toUpdate, toInsert,key,allnumbers); + return new ProcessingResult(toUpdate, toInsert, key, allnumbers); } /** @@ -243,7 +270,7 @@ public class ErpContractServiceImpl implements ErpContractService { if (!result.toUpdate.isEmpty()) { erpContractMapper.updateBatch(result.toUpdate); } - myRedisConfig.updateRedisCache(result.key,result.allnumbers); + myRedisConfig.updateRedisCache(result.key, result.allnumbers); } /** @@ -255,7 +282,7 @@ public class ErpContractServiceImpl implements ErpContractService { private final String key; private final List allnumbers; - public ProcessingResult(List toUpdate, List toInsert,String key,List allnumbers) { + public ProcessingResult(List toUpdate, List toInsert, String key, List allnumbers) { this.toUpdate = toUpdate; this.toInsert = toInsert; this.key = key; diff --git a/zt-module-erp/zt-module-erp-server/src/main/java/com/zt/plat/module/erp/service/erp/ErpFactoryService.java b/zt-module-erp/zt-module-erp-server/src/main/java/com/zt/plat/module/erp/service/erp/ErpFactoryService.java index 3583dda..29f36f0 100644 --- a/zt-module-erp/zt-module-erp-server/src/main/java/com/zt/plat/module/erp/service/erp/ErpFactoryService.java +++ b/zt-module-erp/zt-module-erp-server/src/main/java/com/zt/plat/module/erp/service/erp/ErpFactoryService.java @@ -62,4 +62,8 @@ public interface ErpFactoryService { PageResult getErpFactoryPage(ErpFactoryPageReqVO pageReqVO); void callErpRfcInterface(); + + void enableFactoryList(List saveReqVOS); + + PageResult getErpFactoryPageByCpn(ErpFactoryPageReqVO pageReqVO); } \ No newline at end of file diff --git a/zt-module-erp/zt-module-erp-server/src/main/java/com/zt/plat/module/erp/service/erp/ErpFactoryServiceImpl.java b/zt-module-erp/zt-module-erp-server/src/main/java/com/zt/plat/module/erp/service/erp/ErpFactoryServiceImpl.java index e4d09c6..06c32fa 100644 --- a/zt-module-erp/zt-module-erp-server/src/main/java/com/zt/plat/module/erp/service/erp/ErpFactoryServiceImpl.java +++ b/zt-module-erp/zt-module-erp-server/src/main/java/com/zt/plat/module/erp/service/erp/ErpFactoryServiceImpl.java @@ -16,6 +16,7 @@ import com.zt.plat.module.erp.controller.admin.erp.vo.ErpFactorySaveReqVO; import com.zt.plat.module.erp.dal.dataobject.erp.ErpFactoryDO; import com.zt.plat.module.erp.dal.mysql.erp.ErpFactoryMapper; import jakarta.annotation.Resource; +import org.apache.ibatis.executor.BatchResult; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import org.springframework.validation.annotation.Validated; @@ -51,6 +52,21 @@ public class ErpFactoryServiceImpl implements ErpFactoryService { public ErpFactoryRespVO createErpFactory(ErpFactorySaveReqVO createReqVO) { // 插入 ErpFactoryDO erpFactory = BeanUtils.toBean(createReqVO, ErpFactoryDO.class); + // 工厂编码自动生成，格式 GC-0001,依次新增 + if (erpFactory.getNumber() == null){ + String maxCode = erpFactoryMapper.selectMaxCode(); + if (maxCode == null) { + erpFactory.setNumber("GC-0001"); + } else { + String prefix = "GC-"; + String numberPart = maxCode.substring(prefix.length()); + int nextNumber = Integer.parseInt(numberPart) + 1; + String nextCode = prefix + String.format("%04d", nextNumber); + erpFactory.setNumber(nextCode); + } + } + erpFactory.setType("供应链"); + erpFactory.setIsEnable("1"); erpFactoryMapper.insert(erpFactory); // 返回 return BeanUtils.toBean(erpFactory, ErpFactoryRespVO.class); @@ -62,6 +78,9 @@ public class ErpFactoryServiceImpl implements ErpFactoryService { validateErpFactoryExists(updateReqVO.getId()); // 更新 ErpFactoryDO updateObj = BeanUtils.toBean(updateReqVO, ErpFactoryDO.class); + if (updateObj.getType().equals("ERP")||updateObj.getIsEnable().equals("1")){ + throw exception(ERP_FACTORY_NOT_ALLOW_UPDATE); + } erpFactoryMapper.updateById(updateObj); } @@ -103,6 +122,39 @@ public class ErpFactoryServiceImpl implements ErpFactoryService { public PageResult getErpFactoryPage(ErpFactoryPageReqVO pageReqVO) { return erpFactoryMapper.selectPage(pageReqVO); } + + @Override + public void enableFactoryList(List saveReqVOS) { + List updateObj = BeanUtils.toBean(saveReqVOS, ErpFactoryDO.class); + List count = erpFactoryMapper.updateById(updateObj); + if (CollUtil.isEmpty(count)) { + throw exception(ERP_FACTORY_NOT_EXISTS); + } + } + + @Override + public PageResult getErpFactoryPageByCpn(ErpFactoryPageReqVO pageReqVO) { + // 获取分页数据 + List list = erpFactoryMapper.getPageByReq(pageReqVO); + if (list == null) { + list = CollUtil.newArrayList(); + } + // 分页处理 + int pageNo = pageReqVO.getPageNo(); + int pageSize = pageReqVO.getPageSize(); + int total = list.size(); + // 计算分页起始和结束位置 + int fromIndex = (pageNo - 1) * pageSize; + int toIndex = Math.min(fromIndex + pageSize, total); + // 如果起始位置超出范围，则返回空列表 + if (fromIndex >= total) { + return new PageResult<>(new ArrayList<>(), (long) total); + } + // 截取当前页数据 + List pageList = list.subList(fromIndex, toIndex); + return new PageResult<>(pageList, (long) total); + } + @Override @Transactional @XxlJob("getErpFactoryTask") @@ -173,7 +225,8 @@ public class ErpFactoryServiceImpl implements ErpFactoryService { ErpFactoryDO DO = new ErpFactoryDO(); DO.setName(dataJson.getString("NAME1")); DO.setNumber(number); - DO.setCompanyId(dataJson.getString("BUKRS")); + DO.setCompanyNumber(dataJson.getString("BUKRS")); + DO.setType("ERP"); if (numbers.get(number)!=null) { // 更新 DO.setId(numbers.get(number)); @@ -244,7 +297,7 @@ public class ErpFactoryServiceImpl implements ErpFactoryService { private void initializeMap(String key) { Map existingNumbers = erpFactoryMapper.selectList(new LambdaQueryWrapperX()) - .stream() + .stream().filter(erpFactoryDO -> erpFactoryDO.getType().equals("ERP")) .collect(Collectors.toMap(ErpFactoryDO::getNumber, ErpFactoryDO::getId)); myRedisConfig.addRedisCacheMap(key, existingNumbers); } diff --git a/zt-module-erp/zt-module-erp-server/src/main/java/com/zt/plat/module/erp/service/erp/ErpMaterialServiceImpl.java b/zt-module-erp/zt-module-erp-server/src/main/java/com/zt/plat/module/erp/service/erp/ErpMaterialServiceImpl.java index 6cfec6e..224ed84 100644 --- a/zt-module-erp/zt-module-erp-server/src/main/java/com/zt/plat/module/erp/service/erp/ErpMaterialServiceImpl.java +++ b/zt-module-erp/zt-module-erp-server/src/main/java/com/zt/plat/module/erp/service/erp/ErpMaterialServiceImpl.java @@ -228,7 +228,8 @@ public class ErpMaterialServiceImpl implements ErpMaterialService { private void initialize(String key) { List existingNumbers = erpMaterialMapper.selectList(new LambdaQueryWrapperX()) - .stream() + .stream( ) + .filter(ErpMaterialDO -> ErpMaterialDO.getType().equals("ERP")) .map(ErpMaterialDO::getDownCenterNumber) .collect(Collectors.toList()); myRedisConfig.updateRedisCache(key, existingNumbers); diff --git a/zt-module-erp/zt-module-erp-server/src/main/java/com/zt/plat/module/erp/service/erp/ErpWarehouseServiceImpl.java b/zt-module-erp/zt-module-erp-server/src/main/java/com/zt/plat/module/erp/service/erp/ErpWarehouseServiceImpl.java index 27c07a4..f7028bf 100644 --- a/zt-module-erp/zt-module-erp-server/src/main/java/com/zt/plat/module/erp/service/erp/ErpWarehouseServiceImpl.java +++ b/zt-module-erp/zt-module-erp-server/src/main/java/com/zt/plat/module/erp/service/erp/ErpWarehouseServiceImpl.java @@ -244,7 +244,8 @@ public class ErpWarehouseServiceImpl implements ErpWarehouseService { } private void initializeMap(String key) { - List assets = erpWarehouseMapper.selectList(new LambdaQueryWrapperX()); + List assets = erpWarehouseMapper.selectList(new LambdaQueryWrapperX() + .eq(ErpWarehouseDO::getType, "ERP")); Map existingNumbers = new HashMap<>(); for (ErpWarehouseDO asset : assets) { String mapKey = asset.getFactoryNumber() + "-" + asset.getNumber(); diff --git a/zt-module-erp/zt-module-erp-server/src/main/resources/mapper/ErpAssetMapper.xml b/zt-module-erp/zt-module-erp-server/src/main/resources/mapper/ErpAssetMapper.xml index 12a0566..fb84721 100644 --- a/zt-module-erp/zt-module-erp-server/src/main/resources/mapper/ErpAssetMapper.xml +++ b/zt-module-erp/zt-module-erp-server/src/main/resources/mapper/ErpAssetMapper.xml @@ -8,23 +8,4 @@ 代码生成器暂时只生成 Mapper XML 文件本身，更多推荐 MybatisX 快速开发插件来生成查询。 文档可见：https://www.iocoder.cn/MyBatis/x-plugins/ --> - - UPDATE sply_erp_ast - - NAME = CASE - - WHEN CPN_NUM = #{item.companyNumber} AND MAIN_AST_NUM = #{item.mainAssetNumber} THEN #{item.name} - - END, - CPN_ID = CASE - - WHEN CPN_NUM = #{item.companyNumber} AND MAIN_AST_NUM = #{item.mainAssetNumber} THEN #{item.companyId} - - END - - WHERE (CPN_NUM, MAIN_AST_NUM) IN - - #{item.companyNumber}, #{item.mainAssetNumber} - - \ No newline at end of file diff --git a/zt-module-erp/zt-module-erp-server/src/main/resources/mapper/ErpBomMapper.xml b/zt-module-erp/zt-module-erp-server/src/main/resources/mapper/ErpBomMapper.xml index 85d4dfb..632e44e 100644 --- a/zt-module-erp/zt-module-erp-server/src/main/resources/mapper/ErpBomMapper.xml +++ b/zt-module-erp/zt-module-erp-server/src/main/resources/mapper/ErpBomMapper.xml @@ -9,18 +9,4 @@ 文档可见：https://www.iocoder.cn/MyBatis/x-plugins/ --> - - - - - - - UPDATE sply_erp_fact - - NAME = #{item.name}, - CPN_ID = #{item.companyId}, - - WHERE NUM = #{item.number} - - \ No newline at end of file diff --git a/zt-module-erp/zt-module-erp-server/src/main/resources/mapper/ErpCompanyMapper.xml b/zt-module-erp/zt-module-erp-server/src/main/resources/mapper/ErpCompanyMapper.xml index f9f4620..0122889 100644 --- a/zt-module-erp/zt-module-erp-server/src/main/resources/mapper/ErpCompanyMapper.xml +++ b/zt-module-erp/zt-module-erp-server/src/main/resources/mapper/ErpCompanyMapper.xml @@ -8,15 +8,4 @@ 代码生成器暂时只生成 Mapper XML 文件本身，更多推荐 MybatisX 快速开发插件来生成查询。 文档可见：https://www.iocoder.cn/MyBatis/x-plugins/ --> - - - - UPDATE sply_erp_fact - - NAME = #{item.name}, - CPN_ID = #{item.companyId}, - - WHERE NUM = #{item.number} - - \ No newline at end of file diff --git a/zt-module-erp/zt-module-erp-server/src/main/resources/mapper/ErpContractMapper.xml b/zt-module-erp/zt-module-erp-server/src/main/resources/mapper/ErpContractMapper.xml index 688d9d4..e7dacd8 100644 --- a/zt-module-erp/zt-module-erp-server/src/main/resources/mapper/ErpContractMapper.xml +++ b/zt-module-erp/zt-module-erp-server/src/main/resources/mapper/ErpContractMapper.xml @@ -8,15 +8,4 @@ 代码生成器暂时只生成 Mapper XML 文件本身，更多推荐 MybatisX 快速开发插件来生成查询。 文档可见：https://www.iocoder.cn/MyBatis/x-plugins/ --> - - - - UPDATE sply_erp_fact - - NAME = #{item.name}, - CPN_ID = #{item.companyId}, - - WHERE NUM = #{item.number} - - \ No newline at end of file diff --git a/zt-module-erp/zt-module-erp-server/src/main/resources/mapper/ErpCostcenterMapper.xml b/zt-module-erp/zt-module-erp-server/src/main/resources/mapper/ErpCostcenterMapper.xml index 498c4e0..54e0e40 100644 --- a/zt-module-erp/zt-module-erp-server/src/main/resources/mapper/ErpCostcenterMapper.xml +++ b/zt-module-erp/zt-module-erp-server/src/main/resources/mapper/ErpCostcenterMapper.xml @@ -9,61 +9,4 @@ 文档可见：https://www.iocoder.cn/MyBatis/x-plugins/ --> - - UPDATE sply_erp_cctr - SET - NAME = CASE NUM - - - WHEN #{item.number} THEN #{item.name} - - - ELSE NAME - END, - IS_USE = CASE NUM - - - WHEN #{item.number} THEN #{item.isUse} - - - ELSE IS_USE - END, - SCO_NUM = CASE NUM - - - WHEN #{item.number} THEN #{item.scopeNumber} - - - ELSE SCO_NUM - END, - STRT_DT = CASE NUM - - - WHEN #{item.number} THEN #{item.startDate} - - - ELSE STRT_DT - END, - END_DT = CASE NUM - - - WHEN #{item.number} THEN #{item.endDate} - - - ELSE END_DT - END, - SCO_NAME = CASE NUM - - - WHEN #{item.number} THEN #{item.scopeName} - - - ELSE SCO_NAME - END - WHERE NUM IN - - #{item.number} - - - \ No newline at end of file diff --git a/zt-module-erp/zt-module-erp-server/src/main/resources/mapper/ErpCustomerMapper.xml b/zt-module-erp/zt-module-erp-server/src/main/resources/mapper/ErpCustomerMapper.xml index 31f5228..8e76ec1 100644 --- a/zt-module-erp/zt-module-erp-server/src/main/resources/mapper/ErpCustomerMapper.xml +++ b/zt-module-erp/zt-module-erp-server/src/main/resources/mapper/ErpCustomerMapper.xml @@ -8,15 +8,4 @@ 代码生成器暂时只生成 Mapper XML 文件本身，更多推荐 MybatisX 快速开发插件来生成查询。 文档可见：https://www.iocoder.cn/MyBatis/x-plugins/ --> - - - - UPDATE sply_erp_fact - - NAME = #{item.name}, - CPN_ID = #{item.companyId}, - - WHERE NUM = #{item.number} - - \ No newline at end of file diff --git a/zt-module-erp/zt-module-erp-server/src/main/resources/mapper/ErpFactoryMapper.xml b/zt-module-erp/zt-module-erp-server/src/main/resources/mapper/ErpFactoryMapper.xml index 4a23831..baadafd 100644 --- a/zt-module-erp/zt-module-erp-server/src/main/resources/mapper/ErpFactoryMapper.xml +++ b/zt-module-erp/zt-module-erp-server/src/main/resources/mapper/ErpFactoryMapper.xml @@ -9,14 +9,28 @@ 文档可见：https://www.iocoder.cn/MyBatis/x-plugins/ --> - - - UPDATE sply_erp_fact - - NAME = #{item.name}, - CPN_ID = #{item.companyId}, - - WHERE NUM = #{item.number} - - + + + \ No newline at end of file diff --git a/zt-module-erp/zt-module-erp-server/src/main/resources/mapper/ErpInternalOrderMapper.xml b/zt-module-erp/zt-module-erp-server/src/main/resources/mapper/ErpInternalOrderMapper.xml index b59832f..4a1460c 100644 --- a/zt-module-erp/zt-module-erp-server/src/main/resources/mapper/ErpInternalOrderMapper.xml +++ b/zt-module-erp/zt-module-erp-server/src/main/resources/mapper/ErpInternalOrderMapper.xml @@ -9,14 +9,4 @@ 文档可见：https://www.iocoder.cn/MyBatis/x-plugins/ --> - - - UPDATE sply_erp_fact - - NAME = #{item.name}, - CPN_ID = #{item.companyId}, - - WHERE NUM = #{item.number} - - \ No newline at end of file diff --git a/zt-module-erp/zt-module-erp-server/src/main/resources/mapper/ErpProcessDetailMapper.xml b/zt-module-erp/zt-module-erp-server/src/main/resources/mapper/ErpProcessDetailMapper.xml index f487c8d..b58d773 100644 --- a/zt-module-erp/zt-module-erp-server/src/main/resources/mapper/ErpProcessDetailMapper.xml +++ b/zt-module-erp/zt-module-erp-server/src/main/resources/mapper/ErpProcessDetailMapper.xml @@ -9,14 +9,4 @@ 文档可见：https://www.iocoder.cn/MyBatis/x-plugins/ --> - - - UPDATE sply_erp_fact - - NAME = #{item.name}, - CPN_ID = #{item.companyId}, - - WHERE NUM = #{item.number} - - \ No newline at end of file diff --git a/zt-module-erp/zt-module-erp-server/src/main/resources/mapper/ErpProcessMapper.xml b/zt-module-erp/zt-module-erp-server/src/main/resources/mapper/ErpProcessMapper.xml index 433aa98..e7b766e 100644 --- a/zt-module-erp/zt-module-erp-server/src/main/resources/mapper/ErpProcessMapper.xml +++ b/zt-module-erp/zt-module-erp-server/src/main/resources/mapper/ErpProcessMapper.xml @@ -9,14 +9,4 @@ 文档可见：https://www.iocoder.cn/MyBatis/x-plugins/ --> - - - UPDATE sply_erp_fact - - NAME = #{item.name}, - CPN_ID = #{item.companyId}, - - WHERE NUM = #{item.number} - - \ No newline at end of file diff --git a/zt-module-erp/zt-module-erp-server/src/main/resources/mapper/ErpProductiveOrderMapper.xml b/zt-module-erp/zt-module-erp-server/src/main/resources/mapper/ErpProductiveOrderMapper.xml index 84cc4c6..e39974f 100644 --- a/zt-module-erp/zt-module-erp-server/src/main/resources/mapper/ErpProductiveOrderMapper.xml +++ b/zt-module-erp/zt-module-erp-server/src/main/resources/mapper/ErpProductiveOrderMapper.xml @@ -9,14 +9,4 @@ 文档可见：https://www.iocoder.cn/MyBatis/x-plugins/ --> - - - UPDATE sply_erp_fact - - NAME = #{item.name}, - CPN_ID = #{item.companyId}, - - WHERE NUM = #{item.number} - - \ No newline at end of file diff --git a/zt-module-erp/zt-module-erp-server/src/main/resources/mapper/ErpProductiveVersionMapper.xml b/zt-module-erp/zt-module-erp-server/src/main/resources/mapper/ErpProductiveVersionMapper.xml index 9cdaf4c..c64aa8e 100644 --- a/zt-module-erp/zt-module-erp-server/src/main/resources/mapper/ErpProductiveVersionMapper.xml +++ b/zt-module-erp/zt-module-erp-server/src/main/resources/mapper/ErpProductiveVersionMapper.xml @@ -9,14 +9,4 @@ 文档可见：https://www.iocoder.cn/MyBatis/x-plugins/ --> - - - UPDATE sply_erp_fact - - NAME = #{item.name}, - CPN_ID = #{item.companyId}, - - WHERE NUM = #{item.number} - - \ No newline at end of file diff --git a/zt-module-erp/zt-module-erp-server/src/main/resources/mapper/ErpPurchaseOrganizationMapper.xml b/zt-module-erp/zt-module-erp-server/src/main/resources/mapper/ErpPurchaseOrganizationMapper.xml index 2a28feb..eac0416 100644 --- a/zt-module-erp/zt-module-erp-server/src/main/resources/mapper/ErpPurchaseOrganizationMapper.xml +++ b/zt-module-erp/zt-module-erp-server/src/main/resources/mapper/ErpPurchaseOrganizationMapper.xml @@ -9,14 +9,4 @@ 文档可见：https://www.iocoder.cn/MyBatis/x-plugins/ --> - - - UPDATE sply_erp_fact - - NAME = #{item.name}, - CPN_ID = #{item.companyId}, - - WHERE NUM = #{item.number} - - \ No newline at end of file diff --git a/zt-module-erp/zt-module-erp-server/src/main/resources/mapper/ErpSalesOrganizationMapper.xml b/zt-module-erp/zt-module-erp-server/src/main/resources/mapper/ErpSalesOrganizationMapper.xml index 09c59b5..616ebb0 100644 --- a/zt-module-erp/zt-module-erp-server/src/main/resources/mapper/ErpSalesOrganizationMapper.xml +++ b/zt-module-erp/zt-module-erp-server/src/main/resources/mapper/ErpSalesOrganizationMapper.xml @@ -9,14 +9,4 @@ 文档可见：https://www.iocoder.cn/MyBatis/x-plugins/ --> - - - UPDATE sply_erp_fact - - NAME = #{item.name}, - CPN_ID = #{item.companyId}, - - WHERE NUM = #{item.number} - - \ No newline at end of file diff --git a/zt-module-erp/zt-module-erp-server/src/main/resources/mapper/ErpWarehouseMapper.xml b/zt-module-erp/zt-module-erp-server/src/main/resources/mapper/ErpWarehouseMapper.xml index a78b3ab..533eb39 100644 --- a/zt-module-erp/zt-module-erp-server/src/main/resources/mapper/ErpWarehouseMapper.xml +++ b/zt-module-erp/zt-module-erp-server/src/main/resources/mapper/ErpWarehouseMapper.xml @@ -9,14 +9,4 @@ 文档可见：https://www.iocoder.cn/MyBatis/x-plugins/ --> - - - UPDATE sply_erp_fact - - NAME = #{item.name}, - CPN_ID = #{item.companyId}, - - WHERE NUM = #{item.number} - - \ No newline at end of file