Merge remote-tracking branch 'origin/dev' into dev

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

@@ -14,6 +14,8 @@ public class DemotesQueryReqVO extends PageParam {
     private String contractPaperNumber;
     @Schema(description = "物料名称")
     private String materialName;
+    @Schema(description = "物料编码")
+    private String materialNumber;
     @Schema(description = "金属元素")
-    private String elementName;
+    private String elementAbbreviation;
 }

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

@@ -12,8 +12,12 @@ public class FormulasQueryReqVO extends PageParam {
     private String contractName;
     @Schema(description = "合同编码")
     private String contractPaperNumber;
+    @Schema(description = "公式类型")
+    private String formulaType;
     @Schema(description = "物料名称")
     private String materialName;
+    @Schema(description = "物料编码")
+    private String materialNumber;
     @Schema(description = "金属元素")
-    private String elementName;
+    private String elementAbbreviation;
 }

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

@@ -14,6 +14,8 @@ public class NotsQueryReqVO extends PageParam {
     private String contractPaperNumber;
     @Schema(description = "物料名称")
     private String materialName;
+    @Schema(description = "物料编码")
+    private String materialNumber;
     @Schema(description = "金属元素")
-    private String elementName;
+    private String elementAbbreviation;
 }

zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/dal/mysql/contract/ContractDemoteMapper.java

@@ -43,10 +43,13 @@ public interface ContractDemoteMapper extends BaseMapperX<ContractDemoteDO> {
             "<if test= \"materialName != null and materialName != ''\">",
             "and mtrl_name like concat('%',#{materialName},'%')",
             "</if>",
-            "<if test= \"elementName != null and elementName != ''\">",
-            "and mtrl_num like concat('%',#{elementName},'%')",
+            "<if test= \"materialNumber != null and materialNumber != ''\">",
+            "and MTRL_NUM like concat('%',#{materialNumber},'%')",
+            "</if>",
+            "<if test= \"elementAbbreviation != null and elementAbbreviation != ''\">",
+            "and ELEM_ABBR like concat('%',#{elementAbbreviation},'%')",
             "</if>",
             "</script>"
     })
-    IPage<DemoteRespVO> selectDemotes(IPage<?> page, List<Long> contractIds, String materialName, String elementName);
+    IPage<DemoteRespVO> selectDemotes(IPage<?> page, List<Long> contractIds, String materialName, String materialNumber, String elementAbbreviation);
 }

zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/dal/mysql/contract/ContractFormulaMapper.java

@@ -42,13 +42,19 @@ public interface ContractFormulaMapper extends BaseMapperX<ContractFormulaDO> {
             "#{contractId}",
             "</foreach>",
             "</if>",
+            "<if test= \"formulaType != null and formulaType != ''\">",
+            "and FMU_TP = #{formulaType}",
+            "</if>",
             "<if test= \"materialName != null and materialName != ''\">",
             "and mtrl_name like concat('%',#{materialName},'%')",
             "</if>",
-            "<if test= \"elementName != null and elementName != ''\">",
-            "and mtrl_num like concat('%',#{elementName},'%')",
+            "<if test= \"materialNumber != null and materialNumber != ''\">",
+            "and MTRL_NUM like concat('%',#{materialNumber},'%')",
+            "</if>",
+            "<if test= \"elementAbbreviation != null and elementAbbreviation != ''\">",
+            "and ELEM_ABBR like concat('%',#{elementAbbreviation},'%')",
             "</if>",
             "</script>"
     })
-    IPage<FormulaRespVO> selectFormulas(IPage<?> page, List<Long> contractIds, String materialName, String elementName);
+    IPage<FormulaRespVO> selectFormulas(IPage<?> page, List<Long> contractIds, String formulaType, String materialName, String materialNumber, String elementAbbreviation);
 }

zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/dal/mysql/contract/ContractNotMapper.java

@@ -43,10 +43,13 @@ public interface ContractNotMapper extends BaseMapperX<ContractNotDO> {
             "<if test= \"materialName != null and materialName != ''\">",
             "and mtrl_name like concat('%',#{materialName},'%')",
             "</if>",
-            "<if test= \"elementName != null and elementName != ''\">",
-            "and elem_name like concat('%',#{elementName},'%')",
+            "<if test= \"materialNumber != null and materialNumber != ''\">",
+            "and MTRL_NUM like concat('%',#{materialNumber},'%')",
+            "</if>",
+            "<if test= \"elementAbbreviation != null and elementAbbreviation != ''\">",
+            "and ELEM_ABBR like concat('%',#{elementAbbreviation},'%')",
             "</if>",
             "</script>"
     })
-    IPage<NotRespVO> selectNots(IPage<NotRespVO> page, List<Long> contractIds, String materialName, String elementName);
+    IPage<NotRespVO> selectNots(IPage<NotRespVO> page, List<Long> contractIds, String materialName, String materialNumber, String elementAbbreviation);
 }

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

@@ -1198,7 +1198,8 @@ public class ContractServiceImpl implements ContractService {
                 new Page<NotRespVO>().setCurrent(queryReqVO.getPageNo()).setSize(queryReqVO.getPageSize()),
                 contractIds,
                 queryReqVO.getMaterialName(),
-                queryReqVO.getElementName()
+                queryReqVO.getMaterialNumber(),
+                queryReqVO.getElementAbbreviation()
         );
 
         // 分页返回
@@ -1219,7 +1220,8 @@ public class ContractServiceImpl implements ContractService {
                 new Page<>().setCurrent(queryReqVO.getPageNo()).setSize(queryReqVO.getPageSize()),
                 contractIds,
                 queryReqVO.getMaterialName(),
-                queryReqVO.getElementName()
+                queryReqVO.getMaterialNumber(),
+                queryReqVO.getElementAbbreviation()
         );
 
         // 分页返回
@@ -1239,8 +1241,10 @@ public class ContractServiceImpl implements ContractService {
         IPage<FormulaRespVO> ipage = contractFormulaMapper.selectFormulas(
                 new Page<>().setCurrent(queryReqVO.getPageNo()).setSize(queryReqVO.getPageSize()),
                 contractIds,
+                queryReqVO.getFormulaType(),
                 queryReqVO.getMaterialName(),
-                queryReqVO.getElementName()
+                queryReqVO.getMaterialNumber(),
+                queryReqVO.getElementAbbreviation()
         );
 
         // 分页返回结果