Merge remote-tracking branch 'origin/0.8.X' into 0.8.X

klp-mes/src/main/java/com/klp/mes/qc/domain/QcInspectionTask.java

@@ -86,6 +86,10 @@ public class QcInspectionTask extends BaseEntity {
      * 钢卷ID集合，多个使用英文逗号分隔
      */
     private String coilIds;
+    /**
+     * 钢卷号集合
+     */
+    private String enterCoilNos;
     /**
      * 删除标志（0=正常，1=已删除）
      */

klp-mes/src/main/java/com/klp/mes/qc/domain/bo/QcInspectionTaskBo.java

@@ -99,5 +99,8 @@ public class QcInspectionTaskBo extends BaseEntity {
      */
     private String coilIds;
 
-
+    /**
+     * 钢卷号集合
+     */
+    private String enterCoilNos;
 }

klp-mes/src/main/java/com/klp/mes/qc/domain/vo/QcInspectionTaskVo.java

@@ -124,6 +124,11 @@ public class QcInspectionTaskVo {
      */
     private String coilIds;
 
+    /**
+     * 钢卷号集合
+     */
+    private String enterCoilNos;
+
     private List<WmsMaterialCoilVo> coilList;
 
 

klp-mes/src/main/java/com/klp/mes/qc/service/impl/QcInspectionTaskServiceImpl.java

@@ -135,6 +135,7 @@ public class QcInspectionTaskServiceImpl implements IQcInspectionTaskService {
         lqw.eq(bo.getAuditTime() != null, QcInspectionTask::getAuditTime, bo.getAuditTime());
         lqw.eq(StringUtils.isNotBlank(bo.getResult()), QcInspectionTask::getResult, bo.getResult());
         lqw.like(StringUtils.isNotBlank(bo.getCoilIds()), QcInspectionTask::getCoilIds, bo.getCoilIds());
+        lqw.like(StringUtils.isNotBlank(bo.getEnterCoilNos()), QcInspectionTask::getEnterCoilNos, bo.getEnterCoilNos());
         return lqw;
     }
 

klp-mes/src/main/resources/mapper/qc/QcInspectionTaskMapper.xml

@@ -21,6 +21,7 @@
         <result property="result" column="result"/>
         <result property="remark" column="remark"/>
         <result property="coilIds" column="coil_ids"/>
+        <result property="enterCoilNos" column="enter_coil_nos"/>
         <result property="delFlag" column="del_flag"/>
         <result property="createTime" column="create_time"/>
         <result property="createBy" column="create_by"/>