diff --git a/src/main/java/com/spring/modules/part/entity/PartInformationEntity.java b/src/main/java/com/spring/modules/part/entity/PartInformationEntity.java index f9ebc03e..9bc3bbc4 100644 --- a/src/main/java/com/spring/modules/part/entity/PartInformationEntity.java +++ b/src/main/java/com/spring/modules/part/entity/PartInformationEntity.java @@ -408,4 +408,9 @@ public class PartInformationEntity extends QueryPage implements Serializable { @TableField(updateStrategy = FieldStrategy.NOT_EMPTY) private String copyPartNo; + + /** + * 图纸编码 + **/ + private String drawingNo; } diff --git a/src/main/java/com/spring/modules/project/data/PlmProjectInfoData.java b/src/main/java/com/spring/modules/project/data/PlmProjectInfoData.java index b4e24826..eeb91ff7 100644 --- a/src/main/java/com/spring/modules/project/data/PlmProjectInfoData.java +++ b/src/main/java/com/spring/modules/project/data/PlmProjectInfoData.java @@ -36,6 +36,7 @@ public class PlmProjectInfoData extends PlmProjectInfo { private String toolNo; private String toolDesc; private String userId; + private String drawingNo; @TableField(exist = false) private String SearchType; @TableField(exist = false) @@ -90,6 +91,14 @@ public class PlmProjectInfoData extends PlmProjectInfo { this.plmPartNo = plmPartNo; } + public String getDrawingNo() { + return drawingNo; + } + + public void setDrawingNo(String drawingNo) { + this.drawingNo = drawingNo; + } + public String getIfsPartNo() { return ifsPartNo; } diff --git a/src/main/java/com/spring/modules/project/data/PlmProjectPartData.java b/src/main/java/com/spring/modules/project/data/PlmProjectPartData.java index e72b4db4..11b36ac5 100644 --- a/src/main/java/com/spring/modules/project/data/PlmProjectPartData.java +++ b/src/main/java/com/spring/modules/project/data/PlmProjectPartData.java @@ -69,6 +69,16 @@ public class PlmProjectPartData extends PlmProjectPart { private String temporaryPartFlag; + private String drawingNo; + + public String getDrawingNo() { + return drawingNo; + } + + public void setDrawingNo(String drawingNo) { + this.drawingNo = drawingNo; + } + public String getIfsPartNo() { return ifsPartNo; } diff --git a/src/main/resources/mapper/part/PartInformationMapper.xml b/src/main/resources/mapper/part/PartInformationMapper.xml index f8299f88..c6ebf4ca 100644 --- a/src/main/resources/mapper/part/PartInformationMapper.xml +++ b/src/main/resources/mapper/part/PartInformationMapper.xml @@ -103,6 +103,7 @@ update_by, plm_part_no, ifs_part_no, + drawing_no, show_in_query_flag, temporary_part_flag, dbo.get_ifHas_peifang(site,part_no) as ifHasPeifang, @@ -145,6 +146,9 @@ AND part_type = #{query.partType} + + AND drawing_no like #{query.drawingNo} + @@ -1248,13 +1252,12 @@ create_date, create_by, update_date, - update_by + update_by, + drawing_no FROM part where site = #{site} and part_no like #{partNo} + '%' order by create_date desc - -