diff --git a/klp-mes/src/main/java/com/klp/mes/qc/controller/WmsCheckItemController.java b/klp-mes/src/main/java/com/klp/mes/qc/controller/WmsCheckItemController.java index 6ce74419..131a55e4 100644 --- a/klp-mes/src/main/java/com/klp/mes/qc/controller/WmsCheckItemController.java +++ b/klp-mes/src/main/java/com/klp/mes/qc/controller/WmsCheckItemController.java @@ -72,8 +72,8 @@ public class WmsCheckItemController extends BaseController { @Log(title = "检查项", businessType = BusinessType.INSERT) @RepeatSubmit() @PostMapping() - public R add(@Validated(AddGroup.class) @RequestBody WmsCheckItemBo bo) { - return toAjax(iWmsCheckItemService.insertByBo(bo)); + public R add(@Validated(AddGroup.class) @RequestBody WmsCheckItemBo bo) { + return R.ok(iWmsCheckItemService.insertByBo(bo)); } /** diff --git a/klp-mes/src/main/java/com/klp/mes/qc/domain/WmsCheckItem.java b/klp-mes/src/main/java/com/klp/mes/qc/domain/WmsCheckItem.java index 77a6eb7c..2a471687 100644 --- a/klp-mes/src/main/java/com/klp/mes/qc/domain/WmsCheckItem.java +++ b/klp-mes/src/main/java/com/klp/mes/qc/domain/WmsCheckItem.java @@ -49,4 +49,6 @@ public class WmsCheckItem extends BaseEntity { private String unit; //定性定量 private Integer qualitativeQuantitative; + //单个样品分析时间 + private String sampleAnalysisTime; } diff --git a/klp-mes/src/main/java/com/klp/mes/qc/domain/bo/WmsCheckItemBo.java b/klp-mes/src/main/java/com/klp/mes/qc/domain/bo/WmsCheckItemBo.java index 0a08a928..72dc7926 100644 --- a/klp-mes/src/main/java/com/klp/mes/qc/domain/bo/WmsCheckItemBo.java +++ b/klp-mes/src/main/java/com/klp/mes/qc/domain/bo/WmsCheckItemBo.java @@ -43,5 +43,7 @@ public class WmsCheckItemBo extends BaseEntity { private String unit; //定性定量 private Integer qualitativeQuantitative; + //单个样品分析时间 + private String sampleAnalysisTime; } diff --git a/klp-mes/src/main/java/com/klp/mes/qc/domain/vo/WmsCheckItemVo.java b/klp-mes/src/main/java/com/klp/mes/qc/domain/vo/WmsCheckItemVo.java index ac4fe28d..f3480190 100644 --- a/klp-mes/src/main/java/com/klp/mes/qc/domain/vo/WmsCheckItemVo.java +++ b/klp-mes/src/main/java/com/klp/mes/qc/domain/vo/WmsCheckItemVo.java @@ -53,6 +53,9 @@ public class WmsCheckItemVo { private String unit; //定性定量 private Integer qualitativeQuantitative; + //单个样品分析时间 + @ExcelProperty(value = "单个样品分析时间") + private String sampleAnalysisTime; private Long checkTaskItemId; diff --git a/klp-mes/src/main/java/com/klp/mes/qc/service/IWmsCheckItemService.java b/klp-mes/src/main/java/com/klp/mes/qc/service/IWmsCheckItemService.java index 79d249b0..49ff78fe 100644 --- a/klp-mes/src/main/java/com/klp/mes/qc/service/IWmsCheckItemService.java +++ b/klp-mes/src/main/java/com/klp/mes/qc/service/IWmsCheckItemService.java @@ -35,7 +35,7 @@ public interface IWmsCheckItemService { /** * 新增检查项 */ - Boolean insertByBo(WmsCheckItemBo bo); + Long insertByBo(WmsCheckItemBo bo); /** * 修改检查项 diff --git a/klp-mes/src/main/java/com/klp/mes/qc/service/impl/WmsCheckItemServiceImpl.java b/klp-mes/src/main/java/com/klp/mes/qc/service/impl/WmsCheckItemServiceImpl.java index 16332e33..0e3ca956 100644 --- a/klp-mes/src/main/java/com/klp/mes/qc/service/impl/WmsCheckItemServiceImpl.java +++ b/klp-mes/src/main/java/com/klp/mes/qc/service/impl/WmsCheckItemServiceImpl.java @@ -69,6 +69,7 @@ public class WmsCheckItemServiceImpl implements IWmsCheckItemService { lqw.eq(bo.getStandardTarget() != null, WmsCheckItem::getStandardTarget, bo.getStandardTarget()); lqw.like(StringUtils.isNotBlank(bo.getUnit()), WmsCheckItem::getUnit, bo.getUnit()); lqw.eq(bo.getQualitativeQuantitative() != null, WmsCheckItem::getQualitativeQuantitative, bo.getQualitativeQuantitative()); + lqw.like(StringUtils.isNotBlank(bo.getSampleAnalysisTime()), WmsCheckItem::getSampleAnalysisTime, bo.getSampleAnalysisTime()); return lqw; } @@ -76,14 +77,14 @@ public class WmsCheckItemServiceImpl implements IWmsCheckItemService { * 新增检查项 */ @Override - public Boolean insertByBo(WmsCheckItemBo bo) { + public Long insertByBo(WmsCheckItemBo bo) { WmsCheckItem add = BeanUtil.toBean(bo, WmsCheckItem.class); validEntityBeforeSave(add); boolean flag = baseMapper.insert(add) > 0; if (flag) { bo.setItemId(add.getItemId()); } - return flag; + return add.getItemId(); } /** diff --git a/klp-mes/src/main/resources/mapper/qc/WmsCheckItemMapper.xml b/klp-mes/src/main/resources/mapper/qc/WmsCheckItemMapper.xml index 13773e85..38f37ce0 100644 --- a/klp-mes/src/main/resources/mapper/qc/WmsCheckItemMapper.xml +++ b/klp-mes/src/main/resources/mapper/qc/WmsCheckItemMapper.xml @@ -13,6 +13,7 @@ + @@ -28,6 +29,7 @@ standard_target, unit, qualitative_quantitative, + sample_analysis_time, create_by, create_time, update_by,