From a03db07de7a72420ff5a76894ac9d31aba5f51cd Mon Sep 17 00:00:00 2001 From: fengyuan_yang <1976974459@qq.com> Date: Thu, 29 Oct 2026 13:01:09 +0800 Subject: [PATCH] =?UTF-8?q?2026-10-29=20=E6=8A=80=E6=9C=AF=E5=8F=82?= =?UTF-8?q?=E6=95=B0=E5=8D=A1=E6=96=B0=E5=A2=9E=E2=80=9C=E5=AE=A2=E6=88=B7?= =?UTF-8?q?=E4=BB=A3=E7=A0=81=E2=80=9D=E5=92=8C=E2=80=9C=E5=AE=A2=E6=88=B7?= =?UTF-8?q?=E5=90=8D=E7=A7=B0=E2=80=9D=E5=88=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../data/PlmTechnicalSpecificationSheetData.java | 9 +++++++++ .../sampleManagement/TechnicalSpecificationMapper.xml | 10 ++++++++-- 2 files changed, 17 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/spring/modules/sampleManagement/data/PlmTechnicalSpecificationSheetData.java b/src/main/java/com/spring/modules/sampleManagement/data/PlmTechnicalSpecificationSheetData.java index 79bd4b32..7d40df52 100644 --- a/src/main/java/com/spring/modules/sampleManagement/data/PlmTechnicalSpecificationSheetData.java +++ b/src/main/java/com/spring/modules/sampleManagement/data/PlmTechnicalSpecificationSheetData.java @@ -29,6 +29,7 @@ public class PlmTechnicalSpecificationSheetData extends PlmTechnicalSpecificatio private String finalCustomerNo; private String finalCustomerDesc; private String customerDesc; + private String customerNo; private String partNo; private String partFamily; private String newPartNo; @@ -648,6 +649,14 @@ public class PlmTechnicalSpecificationSheetData extends PlmTechnicalSpecificatio this.customerDesc = customerDesc; } + public String getCustomerNo() { + return customerNo; + } + + public void setCustomerNo(String customerNo) { + this.customerNo = customerNo; + } + @Override public String getProofingNo() { return proofingNo; diff --git a/src/main/resources/mapper/sampleManagement/TechnicalSpecificationMapper.xml b/src/main/resources/mapper/sampleManagement/TechnicalSpecificationMapper.xml index 58ab098e..1332a2ed 100644 --- a/src/main/resources/mapper/sampleManagement/TechnicalSpecificationMapper.xml +++ b/src/main/resources/mapper/sampleManagement/TechnicalSpecificationMapper.xml @@ -2567,10 +2567,13 @@ a.stage, a.label_length, a.label_width, - a.radius + a.radius, + cust.customer_no as customerNo, + cust.customer_desc as customerDesc FROM plm_technical_specification_sheet a left join view_Project_final_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 + left join plm_customer_information cust on cust.site = c.site and cust.customer_no = c.customer_id left join plm_request_header as prh on a.site = prh.site and prh.menu_id = '103002' left join plm_request_node as d on a.site = d.site and prh.classification_no = d.classification_no and prh.workflow_id = d.workflow_id and a.step_id = d.step_id left join plm_customer_part_info pcpi on a.site = pcpi.site and a.test_part_no = pcpi.part_no and c.customer_id = pcpi.customer_no @@ -3015,11 +3018,14 @@ a.stage, a.label_length, a.label_width, - a.radius + a.radius, + cust.customer_no as customerNo, + cust.customer_desc as customerDesc FROM plm_technical_specification_sheet a left join view_Project_final_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 + left join plm_customer_information cust on cust.site = c.site and cust.customer_no = c.customer_id left join plm_request_header as prh on a.site = prh.site and prh.menu_id = '103002' left join plm_request_node as d on a.site = d.site and prh.classification_no = d.classification_no and prh.workflow_id = d.workflow_id and a.step_id = d.step_id