diff --git a/klp-flow/src/main/java/com/klp/flow/domain/SchProdScheduleDetail.java b/klp-flow/src/main/java/com/klp/flow/domain/SchProdScheduleDetail.java index b6fa6b5ac..fd40eac08 100644 --- a/klp-flow/src/main/java/com/klp/flow/domain/SchProdScheduleDetail.java +++ b/klp-flow/src/main/java/com/klp/flow/domain/SchProdScheduleDetail.java @@ -62,6 +62,10 @@ public class SchProdScheduleDetail extends BaseEntity { * 单行排产备注 */ private String remark; + /** + * 是否下发(0=未下发, 1=已下发) + */ + private Long isIssued; /** * 删除标识 0正常 2删除 */ diff --git a/klp-flow/src/main/java/com/klp/flow/domain/bo/SchProdScheduleDetailBo.java b/klp-flow/src/main/java/com/klp/flow/domain/bo/SchProdScheduleDetailBo.java index ee191b6f5..fa17f70d2 100644 --- a/klp-flow/src/main/java/com/klp/flow/domain/bo/SchProdScheduleDetailBo.java +++ b/klp-flow/src/main/java/com/klp/flow/domain/bo/SchProdScheduleDetailBo.java @@ -69,5 +69,9 @@ public class SchProdScheduleDetailBo extends BaseEntity { */ private String remark; + /** + * 是否下发(0=未下发, 1=已下发) + */ + private Long isIssued; } diff --git a/klp-flow/src/main/java/com/klp/flow/domain/vo/SchProdScheduleDetailVo.java b/klp-flow/src/main/java/com/klp/flow/domain/vo/SchProdScheduleDetailVo.java index 24a51fa89..3c73f4ff2 100644 --- a/klp-flow/src/main/java/com/klp/flow/domain/vo/SchProdScheduleDetailVo.java +++ b/klp-flow/src/main/java/com/klp/flow/domain/vo/SchProdScheduleDetailVo.java @@ -83,6 +83,13 @@ public class SchProdScheduleDetailVo { @ExcelProperty(value = "单行排产备注") private String remark; + /** + * 是否下发(0=未下发, 1=已下发) + */ + @ExcelProperty(value = "是否下发", converter = ExcelDictConvert.class) + @ExcelDictFormat(readConverterExp = "0=未下发,1=已下发") + private Long isIssued; + /** * 关联的排产单主表信息 */ diff --git a/klp-flow/src/main/java/com/klp/flow/service/impl/SchProdScheduleDetailServiceImpl.java b/klp-flow/src/main/java/com/klp/flow/service/impl/SchProdScheduleDetailServiceImpl.java index d2e89b0e9..2505cc927 100644 --- a/klp-flow/src/main/java/com/klp/flow/service/impl/SchProdScheduleDetailServiceImpl.java +++ b/klp-flow/src/main/java/com/klp/flow/service/impl/SchProdScheduleDetailServiceImpl.java @@ -105,6 +105,8 @@ public class SchProdScheduleDetailServiceImpl implements ISchProdScheduleDetailS lqw.eq(StringUtils.isNotBlank(bo.getMaterial()), SchProdScheduleDetail::getMaterial, bo.getMaterial()); lqw.eq(bo.getScheduleWeight() != null, SchProdScheduleDetail::getScheduleWeight, bo.getScheduleWeight()); lqw.eq(StringUtils.isNotBlank(bo.getProductType()), SchProdScheduleDetail::getProductType, bo.getProductType()); + // 是否下发 + lqw.eq(bo.getIsIssued() != null, SchProdScheduleDetail::getIsIssued, bo.getIsIssued()); return lqw; } diff --git a/klp-flow/src/main/resources/mapper/flow/SchProdScheduleDetailMapper.xml b/klp-flow/src/main/resources/mapper/flow/SchProdScheduleDetailMapper.xml index a2c30d7fc..5b2a537b7 100644 --- a/klp-flow/src/main/resources/mapper/flow/SchProdScheduleDetailMapper.xml +++ b/klp-flow/src/main/resources/mapper/flow/SchProdScheduleDetailMapper.xml @@ -15,6 +15,7 @@ +