From e73762b4d03dc2968a24116fb35ab445f09097b3 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: Mon, 3 Aug 2026 13:20:48 +0800
Subject: [PATCH] bug

---
 .../com/heai/modules/pms/service/Impl/QcServiceImpl.java    | 6 +++---
 .../heai/modules/production/entity/PrintLabelRecord.java    | 2 +-
 .../service/impl/StagnationInspectionServiceImpl.java       | 2 +-
 src/main/resources/mapper/app/WareHouse.xml                 | 2 +-
 src/main/resources/mapper/production/DailyPlanMapper.xml    | 2 +-
 .../resources/mapper/production/PrintLabelRecordMapper.xml  | 6 +++---
 6 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/src/main/java/com/heai/modules/pms/service/Impl/QcServiceImpl.java b/src/main/java/com/heai/modules/pms/service/Impl/QcServiceImpl.java
index 0f70771..f3461c8 100644
--- a/src/main/java/com/heai/modules/pms/service/Impl/QcServiceImpl.java
+++ b/src/main/java/com/heai/modules/pms/service/Impl/QcServiceImpl.java
@@ -6179,7 +6179,7 @@ public class QcServiceImpl implements QcService {
             }
             log.debug("更新呆滞刷新日期 - 数量: {}, 日期: {}", labelRecordIds.size(), now);
 
-            // 如果是临期品检验，还需要更新 InventoryStock.ExpiredDate_new
+            // 如果是临期品检验，还需要更新 InventoryStock.ExpiredDate
             boolean isExpiredInspection = details.stream()
                     .anyMatch(detail -> "临期品".equals(detail.getType()));
             if (isExpiredInspection) {
@@ -6247,7 +6247,7 @@ public class QcServiceImpl implements QcService {
                         detail.getLabelRecordId(), detail.getType(), detail.getPreAuditTime());
             }
 
-            // 如果是临期品检验，还需要更新 InventoryStock.ExpiredDate_new
+            // 如果是临期品检验，还需要更新 InventoryStock.ExpiredDate
             boolean isExpiredInspection = details.stream()
                     .anyMatch(detail -> "临期品".equals(detail.getType()));
             log.debug("🔍 是否为临期品检验: {}", isExpiredInspection);
