diff --git a/klp-mes/src/main/java/com/klp/mes/eqp/controller/EqpAuxiliaryMaterialController.java b/klp-mes/src/main/java/com/klp/mes/eqp/controller/EqpAuxiliaryMaterialController.java index 68bbaa41..7d50665b 100644 --- a/klp-mes/src/main/java/com/klp/mes/eqp/controller/EqpAuxiliaryMaterialController.java +++ b/klp-mes/src/main/java/com/klp/mes/eqp/controller/EqpAuxiliaryMaterialController.java @@ -71,8 +71,8 @@ public class EqpAuxiliaryMaterialController extends BaseController { @Log(title = "辅料", businessType = BusinessType.INSERT) @RepeatSubmit() @PostMapping() - public R add(@Validated(AddGroup.class) @RequestBody EqpAuxiliaryMaterialBo bo) { - return toAjax(iEqpAuxiliaryMaterialService.insertByBo(bo)); + public R add(@Validated(AddGroup.class) @RequestBody EqpAuxiliaryMaterialBo bo) { + return R.ok(iEqpAuxiliaryMaterialService.insertByBo(bo)); } /** diff --git a/klp-mes/src/main/java/com/klp/mes/eqp/controller/EqpSparePartController.java b/klp-mes/src/main/java/com/klp/mes/eqp/controller/EqpSparePartController.java index 22d03150..5c6d66a7 100644 --- a/klp-mes/src/main/java/com/klp/mes/eqp/controller/EqpSparePartController.java +++ b/klp-mes/src/main/java/com/klp/mes/eqp/controller/EqpSparePartController.java @@ -71,8 +71,8 @@ public class EqpSparePartController extends BaseController { @Log(title = "备品备件", businessType = BusinessType.INSERT) @RepeatSubmit() @PostMapping() - public R add(@Validated(AddGroup.class) @RequestBody EqpSparePartBo bo) { - return toAjax(iEqpSparePartService.insertByBo(bo)); + public R add(@Validated(AddGroup.class) @RequestBody EqpSparePartBo bo) { + return R.ok(iEqpSparePartService.insertByBo(bo)); } /** diff --git a/klp-mes/src/main/java/com/klp/mes/eqp/service/IEqpAuxiliaryMaterialService.java b/klp-mes/src/main/java/com/klp/mes/eqp/service/IEqpAuxiliaryMaterialService.java index 071d1789..70436f04 100644 --- a/klp-mes/src/main/java/com/klp/mes/eqp/service/IEqpAuxiliaryMaterialService.java +++ b/klp-mes/src/main/java/com/klp/mes/eqp/service/IEqpAuxiliaryMaterialService.java @@ -35,7 +35,7 @@ public interface IEqpAuxiliaryMaterialService { /** * 新增辅料 */ - Boolean insertByBo(EqpAuxiliaryMaterialBo bo); + Long insertByBo(EqpAuxiliaryMaterialBo bo); /** * 修改辅料 diff --git a/klp-mes/src/main/java/com/klp/mes/eqp/service/IEqpSparePartService.java b/klp-mes/src/main/java/com/klp/mes/eqp/service/IEqpSparePartService.java index dd296a04..c059f88c 100644 --- a/klp-mes/src/main/java/com/klp/mes/eqp/service/IEqpSparePartService.java +++ b/klp-mes/src/main/java/com/klp/mes/eqp/service/IEqpSparePartService.java @@ -35,7 +35,7 @@ public interface IEqpSparePartService { /** * 新增备品备件 */ - Boolean insertByBo(EqpSparePartBo bo); + Long insertByBo(EqpSparePartBo bo); /** * 修改备品备件 diff --git a/klp-mes/src/main/java/com/klp/mes/eqp/service/impl/EqpAuxiliaryMaterialServiceImpl.java b/klp-mes/src/main/java/com/klp/mes/eqp/service/impl/EqpAuxiliaryMaterialServiceImpl.java index 5b6aac46..24670aa9 100644 --- a/klp-mes/src/main/java/com/klp/mes/eqp/service/impl/EqpAuxiliaryMaterialServiceImpl.java +++ b/klp-mes/src/main/java/com/klp/mes/eqp/service/impl/EqpAuxiliaryMaterialServiceImpl.java @@ -75,14 +75,14 @@ public class EqpAuxiliaryMaterialServiceImpl implements IEqpAuxiliaryMaterialSer * 新增辅料 */ @Override - public Boolean insertByBo(EqpAuxiliaryMaterialBo bo) { + public Long insertByBo(EqpAuxiliaryMaterialBo bo) { EqpAuxiliaryMaterial add = BeanUtil.toBean(bo, EqpAuxiliaryMaterial.class); validEntityBeforeSave(add); boolean flag = baseMapper.insert(add) > 0; if (flag) { bo.setAuxiliaryId(add.getAuxiliaryId()); } - return flag; + return add.getAuxiliaryId(); } /** diff --git a/klp-mes/src/main/java/com/klp/mes/eqp/service/impl/EqpSparePartServiceImpl.java b/klp-mes/src/main/java/com/klp/mes/eqp/service/impl/EqpSparePartServiceImpl.java index b7f9001d..f2a97e7f 100644 --- a/klp-mes/src/main/java/com/klp/mes/eqp/service/impl/EqpSparePartServiceImpl.java +++ b/klp-mes/src/main/java/com/klp/mes/eqp/service/impl/EqpSparePartServiceImpl.java @@ -91,14 +91,14 @@ public class EqpSparePartServiceImpl implements IEqpSparePartService { * 新增备品备件 */ @Override - public Boolean insertByBo(EqpSparePartBo bo) { + public Long insertByBo(EqpSparePartBo bo) { EqpSparePart add = BeanUtil.toBean(bo, EqpSparePart.class); validEntityBeforeSave(add); boolean flag = baseMapper.insert(add) > 0; if (flag) { bo.setPartId(add.getPartId()); } - return flag; + return add.getPartId(); } /**