From aee2c546b6f37ebb885bdedb2873d17173510788 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=A8=E5=A5=89=E6=BA=90?= <1976974459@qq.com>
Date: Mon, 6 Nov 2023 20:52:36 +0800
Subject: [PATCH] =?UTF-8?q?2023-11-06=EF=BC=8C=E8=AE=BE=E5=A4=87=E5=92=8C?=
 =?UTF-8?q?=E8=B4=A8=E9=87=8F=E4=BF=AE=E6=94=B93?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../pms/service/Impl/QcServiceImpl.java       | 24 +++++++++----------
 src/main/resources/mapper/pms/QcMapper.xml    | 12 ++++++----
 2 files changed, 19 insertions(+), 17 deletions(-)

diff --git a/src/main/java/com/xujie/sys/modules/pms/service/Impl/QcServiceImpl.java b/src/main/java/com/xujie/sys/modules/pms/service/Impl/QcServiceImpl.java
index 1d6cb524..5856dbad 100644
--- a/src/main/java/com/xujie/sys/modules/pms/service/Impl/QcServiceImpl.java
+++ b/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;
     }
 
 
diff --git a/src/main/resources/mapper/pms/QcMapper.xml b/src/main/resources/mapper/pms/QcMapper.xml
index c8ba8e55..a6c86a69 100644
--- a/src/main/resources/mapper/pms/QcMapper.xml
+++ b/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