From f5c5d0ac1f0e58be046493b43bbbcf4f72ff2687 Mon Sep 17 00:00:00 2001
From: "han\\hanst" <songtao.han@xujiesoft.com>
Date: Wed, 16 Sep 2026 11:00:50 +0800
Subject: [PATCH] site%

---
 .../modules/inspection/entity/UnqualifiedInspectionDto.java   | 4 ++++
 .../service/impl/IfsInspectionHistoryServiceImpl.java         | 2 +-
 .../inspection/service/impl/InspectionInboundServiceImpl.java | 4 +++-
 3 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/src/main/java/com/gaotao/modules/inspection/entity/UnqualifiedInspectionDto.java b/src/main/java/com/gaotao/modules/inspection/entity/UnqualifiedInspectionDto.java
index c5ae2414..1e68ae3f 100644
--- a/src/main/java/com/gaotao/modules/inspection/entity/UnqualifiedInspectionDto.java
+++ b/src/main/java/com/gaotao/modules/inspection/entity/UnqualifiedInspectionDto.java
@@ -8,6 +8,10 @@ import java.util.Date;
 @Data
 public class UnqualifiedInspectionDto {
     private String site;
+    /**
+     * IFS工厂编码。PDA不合格处理扫描/确认必须用单据行contract，不能用登录大site。
+     */
+    private String contract;
     private String transNo;
     private String itemNo;
     private String partNo;
diff --git a/src/main/java/com/gaotao/modules/inspection/service/impl/IfsInspectionHistoryServiceImpl.java b/src/main/java/com/gaotao/modules/inspection/service/impl/IfsInspectionHistoryServiceImpl.java
index 1d64ac26..91831c0f 100644
--- a/src/main/java/com/gaotao/modules/inspection/service/impl/IfsInspectionHistoryServiceImpl.java
+++ b/src/main/java/com/gaotao/modules/inspection/service/impl/IfsInspectionHistoryServiceImpl.java
@@ -78,7 +78,7 @@ public class IfsInspectionHistoryServiceImpl implements IfsInspectionHistoryServ
             Map<String, Object> params = Map.of(
                 "ifsDBName", ifsDBName,
                 "domainUserID", getCurrentDomainUserID(),
-                    "ifsSiteID", site,
+                    "ifsSiteID", site+"%",
                     "ifsTransactionID", ifsTransId
             );
 
diff --git a/src/main/java/com/gaotao/modules/inspection/service/impl/InspectionInboundServiceImpl.java b/src/main/java/com/gaotao/modules/inspection/service/impl/InspectionInboundServiceImpl.java
index bb099190..729a2dda 100644
--- a/src/main/java/com/gaotao/modules/inspection/service/impl/InspectionInboundServiceImpl.java
+++ b/src/main/java/com/gaotao/modules/inspection/service/impl/InspectionInboundServiceImpl.java
@@ -264,7 +264,9 @@ public class InspectionInboundServiceImpl implements InspectionInboundService {
 
                 if (unqualifiedQty != null && unqualifiedQty.compareTo(BigDecimal.ZERO) > 0) {
                     UnqualifiedInspectionDto dto = new UnqualifiedInspectionDto();
-                    dto.setSite(ifsHistory.getContract()); // 使用contract作为site
+                    // 列表行site与contract都落IFS工厂编码，处理页按选中行contract作为实际site
+                    dto.setSite(ifsHistory.getContract());
+                    dto.setContract(ifsHistory.getContract());
                     dto.setTransNo(ifsHistory.getOrderNo() + "-"+ifsHistory.getLineNo()+ "-"+ifsHistory.getReleaseNo()
                             + "-" + ifsHistory.getReceiptNo()); // 组合单据号
                     dto.setItemNo(ifsHistory.getLineNo());