From 3d1882f08b664dd5a38b7fe9eb572687bd5d9743 Mon Sep 17 00:00:00 2001
From: fengyuan_yang <1976974459@qq.com>
Date: Thu, 12 Jun 2025 14:49:30 +0800
Subject: [PATCH] =?UTF-8?q?2025-06-12=20BM=E5=92=8CECN=E7=9A=84=E5=89=8D?=
 =?UTF-8?q?=E7=AB=AF=E4=B8=AD=E8=8B=B1=E6=96=87=20=E6=B2=B9=E5=A2=A8?=
 =?UTF-8?q?=E9=85=8D=E6=96=B9=E5=B0=86=E6=9C=BA=E5=8F=B0=E5=AD=97=E6=AE=B5?=
 =?UTF-8?q?=E6=94=BE=E5=85=A5=E5=88=B0=E6=95=B0=E6=8D=AE=E5=AD=97=E5=85=B8?=
 =?UTF-8?q?=E4=B8=AD=20=E5=B7=A5=E8=89=BA=E9=A1=B5=E7=AD=BE=E4=B8=AD?=
 =?UTF-8?q?=E7=9A=84=E4=B8=80=E9=94=AE=E5=AF=BC=E5=85=A5=EF=BC=8C=E9=9C=80?=
 =?UTF-8?q?=E8=A6=81=E5=A2=9E=E5=8A=A0=E7=89=A9=E6=96=99=E5=90=8D=E7=A7=B0?=
 =?UTF-8?q?=E5=AD=97=E6=AE=B5=20=E5=B7=A5=E8=89=BA=E7=AC=AC=E4=B8=80?=
 =?UTF-8?q?=E6=9D=A1=E7=9A=84=E5=A4=87=E6=B3=A8=E4=BF=A1=E6=81=AF=E6=98=BE?=
 =?UTF-8?q?=E7=A4=BA=E4=B8=8D=E5=85=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../MasterPartInformationServiceImpl.java     |  1 -
 .../data/PlmBmPrintFlexoColorData.java        |  9 ++
 .../data/PlmBmPrintIndigoColorData.java       |  9 ++
 .../TechnicalSpecificationMapper.xml          | 96 ++++++++++---------
 4 files changed, 68 insertions(+), 47 deletions(-)

diff --git a/src/main/java/com/spring/modules/part/service/impl/MasterPartInformationServiceImpl.java b/src/main/java/com/spring/modules/part/service/impl/MasterPartInformationServiceImpl.java
index 33153133..3151c09d 100644
--- a/src/main/java/com/spring/modules/part/service/impl/MasterPartInformationServiceImpl.java
+++ b/src/main/java/com/spring/modules/part/service/impl/MasterPartInformationServiceImpl.java
@@ -320,7 +320,6 @@ public class MasterPartInformationServiceImpl extends ServiceImpl<MasterPartInfo
                             throw new RuntimeException("IFS 物料件模板修改异常：" + updateMasterPartModelResponse.get("resultMsg"));
                         }
                     }
-
                 }
             }
         }
diff --git a/src/main/java/com/spring/modules/sampleManagement/data/PlmBmPrintFlexoColorData.java b/src/main/java/com/spring/modules/sampleManagement/data/PlmBmPrintFlexoColorData.java
index 134e0957..63609795 100644
--- a/src/main/java/com/spring/modules/sampleManagement/data/PlmBmPrintFlexoColorData.java
+++ b/src/main/java/com/spring/modules/sampleManagement/data/PlmBmPrintFlexoColorData.java
@@ -7,5 +7,14 @@ import java.util.Date;
 @Alias("PlmBmPrintFlexoColorData")
 public class PlmBmPrintFlexoColorData extends PlmBmPrintFlexoColor {
 
+    private String inkDesc;
+
+    public String getInkDesc() {
+        return inkDesc;
+    }
+
+    public void setInkDesc(String inkDesc) {
+        this.inkDesc = inkDesc;
+    }
 }
 
diff --git a/src/main/java/com/spring/modules/sampleManagement/data/PlmBmPrintIndigoColorData.java b/src/main/java/com/spring/modules/sampleManagement/data/PlmBmPrintIndigoColorData.java
index f14ff09f..f8dd8c42 100644
--- a/src/main/java/com/spring/modules/sampleManagement/data/PlmBmPrintIndigoColorData.java
+++ b/src/main/java/com/spring/modules/sampleManagement/data/PlmBmPrintIndigoColorData.java
@@ -6,4 +6,13 @@ import org.apache.ibatis.type.Alias;
 @Alias("PlmBmPrintIndigoColorData")
 public class PlmBmPrintIndigoColorData extends PlmBmPrintIndigoColor {
 
+    private String inkDesc;
+
+    public String getInkDesc() {
+        return inkDesc;
+    }
+
+    public void setInkDesc(String inkDesc) {
+        this.inkDesc = inkDesc;
+    }
 }
