From f59650015184097feb2e4185288455496cbfd50f Mon Sep 17 00:00:00 2001 From: chenbowen Date: Wed, 19 Nov 2025 14:48:07 +0800 Subject: [PATCH 1/2] =?UTF-8?q?1.=20=E5=8D=87=E7=BA=A7=E7=A7=81=E6=9C=89?= =?UTF-8?q?=E5=8C=85=E7=89=88=E6=9C=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index e5a5726d..e65b2515 100644 --- a/pom.xml +++ b/pom.xml @@ -19,7 +19,7 @@ https://github.com/YunaiV/ruoyi-vue-pro - 3.0.43 + 3.0.44 17 ${java.version} From 05069e28469ac5d7cd540e1a91f7a4560089616f Mon Sep 17 00:00:00 2001 From: guojunyun Date: Wed, 19 Nov 2025 15:15:37 +0800 Subject: [PATCH 2/2] =?UTF-8?q?SZHGYL-289=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../api/vo/contract/DemotesQueryReqVO.java | 4 +++- .../api/vo/contract/FormulasQueryReqVO.java | 6 +++++- .../api/vo/contract/NotsQueryReqVO.java | 4 +++- .../dal/mysql/contract/ContractDemoteMapper.java | 9 ++++++--- .../dal/mysql/contract/ContractFormulaMapper.java | 12 +++++++++--- .../dal/mysql/contract/ContractNotMapper.java | 9 ++++++--- .../service/contract/ContractServiceImpl.java | 10 +++++++--- 7 files changed, 39 insertions(+), 15 deletions(-) diff --git a/zt-module-contract-order/zt-module-contract-order-api/src/main/java/com/zt/plat/module/contractorder/api/vo/contract/DemotesQueryReqVO.java b/zt-module-contract-order/zt-module-contract-order-api/src/main/java/com/zt/plat/module/contractorder/api/vo/contract/DemotesQueryReqVO.java index f19447b3..76b3a0d0 100644 --- a/zt-module-contract-order/zt-module-contract-order-api/src/main/java/com/zt/plat/module/contractorder/api/vo/contract/DemotesQueryReqVO.java +++ b/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; } diff --git a/zt-module-contract-order/zt-module-contract-order-api/src/main/java/com/zt/plat/module/contractorder/api/vo/contract/FormulasQueryReqVO.java b/zt-module-contract-order/zt-module-contract-order-api/src/main/java/com/zt/plat/module/contractorder/api/vo/contract/FormulasQueryReqVO.java index b5664ed2..d118512f 100644 --- a/zt-module-contract-order/zt-module-contract-order-api/src/main/java/com/zt/plat/module/contractorder/api/vo/contract/FormulasQueryReqVO.java +++ b/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; } diff --git a/zt-module-contract-order/zt-module-contract-order-api/src/main/java/com/zt/plat/module/contractorder/api/vo/contract/NotsQueryReqVO.java b/zt-module-contract-order/zt-module-contract-order-api/src/main/java/com/zt/plat/module/contractorder/api/vo/contract/NotsQueryReqVO.java index 7e691494..2a0bb5d9 100644 --- a/zt-module-contract-order/zt-module-contract-order-api/src/main/java/com/zt/plat/module/contractorder/api/vo/contract/NotsQueryReqVO.java +++ b/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; } 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 280b47d3..58ae3d80 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 @@ -43,10 +43,13 @@ public interface ContractDemoteMapper extends BaseMapperX { "", "and mtrl_name like concat('%',#{materialName},'%')", "", - "", - "and mtrl_num like concat('%',#{elementName},'%')", + "", + "and MTRL_NUM like concat('%',#{materialNumber},'%')", + "", + "", + "and ELEM_ABBR like concat('%',#{elementAbbreviation},'%')", "", "" }) - IPage selectDemotes(IPage page, List contractIds, String materialName, String elementName); + IPage selectDemotes(IPage page, List contractIds, String materialName, String materialNumber, String elementAbbreviation); } \ 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 12630e8b..64852d88 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 @@ -42,13 +42,19 @@ public interface ContractFormulaMapper extends BaseMapperX { "#{contractId}", "", "", + "", + "and FMU_TP = #{formulaType}", + "", "", "and mtrl_name like concat('%',#{materialName},'%')", "", - "", - "and mtrl_num like concat('%',#{elementName},'%')", + "", + "and MTRL_NUM like concat('%',#{materialNumber},'%')", + "", + "", + "and ELEM_ABBR like concat('%',#{elementAbbreviation},'%')", "", "" }) - IPage selectFormulas(IPage page, List contractIds, String materialName, String elementName); + IPage selectFormulas(IPage page, List contractIds, String formulaType, String materialName, String materialNumber, String elementAbbreviation); } \ 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 92f42f0a..3fc55c50 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 @@ -43,10 +43,13 @@ public interface ContractNotMapper extends BaseMapperX { "", "and mtrl_name like concat('%',#{materialName},'%')", "", - "", - "and elem_name like concat('%',#{elementName},'%')", + "", + "and MTRL_NUM like concat('%',#{materialNumber},'%')", + "", + "", + "and ELEM_ABBR like concat('%',#{elementAbbreviation},'%')", "", "" }) - IPage selectNots(IPage page, List contractIds, String materialName, String elementName); + IPage selectNots(IPage page, List contractIds, String materialName, String materialNumber, String elementAbbreviation); } \ 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/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 8c2e398b..d304cede 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 @@ -1198,7 +1198,8 @@ public class ContractServiceImpl implements ContractService { new Page().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 ipage = contractFormulaMapper.selectFormulas( new Page<>().setCurrent(queryReqVO.getPageNo()).setSize(queryReqVO.getPageSize()), contractIds, + queryReqVO.getFormulaType(), queryReqVO.getMaterialName(), - queryReqVO.getElementName() + queryReqVO.getMaterialNumber(), + queryReqVO.getElementAbbreviation() ); // 分页返回结果