From c3540d054f922ffce7d5236f8454de0a248de548 Mon Sep 17 00:00:00 2001
From: qiezi <15576055375@163.com>
Date: Wed, 7 Aug 2024 16:51:19 +0800
Subject: [PATCH] =?UTF-8?q?24-07-31=20=E6=A0=87=E7=AD=BE=E8=AE=B0=E5=BD=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/PrintLabelRecordServiceImpl.java         | 2 --
 .../mapper/production/PrintLabelRecordMapper.xml          | 8 ++++----
 src/test/java/com/heai/RedisTest.java                     | 7 +++++++
 3 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/src/main/java/com/heai/modules/production/service/impl/PrintLabelRecordServiceImpl.java b/src/main/java/com/heai/modules/production/service/impl/PrintLabelRecordServiceImpl.java
index c8410fb..b259e9f 100644
--- a/src/main/java/com/heai/modules/production/service/impl/PrintLabelRecordServiceImpl.java
+++ b/src/main/java/com/heai/modules/production/service/impl/PrintLabelRecordServiceImpl.java
@@ -69,8 +69,6 @@ public class PrintLabelRecordServiceImpl extends ServiceImpl<PrintLabelRecordMap
             item.put("partSpec",part.getSpec());
             item.put("partDesc",part.getPartDescription());
             item.put("code",genPrintTypeCode(String.valueOf(item.get("labelType"))));
-            item.put("code",genPrintTypeCode(String.valueOf(item.get("labelType"))));
-            item.put("code",genPrintTypeCode(String.valueOf(item.get("labelType"))));
             item.put("contractNo", finalCoHeader.getContractNo());
             item.put("customerPONo",finalCoHeader.getCustomerPoNo());
             item.put("partRevNo",partRevNo);
diff --git a/src/main/resources/mapper/production/PrintLabelRecordMapper.xml b/src/main/resources/mapper/production/PrintLabelRecordMapper.xml
index 41d3df2..b693cd0 100644
--- a/src/main/resources/mapper/production/PrintLabelRecordMapper.xml
+++ b/src/main/resources/mapper/production/PrintLabelRecordMapper.xml
@@ -2,7 +2,7 @@
 
 <mapper namespace="com.heai.modules.production.dao.PrintLabelRecordMapper">
     <select id="handlerPrintBoxLabel" resultType="java.util.Map">
-        Select '*'                                                                                           as batchNo
+        Select D.DelNotifyNo                                                                                          as batchNo
              , ''                                                                                            as printerName
              , 'N'                                                                                           as status
              , D.DelnotifyNo                                                                                 as orderRef1
@@ -24,7 +24,7 @@
              , 1                                                                                             as printQty
              , REPLACE(Address_E + '   Phone:' + S.PhoneNo + '   Email:' + S.Email, CHAR(13) + CHAR(10),
                        '')                                                                                   as siteDetail
-             , SiteName                                                                                      as siteName
+             , SiteName_E                                                                                      as siteName
              , (case
                     when C.CustomerGroup = 'TBC' then CA.EndCustOurVendorCode
                     else C.OurVendorCode end)                                                                as endCustVendorCode
@@ -45,7 +45,7 @@
           and H.SeqNo &lt;= #{boxNum}
           and #{boxNum} > 0
         Union all
-        Select '*'                                                                                           as batchNo
+        Select D.DelNotifyNo                                                                                           as batchNo
              , ''                                                                                            as printerName
              , 'N'                                                                                           as status
              , D.DelnotifyNo                                                                                 as orderRef1
@@ -67,7 +67,7 @@
              , 1                                                                                             as printQty
              , REPLACE(Address_E + '   Phone:' + S.PhoneNo + '   Email:' + S.Email, CHAR(13) + CHAR(10),
                        '')                                                                                   as siteDetail
-             , SiteName                                                                                      as siteName
+             , SiteName_E                                                                                      as siteName
              , (case
                     when C.CustomerGroup = 'TBC' then CA.EndCustOurVendorCode
                     else C.OurVendorCode end)                                                                as endCustVendorCode
diff --git a/src/test/java/com/heai/RedisTest.java b/src/test/java/com/heai/RedisTest.java
index a0619ae..2ae1fca 100644
--- a/src/test/java/com/heai/RedisTest.java
+++ b/src/test/java/com/heai/RedisTest.java
@@ -9,6 +9,8 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.test.context.junit4.SpringRunner;
 
+import java.net.Socket;
+
 @RunWith(SpringRunner.class)
 @SpringBootTest
 public class RedisTest {
@@ -24,4 +26,9 @@ public class RedisTest {
 		System.out.println(ToStringBuilder.reflectionToString(redisUtils.get("user", SysUserEntity.class)));
 	}
 
+	@Test
+	public void test(){
+
+	}
+
 }