From 0475f95ce202817c49ccbd994fa1633997369571 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?yinjinlu-pc=5C=E5=B0=B9=E9=87=91=E8=B7=AF?=
 <411641505@qq.com>
Date: Sun, 20 Aug 2023 18:14:46 +0800
Subject: [PATCH] =?UTF-8?q?=E7=94=9F=E4=BA=A7=E6=8A=A5=E5=B7=A5=E6=B7=BB?=
 =?UTF-8?q?=E5=8A=A0=E5=BE=85=E8=B4=A8=E6=A3=80=E6=95=B0=E9=87=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/ktg/mes/pro/domain/ProFeedback.java     | 12 ++++++++++++
 .../main/resources/mapper/pro/ProFeedbackMapper.xml  |  7 ++++++-
 2 files changed, 18 insertions(+), 1 deletion(-)

diff --git a/ktg-mes/src/main/java/com/ktg/mes/pro/domain/ProFeedback.java b/ktg-mes/src/main/java/com/ktg/mes/pro/domain/ProFeedback.java
index 6acdff9..0ab3f3d 100644
--- a/ktg-mes/src/main/java/com/ktg/mes/pro/domain/ProFeedback.java
+++ b/ktg-mes/src/main/java/com/ktg/mes/pro/domain/ProFeedback.java
@@ -109,6 +109,9 @@ public class ProFeedback extends BaseEntity
     @Excel(name = "不良品数量")
     private BigDecimal quantityUnquanlified;
 
+    @Excel(name = "待检测数量")
+    private BigDecimal quantityUncheck;
+
     /** 报工用户名 */
     @Excel(name = "报工用户名")
     private String userName;
@@ -444,6 +447,14 @@ public class ProFeedback extends BaseEntity
         this.recordNick = recordNick;
     }
 
+    public BigDecimal getQuantityUncheck() {
+        return quantityUncheck;
+    }
+
+    public void setQuantityUncheck(BigDecimal quantityUncheck) {
+        this.quantityUncheck = quantityUncheck;
+    }
+
     @Override
     public String toString() {
         return "ProFeedback{" +
@@ -470,6 +481,7 @@ public class ProFeedback extends BaseEntity
                 ", quantityFeedback=" + quantityFeedback +
                 ", quantityQualified=" + quantityQualified +
                 ", quantityUnquanlified=" + quantityUnquanlified +
+                ", quantityUncheck=" + quantityUncheck +
                 ", userName='" + userName + '\'' +
                 ", nickName='" + nickName + '\'' +
                 ", feedbackChannel='" + feedbackChannel + '\'' +
diff --git a/ktg-mes/src/main/resources/mapper/pro/ProFeedbackMapper.xml b/ktg-mes/src/main/resources/mapper/pro/ProFeedbackMapper.xml
index 3755034..65e773a 100644
--- a/ktg-mes/src/main/resources/mapper/pro/ProFeedbackMapper.xml
+++ b/ktg-mes/src/main/resources/mapper/pro/ProFeedbackMapper.xml
@@ -28,6 +28,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="quantityFeedback"    column="quantity_feedback"    />
         <result property="quantityQualified"    column="quantity_qualified"    />
         <result property="quantityUnquanlified"    column="quantity_unquanlified"    />
+        <result property="quantityUnCheck"    column="quantity_uncheck"    />
         <result property="userName"    column="user_name"    />
         <result property="nickName"    column="nick_name"    />
         <result property="feedbackChannel"    column="feedback_channel"    />
@@ -47,7 +48,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </resultMap>
 
     <sql id="selectProFeedbackVo">
-        select record_id,feedback_type, workstation_id, workstation_code, workstation_name,process_id, process_code, process_name, workorder_id, workorder_code, workorder_name, task_id, task_code,item_id,item_code,item_name,specification,unit_of_measure, quantity, quantity_feedback, quantity_qualified, quantity_unquanlified, user_name, nick_name, feedback_channel, feedback_time,record_user,record_nick,status, remark, attr1, attr2, attr3, attr4, create_by, create_time, update_by, update_time from pro_feedback
+        select record_id,feedback_type, workstation_id, workstation_code, workstation_name,process_id, process_code, process_name, workorder_id, workorder_code, workorder_name, task_id, task_code,item_id,item_code,item_name,specification,unit_of_measure, quantity, quantity_feedback, quantity_qualified, quantity_unquanlified,quantity_uncheck, user_name, nick_name, feedback_channel, feedback_time,record_user,record_nick,status, remark, attr1, attr2, attr3, attr4, create_by, create_time, update_by, update_time from pro_feedback
     </sql>
 
     <select id="selectProFeedbackList" parameterType="ProFeedback" resultMap="ProFeedbackResult">
@@ -75,6 +76,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="quantityFeedback != null "> and quantity_feedback = #{quantityFeedback}</if>
             <if test="quantityQualified != null "> and quantity_qualified = #{quantityQualified}</if>
             <if test="quantityUnquanlified != null "> and quantity_unquanlified = #{quantityUnquanlified}</if>
+            <if test="quantityUnCheck != null "> and quantity_uncheck = #{quantityUnCheck}</if>
             <if test="userName != null  and userName != ''"> and user_name like concat('%', #{userName}, '%')</if>
             <if test="nickName != null  and nickName != ''"> and nick_name like concat('%', #{nickName}, '%')</if>
             <if test="feedbackChannel != null  and feedbackChannel != ''"> and feedback_channel = #{feedbackChannel}</if>
@@ -116,6 +118,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="quantityFeedback != null">quantity_feedback,</if>
             <if test="quantityQualified != null">quantity_qualified,</if>
             <if test="quantityUnquanlified != null">quantity_unquanlified,</if>
+            <if test="quantityUnCheck != null ">quantity_uncheck,</if>
             <if test="userName != null">user_name,</if>
             <if test="nickName != null">nick_name,</if>
             <if test="feedbackChannel != null">feedback_channel,</if>
@@ -156,6 +159,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="quantityFeedback != null">#{quantityFeedback},</if>
             <if test="quantityQualified != null">#{quantityQualified},</if>
             <if test="quantityUnquanlified != null">#{quantityUnquanlified},</if>
+            <if test="quantityUnCheck != null ">#{quantityUnCheck},</if>
             <if test="userName != null">#{userName},</if>
             <if test="nickName != null">#{nickName},</if>
             <if test="feedbackChannel != null">#{feedbackChannel},</if>
@@ -200,6 +204,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="quantityFeedback != null">quantity_feedback = #{quantityFeedback},</if>
             <if test="quantityQualified != null">quantity_qualified = #{quantityQualified},</if>
             <if test="quantityUnquanlified != null">quantity_unquanlified = #{quantityUnquanlified},</if>
+            <if test="quantityUnCheck != null ">quantity_uncheck = #{quantityUnCheck},</if>
             <if test="userName != null">user_name = #{userName},</if>
             <if test="nickName != null">nick_name = #{nickName},</if>
             <if test="feedbackChannel != null">feedback_channel = #{feedbackChannel},</if>