生产报工增加异常原因

mes/src/main/java/com/ximai/mes/pro/domain/ProFeedback.java

@@ -320,6 +320,8 @@ public class ProFeedback extends BaseEntity {
 
     /** 异常原因 */
     private String abnormalReason;
+    /** 异常原因 备注*/
+    private String abnormalRemark;
 
 
 

mes/src/main/java/com/ximai/mes/pro/domain/vo/ProFeedbackVo.java

@@ -285,4 +285,6 @@ public class ProFeedbackVo {
 
     /** 异常原因 */
     private String abnormalReason;
+    /** 异常原因 备注*/
+    private String abnormalRemark;
 }

mes/src/main/resources/mapper/pro/ProFeedbackMapper.xml

@@ -112,7 +112,8 @@
                it.sap_item_code,
                f.abnormal_id,
                f.abnormal_type,
-               f.abnormal_reason
+               f.abnormal_reason,
+               f.abnormal_remark
         from pro_feedback f
 --                  left join pro_task_assist_process ptap on f.task_workunit_id = ptap.task_workunit_id
                  left join pro_task pt on f.task_id = pt.task_id
@@ -227,6 +228,7 @@
             <if test="abnormalId != null">abnormal_id,</if>
             <if test="abnormalType != null">abnormal_type,</if>
             <if test="abnormalReason != null">abnormal_reason,</if>
+            <if test="abnormalRemark != null">abnormal_remark,</if>
         </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="feedbackType !=null ">#{feedbackType},</if>
@@ -285,6 +287,7 @@
             <if test="abnormalId != null">#{abnormalId},</if>
             <if test="abnormalType != null">#{abnormalType},</if>
             <if test="abnormalReason != null">#{abnormalReason},</if>
+            <if test="abnormalRemark != null">#{abnormalRemark},</if>
         </trim>
     </insert>
 
@@ -345,6 +348,7 @@
             <if test="abnormalId != null">abnormal_id = #{abnormalId},</if>
             <if test="abnormalType != null">abnormal_type = #{abnormalType},</if>
             <if test="abnormalReason != null">abnormal_reason = #{abnormalReason},</if>
+            <if test="abnormalRemark != null">abnormal_remark = #{abnormalRemark},</if>
         </trim>
         where record_id = #{recordId}
     </update>