From bca451dc188b770f86449fab727da595007c2f49 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=B5=B5=E5=AE=8F=E6=96=8C?= <2164406372@qq.com>
Date: Thu, 21 Aug 2025 09:25:51 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=B7=A5=E5=BA=8F=E6=89=80?=
 =?UTF-8?q?=E5=B1=9E=E6=9C=BA=E5=8F=B0=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../modules/pms/controller/PqcController.java | 25 ++++++++++++++++---
 .../sys/modules/pms/mapper/PqcMapper.java     |  4 +++
 .../pms/service/Impl/PqcServiceImpl.java      | 10 ++++++++
 .../sys/modules/pms/service/PqcService.java   |  4 +++
 src/main/resources/mapper/pms/PqcMapper.xml   | 19 +++++++++-----
 5 files changed, 52 insertions(+), 10 deletions(-)

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 3f30a204..86eaf312 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
@@ -314,10 +314,27 @@ public class PqcController {
     @PostMapping("/deleteOperationForResource")
     public R deleteOperationForResource(@RequestBody  OperationForResource data){
         int i = pqcService.deleteOperationForResource(data);
-        if (i==1){
-            return R.ok();
-        }
-        return R.ok().put("code",2);
+        return R.ok();
+    }
+    /**
+     * 删除工序对应机台记录
+     * @param
+     * @return
+     */
+    @PostMapping("/deleteOperationForResource2")
+    public R deleteOperationForResource2(@RequestBody  OperationForResource data){
+        int i = pqcService.deleteOperationForResource2(data);
+        return R.ok();
+    }
+    /**
+     * 查询工序对应的机台记录
+     * @param
+     * @return
+     */
+    @PostMapping("/getResourceDataOperationForResource")
+    public R getResourceDataOperationForResource(@RequestBody  OperationForResource data){
+        List<OperationForResource> list =  pqcService.getResourceDataOperationForResource(data);
+        return R.ok().put("rows",list);
     }
     /**
      * 删除用户默认工序记录
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 9aaa15c2..9397014c 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
@@ -79,4 +79,8 @@ public interface PqcMapper {
     List<SysUserEntity> getAllUserList(SysUserEntity data);
 
     List<ResourceData> queryResourceList2(ResourceData data);
+
+    List<OperationForResource> getResourceDataOperationForResource(OperationForResource data);
+
+    int deleteOperationForResource2(OperationForResource 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 c3510371..9a83288b 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
@@ -792,4 +792,14 @@ public class PqcServiceImpl implements PqcService {
         List<ResourceData> list = pqcMapper.queryResourceList2(data);
         return list;
     }
+
+    @Override
+    public List<OperationForResource> getResourceDataOperationForResource(OperationForResource data) {
+        return pqcMapper.getResourceDataOperationForResource(data);
+    }
+
+    @Override
+    public int deleteOperationForResource2(OperationForResource data) {
+        return pqcMapper.deleteOperationForResource2(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 c1296b0d..271e372c 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
@@ -65,4 +65,8 @@ public interface PqcService {
     List<SysUserEntity> getAllUserList(SysUserEntity data);
 
     List<ResourceData> queryResourceList2(ResourceData data);
+
+    List<OperationForResource> getResourceDataOperationForResource(OperationForResource data);
+
+    int deleteOperationForResource2(OperationForResource data);
 }
diff --git a/src/main/resources/mapper/pms/PqcMapper.xml b/src/main/resources/mapper/pms/PqcMapper.xml
index 33391ef0..4b898e0f 100644
--- a/src/main/resources/mapper/pms/PqcMapper.xml
+++ b/src/main/resources/mapper/pms/PqcMapper.xml
@@ -206,11 +206,14 @@
         WHERE inspection_no = #{inspectionNo} and item_no = #{itemNo} and site = #{site} and bu_no = #{buNo}
     </delete>
     <delete id="deleteOperationForResource">
-        delete from operation_resource where id = #{id}
+        delete from operation_resource where bu=#{bu} and operation = #{operation}
     </delete>
     <delete id="deleteUserDefaultOperation">
         delete from user_default_operation where id = #{id}
     </delete>
+    <delete id="deleteOperationForResource2">
+        delete from operation_resource where id = #{id}
+    </delete>
 
     <insert id="savePQCSubDetailed">
         INSERT INTO qc_pqc_sub_detail_record
@@ -385,12 +388,8 @@
         </where>
     </select>
     <select id="queryOperationForResourceList" resultType="com.xujie.sys.modules.pms.data.OperationForResource">
-        SELECT a.*,
-        dbo.get_bu_desc(a.site, a.bu_no) as buDesc,
-        b.resource_desc,
-        qro.description as operationDesc
+        SELECT a.bu,dbo.get_bu_desc(a.site, a.bu_no) as buDesc,a.operation,qro.description as operationDesc
         FROM operation_resource a
-        left join resource b on a.resource = b.resource_id
         left join qc_pqc_record_operation qro on a.operation = qro.code
         <where>
             <if test="params.bu != null and params.bu != ''">
@@ -403,6 +402,7 @@
                 and resource like '%'+ #{params.resource}+'%'
             </if>
         </where>
+        group by a.bu,a.operation,dbo.get_bu_desc(a.site, a.bu_no),qro.description
     </select>
     <select id="queryResourceList" resultType="com.xujie.sys.modules.pms.data.ResourceData">
         select * from resource
@@ -449,6 +449,13 @@
             </if>
         </where>
     </select>
+    <select id="getResourceDataOperationForResource"
+            resultType="com.xujie.sys.modules.pms.data.OperationForResource">
+        select a.*,b.resource_desc
+        from operation_resource a
+        left join resource b on a.resource = b.resource_id
+        where bu = #{bu} and operation = #{operation}
+    </select>
 </mapper>