diff --git a/klp-mes/src/main/java/com/klp/mes/qc/domain/QcInspectionTask.java b/klp-mes/src/main/java/com/klp/mes/qc/domain/QcInspectionTask.java
index 25ebefd2..20a9ae16 100644
--- a/klp-mes/src/main/java/com/klp/mes/qc/domain/QcInspectionTask.java
+++ b/klp-mes/src/main/java/com/klp/mes/qc/domain/QcInspectionTask.java
@@ -78,6 +78,10 @@ public class QcInspectionTask extends BaseEntity {
* 备注
*/
private String remark;
+ /**
+ * 钢卷ID集合,多个使用英文逗号分隔
+ */
+ private String coilIds;
/**
* 删除标志(0=正常,1=已删除)
*/
diff --git a/klp-mes/src/main/java/com/klp/mes/qc/domain/bo/QcInspectionTaskBo.java b/klp-mes/src/main/java/com/klp/mes/qc/domain/bo/QcInspectionTaskBo.java
index 65920902..479c0e77 100644
--- a/klp-mes/src/main/java/com/klp/mes/qc/domain/bo/QcInspectionTaskBo.java
+++ b/klp-mes/src/main/java/com/klp/mes/qc/domain/bo/QcInspectionTaskBo.java
@@ -89,5 +89,10 @@ public class QcInspectionTaskBo extends BaseEntity {
*/
private String remark;
+ /**
+ * 钢卷ID集合,多个使用英文逗号分隔
+ */
+ private String coilIds;
+
}
diff --git a/klp-mes/src/main/java/com/klp/mes/qc/domain/vo/QcInspectionTaskVo.java b/klp-mes/src/main/java/com/klp/mes/qc/domain/vo/QcInspectionTaskVo.java
index dd68d36f..fb8808bc 100644
--- a/klp-mes/src/main/java/com/klp/mes/qc/domain/vo/QcInspectionTaskVo.java
+++ b/klp-mes/src/main/java/com/klp/mes/qc/domain/vo/QcInspectionTaskVo.java
@@ -110,5 +110,11 @@ public class QcInspectionTaskVo {
@ExcelProperty(value = "备注")
private String remark;
+ /**
+ * 钢卷ID集合,多个使用英文逗号分隔
+ */
+ @ExcelProperty(value = "钢卷ID集合")
+ private String coilIds;
+
}
diff --git a/klp-mes/src/main/java/com/klp/mes/qc/service/impl/QcInspectionTaskServiceImpl.java b/klp-mes/src/main/java/com/klp/mes/qc/service/impl/QcInspectionTaskServiceImpl.java
index f2492075..40b0958e 100644
--- a/klp-mes/src/main/java/com/klp/mes/qc/service/impl/QcInspectionTaskServiceImpl.java
+++ b/klp-mes/src/main/java/com/klp/mes/qc/service/impl/QcInspectionTaskServiceImpl.java
@@ -73,6 +73,7 @@ public class QcInspectionTaskServiceImpl implements IQcInspectionTaskService {
lqw.eq(StringUtils.isNotBlank(bo.getAuditUser()), QcInspectionTask::getAuditUser, bo.getAuditUser());
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());
return lqw;
}
diff --git a/klp-mes/src/main/resources/mapper/qc/QcInspectionTaskMapper.xml b/klp-mes/src/main/resources/mapper/qc/QcInspectionTaskMapper.xml
index c085cf22..01664e75 100644
--- a/klp-mes/src/main/resources/mapper/qc/QcInspectionTaskMapper.xml
+++ b/klp-mes/src/main/resources/mapper/qc/QcInspectionTaskMapper.xml
@@ -19,6 +19,7 @@
+