From d2e6cb0f200e392a7fead3aeedfc23ba52472e61 Mon Sep 17 00:00:00 2001
From: yinq <yinq>
Date: Sun, 17 Mar 2024 15:51:43 +0800
Subject: [PATCH] =?UTF-8?q?change=20-=20=E8=A1=A5=E6=89=93=E6=9D=A1?=
 =?UTF-8?q?=E7=A0=81=E5=AD=98=E6=89=93=E5=8D=B0=E5=90=8D=E7=A7=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/resources/mapper/PdaBindingMapper.xml    | 15 ++++++++++++---
 1 file changed, 12 insertions(+), 3 deletions(-)

diff --git a/aucma-api/src/main/resources/mapper/PdaBindingMapper.xml b/aucma-api/src/main/resources/mapper/PdaBindingMapper.xml
index a622d50..b01e8a2 100644
--- a/aucma-api/src/main/resources/mapper/PdaBindingMapper.xml
+++ b/aucma-api/src/main/resources/mapper/PdaBindingMapper.xml
@@ -62,9 +62,16 @@
     </select>
 
     <select id="selectPrintBarcode" resultType="java.util.HashMap">
-        SELECT ORDER_CODE, MATERIAL_CODE, MATERIAL_NAME, MATERIAL_BARCODE, PRINT_TIME, PRINT_BARTYPE
-        FROM PRINT_BARCODE
-        WHERE MATERIAL_BARCODE = #{boxCode}
+        SELECT PB.ORDER_CODE,
+               PB.MATERIAL_CODE,
+               PB.MATERIAL_NAME,
+               PB.MATERIAL_BARCODE,
+               PB.PRINT_TIME,
+               PB.PRINT_BARTYPE,
+               OI.PRINT_NAME
+        FROM BASE_ORDERINFO OI
+                 JOIN C##AUCMA_SCADA.PRINT_BARCODE PB ON PB.ORDER_CODE = OI.ORDER_CODE
+        WHERE PB.MATERIAL_BARCODE = #{boxCode}
     </select>
 
     <update id="unbindBarCode">
@@ -81,6 +88,7 @@
             <if test="MATERIAL_NAME != null">MATERIAL_NAME,</if>
             <if test="MATERIAL_BARCODE != null">MATERIAL_BARCODE,</if>
             <if test="PRINT_BARTYPE != null">PRINT_BARTYPE,</if>
+            <if test="PRINT_NAME != null">PRINT_NAME,</if>
         </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="ORDER_CODE != null">#{ORDER_CODE},</if>
@@ -88,6 +96,7 @@
             <if test="MATERIAL_NAME != null">#{MATERIAL_NAME},</if>
             <if test="MATERIAL_BARCODE != null">#{MATERIAL_BARCODE},</if>
             <if test="PRINT_BARTYPE != null">#{PRINT_BARTYPE},</if>
+            <if test="PRINT_NAME != null">#{PRINT_NAME},</if>
         </trim>
     </insert>
 </mapper>
\ No newline at end of file