diff --git a/src/main/resources/mapper/sampleManagement/TechnicalSpecificationMapper.xml b/src/main/resources/mapper/sampleManagement/TechnicalSpecificationMapper.xml
index 1ecb7326..a7ea97cc 100644
--- a/src/main/resources/mapper/sampleManagement/TechnicalSpecificationMapper.xml
+++ b/src/main/resources/mapper/sampleManagement/TechnicalSpecificationMapper.xml
@@ -2023,29 +2023,31 @@
 
     <select id="searchBMprintFlexoColor" resultType="PlmBmPrintFlexoColorData">
         select
-            id,
-            site,
-            codeNo,
-            printSide,
+            a.id,
+            a.site,
+            a.codeNo,
+            a.printSide,
             [order],
-            colorReference,
-            inkCode,
-            colorMatch,
-            lpi,
-            bcm,
-            openFlag,
-            gallus,
-            markAndy,
-            hexiang,
-            temperature,
-            pressure,
-            updateDate,
-            updateBy,
-            resource_no,
-            speed
-        from plm_bm_printFlexoColor
-        where site = #{site} and codeNo = #{codeNo}
-        order by printSide desc, [order]
+            a.colorReference,
+            a.inkCode,
+            p.part_desc as inkDesc,
+            a.colorMatch,
+            a.lpi,
+            a.bcm,
+            a.openFlag,
+            a.gallus,
+            a.markAndy,
+            a.hexiang,
+            a.temperature,
+            a.pressure,
+            a.updateDate,
+            a.updateBy,
+            a.resource_no,
+            a.speed
+        from plm_bm_printFlexoColor as a
+        left join part as p on a.site = p.site and a.inkCode = p.part_no
+        where a.site = #{site} and a.codeNo = #{codeNo}
+        order by a.printSide desc, [order]
     </select>
 
     <select id="checkBMprintFlexoColorOrder" resultType="PlmBmPrintFlexoColorData">
@@ -2113,28 +2115,30 @@
     </delete>
 
     <select id="searchBMprintIndigoColor" resultType="PlmBmPrintIndigoColorData">
-        select id,
-               code_no,
-               site,
-               [order],
-               printSide,
-               colorReference,
-               inkCode,
-               colorMatch,
-               printMotion,
-               opticalDensity,
-               lut,
-               lpi,
-               screenAngle,
-               printHits,
-               blanketTemperture,
-               remark,
-               updateBy,
-               updateDate
-        from plm_bm_printIndigoColor
-        where site = #{site}
-          and code_no = #{codeNo}
-        order by printSide desc, [order]
+        select
+            a.id,
+            a.code_no,
+            a.site,
+            [order],
+            a.printSide,
+            a.colorReference,
+            a.inkCode,
+            p.part_desc as inkDesc,
+            a.colorMatch,
+            a.printMotion,
+            a.opticalDensity,
+            a.lut,
+            a.lpi,
+            a.screenAngle,
+            a.printHits,
+            a.blanketTemperture,
+            a.remark,
+            a.updateBy,
+            a.updateDate
+        from plm_bm_printIndigoColor as a
+        left join part as p on a.site = p.site and a.inkCode = p.part_no
+        where a.site = #{site} and a.code_no = #{codeNo}
+        order by a.printSide desc, [order]
     </select>
 
     <select id="checkBMprintIndigoColorOrder" resultType="PlmBmPrintIndigoColorData">
@@ -2452,8 +2456,8 @@
         dbo.get_technicalSpecificationTeamNames(a.site, a.code_no, 'dcc')             dccOperaterName,
         dbo.get_technicalSpecificationTeamNames(a.site, a.code_no, 'cqc')             cqcOperatorName,
         dbo.get_technicalSpecificationTeamNames(a.site, a.code_no, 'fai')             faiOperatorName,
-        dbo.get_technicalSpecificationTeamNo(a.site, a.code_no, 'plan')               planOperater,
-        dbo.get_technicalSpecificationTeamName(a.site, a.code_no, 'plan')             planOperaterName,
+        dbo.get_technicalSpecificationTeamNo(a.site, a.code_no, 'plan')               planOperator,
+        dbo.get_technicalSpecificationTeamName(a.site, a.code_no, 'plan')             planOperatorName,
         d.is_reject                                                                  as isReject,
         d.node_id                                                                    as nodeId,
         d.node_name                                                                  as nodeName,