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 5be5f7c5..32c7872b 100644 --- a/klp-wms/src/main/java/com/klp/domain/WmsCoilAbnormal.java +++ b/klp-wms/src/main/java/com/klp/domain/WmsCoilAbnormal.java @@ -123,6 +123,11 @@ public class WmsCoilAbnormal extends BaseEntity { */ private String attachmentFiles; + /** + * 父异常ID(记录这条异常继承自哪条老异常) + */ + private Long parentAbnormalId; + /** * 数据来源:2=二级系统同步,3=三级本地录入 */ 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 3d51d930..6c6c8647 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 @@ -120,6 +120,11 @@ public class WmsCoilAbnormalBo extends BaseEntity { */ private String attachmentFiles; + /** + * 父异常ID(记录这条异常继承自哪条老异常) + */ + private Long parentAbnormalId; + /** * 数据来源:2=二级系统同步,3=三级本地录入 */ diff --git a/klp-wms/src/main/java/com/klp/domain/vo/WmsCoilAbnormalExportVo.java b/klp-wms/src/main/java/com/klp/domain/vo/WmsCoilAbnormalExportVo.java index 6cd67210..7f52bf4f 100644 --- a/klp-wms/src/main/java/com/klp/domain/vo/WmsCoilAbnormalExportVo.java +++ b/klp-wms/src/main/java/com/klp/domain/vo/WmsCoilAbnormalExportVo.java @@ -195,6 +195,8 @@ public class WmsCoilAbnormalExportVo { @ColumnWidth(10) private String plateSurface; + private String parentAbnormalId; + private String sourceSystem; private String processSource; 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 910fcbd0..a4d51b53 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 @@ -145,6 +145,11 @@ public class WmsCoilAbnormalVo extends BaseEntity { */ private String attachmentFiles; + /** + * 父异常ID + */ + private Long parentAbnormalId; + /** * 数据来源 */ 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 2a27175e..5145767c 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 @@ -80,6 +80,7 @@ public class WmsCoilAbnormalServiceImpl implements IWmsCoilAbnormalService { lqw.eq(bo.getJudgeTime() != null, WmsCoilAbnormal::getJudgeTime, bo.getJudgeTime()); lqw.eq(bo.getMainMark() != null, WmsCoilAbnormal::getMainMark, bo.getMainMark()); lqw.eq(bo.getWholeCoilMark() != null, WmsCoilAbnormal::getWholeCoilMark, bo.getWholeCoilMark()); + lqw.eq(bo.getParentAbnormalId() != null, WmsCoilAbnormal::getParentAbnormalId, bo.getParentAbnormalId()); lqw.eq(bo.getSourceSystem() != null, WmsCoilAbnormal::getSourceSystem, bo.getSourceSystem()); lqw.eq(StringUtils.isNotBlank(bo.getProcessSource()), WmsCoilAbnormal::getProcessSource, bo.getProcessSource()); return lqw; diff --git a/klp-wms/src/main/resources/mapper/klp/WmsCoilAbnormalMapper.xml b/klp-wms/src/main/resources/mapper/klp/WmsCoilAbnormalMapper.xml index b8d323d8..5b5b4725 100644 --- a/klp-wms/src/main/resources/mapper/klp/WmsCoilAbnormalMapper.xml +++ b/klp-wms/src/main/resources/mapper/klp/WmsCoilAbnormalMapper.xml @@ -25,6 +25,7 @@ +