From 138bb110ec17bc90fa8e11448a7413925cf60454 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 17:42:31 +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=B92?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/resources/mapper/pms/QcMapper.xml | 22 ++++++++++++++--------
 1 file changed, 14 insertions(+), 8 deletions(-)

diff --git a/src/main/resources/mapper/pms/QcMapper.xml b/src/main/resources/mapper/pms/QcMapper.xml
index 15ea8941..c8ba8e55 100644
--- a/src/main/resources/mapper/pms/QcMapper.xml
+++ b/src/main/resources/mapper/pms/QcMapper.xml
@@ -1549,7 +1549,8 @@
             state = #{state},
             inspection_remark = #{inspectionRemark},
             inspector_date = getDate(),
-            sampling_qty = #{samplingQty,jdbcType=DECIMAL}
+            sampling_qty = #{samplingQty,jdbcType=DECIMAL},
+            roll_qty = #{rollQty,jdbcType=DECIMAL}
         WHERE site = #{site}
         AND inspection_no = #{inspectionNo}
     </update>
@@ -1837,7 +1838,8 @@
             state = #{state},
             inspection_remark = #{inspectionRemark},
             inspector_date = getDate(),
-            sampling_qty = #{samplingQty,jdbcType=DECIMAL}
+            sampling_qty = #{samplingQty,jdbcType=DECIMAL},
+            roll_qty = #{rollQty,jdbcType=DECIMAL}
         WHERE site = #{site} and inspection_no = #{inspectionNo}
     </update>
 
@@ -1927,7 +1929,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 b.approve_qty is not null and a.orderno = #{orderNo}
+        WHERE a.site = #{site} and  b.approve_qty is not null and a.seqno = #{seqNo}
         ORDER BY a.id desc
     </select>
 
@@ -1941,10 +1943,12 @@
         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 b.approve_qty is not null and a.orderno = #{orderNo} and c.operation_desc = #{operationDesc}
+        WHERE a.site = #{site} and b.approve_qty is not null and a.seqno = #{seqNo}
         ORDER BY a.id desc
     </select>
 
+<!--    a.orderno = #{orderNo} and c.operation_desc = #{operationDesc}-->
+
     <!-- 查询机台名称 -->
     <select id="selectResourceDesc" parameterType="QcFAIRecordData" resultType="QcFAIRecordData">
         SELECT distinct
@@ -2412,7 +2416,8 @@
             state = #{state},
             inspection_remark = #{inspectionRemark},
             inspector_date = getDate(),
-            sampling_qty = #{samplingQty,jdbcType=DECIMAL}
+            sampling_qty = #{samplingQty,jdbcType=DECIMAL},
+            roll_qty = #{rollQty,jdbcType=DECIMAL}
         WHERE site = #{site} and inspection_no = #{inspectionNo}
     </update>
 
@@ -2633,15 +2638,16 @@
 
     <!-- 模糊查询标签号 -->
     <select id="getRollNo" resultType="QcFAIRecordData" parameterType="QcFAIRecordData">
-        SELECT DISTINCT top 3
+        SELECT DISTINCT top 5
             a.seqno,
             a.orderno,
-            b.roll_no
+            b.roll_no,
+            a.itemno
         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 t.status = '下达' and b.state ='在库' and b.roll_no like '%' + #{rollNo}+'%'
+        WHERE a.site = #{site} and b.roll_no like '%' + #{rollNo}+'%'
     </select>
 
 </mapper>