From 70cc971b96a2cfeb29576fb455e7a17b1bbd3e5a Mon Sep 17 00:00:00 2001
From: zelian_wu <zelian.wu@xujiesoft.com>
Date: Mon, 8 Jan 2024 15:08:10 +0800
Subject: [PATCH] =?UTF-8?q?2024-1-8=20=E9=A1=B9=E7=9B=AE=E7=89=A9=E6=96=99?=
 =?UTF-8?q?=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mapper/quotation/QuotationInformationMapper.xml      | 7 ++-----
 .../sampleManagement/TechnicalSpecificationMapper.xml    | 9 +++++----
 2 files changed, 7 insertions(+), 9 deletions(-)

diff --git a/src/main/resources/mapper/quotation/QuotationInformationMapper.xml b/src/main/resources/mapper/quotation/QuotationInformationMapper.xml
index edc80671..c02e180d 100644
--- a/src/main/resources/mapper/quotation/QuotationInformationMapper.xml
+++ b/src/main/resources/mapper/quotation/QuotationInformationMapper.xml
@@ -213,18 +213,15 @@
             customer_status,
             customer_description,
             customer_industry,
-            company_name,
-            job_description,
-            remark,
             create_date,
             create_by,
             update_date,
             update_by,
             dbo.plm_get_contactName(site, customer_no, 'Y') as contactName,
             dbo.plm_get_contactPhoneNumber(site, customer_no, 'Y') as contactPhoneNumber1,
-            dbo.plm_get_addressName(site, customer_no, 'Y') as addressName,
+            dbo.plm_get_addressName(site, customer_no) as addressName,
             dbo.plm_get_position(site, customer_no, 'Y') as position,
-            dbo.plm_get_addressType(site, customer_no, 'Y') as addressType
+            dbo.plm_get_addressType(site, customer_no) as addressType
         FROM plm_customer_information
         where site = #{site} and customer_no = #{customerNo}
     </select>
diff --git a/src/main/resources/mapper/sampleManagement/TechnicalSpecificationMapper.xml b/src/main/resources/mapper/sampleManagement/TechnicalSpecificationMapper.xml
index c1bfc68c..09847871 100644
--- a/src/main/resources/mapper/sampleManagement/TechnicalSpecificationMapper.xml
+++ b/src/main/resources/mapper/sampleManagement/TechnicalSpecificationMapper.xml
@@ -58,8 +58,9 @@
 </select>
 
 <select id="getTechnicalCustomerInfoData" resultType="TechnicalCustomerInfoData">
-    select a.id,b.customer_id,c.customer_desc as customerName,c.remark as customerDesc ,b.customer_Remark,b.remark
-    from plm_technical_specification_sheet a  left join plm_project_info b on a.site=b.site and a.project_id=b.project_id
+    select a.id,b.customer_id,c.customer_desc as customerName,c.customer_description as customerDesc ,b.customer_Remark,b.remark
+    from plm_technical_specification_sheet a
+    left join plm_project_info b on a.site=b.site and a.project_id=b.project_id
     left join plm_customer_information c on b.site=c.site and b.customer_id=c.customer_no where a.id=#{id}
 
 </select>
@@ -529,7 +530,7 @@ id
 </update>
 
 <delete id="deleteBMInkFormulationColor">
-    delete from plm_bm_InkFormulationColor whe  re id=#{id}
+    delete from plm_bm_InkFormulationColor where id=#{id}
 </delete>
 
 <select id="checkPlmBmInkFormulationColorOrder" resultType="PlmBmInkFormulationColorData">
@@ -637,7 +638,7 @@ update_date,update_by,id
 </insert>
 
 <update id="updateBMCutDetail">
-    update plm_bm_Cut set [action]=#{action},remarks=#{remarks}
+    update plm_bm_Cut set [action]=#{action},remarks=#{remarks},
     update_date=GetDate(),update_by=#{updateBy} where site=#{site} and code_no=#{codeNo}
 </update>