From dcf40c8842f3121105b211e23870b4cc922949ea Mon Sep 17 00:00:00 2001
From: yuejiayang <146344614+YangLei105@users.noreply.github.com>
Date: Tue, 16 Jan 2024 16:19:45 +0800
Subject: [PATCH] =?UTF-8?q?2024.1.16=20=E6=B4=BE=E5=B7=A5=E5=8D=95?=
 =?UTF-8?q?=E5=8F=B7=E6=A8=A1=E6=80=81=E6=A1=86=E5=8F=98=E6=9B=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../sys/modules/pms/data/QcFAIRecordData.java | 21 +++++++++++++++++++
 src/main/resources/mapper/pms/QcMapper.xml    |  6 ++++++
 2 files changed, 27 insertions(+)

diff --git a/src/main/java/com/xujie/sys/modules/pms/data/QcFAIRecordData.java b/src/main/java/com/xujie/sys/modules/pms/data/QcFAIRecordData.java
index 2ccd3df4..f71f7d90 100644
--- a/src/main/java/com/xujie/sys/modules/pms/data/QcFAIRecordData.java
+++ b/src/main/java/com/xujie/sys/modules/pms/data/QcFAIRecordData.java
@@ -43,6 +43,23 @@ public class QcFAIRecordData extends QueryPage {
     private String inspectionTypeName;
     // 工单号
     private String orderNo;
+
+    public String getLotsize() {
+        return lotsize;
+    }
+
+    public void setLotsize(String lotsize) {
+        this.lotsize = lotsize;
+    }
+
+    public String getQtyrequired() {
+        return qtyrequired;
+    }
+
+    public void setQtyrequired(String qtyrequired) {
+        this.qtyrequired = qtyrequired;
+    }
+
     // 工序号
     private String operationNo;
     // 工序名称
@@ -59,6 +76,10 @@ public class QcFAIRecordData extends QueryPage {
     private String partDesc;
     //老编码
     private String cinvSourceCode;
+    // 工单数量
+    private String lotsize;
+    // 派工数量
+    private String qtyrequired;
     // 质检备注
     private String inspectionRemark;
     // 送检数量
diff --git a/src/main/resources/mapper/pms/QcMapper.xml b/src/main/resources/mapper/pms/QcMapper.xml
index 08dea5da..b7bdb94a 100644
--- a/src/main/resources/mapper/pms/QcMapper.xml
+++ b/src/main/resources/mapper/pms/QcMapper.xml
@@ -3016,6 +3016,9 @@
             a.orderno,
             J.part_no,
             J.part_desc,
+            t.lotsize,
+            a.qtyrequired,
+            c.operation_desc,
             dbo.qc_get_sku(a.part_no) AS sku
         FROM
             soscheduledrouting AS a
@@ -3043,6 +3046,9 @@
             <if test="query.partDesc != null and query.partDesc != ''">
                 AND J.part_desc LIKE '%' + #{query.partDesc} + '%'
             </if>
+            <if test="query.operationDesc != null and query.operationDesc != ''">
+                AND c.operation_desc LIKE '%' + #{query.operationDesc} + '%'
+            </if>
     </select>
     <select id="searchPartInfo" parameterType="com.xujie.sys.modules.pms.data.QcFAIRecordData" resultType="com.xujie.sys.modules.pms.data.QcFAIRecordData">
         select