From 63211c9230aebb54370ba803f875f1e507eefe7c Mon Sep 17 00:00:00 2001
From: qiankanghui <kanghui.qian@xujiesoft.com>
Date: Wed, 22 Jul 2026 16:11:15 +0800
Subject: [PATCH] =?UTF-8?q?fix(production):=20=E4=BF=AE=E5=A4=8D=E4=B8=B4?=
 =?UTF-8?q?=E6=9C=9F=E5=93=81=E6=A0=87=E7=AD=BE=E6=9F=A5=E8=AF=A2=E9=80=BB?=
 =?UTF-8?q?=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 移除DISTINCT关键字优化查询性能
- 调整表连接顺序从LEFT JOIN改为INNER JOIN确保数据一致性
- 修改过期日期计算逻辑使用DATEADD函数替代原有过期天数判断
- 添加CDATA标签处理SQL中的特殊字符比较操作
---
 .../production/PrintLabelRecordMapper.xml       | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

diff --git a/src/main/resources/mapper/production/PrintLabelRecordMapper.xml b/src/main/resources/mapper/production/PrintLabelRecordMapper.xml
index 9be279f..11737f8 100644
--- a/src/main/resources/mapper/production/PrintLabelRecordMapper.xml
+++ b/src/main/resources/mapper/production/PrintLabelRecordMapper.xml
@@ -270,7 +270,7 @@
 
     <!-- 查询临期品标签（Part表 ExpireDateControlFlag='Y' and ToExpireDays >= 0） -->
     <select id="selectExpiredLabels" resultType="com.heai.modules.production.entity.PrintLabelRecord">
-        SELECT DISTINCT
+        SELECT
         plr.id,
         plr.site,
         plr.part_no,
@@ -288,11 +288,11 @@
         plr.weight,
         plr.stagnation_refresh_date,
         ISNULL(istk.ExpiredDate_new, istk.ExpiredDate) AS expiry_date
-        FROM print_label_record plr
-        left JOIN Part p
-        ON plr.site = p.Site
-        AND plr.part_no = p.PartNo
-        left JOIN InventoryStock istk
+        FROM PART p
+        INNER JOIN print_label_record plr
+        ON plr.Site = p.Site
+        AND p.PartNo = plr.part_no
+        INNER JOIN InventoryStock istk
         ON plr.site = istk.Site
         AND plr.part_no = istk.PartNo
         AND plr.batch_no = istk.BatchNo
@@ -300,8 +300,9 @@
         AND plr.location_id = istk.LocationID
         WHERE plr.status = '已入库'
         AND p.ExpireDateControlFlag = 'Y'
-        AND ISNULL(p.ToExpireDays, 0) >= 0
-        AND ISNULL(istk.ExpiredDate_new, istk.ExpiredDate) &lt;= GETDATE()
+        <![CDATA[
+          AND DATEADD(DAY,-90,ISNULL(istk.ExpiredDate_new, istk.ExpiredDate)) <= GETDATE()
+        ]]>
         AND plr.id NOT IN (
         SELECT label_record_id
         FROM stagnation_detail