From fdb91137b758b241f9780703867c418bf2518083 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=A8=E5=A5=89=E6=BA=90?= <1976974459@qq.com>
Date: Tue, 7 Nov 2023 13:13:41 +0800
Subject: [PATCH] =?UTF-8?q?2023-11-07=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=B91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../modules/pms/controller/QcController.java  | 17 +++++++++++--
 .../pms/data/QcInspectionTypeData.java        | 10 ++++++++
 .../sys/modules/pms/mapper/QcMapper.java      |  4 ++-
 .../pms/service/Impl/QcServiceImpl.java       | 20 +++++++++++++--
 .../sys/modules/pms/service/QcService.java    |  4 ++-
 src/main/resources/mapper/pms/QcMapper.xml    | 25 ++++++++++++++-----
 6 files changed, 68 insertions(+), 12 deletions(-)

diff --git a/src/main/java/com/xujie/sys/modules/pms/controller/QcController.java b/src/main/java/com/xujie/sys/modules/pms/controller/QcController.java
index 552a4aba..96461b17 100644
--- a/src/main/java/com/xujie/sys/modules/pms/controller/QcController.java
+++ b/src/main/java/com/xujie/sys/modules/pms/controller/QcController.java
@@ -380,8 +380,8 @@ public class QcController {
      * @return: com.xujie.sys.common.utils.R
      **/
     @PostMapping(value="/InspectionTypeSearch")
-    public R InspectionTypeSearch(){
-        List<QcInspectionTypeData> list = qcService.InspectionTypeSearch();
+    public R InspectionTypeSearch(@RequestBody QcInspectionTypeData data){
+        List<QcInspectionTypeData> list = qcService.InspectionTypeSearch(data);
         return R.ok().put("rows", list);
     }
 
@@ -1636,6 +1636,19 @@ public class QcController {
         List<QcFAIRecordData> list = qcService.getRollNo(data);
         return R.ok().put("rows", list);
     }
+
+    /**
+     * @description: 标签号回车事件
+     * @author: fengyuan_yang
+     * @date: 2023/11/7 10:22
+     * @param: [data]
+     * @return: com.xujie.sys.common.utils.R
+     **/
+    @PostMapping("/rollNoEnter")
+    public R rollNoEnter(@RequestBody QcFAIRecordData data){
+        List<QcFAIRecordData> list = qcService.rollNoEnter(data);
+        return R.ok().put("rows", list);
+    }
 }
 
 
diff --git a/src/main/java/com/xujie/sys/modules/pms/data/QcInspectionTypeData.java b/src/main/java/com/xujie/sys/modules/pms/data/QcInspectionTypeData.java
index 9d72ca61..cf07c205 100644
--- a/src/main/java/com/xujie/sys/modules/pms/data/QcInspectionTypeData.java
+++ b/src/main/java/com/xujie/sys/modules/pms/data/QcInspectionTypeData.java
@@ -6,6 +6,8 @@ import org.springframework.format.annotation.DateTimeFormat;
 import java.util.Date;
 
 public class QcInspectionTypeData {
+    // 工厂
+    private String site;
     // 检验类型编码
     private String inspectionTypeNo;
     // 检验类型名称
@@ -17,6 +19,14 @@ public class QcInspectionTypeData {
     // 创建人
     private String createBy;
 
+    public String getSite() {
+        return site;
+    }
+
+    public void setSite(String site) {
+        this.site = site;
+    }
+
     public String getInspectionTypeNo() {
         return inspectionTypeNo;
     }
diff --git a/src/main/java/com/xujie/sys/modules/pms/mapper/QcMapper.java b/src/main/java/com/xujie/sys/modules/pms/mapper/QcMapper.java
index 007b3c8a..b594fa0e 100644
--- a/src/main/java/com/xujie/sys/modules/pms/mapper/QcMapper.java
+++ b/src/main/java/com/xujie/sys/modules/pms/mapper/QcMapper.java
@@ -161,7 +161,7 @@ public interface QcMapper {
 
     String queryLastSamplingPlanNo(QcSamplingInspectionPlanData data);
 
-    List<QcInspectionTypeData> InspectionTypeSearch();
+    List<QcInspectionTypeData> InspectionTypeSearch(QcInspectionTypeData data);
 
     IPage<QcPartAttributeData> qcPartAttributeSearch(Page<QcPartAttributeData> qcPartAttributeDataPage,@Param("query") QcPartAttributeData data);
 
@@ -425,4 +425,6 @@ public interface QcMapper {
     void imageDelete(SysOssEntity data);
 
     List<QcFAIRecordData> getRollNo(QcFAIRecordData data);
+
+    QcFAIRecordData rollNoEnter(QcFAIRecordData data);
 }
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 5856dbad..c4e3b110 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
@@ -939,8 +939,8 @@ public class QcServiceImpl implements QcService {
      * @return: java.util.List<com.xujie.sys.modules.pms.data.QcInspectionTypeData>
      **/
     @Override
-    public List<QcInspectionTypeData> InspectionTypeSearch() {
-        List<QcInspectionTypeData> list = qcMapper.InspectionTypeSearch();
+    public List<QcInspectionTypeData> InspectionTypeSearch(QcInspectionTypeData data) {
+        List<QcInspectionTypeData> list = qcMapper.InspectionTypeSearch(data);
         return list;
     }
 
@@ -3200,6 +3200,22 @@ public class QcServiceImpl implements QcService {
         return list;
     }
 
+    /**
+     * @description: 标签号回车事件
+     * @author: fengyuan_yang
+     * @date: 2023/11/7 10:24
+     * @param: [data]
+     * @return: java.util.List<com.xujie.sys.modules.pms.data.QcFAIRecordData>
+     **/
+    @Override
+    public List<QcFAIRecordData> rollNoEnter(QcFAIRecordData data) {
+        // 根据标签号查出派工单和工单号
+        QcFAIRecordData workOrderData = qcMapper.rollNoEnter(data);
+        // 根据派工单号查出所有数据
+        List<QcFAIRecordData> list = qcMapper.getOperationList(workOrderData);
+        return list;
+    }
+
 
 }
 
diff --git a/src/main/java/com/xujie/sys/modules/pms/service/QcService.java b/src/main/java/com/xujie/sys/modules/pms/service/QcService.java
index 7ae8d14d..13cadbef 100644
--- a/src/main/java/com/xujie/sys/modules/pms/service/QcService.java
+++ b/src/main/java/com/xujie/sys/modules/pms/service/QcService.java
@@ -104,7 +104,7 @@ public interface QcService {
 
     void samplingLevelDelete(QcSamplingInspectionLevelData data);
 
-    List<QcInspectionTypeData> InspectionTypeSearch();
+    List<QcInspectionTypeData> InspectionTypeSearch(QcInspectionTypeData data);
 
     PageUtils qcPartAttributeSearch(QcPartAttributeData data);
 
@@ -253,4 +253,6 @@ public interface QcService {
     void imageDelete(SysOssEntity data);
 
     List<QcFAIRecordData> getRollNo(QcFAIRecordData data);
+
+    List<QcFAIRecordData> rollNoEnter(QcFAIRecordData data);
 }
diff --git a/src/main/resources/mapper/pms/QcMapper.xml b/src/main/resources/mapper/pms/QcMapper.xml
index a6c86a69..e43b607e 100644
--- a/src/main/resources/mapper/pms/QcMapper.xml
+++ b/src/main/resources/mapper/pms/QcMapper.xml
@@ -502,10 +502,11 @@
     </delete>
 
     <!-- 搜索所有检验类型 -->
-    <select id="InspectionTypeSearch" resultType="QcInspectionTypeData">
+    <select id="InspectionTypeSearch" resultType="QcInspectionTypeData" parameterType="QcInspectionTypeData">
         SELECT inspection_type_no,
                inspection_type_name
         FROM  qc_inspection_type
+        WHERE site = #{site}
     </select>
 
     <!-- 搜索所有设备 -->
@@ -1920,6 +1921,8 @@
     <select id="getOperationList" parameterType="QcFAIRecordData" resultType="QcFAIRecordData">
         SELECT
             DISTINCT
+            a.seqno as seqNo,
+            a.orderno as orderNo,
             j.part_no,
             j.part_desc,
             j.spec,
@@ -1933,7 +1936,7 @@
         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}
+        WHERE b.approve_qty is not null and a.seqno = #{seqNo}
     </select>
 
     <!-- 根据工单号和工序号查出所有数据 -->
@@ -2641,15 +2644,25 @@
 
     <!-- 模糊查询标签号 -->
     <select id="getRollNo" resultType="QcFAIRecordData" parameterType="QcFAIRecordData">
-        SELECT DISTINCT top 5
+        SELECT DISTINCT top 3
             a.seqno,
             a.orderno,
             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
-        LEFT JOIN shoporder t ON t.orderno = a.orderno AND a.site = t.site
-        WHERE a.site = #{site} and b.roll_no like '%' + #{rollNo}+'%'
+        WHERE a.site = #{site} and b.roll_no like '%' + #{rollNo} + '%'
+    </select>
+
+    <!-- 标签号回车事件 -->
+    <select id="rollNoEnter" resultType="QcFAIRecordData" parameterType="QcFAIRecordData">
+        SELECT
+            a.site,
+            a.seqno as seqNo,
+            a.orderno as orderNo,
+            b.roll_no
+        FROM soscheduledrouting AS a
+        LEFT JOIN sfdc_rolls AS b ON a.site = b.site AND a.seqno = b.createdops_seqno
+        WHERE b.roll_no = #{rollNo}
     </select>
 
 </mapper>