diff --git a/klp-wms/src/main/java/com/klp/domain/WmsCoilAbnormal.java b/klp-wms/src/main/java/com/klp/domain/WmsCoilAbnormal.java index a69659a9..99c881f3 100644 --- a/klp-wms/src/main/java/com/klp/domain/WmsCoilAbnormal.java +++ b/klp-wms/src/main/java/com/klp/domain/WmsCoilAbnormal.java @@ -31,6 +31,12 @@ public class WmsCoilAbnormal extends BaseEntity { * 钢卷ID */ private Long coilId; + + /** + * 产线名称 + */ + private String productionLine; + /** * 位置(上下,操作侧,中间,驱动侧) */ diff --git a/klp-wms/src/main/java/com/klp/domain/bo/WmsCoilAbnormalBo.java b/klp-wms/src/main/java/com/klp/domain/bo/WmsCoilAbnormalBo.java index 99aeddae..bd89b4de 100644 --- a/klp-wms/src/main/java/com/klp/domain/bo/WmsCoilAbnormalBo.java +++ b/klp-wms/src/main/java/com/klp/domain/bo/WmsCoilAbnormalBo.java @@ -30,6 +30,11 @@ public class WmsCoilAbnormalBo extends BaseEntity { */ private Long coilId; + /** + * 产线名称 + */ + private String productionLine; + /** * 位置(上下,操作侧,中间,驱动侧) */ diff --git a/klp-wms/src/main/java/com/klp/domain/vo/WmsCoilAbnormalVo.java b/klp-wms/src/main/java/com/klp/domain/vo/WmsCoilAbnormalVo.java index 89f3598d..21d916c4 100644 --- a/klp-wms/src/main/java/com/klp/domain/vo/WmsCoilAbnormalVo.java +++ b/klp-wms/src/main/java/com/klp/domain/vo/WmsCoilAbnormalVo.java @@ -34,6 +34,12 @@ public class WmsCoilAbnormalVo { @ExcelProperty(value = "钢卷ID") private Long coilId; + /** + * 产线名称 + */ + @ExcelProperty(value = "产线名称") + private String productionLine; + /** * 位置(上下,操作侧,中间,驱动侧) */ diff --git a/klp-wms/src/main/java/com/klp/service/impl/WmsCoilAbnormalServiceImpl.java b/klp-wms/src/main/java/com/klp/service/impl/WmsCoilAbnormalServiceImpl.java index 768fe09a..c499aa45 100644 --- a/klp-wms/src/main/java/com/klp/service/impl/WmsCoilAbnormalServiceImpl.java +++ b/klp-wms/src/main/java/com/klp/service/impl/WmsCoilAbnormalServiceImpl.java @@ -64,6 +64,7 @@ public class WmsCoilAbnormalServiceImpl implements IWmsCoilAbnormalService { Map params = bo.getParams(); LambdaQueryWrapper lqw = Wrappers.lambdaQuery(); lqw.eq(bo.getCoilId() != null, WmsCoilAbnormal::getCoilId, bo.getCoilId()); + lqw.eq(StringUtils.isNotBlank(bo.getProductionLine()), WmsCoilAbnormal::getProductionLine, bo.getProductionLine()); lqw.eq(StringUtils.isNotBlank(bo.getPosition()), WmsCoilAbnormal::getPosition, bo.getPosition()); lqw.eq(bo.getLength() != null, WmsCoilAbnormal::getLength, bo.getLength()); lqw.eq(bo.getStartPosition() != null, WmsCoilAbnormal::getStartPosition, bo.getStartPosition()); diff --git a/klp-wms/src/main/resources/mapper/klp/WmsCoilAbnormalMapper.xml b/klp-wms/src/main/resources/mapper/klp/WmsCoilAbnormalMapper.xml index 0803a5e2..6624c911 100644 --- a/klp-wms/src/main/resources/mapper/klp/WmsCoilAbnormalMapper.xml +++ b/klp-wms/src/main/resources/mapper/klp/WmsCoilAbnormalMapper.xml @@ -7,6 +7,7 @@ +