1

src/main/java/com/xujie/sys/modules/pms/controller/QcController.java

@@ -1642,6 +1642,12 @@ public class QcController {
         return R.ok().put("rows", list);
     }
 
+    @PostMapping("/getSpecialOperationList2")
+    public R getSpecialOperationList2(@RequestBody QcFAIRecordData data){
+        List<QcFAIRecordData> list = qcService.getSpecialOperationList2(data);
+        return R.ok().put("rows", list);
+    }
+
     /**
      * @description: 获取处置措施列表
      * @author: fengyuan_yang

src/main/java/com/xujie/sys/modules/pms/mapper/QcMapper.java

@@ -412,6 +412,8 @@ public interface QcMapper {
 
     List<QcFAIRecordData> getSpecialOperationList(QcFAIRecordData data);
 
+    List<QcFAIRecordData> getSpecialOperationList2(QcFAIRecordData data);
+
     List<QcFAIRecordData> disposalMeasuresSearch(QcFAIRecordData data);
 
     void qcPartAttributeEdit(QcPartAttributeData data);

src/main/java/com/xujie/sys/modules/pms/service/Impl/QcServiceImpl.java

@@ -3685,6 +3685,22 @@ public class QcServiceImpl implements QcService {
         return list;
     }
 
+    @Override
+    public List<QcFAIRecordData> getSpecialOperationList2(QcFAIRecordData data) {
+        // 获得 site 和 bu
+        if (data.getBu().split("_").length >= 2 ) {
+            if (!data.getBu().split("_")[0].equals("***")){
+                data.setSite(data.getBu().split("_")[0]);
+            }
+
+            data.setBuNo(data.getBu().split("_")[1]);
+        } else {
+            throw new RuntimeException("工厂和部门有误!");
+        }
+        List<QcFAIRecordData> list = qcMapper.getSpecialOperationList2(data);
+        return list;
+    }
+
     /**
      * 获取处置措施列表
      **/

src/main/java/com/xujie/sys/modules/pms/service/QcService.java

@@ -244,6 +244,8 @@ public interface QcService {
 
     List<QcFAIRecordData> getSpecialOperationList(QcFAIRecordData data);
 
+    List<QcFAIRecordData> getSpecialOperationList2(QcFAIRecordData data);
+
     List<QcFAIRecordData> disposalMeasuresSearch(QcFAIRecordData data);
 
     void qcPartAttributeEdit(QcPartAttributeData data);

src/main/resources/mapper/pms/QcMapper.xml

@@ -3187,6 +3187,15 @@
         where site = #{site}
     </select>
 
+    <select id="getSpecialOperationList2" resultType="com.xujie.sys.modules.pms.data.QcFAIRecordData" parameterType="com.xujie.sys.modules.pms.data.QcFAIRecordData">
+        select distinct site , routing_item_no as operation_no,item_desc as operation_desc from  routing_detail
+        <where>
+            <if test = "site != null and site != ''">
+                 site = #{site}
+            </if>
+        </where>
+    </select>
+
     <!-- 获取处置措施列表 -->
     <select id="disposalMeasuresSearch" resultType="com.xujie.sys.modules.pms.data.QcFAIRecordData" parameterType="com.xujie.sys.modules.pms.data.QcFAIRecordData">
         SELECT