diff --git a/ruoyi-oa/src/main/java/com/ruoyi/oa/controller/SysOaWarehouseMasterController.java b/ruoyi-oa/src/main/java/com/ruoyi/oa/controller/SysOaWarehouseMasterController.java index 6fe896e..01351d8 100644 --- a/ruoyi-oa/src/main/java/com/ruoyi/oa/controller/SysOaWarehouseMasterController.java +++ b/ruoyi-oa/src/main/java/com/ruoyi/oa/controller/SysOaWarehouseMasterController.java @@ -161,4 +161,11 @@ public class SysOaWarehouseMasterController extends BaseController { return toAjax(iSysOaWarehouseMasterService.redoMaster(masterId)); } + /** + * 单独修改remark + */ + @PutMapping("/updateRemark") + public R updateRemark(@RequestParam Long masterId, @RequestParam String remark) { + return toAjax(iSysOaWarehouseMasterService.updateRemark(masterId, remark)); + } } diff --git a/ruoyi-oa/src/main/java/com/ruoyi/oa/controller/SysOaWarehouseTaskController.java b/ruoyi-oa/src/main/java/com/ruoyi/oa/controller/SysOaWarehouseTaskController.java index ab4e21c..55af2dd 100644 --- a/ruoyi-oa/src/main/java/com/ruoyi/oa/controller/SysOaWarehouseTaskController.java +++ b/ruoyi-oa/src/main/java/com/ruoyi/oa/controller/SysOaWarehouseTaskController.java @@ -144,14 +144,6 @@ public class SysOaWarehouseTaskController extends BaseController { return toAjax(1); } - /** - * 单独修改remark - */ - @PutMapping("/updateRemark") - public R updateRemark(@RequestParam Long taskId, @RequestParam String remark) { - return toAjax(iSysOaWarehouseTaskService.updateRemark(taskId, remark)); - } - /** * 删除采购计划 diff --git a/ruoyi-oa/src/main/java/com/ruoyi/oa/service/ISysOaWarehouseMasterService.java b/ruoyi-oa/src/main/java/com/ruoyi/oa/service/ISysOaWarehouseMasterService.java index a485d9e..1e83a9f 100644 --- a/ruoyi-oa/src/main/java/com/ruoyi/oa/service/ISysOaWarehouseMasterService.java +++ b/ruoyi-oa/src/main/java/com/ruoyi/oa/service/ISysOaWarehouseMasterService.java @@ -83,4 +83,8 @@ public interface ISysOaWarehouseMasterService { */ boolean updateIsLike(Long masterId, Integer isLike); + /** + * 单独修改remark + */ + Boolean updateRemark(Long masterId, String remark); } diff --git a/ruoyi-oa/src/main/java/com/ruoyi/oa/service/ISysOaWarehouseTaskService.java b/ruoyi-oa/src/main/java/com/ruoyi/oa/service/ISysOaWarehouseTaskService.java index 7e84af2..ec0aaa5 100644 --- a/ruoyi-oa/src/main/java/com/ruoyi/oa/service/ISysOaWarehouseTaskService.java +++ b/ruoyi-oa/src/main/java/com/ruoyi/oa/service/ISysOaWarehouseTaskService.java @@ -61,9 +61,6 @@ public interface ISysOaWarehouseTaskService { int updateToWare(SysOaWarehouseTaskBo bo); - /** - * 单独修改remark - */ - Boolean updateRemark(Long taskId, String remark); + } diff --git a/ruoyi-oa/src/main/java/com/ruoyi/oa/service/impl/SysOaWarehouseMasterServiceImpl.java b/ruoyi-oa/src/main/java/com/ruoyi/oa/service/impl/SysOaWarehouseMasterServiceImpl.java index f33c20e..97bd5db 100644 --- a/ruoyi-oa/src/main/java/com/ruoyi/oa/service/impl/SysOaWarehouseMasterServiceImpl.java +++ b/ruoyi-oa/src/main/java/com/ruoyi/oa/service/impl/SysOaWarehouseMasterServiceImpl.java @@ -309,4 +309,13 @@ public class SysOaWarehouseMasterServiceImpl implements ISysOaWarehouseMasterSer .eq(SysOaWarehouseMaster::getMasterId, masterId) ) > 0; } + + @Override + public Boolean updateRemark(Long masterId, String remark) { + if (masterId == null) return false; + SysOaWarehouseMaster update = new SysOaWarehouseMaster(); + update.setMasterId(masterId); + update.setRemark(remark); + return baseMapper.updateById(update) > 0; + } } diff --git a/ruoyi-oa/src/main/java/com/ruoyi/oa/service/impl/SysOaWarehouseTaskServiceImpl.java b/ruoyi-oa/src/main/java/com/ruoyi/oa/service/impl/SysOaWarehouseTaskServiceImpl.java index 2e39211..ab8646a 100644 --- a/ruoyi-oa/src/main/java/com/ruoyi/oa/service/impl/SysOaWarehouseTaskServiceImpl.java +++ b/ruoyi-oa/src/main/java/com/ruoyi/oa/service/impl/SysOaWarehouseTaskServiceImpl.java @@ -211,14 +211,7 @@ public class SysOaWarehouseTaskServiceImpl implements ISysOaWarehouseTaskService return baseMapper.updateById(task); } - @Override - public Boolean updateRemark(Long taskId, String remark) { - if (taskId == null) return false; - SysOaWarehouseTask update = new SysOaWarehouseTask(); - update.setTaskId(taskId); - update.setRemark(remark); - return baseMapper.updateById(update) > 0; - } + private int toWareOne(Long masterId, SysOaWarehouseTaskBo bo , SysOaWarehouseDetailBo sysOaWarehouseDetailBo) { // 进行入库操作 (因为存在一种情况是此为全新物料是没有物料id的)