From 74c71be7e276faf5ab983196b050e8c467787412 Mon Sep 17 00:00:00 2001
From: shaoyong <yorkshao@163.com>
Date: Fri, 16 Aug 2024 18:03:12 +0800
Subject: [PATCH] =?UTF-8?q?=E4=B8=8D=E8=89=AF=E6=8F=8F=E8=BF=B0code?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/op/quality/domain/QcCheckTaskIncome.java    | 9 +++++++++
 .../service/impl/QcCheckTaskIncomeServiceImpl.java       | 2 ++
 .../resources/mapper/quality/QcCheckTaskIncomeMapper.xml | 9 ++++++++-
 3 files changed, 19 insertions(+), 1 deletion(-)

diff --git a/op-modules/op-quality/src/main/java/com/op/quality/domain/QcCheckTaskIncome.java b/op-modules/op-quality/src/main/java/com/op/quality/domain/QcCheckTaskIncome.java
index cf51b102..5205ae47 100644
--- a/op-modules/op-quality/src/main/java/com/op/quality/domain/QcCheckTaskIncome.java
+++ b/op-modules/op-quality/src/main/java/com/op/quality/domain/QcCheckTaskIncome.java
@@ -190,6 +190,7 @@ public class QcCheckTaskIncome extends BaseEntity {
     private String fileList;
     private List<BaseFile> files;
     private String remark;
+    private String remarkCode;
     private String belongTo;
     private String oldBelongTo;
     private String noOkQualityNames;
@@ -852,6 +853,14 @@ public class QcCheckTaskIncome extends BaseEntity {
         return delFlag;
     }
 
+    public String getRemarkCode() {
+        return remarkCode;
+    }
+
+    public void setRemarkCode(String remarkCode) {
+        this.remarkCode = remarkCode;
+    }
+
     @Override
     public String toString() {
         return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE)
diff --git a/op-modules/op-quality/src/main/java/com/op/quality/service/impl/QcCheckTaskIncomeServiceImpl.java b/op-modules/op-quality/src/main/java/com/op/quality/service/impl/QcCheckTaskIncomeServiceImpl.java
index 5bb13f95..5c7d77a1 100644
--- a/op-modules/op-quality/src/main/java/com/op/quality/service/impl/QcCheckTaskIncomeServiceImpl.java
+++ b/op-modules/op-quality/src/main/java/com/op/quality/service/impl/QcCheckTaskIncomeServiceImpl.java
@@ -678,6 +678,7 @@ public class QcCheckTaskIncomeServiceImpl<QcCheckUnqualifiedService> implements
 		qcCheckTask.setUpdateTime(nowTime);
 		qcCheckTask.setCheckTime(nowTime);
 		qcCheckTask.setRemark(qcCheckTaskIncome.getRemark());
+		qcCheckTask.setRemarkCode(qcCheckTaskIncome.getRemarkCode());
 		qcCheckTask.setCheckResult(result);//检验结果Y合格 N不合格
 		qcCheckTask.setIncomeBatchNo(qcCheckTaskIncome.getIncomeBatchNo());
 		BigDecimal noOkQquality = new BigDecimal("0");
@@ -841,6 +842,7 @@ public class QcCheckTaskIncomeServiceImpl<QcCheckUnqualifiedService> implements
 		qcCheckTask.setUpdateTime(nowTime);
 		qcCheckTask.setCheckTime(nowTime);
 		qcCheckTask.setRemark(qcCheckTaskIncome.getRemark());
+		qcCheckTask.setRemarkCode(qcCheckTaskIncome.getRemarkCode());
 		qcCheckTask.setCheckResult(result);//检验结果Y合格 N不合格
 		qcCheckTask.setIncomeBatchNo(qcCheckTaskIncome.getIncomeBatchNo());
 		BigDecimal noOkQquality = new BigDecimal("0");
diff --git a/op-modules/op-quality/src/main/resources/mapper/quality/QcCheckTaskIncomeMapper.xml b/op-modules/op-quality/src/main/resources/mapper/quality/QcCheckTaskIncomeMapper.xml
index abdd4fe7..bcb89235 100644
--- a/op-modules/op-quality/src/main/resources/mapper/quality/QcCheckTaskIncomeMapper.xml
+++ b/op-modules/op-quality/src/main/resources/mapper/quality/QcCheckTaskIncomeMapper.xml
@@ -39,6 +39,7 @@
         <result property="sampleCode" column="sample_code"/>
         <result property="orderType" column="order_type"/>
         <result property="orderTypeDesc" column="order_type_desc"/>
+        <result property="remark" column="remark"/>
     </resultMap>
 
     <sql id="selectQcCheckTaskIncomeVo">
@@ -46,7 +47,7 @@
 		       supplier_code, supplier_name, income_time, check_loc, check_status, check_man_code,
 		       check_man_name, check_time, check_result, status, attr1, attr2, attr3, attr4, create_by,
 		       create_time, update_by, update_time, factory_code, del_flag , check_type,sample_quality, noOk_quality,
-               order_type,order_type_desc
+               order_type,order_type_desc,remark
 		from qc_check_task
 	</sql>
 
@@ -313,6 +314,7 @@
         <if test="cNoOkquality != null">cNoOkquality = #{cNoOkquality},</if>
         <if test="incomeBatchNo != null">income_batch_no = #{incomeBatchNo},</if>
         <if test="remark != null">remark = #{remark},</if>
+        <if test="remarkCode != null">remark_code = #{remarkCode},</if>
         <if test="reason != null">reason = #{reason},</if>
         <if test="bz != null">bz = #{bz},</if>
         <if test="cxzz != null">cxzz = #{cxzz},</if>
@@ -362,6 +364,7 @@
             <if test="orderType != null">order_type,</if>
             <if test="orderTypeDesc != null">order_type_desc,</if>
             <if test="remark != null">remark,</if>
+            <if test="remarkCode != null">remark_code,</if>
             <if test="reason != null">reason,</if>
             <if test="bz != null">bz,</if>
             <if test="startOA != null">start_oA,</if>
@@ -420,6 +423,7 @@
             <if test="orderType != null">#{orderType},</if>
             <if test="orderTypeDesc != null">#{orderTypeDesc},</if>
             <if test="remark != null">#{remark},</if>
+            <if test="remarkCode != null">#{remarkCode},</if>
             <if test="reason != null">#{reason},</if>
             <if test="bz != null">#{bz},</if>
             <if test="startOA != null">#{startOA},</if>
@@ -458,6 +462,7 @@
         <if test="cNoOkquality != null">cNoOkquality = #{cNoOkquality},</if>
         <if test="incomeBatchNo != null">income_batch_no = #{incomeBatchNo},</if>
         <if test="remark != null">remark = #{remark},</if>
+        <if test="remarkCode != null">remark_code = #{remarkCode},</if>
         <if test="reason != null">reason = #{reason},</if>
         <if test="bz != null">bz = #{bz},</if>
         <if test="startOA != null">start_oA = #{startOA},</if>
@@ -592,6 +597,7 @@
 			qct.income_time incomeTime,
 			qct.check_loc checkLoc,
 		    qct.remark,
+            qct.remark_code remarkCode,
             qct.cxzz,
             qct.jgy,
             qct.pgy
@@ -621,6 +627,7 @@
             qct.income_time incomeTime,
             qct.check_loc checkLoc,
             qct.remark,
+            qct.remark_code remarkCode,
             qct.czbjr,
             qct.zcf,
             qct.zcoemcm,