2023-11-06，设备和质量修改3

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

@@ -2691,12 +2691,12 @@ public class QcServiceImpl implements QcService {
     public List<QcFAIRecordData> getResourceList(QcFAIRecordData data) {
         // 根据工单号和工序号查出所有数据
         List<QcFAIRecordData> list = qcMapper.getResourceList(data);
-        // 去重
-        List<QcFAIRecordData> collect = list.stream().collect(
-                Collectors.collectingAndThen(
-                        Collectors.toCollection(() -> new TreeSet<>(Comparator.comparing(QcFAIRecordData::getResourceId))), ArrayList::new
-                ));
-        return collect;
+//        // 去重
+//        List<QcFAIRecordData> collect = list.stream().collect(
+//                Collectors.collectingAndThen(
+//                        Collectors.toCollection(() -> new TreeSet<>(Comparator.comparing(QcFAIRecordData::getResourceId))), ArrayList::new
+//                ));
+        return list;
     }
 
     /**
@@ -2710,12 +2710,12 @@ public class QcServiceImpl implements QcService {
     public List<QcFAIRecordData> getPartList(QcFAIRecordData data) {
         // 根据工单号查出所有数据
         List<QcFAIRecordData> list = qcMapper.getOperationList(data);
-        // 去重
-        List<QcFAIRecordData> collect = list.stream().collect(
-                Collectors.collectingAndThen(
-                        Collectors.toCollection(() -> new TreeSet<>(Comparator.comparing(QcFAIRecordData::getPartNo))), ArrayList::new
-                ));
-        return collect;
+//        // 去重
+//        List<QcFAIRecordData> collect = list.stream().collect(
+//                Collectors.collectingAndThen(
+//                        Collectors.toCollection(() -> new TreeSet<>(Comparator.comparing(QcFAIRecordData::getPartNo))), ArrayList::new
+//                ));
+        return list;
     }
 
 

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

@@ -1919,18 +1919,21 @@
     <!-- 查询工序列表 -->
     <select id="getOperationList" parameterType="QcFAIRecordData" resultType="QcFAIRecordData">
         SELECT
+            DISTINCT
             j.part_no,
             j.part_desc,
             j.spec,
             j.sku,
             c.operation_desc as operationDesc,
-            a.itemno as operationNo
+            a.itemno as operationNo,
+            a.s_resourceid as resourceId,
+            DBO.getResourceDesc(a.site, a.s_resourceid) as resourceDesc,
+            c.work_center_no
         FROM soscheduledrouting as a
         LEFT JOIN sfdc as b ON a.site = b.site and a.seqno = b.assjob_seq_no
         LEFT JOIN so_routing as c ON c.order_no = a.orderno and a.itemno = c.item_no and c.site = a.site
         LEFT JOIN part j ON a.site = j.site and a.part_no = j.part_no
-        WHERE a.site = #{site} and  b.approve_qty is not null and a.seqno = #{seqNo}
-        ORDER BY a.id desc
+        WHERE a.site = #{site} and b.approve_qty is not null and a.seqno = #{seqNo}
     </select>
 
     <!-- 根据工单号和工序号查出所有数据 -->
@@ -2641,8 +2644,7 @@
         SELECT DISTINCT top 5
             a.seqno,
             a.orderno,
-            b.roll_no,
-            a.itemno
+            b.roll_no
         FROM soscheduledrouting AS a
         LEFT JOIN sfdc_rolls AS b ON a.site = b.site AND a.seqno = b.createdops_seqno
         LEFT JOIN part J ON a.site = J.site AND a.part_no = J.part_no