diff --git a/src/main/java/com/spring/modules/change/entity/TechnicalSpecificationData.java b/src/main/java/com/spring/modules/change/entity/TechnicalSpecificationData.java index d86adb73..811f19dd 100644 --- a/src/main/java/com/spring/modules/change/entity/TechnicalSpecificationData.java +++ b/src/main/java/com/spring/modules/change/entity/TechnicalSpecificationData.java @@ -58,4 +58,6 @@ public class TechnicalSpecificationData extends QueryPage { * ECN地址 */ private String ecnAddress; + + private String oriCodeNo; } diff --git a/src/main/java/com/spring/modules/change/vo/ChangeRequestDetailVo.java b/src/main/java/com/spring/modules/change/vo/ChangeRequestDetailVo.java index 7e8dff4b..8ea1be58 100644 --- a/src/main/java/com/spring/modules/change/vo/ChangeRequestDetailVo.java +++ b/src/main/java/com/spring/modules/change/vo/ChangeRequestDetailVo.java @@ -9,4 +9,5 @@ import java.util.List; @Data public class ChangeRequestDetailVo extends ChangeRequestDetailEntity { + private String oriCodeNo; } diff --git a/src/main/java/com/spring/modules/part/mapper/PartInformationMapper.java b/src/main/java/com/spring/modules/part/mapper/PartInformationMapper.java index 338bbd86..c55780c6 100644 --- a/src/main/java/com/spring/modules/part/mapper/PartInformationMapper.java +++ b/src/main/java/com/spring/modules/part/mapper/PartInformationMapper.java @@ -267,4 +267,6 @@ public interface PartInformationMapper extends BaseMapper TblBaseDataEntity getTblBaseData(@Param("firstType") String partCatalog); List getMasterPartPropertyList(@Param("partNo") String partNo, @Param("codeNo") String codeNo, @Param("recordType") String ip); + + String getNextPartNo2(PartInformationVo data); } diff --git a/src/main/java/com/spring/modules/part/service/impl/PartInformationServiceImpl.java b/src/main/java/com/spring/modules/part/service/impl/PartInformationServiceImpl.java index e6a3fcff..d8cb8e3d 100644 --- a/src/main/java/com/spring/modules/part/service/impl/PartInformationServiceImpl.java +++ b/src/main/java/com/spring/modules/part/service/impl/PartInformationServiceImpl.java @@ -2384,14 +2384,18 @@ public class PartInformationServiceImpl extends ServiceImpl AND c.project_name like #{query.projectDesc} - - AND a.code_no like #{query.codeNo} + + AND a.ori_code_no like #{query.oriCodeNo} @@ -63,6 +64,7 @@ c.customer_id, j.customer_desc, a.code_no, + a.ori_code_no, a.rev_no, case when a.ECN_flag = 'Y' then '变更中' else '未发起' end as ecnFlag, a.ECN_no, @@ -94,8 +96,8 @@ AND c.project_name like #{projectDesc} - - AND a.code_no like #{codeNo} + + AND a.ori_code_no like #{oriCodeNo} @@ -235,8 +237,10 @@ a.create_date, a.create_by, a.update_date, - a.update_by + a.update_by, + b.ori_code_no FROM plm_change_request_detail a + left join plm_technical_specification_sheet as b on a.site = b.site and a.code_no = b.code_no where a.site = #{site} and a.change_no = #{changeNo} diff --git a/src/main/resources/mapper/part/PartInformationMapper.xml b/src/main/resources/mapper/part/PartInformationMapper.xml index d3a9aabc..f74eb11c 100644 --- a/src/main/resources/mapper/part/PartInformationMapper.xml +++ b/src/main/resources/mapper/part/PartInformationMapper.xml @@ -1721,6 +1721,11 @@ where part_no like #{ifsPartNo} + '%' and len(part_no) = 8 + + +