diff --git a/src/main/java/com/spring/modules/project/data/TechnicalCustomerInfoData.java b/src/main/java/com/spring/modules/project/data/TechnicalCustomerInfoData.java
index d20e827e..753230bb 100644
--- a/src/main/java/com/spring/modules/project/data/TechnicalCustomerInfoData.java
+++ b/src/main/java/com/spring/modules/project/data/TechnicalCustomerInfoData.java
@@ -11,6 +11,9 @@ public class TechnicalCustomerInfoData {
private String customerRemark;
private String remark;
private String finalCustomerId;
+ private String pictureAddess;
+ private String customerPictureChangeRemark;
+ private String productionFileComments;
public Integer getId() {
return id;
}
@@ -66,4 +69,28 @@ public class TechnicalCustomerInfoData {
public void setFinalCustomerId(String finalCustomerId) {
this.finalCustomerId = finalCustomerId;
}
+
+ public String getPictureAddess() {
+ return pictureAddess;
+ }
+
+ public void setPictureAddess(String pictureAddess) {
+ this.pictureAddess = pictureAddess;
+ }
+
+ public String getCustomerPictureChangeRemark() {
+ return customerPictureChangeRemark;
+ }
+
+ public void setCustomerPictureChangeRemark(String customerPictureChangeRemark) {
+ this.customerPictureChangeRemark = customerPictureChangeRemark;
+ }
+
+ public String getProductionFileComments() {
+ return productionFileComments;
+ }
+
+ public void setProductionFileComments(String productionFileComments) {
+ this.productionFileComments = productionFileComments;
+ }
}
diff --git a/src/main/resources/mapper/sampleManagement/TechnicalSpecificationMapper.xml b/src/main/resources/mapper/sampleManagement/TechnicalSpecificationMapper.xml
index cc5107f8..f0e51278 100644
--- a/src/main/resources/mapper/sampleManagement/TechnicalSpecificationMapper.xml
+++ b/src/main/resources/mapper/sampleManagement/TechnicalSpecificationMapper.xml
@@ -9,6 +9,8 @@
dbo.get_technicalSpecificationTeamName(a.site,a.code_no,'engineer') engineer,
dbo.get_technicalSpecificationTeamName(a.site,a.code_no,'technician') technician,
dbo.get_technicalSpecificationTeamName(a.site,a.code_no,'quotationOfficer') quotationOfficer,c.customer_Id
+ ,a.picture_addess,a.customerPictureChangeRemark,a.productionFileComments,a.bom_type,a.eng_chg_level,a.bom_alternative_no,a.routing_type,a.routing_revision,
+ a.routing_alternative_no
FROM plm_technical_specification_sheet a
left join plm_project_part b on a.site=b.site and a.project_id=b.project_id and a.test_part_no=b.test_part_no
left join plm_project_info c on a.site=c.site and a.project_id=c.project_id
@@ -18,6 +20,9 @@
AND a.site = #{query.site}
+
+
+ AND a.ori_code_no like #{query.oriCodeNo}
AND a.code_no like #{query.codeNo}
@@ -28,6 +33,9 @@
AND a.test_part_no like #{query.testPartNo}
+
+ AND dbo.plm_get_technicalBaseDesc(a.status,'status') like #{query.statusDesc}
+
order by a.code_no desc
@@ -59,7 +67,8 @@