From fdbb558ca42bbd5ef7409f1ab707b2b4da3e2fdb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=B8=B8=E7=86=9F=E5=90=B4=E5=BD=A6=E7=A5=96?=
 <qi.ruan@xujiesoft.com>
Date: Fri, 5 Dec 2025 17:24:11 +0800
Subject: [PATCH] 1

---
 .../service/impl/WcsIntegrationServiceImpl.java     |  2 +-
 .../automatedWarehouse/WcsIntegrationMapper.xml     | 13 ++++++-------
 2 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/src/main/java/com/gaotao/modules/automatedWarehouse/service/impl/WcsIntegrationServiceImpl.java b/src/main/java/com/gaotao/modules/automatedWarehouse/service/impl/WcsIntegrationServiceImpl.java
index 1a8f7fc..dee56b4 100644
--- a/src/main/java/com/gaotao/modules/automatedWarehouse/service/impl/WcsIntegrationServiceImpl.java
+++ b/src/main/java/com/gaotao/modules/automatedWarehouse/service/impl/WcsIntegrationServiceImpl.java
@@ -1156,7 +1156,7 @@ public class WcsIntegrationServiceImpl implements WcsIntegrationService {
                 saveVo.setWidth(new BigDecimal(0));
                 saveVo.setHeight(groupHUs.get(i).getRealHeight()!=null?groupHUs.get(i).getRealHeight():groupHUs.get(i).getHeight()!=null?groupHUs.get(i).getHeight():new BigDecimal(0));
                 saveVo.setWeight(groupHUs.get(i).getWeight()!=null?groupHUs.get(i).getWeight():new BigDecimal(0));
-                saveVo.setSerialNo(groupHUs.get(i).getSerialNo()!=null?groupHUs.get(i).getSerialNo():"无");
+                saveVo.setSerialNo(groupHUs.get(i).getSerialNo()!=null?groupHUs.get(i).getSerialNo().trim():"无");
                 saveVo.setVolume(new BigDecimal(0));
                 if(groupHUs.get(i).getPartNo().startsWith("8")){
                     saveVo.setPartType(PartTypeEnum.fromCode(0));
diff --git a/src/main/resources/mapper/automatedWarehouse/WcsIntegrationMapper.xml b/src/main/resources/mapper/automatedWarehouse/WcsIntegrationMapper.xml
index 80c2164..52ce4e0 100644
--- a/src/main/resources/mapper/automatedWarehouse/WcsIntegrationMapper.xml
+++ b/src/main/resources/mapper/automatedWarehouse/WcsIntegrationMapper.xml
@@ -671,15 +671,14 @@
         AND wcs_flag = 0
     </update>
 
-    <!-- 优化：添加 WITH (NOLOCK) 避免死锁 - rqrq -->
     <select id="getPalletDetailsNewDetail"  resultType="PalletDetailData">
         SELECT a.site, a.pallet_id, a.[position], a.layer, a.serial_no, a.part_no, a.create_date, a.create_by, a.wcs_flag,
                b.part_desc, b.qty, b.batch_no, b.wdr, c.weight, b.length, b.width, c.height, c.is_robot_pick, um_id, b.height as realHeight,
                c.is_commonly_used, CONVERT(varchar(10), ISNULL(ISNULL(b.manufacture_date, b.receive_date), GETDATE()), 23) manufactureDateStr,
                b.reserve_flag
-        FROM pallet_detail a WITH (NOLOCK)
-        LEFT JOIN handling_unit b WITH (NOLOCK) ON a.site = b.site AND a.serial_no = b.unit_id
-        LEFT JOIN part_attribute c WITH (NOLOCK) ON a.site = c.site AND a.part_no = c.part_no
+        FROM pallet_detail a
+        LEFT JOIN handling_unit b  ON a.site = b.site AND a.serial_no = b.unit_id
+        LEFT JOIN part_attribute c  ON a.site = c.site AND a.part_no = c.part_no
         WHERE a.site = #{site} AND a.pallet_id = #{palletId}
           AND a.wcs_flag = 1
     </select>
@@ -1261,9 +1260,9 @@
             pt.wcs_sore_type AS wcsSoreType,
             pt.max_layer AS maxLayer,
             pf.pallet_family_desc AS palletFamilyDesc
-        FROM pallet p WITH (NOLOCK)
-        LEFT JOIN pallet_type pt WITH (NOLOCK) ON p.site = pt.site AND p.pallet_type = pt.pallet_type
-        LEFT JOIN pallet_family pf WITH (NOLOCK) ON p.site = pf.site AND p.pallet_family = pf.pallet_family
+        FROM pallet p
+        LEFT JOIN pallet_type pt  ON p.site = pt.site AND p.pallet_type = pt.pallet_type
+        LEFT JOIN pallet_family pf  ON p.site = pf.site AND p.pallet_family = pf.pallet_family
         WHERE p.site = #{site} 
           AND p.pallet_id = #{palletId}
           AND p.is_deleted = '0'