DeXun/klp-oa
9
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch '0.8.X' of http://49.232.154.205:10100/DeXun/klp-oa into 0.8.X

Browse Source
This commit is contained in:
砂糖
2026-03-25 14:34:29 +08:00
parent 33c003d2ca b98b4593f6
commit e47d6e159e
6 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
klp-mes/src/main/java/com/klp/mes/eqp/controller/EqpAuxiliaryMaterialController.java
View File

@@ -71,8 +71,8 @@ public class EqpAuxiliaryMaterialController extends BaseController {
@Log(title = "辅料", businessType = BusinessType.INSERT) @Log(title = "辅料", businessType = BusinessType.INSERT)
@RepeatSubmit() @RepeatSubmit()
@PostMapping() @PostMapping()
public R<Void> add(@Validated(AddGroup.class) @RequestBody EqpAuxiliaryMaterialBo bo) { public R<Long> add(@Validated(AddGroup.class) @RequestBody EqpAuxiliaryMaterialBo bo) {
return toAjax(iEqpAuxiliaryMaterialService.insertByBo(bo)); return R.ok(iEqpAuxiliaryMaterialService.insertByBo(bo));
} }
/** /**

4
klp-mes/src/main/java/com/klp/mes/eqp/controller/EqpSparePartController.java
View File

@@ -71,8 +71,8 @@ public class EqpSparePartController extends BaseController {
@Log(title = "备品备件", businessType = BusinessType.INSERT) @Log(title = "备品备件", businessType = BusinessType.INSERT)
@RepeatSubmit() @RepeatSubmit()
@PostMapping() @PostMapping()
public R<Void> add(@Validated(AddGroup.class) @RequestBody EqpSparePartBo bo) { public R<Long> add(@Validated(AddGroup.class) @RequestBody EqpSparePartBo bo) {
return toAjax(iEqpSparePartService.insertByBo(bo)); return R.ok(iEqpSparePartService.insertByBo(bo));
} }
/** /**

2
klp-mes/src/main/java/com/klp/mes/eqp/service/IEqpAuxiliaryMaterialService.java
View File

@@ -35,7 +35,7 @@ public interface IEqpAuxiliaryMaterialService {
/** /**
* 新增辅料 * 新增辅料
*/ */
Boolean insertByBo(EqpAuxiliaryMaterialBo bo); Long insertByBo(EqpAuxiliaryMaterialBo bo);
/** /**
* 修改辅料 * 修改辅料

2
klp-mes/src/main/java/com/klp/mes/eqp/service/IEqpSparePartService.java
View File

@@ -35,7 +35,7 @@ public interface IEqpSparePartService {
/** /**
* 新增备品备件 * 新增备品备件
*/ */
Boolean insertByBo(EqpSparePartBo bo); Long insertByBo(EqpSparePartBo bo);
/** /**
* 修改备品备件 * 修改备品备件

4
klp-mes/src/main/java/com/klp/mes/eqp/service/impl/EqpAuxiliaryMaterialServiceImpl.java
View File

@@ -75,14 +75,14 @@ public class EqpAuxiliaryMaterialServiceImpl implements IEqpAuxiliaryMaterialSer
* 新增辅料 * 新增辅料
*/ */
@Override @Override
public Boolean insertByBo(EqpAuxiliaryMaterialBo bo) { public Long insertByBo(EqpAuxiliaryMaterialBo bo) {
EqpAuxiliaryMaterial add = BeanUtil.toBean(bo, EqpAuxiliaryMaterial.class); EqpAuxiliaryMaterial add = BeanUtil.toBean(bo, EqpAuxiliaryMaterial.class);
validEntityBeforeSave(add); validEntityBeforeSave(add);
boolean flag = baseMapper.insert(add) > 0; boolean flag = baseMapper.insert(add) > 0;
if (flag) { if (flag) {
bo.setAuxiliaryId(add.getAuxiliaryId()); bo.setAuxiliaryId(add.getAuxiliaryId());
} }
return flag; return add.getAuxiliaryId();
} }
/** /**

4
klp-mes/src/main/java/com/klp/mes/eqp/service/impl/EqpSparePartServiceImpl.java
View File

@@ -91,14 +91,14 @@ public class EqpSparePartServiceImpl implements IEqpSparePartService {
* 新增备品备件 * 新增备品备件
*/ */
@Override @Override
public Boolean insertByBo(EqpSparePartBo bo) { public Long insertByBo(EqpSparePartBo bo) {
EqpSparePart add = BeanUtil.toBean(bo, EqpSparePart.class); EqpSparePart add = BeanUtil.toBean(bo, EqpSparePart.class);
validEntityBeforeSave(add); validEntityBeforeSave(add);
boolean flag = baseMapper.insert(add) > 0; boolean flag = baseMapper.insert(add) > 0;
if (flag) { if (flag) {
bo.setPartId(add.getPartId()); bo.setPartId(add.getPartId());
} }
return flag; return add.getPartId();
} }
/** /**