diff --git a/klp-wms/src/main/java/com/klp/domain/WmsBatch.java b/klp-wms/src/main/java/com/klp/domain/WmsBatch.java index 703615a8..ab6b03d0 100644 --- a/klp-wms/src/main/java/com/klp/domain/WmsBatch.java +++ b/klp-wms/src/main/java/com/klp/domain/WmsBatch.java @@ -62,5 +62,8 @@ public class WmsBatch extends BaseEntity { * 备注 */ private String remark; - + /** + * 排产计划ID + */ + private Long planId; } diff --git a/klp-wms/src/main/java/com/klp/domain/bo/WmsBatchBo.java b/klp-wms/src/main/java/com/klp/domain/bo/WmsBatchBo.java index 946efe46..e2685ba6 100644 --- a/klp-wms/src/main/java/com/klp/domain/bo/WmsBatchBo.java +++ b/klp-wms/src/main/java/com/klp/domain/bo/WmsBatchBo.java @@ -68,5 +68,10 @@ public class WmsBatchBo extends BaseEntity { */ private String remark; + /** + * 排产计划ID + */ + private Long planId; + } diff --git a/klp-wms/src/main/java/com/klp/domain/vo/WmsBatchVo.java b/klp-wms/src/main/java/com/klp/domain/vo/WmsBatchVo.java index 7a2a3f80..c6e83301 100644 --- a/klp-wms/src/main/java/com/klp/domain/vo/WmsBatchVo.java +++ b/klp-wms/src/main/java/com/klp/domain/vo/WmsBatchVo.java @@ -80,5 +80,9 @@ public class WmsBatchVo { @ExcelProperty(value = "备注") private String remark; + /** + * 排产计划ID + */ + private Long planId; } diff --git a/klp-wms/src/main/java/com/klp/service/impl/WmsBatchServiceImpl.java b/klp-wms/src/main/java/com/klp/service/impl/WmsBatchServiceImpl.java index 605c376f..b16e3352 100644 --- a/klp-wms/src/main/java/com/klp/service/impl/WmsBatchServiceImpl.java +++ b/klp-wms/src/main/java/com/klp/service/impl/WmsBatchServiceImpl.java @@ -67,6 +67,7 @@ public class WmsBatchServiceImpl implements IWmsBatchService { lqw.eq(bo.getEstimatedStartTime() != null, WmsBatch::getEstimatedStartTime, bo.getEstimatedStartTime()); lqw.eq(bo.getEstimatedEndTime() != null, WmsBatch::getEstimatedEndTime, bo.getEstimatedEndTime()); lqw.eq(StringUtils.isNotBlank(bo.getBatchStatus()), WmsBatch::getBatchStatus, bo.getBatchStatus()); + lqw.eq(bo.getPlanId() != null, WmsBatch::getPlanId, bo.getPlanId()); return lqw; } diff --git a/klp-wms/src/main/resources/mapper/klp/WmsBatchMapper.xml b/klp-wms/src/main/resources/mapper/klp/WmsBatchMapper.xml index 4b36199e..dafcfe0c 100644 --- a/klp-wms/src/main/resources/mapper/klp/WmsBatchMapper.xml +++ b/klp-wms/src/main/resources/mapper/klp/WmsBatchMapper.xml @@ -19,6 +19,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" +