From b52904080a526e3f1a6baaab2908b497db9e5860 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=B5=B5=E5=AE=8F=E6=96=8C?= <2164406372@qq.com>
Date: Fri, 22 Aug 2025 11:11:44 +0800
Subject: [PATCH] =?UTF-8?q?PQC=E4=BB=BB=E5=8A=A1=20=E5=A2=9E=E5=8A=A0=20?=
 =?UTF-8?q?=E6=9F=A5=E8=AF=A2SOP=E7=BC=96=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../modules/pms/controller/PqcController.java | 13 +++++++
 .../sys/modules/pms/data/PartSopData.java     | 34 +++++++++++++++++++
 .../sys/modules/pms/mapper/PqcMapper.java     |  2 ++
 .../pms/service/Impl/PqcServiceImpl.java      |  5 +++
 .../sys/modules/pms/service/PqcService.java   |  2 ++
 src/main/resources/mapper/pms/PqcMapper.xml   |  7 ++++
 6 files changed, 63 insertions(+)
 create mode 100644 src/main/java/com/xujie/sys/modules/pms/data/PartSopData.java

diff --git a/src/main/java/com/xujie/sys/modules/pms/controller/PqcController.java b/src/main/java/com/xujie/sys/modules/pms/controller/PqcController.java
index 86eaf312..4ea3e024 100644
--- a/src/main/java/com/xujie/sys/modules/pms/controller/PqcController.java
+++ b/src/main/java/com/xujie/sys/modules/pms/controller/PqcController.java
@@ -388,5 +388,18 @@ public class PqcController {
         }
         return R.ok().put("rows",list);
     }
+    /**
+     * 根据物料查询SOP编码
+     * @param
+     * @return
+     */
+    @PostMapping("/querySopNum")
+    public R querySopNum(@RequestBody PartSopData data){
+        List<PartSopData> list = pqcService.querySopNum(data);
+        if (list.isEmpty()){
+            return R.ok().put("code",2);
+        }
+        return R.ok().put("rows",list);
+    }
 
 }
diff --git a/src/main/java/com/xujie/sys/modules/pms/data/PartSopData.java b/src/main/java/com/xujie/sys/modules/pms/data/PartSopData.java
new file mode 100644
index 00000000..e32e4e14
--- /dev/null
+++ b/src/main/java/com/xujie/sys/modules/pms/data/PartSopData.java
@@ -0,0 +1,34 @@
+package com.xujie.sys.modules.pms.data;
+
+import lombok.Data;
+
+import java.util.Date;
+@Data
+public class PartSopData {
+    private Integer id;
+    private String sopNo;
+    private String sopName;
+    private String sopUrl;
+    private Date creationDate;
+    private String createdBy;
+    private String version;
+    private String partNo;
+    private String sopStatus;
+
+    private String sopType;
+    private String site;
+
+    private Date phaseInDate;
+    private Date phaseOutDate;
+    // MES设备ID
+    private String resourceId;
+
+    private String partDesc;
+    private Date releasedDate;
+
+    private String partType;
+    // 设备编码
+    private String objectID;
+
+    private String searchFlag;
+}
diff --git a/src/main/java/com/xujie/sys/modules/pms/mapper/PqcMapper.java b/src/main/java/com/xujie/sys/modules/pms/mapper/PqcMapper.java
index 9397014c..e4e08821 100644
--- a/src/main/java/com/xujie/sys/modules/pms/mapper/PqcMapper.java
+++ b/src/main/java/com/xujie/sys/modules/pms/mapper/PqcMapper.java
@@ -83,4 +83,6 @@ public interface PqcMapper {
     List<OperationForResource> getResourceDataOperationForResource(OperationForResource data);
 
     int deleteOperationForResource2(OperationForResource data);
+
+    List<PartSopData> querySopNum(PartSopData data);
 }
diff --git a/src/main/java/com/xujie/sys/modules/pms/service/Impl/PqcServiceImpl.java b/src/main/java/com/xujie/sys/modules/pms/service/Impl/PqcServiceImpl.java
index 9a83288b..b4dc9e04 100644
--- a/src/main/java/com/xujie/sys/modules/pms/service/Impl/PqcServiceImpl.java
+++ b/src/main/java/com/xujie/sys/modules/pms/service/Impl/PqcServiceImpl.java
@@ -802,4 +802,9 @@ public class PqcServiceImpl implements PqcService {
     public int deleteOperationForResource2(OperationForResource data) {
         return pqcMapper.deleteOperationForResource2(data);
     }
+
+    @Override
+    public List<PartSopData> querySopNum(PartSopData data) {
+        return pqcMapper.querySopNum(data);
+    }
 }
diff --git a/src/main/java/com/xujie/sys/modules/pms/service/PqcService.java b/src/main/java/com/xujie/sys/modules/pms/service/PqcService.java
index 271e372c..05cdda5c 100644
--- a/src/main/java/com/xujie/sys/modules/pms/service/PqcService.java
+++ b/src/main/java/com/xujie/sys/modules/pms/service/PqcService.java
@@ -69,4 +69,6 @@ public interface PqcService {
     List<OperationForResource> getResourceDataOperationForResource(OperationForResource data);
 
     int deleteOperationForResource2(OperationForResource data);
+
+    List<PartSopData> querySopNum(PartSopData data);
 }
diff --git a/src/main/resources/mapper/pms/PqcMapper.xml b/src/main/resources/mapper/pms/PqcMapper.xml
index 4b898e0f..ec68343a 100644
--- a/src/main/resources/mapper/pms/PqcMapper.xml
+++ b/src/main/resources/mapper/pms/PqcMapper.xml
@@ -456,6 +456,13 @@
         left join resource b on a.resource = b.resource_id
         where bu = #{bu} and operation = #{operation}
     </select>
+    <select id="querySopNum" resultType="com.xujie.sys.modules.pms.data.PartSopData">
+        SELECT top 1  s.id,s.sop_type,s.phase_in_date,s.phase_out_date,sop_no,sop_name,sop_url, s.creation_date, s.created_by, s.version,s.part_no,sop_status,p.part_desc
+        FROM  part_sop s
+                  left join  part p on s.part_no = p.part_no and  s.site = p.site
+        where  s.site = #{site} and s.part_no = #{partNo} and  s.sop_type = #{sopType} and sop_status = #{sopStatus}
+        order by s.phase_in_date desc
+    </select>
 </mapper>