Merge branch 'refs/heads/dev' into test

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

@@ -2,12 +2,15 @@ package com.zt.plat.module.contractorder.api;
 
 
 import com.zt.plat.framework.common.pojo.CommonResult;
-import com.zt.plat.module.contractorder.api.dto.ContractFormulaRespDTO;
+import com.zt.plat.module.contractorder.api.dto.PurchaseOrderWithDetailsDTO;
+import com.zt.plat.module.contractorder.api.dto.contract.ContractRespDTO;
 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.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestParam;
 
 import java.util.List;
@@ -17,10 +20,15 @@ import java.util.List;
 public interface ContractApi {
     String PREFIX = ApiConstants.PREFIX + "/contract";
 
-    @GetMapping(PREFIX + "/formulas")
+    @GetMapping(PREFIX + "/get/by-paper-number")
-    @Operation(summary = "通过合同编号获取对应的结算条款数据")
+    @Operation(summary = "通过合同编号获取对应的合同信息")
-    List<ContractFormulaRespDTO> getFormulas(@RequestParam("contractPaperNumber") String contractPaperNumber);
+    ContractRespDTO getContractByPaperNumber(@RequestParam("contractPaperNumber") String contractPaperNumber);
+
     @GetMapping(PREFIX + "/updateOrderStatus")
     @Operation(summary = "更新订单状态")
     CommonResult<Boolean> updateOrderStatus(@RequestParam("orderId") Long orderId, @RequestParam("status") String status);
+
+    @PostMapping(PREFIX + "/order-by-order-no")
+    @Operation(summary = "更新订单状态", description = "通过订单编号获取订单信息")
+    CommonResult<List<PurchaseOrderWithDetailsDTO>> getOrderByOrderNo(@RequestBody List<String> orderNoS);
 }

zt-module-contract-order/zt-module-contract-order-api/src/main/java/com/zt/plat/module/contractorder/api/dto/contract/CoefficientRespDTO.java

@@ -1,4 +1,4 @@
-package com.zt.plat.module.contractorder.api.dto;
+package com.zt.plat.module.contractorder.api.dto.contract;
 
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
@@ -7,7 +7,7 @@ import java.math.BigDecimal;
 
 @Schema(description = "RPC 服务 - 基础系数配置 Response DTO")
 @Data
-public class ContractCoefficientRespDTO {
+public class CoefficientRespDTO {
 
     @Schema(description = "主键")
     private Long id;

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

@@ -1,4 +1,4 @@
-package com.zt.plat.module.contractorder.api.dto;
+package com.zt.plat.module.contractorder.api.dto.contract;
 
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
@@ -8,7 +8,7 @@ import java.time.LocalDateTime;
 
 @Schema(description = "RPC 服务 - 调整价配置 Response DTO")
 @Data
-public class ContractDeductRespDTO {
+public class DeductRespDTO {
 
     @Schema(description = "主键")
     private Long id;

zt-module-contract-order/zt-module-contract-order-api/src/main/java/com/zt/plat/module/contractorder/api/dto/contract/DemoteRespDTO.java

@@ -0,0 +1,51 @@
+package com.zt.plat.module.contractorder.api.dto.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 DemoteRespDTO {
+
+    @Schema(description = "主键")
+    private Long id;
+
+    @Schema(description = "合同主键")
+    private Long contractId;
+
+    @Schema(description = "金属元素编码")
+    private String elementNumber;
+
+    @Schema(description = "金属元素缩写")
+    private String elementAbbreviation;
+
+    @Schema(description = "金属元素名称")
+    private String elementName;
+
+    @Schema(description = "上限")
+    private BigDecimal gradeUp;
+
+    @Schema(description = "区间方式(字典：STLM_RNG_WY)")
+    private String rangeWay;
+
+    @Schema(description = "下限")
+    private BigDecimal gradeDown;
+
+    @Schema(description = "降级后物料名称")
+    private String materialName;
+
+    @Schema(description = "降级后物料编码")
+    private String materialNumber;
+
+    @Schema(description = "创建时间")
+    private LocalDateTime createTime;
+
+    @Schema(description = "合同名称")
+    private String contractName;
+
+    @Schema(description = "合同编码")
+    private String contractPaperNumber;
+}

zt-module-contract-order/zt-module-contract-order-api/src/main/java/com/zt/plat/module/contractorder/api/dto/contract/DetailRespDTO.java

@@ -0,0 +1,41 @@
+package com.zt.plat.module.contractorder.api.dto.contract;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+
+import java.math.BigDecimal;
+import java.util.List;
+
+@Schema(description = "管理后台 - 合同明细 Response VO")
+@Data
+public class DetailRespDTO {
+    @Schema(description = "主键")
+    private Long id;
+
+    @Schema(description = "物料名称")
+    private String materialName;
+
+    @Schema(description = "物料编码")
+    private String materialNumber;
+
+    @Schema(description = "数量")
+    private BigDecimal quantity;
+
+    @Schema(description = "计量单位")
+    private String unit;
+
+    @Schema(description = "含税单价")
+    private BigDecimal inTaxUnitPrice;
+
+    @Schema(description = "金属元素缩写")
+    private String elementAbbreviation;
+
+    @Schema(description = "金属元素名称")
+    private String elementName;
+
+    @Schema(description = "金属元素编码")
+    private String elementNumber;
+
+    // 交货计划
+    private List<PlanRespDTO> plans;
+}

zt-module-contract-order/zt-module-contract-order-api/src/main/java/com/zt/plat/module/contractorder/api/dto/contract/FormulaRespDTO.java

@@ -1,4 +1,4 @@
-package com.zt.plat.module.contractorder.api.dto;
+package com.zt.plat.module.contractorder.api.dto.contract;
 
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
@@ -7,7 +7,7 @@ import java.util.List;
 
 @Schema(description = "RPC 服务 - 价款结算条款 Response DTO")
 @Data
-public class ContractFormulaRespDTO {
+public class FormulaRespDTO {
 
     @Schema(description = "主键")
     private Long id;
@@ -46,11 +46,11 @@ public class ContractFormulaRespDTO {
     private String settlementType;
 
     // 基础系数配置
-    private List<ContractCoefficientRespDTO> coefficients;
+    private List<CoefficientRespDTO> coefficients;
     // 品位等级价配置
-    private List<ContractGradeRespDTO> grades;
+    private List<GradeRespDTO> grades;
     // 调整价配置
-    private List<ContractDeductRespDTO> deducts;
+    private List<DeductRespDTO> deducts;
     // 市场价配置
-    private List<ContractPriceRespDTO> prices;
+    private List<PriceRespDTO> prices;
 }

zt-module-contract-order/zt-module-contract-order-api/src/main/java/com/zt/plat/module/contractorder/api/dto/contract/GradeRespDTO.java

@@ -1,4 +1,4 @@
-package com.zt.plat.module.contractorder.api.dto;
+package com.zt.plat.module.contractorder.api.dto.contract;
 
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
@@ -8,7 +8,7 @@ import java.time.LocalDateTime;
 
 @Schema(description = "RPC 服务 - 品位等级价配置 Response DTO")
 @Data
-public class ContractGradeRespDTO {
+public class GradeRespDTO {
 
     @Schema(description = "主键")
     private Long id;