@@ -6342,7 +6342,7 @@ public class QcServiceImpl implements QcService {
             log.debug("✅ SQC取消审核时回滚完成状态 - 数量: {}, laboratoryOrderNo: {}",
                     rollbackUpdateCount, laboratoryOrderNo);
 
-            // 如果是临期品检验，还需要回滚 InventoryStock.ExpiredDate_new
+            // 如果是临期品检验，还需要回滚 InventoryStock.ExpiredDate
             boolean isExpiredInspection = details.stream()
                     .anyMatch(detail -> "临期品".equals(detail.getType()));
             if (isExpiredInspection) {
diff --git a/src/main/java/com/heai/modules/production/entity/PrintLabelRecord.java b/src/main/java/com/heai/modules/production/entity/PrintLabelRecord.java
index 7b5b9ee..0dc292d 100644
--- a/src/main/java/com/heai/modules/production/entity/PrintLabelRecord.java
+++ b/src/main/java/com/heai/modules/production/entity/PrintLabelRecord.java
@@ -70,7 +70,7 @@ public class PrintLabelRecord {
     private Date stagnationRefreshDate;
 
     /**
-     * 过期日期（仅用于临期品检验，取自 InventoryStock 表的 ExpiredDate_new 或 ExpiredDate）
+     * 过期日期（仅用于临期品检验，取自 InventoryStock 表的 ExpiredDate）
      */
     @TableField(exist = false)
     private Date expiryDate;
diff --git a/src/main/java/com/heai/modules/production/service/impl/StagnationInspectionServiceImpl.java b/src/main/java/com/heai/modules/production/service/impl/StagnationInspectionServiceImpl.java
index 469caf6..3ba48a4 100644
--- a/src/main/java/com/heai/modules/production/service/impl/StagnationInspectionServiceImpl.java
+++ b/src/main/java/com/heai/modules/production/service/impl/StagnationInspectionServiceImpl.java
@@ -197,7 +197,7 @@ public class StagnationInspectionServiceImpl implements StagnationInspectionServ
 
             // 设置 pre_audit_time：
             // - 呆滞品：取 create_time 和 stagnation_refresh_date 中的最新日期
-            // - 临期品：取 InventoryStock 表的 ExpiredDate_new 或 ExpiredDate
+            // - 临期品：取 InventoryStock 表的 ExpiredDate
             Date preAuditTime;
             if ("临期品".equals(type)) {
                 // 临期品使用库存的过期日期
diff --git a/src/main/resources/mapper/app/WareHouse.xml b/src/main/resources/mapper/app/WareHouse.xml
index 76d53f2..ea74af3 100644
--- a/src/main/resources/mapper/app/WareHouse.xml
+++ b/src/main/resources/mapper/app/WareHouse.xml
@@ -158,7 +158,7 @@
     <select id="getStockData" resultType="com.heai.modules.production.entity.InventoryStockInVo">
         select top 1 Site,WarehouseID,PartNo,BatchNo,LocationID,FirstInDate,LatestOutDate,LatestInDate,ActiveDate,InQty,OutQty,QtyOnHand,
         QtyReserved,InStandardValue,InActualValue,OutStandardValue,OutActualValue,PartnerID,PartnerType,LatestCountDate,
-        Freezeflag,QtyTmp,ManufactureDate,isnull(ExpiredDate_new,ExpiredDate) ExpiredDate,QtytoIssue,DemandPartnerType,DemandPartnerID,DemandPartnerName,dbo.Get_Part_SpecDesc(Site,PartNo) partDesc,
+        Freezeflag,QtyTmp,ManufactureDate,ExpiredDate ExpiredDate,QtytoIssue,DemandPartnerType,DemandPartnerID,DemandPartnerName,dbo.Get_Part_SpecDesc(Site,PartNo) partDesc,
         dbo.Get_WareHouseDesc(Site,WarehouseID) WareHouseDesc
         from InventoryStock where site=#{site} and PartNo=#{partNo} and LocationID=#{locationID} and BatchNo=#{batchNo} and WarehouseID=#{warehouseID}
 
diff --git a/src/main/resources/mapper/production/DailyPlanMapper.xml b/src/main/resources/mapper/production/DailyPlanMapper.xml
index b2b0c2c..84522a3 100644
--- a/src/main/resources/mapper/production/DailyPlanMapper.xml
+++ b/src/main/resources/mapper/production/DailyPlanMapper.xml
@@ -1482,7 +1482,7 @@
     </select>
 
     <update id="updateStockNewDate">
-        update InventoryStock set ExpiredDate_new=#{newDate} where Site=#{site} and WarehouseID=#{warehouseID} and PartNo=#{partNo} and BatchNo=#{barchNo} and LocationID=#{locationID}
+        update InventoryStock set ExpiredDate=#{newDate} where Site=#{site} and WarehouseID=#{warehouseID} and PartNo=#{partNo} and BatchNo=#{barchNo} and LocationID=#{locationID}
     </update>
 
     <select id="checkTV" resultType="com.heai.modules.production.entity.TvSopBaseData">
diff --git a/src/main/resources/mapper/production/PrintLabelRecordMapper.xml b/src/main/resources/mapper/production/PrintLabelRecordMapper.xml
index 11737f8..01a1a44 100644
--- a/src/main/resources/mapper/production/PrintLabelRecordMapper.xml
+++ b/src/main/resources/mapper/production/PrintLabelRecordMapper.xml
@@ -287,7 +287,7 @@
         plr.update_time,
         plr.weight,
         plr.stagnation_refresh_date,
-        ISNULL(istk.ExpiredDate_new, istk.ExpiredDate) AS expiry_date
+        istk.ExpiredDate AS expiry_date
         FROM PART p
         INNER JOIN print_label_record plr
         ON plr.Site = p.Site
@@ -301,7 +301,7 @@
         WHERE plr.status = '已入库'
         AND p.ExpireDateControlFlag = 'Y'
         <![CDATA[
-          AND DATEADD(DAY,-90,ISNULL(istk.ExpiredDate_new, istk.ExpiredDate)) <= GETDATE()
+          AND DATEADD(DAY,-90,istk.ExpiredDate) <= GETDATE()
         ]]>
         AND plr.id NOT IN (
         SELECT label_record_id
@@ -320,7 +320,7 @@
     <!-- 更新库存过期日期（用于临期品检验完成） -->
     <update id="updateInventoryStockExpiredDate">
         UPDATE istk
-        SET istk.ExpiredDate_new = #{newExpiredDate}
+        SET istk.ExpiredDate = #{newExpiredDate}
         FROM InventoryStock istk
         INNER JOIN print_label_record plr
             ON istk.Site = plr.site