diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/back/controller/BackApplyInfoController.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/back/controller/BackApplyInfoController.java index a3c0bfe6..43dd7c5d 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/back/controller/BackApplyInfoController.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/back/controller/BackApplyInfoController.java @@ -236,7 +236,7 @@ public class BackApplyInfoController extends BaseController { */ @ApiOperation(value = "app编码查看保存") @PreventRepeatSubmit - @RequiresPermissions("back:info:update") + @RequiresPermissions("back:info:edit") @SysLog(title = "退料任务", businessType = OperaType.UPDATE, logType = 1,module = "仓储管理->删除退料任务") @PostMapping("/updateMaCode") public AjaxResult updateMaCode(@RequestBody MaCode maCode) { diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/lease/controller/LeaseApplyInfoController.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/lease/controller/LeaseApplyInfoController.java index c92aee20..672dc056 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/lease/controller/LeaseApplyInfoController.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/lease/controller/LeaseApplyInfoController.java @@ -6,6 +6,7 @@ import com.bonus.common.core.web.domain.AjaxResult; import com.bonus.common.core.web.page.TableDataInfo; import com.bonus.common.log.annotation.SysLog; import com.bonus.common.log.enums.OperaType; +import com.bonus.common.security.annotation.RequiresPermissions; import com.bonus.material.common.annotation.PreventRepeatSubmit; import com.bonus.material.lease.domain.LeaseApplyInfo; import com.bonus.material.lease.domain.vo.LeaseApplyRequestVo; @@ -109,6 +110,7 @@ public class LeaseApplyInfoController extends BaseController { @ApiOperation(value = "领料任务发布") @PreventRepeatSubmit @SysLog(title = "领料任务发布", businessType = OperaType.UPDATE, logType = 1,module = "仓储管理->发布领料任务") + //@RequiresPermissions("lease:info:add") @PostMapping("/publish") public AjaxResult publish(@RequestBody @NotNull(message = "任务信息不能为空") LeaseApplyInfo leaseApplyInfo) { return leaseApplyInfoService.publish(leaseApplyInfo); @@ -120,6 +122,7 @@ public class LeaseApplyInfoController extends BaseController { @ApiOperation(value = "领料任务批量发布") @PreventRepeatSubmit @SysLog(title = "领料任务批量发布", businessType = OperaType.UPDATE, logType = 1,module = "仓储管理->批量发布领料任务") + //@RequiresPermissions("lease:info:add") @PostMapping("/publishBatch") public AjaxResult publishBatch(@RequestBody @NotNull(message = "任务信息不能为空") List leaseApplyInfos) { for (LeaseApplyInfo leaseApplyInfo : leaseApplyInfos) { @@ -134,7 +137,7 @@ public class LeaseApplyInfoController extends BaseController { */ @ApiOperation(value = "领料出库") @PreventRepeatSubmit - //@RequiresPermissions("lease:info:add") + //@RequiresPermissions("lease:info:leaseOut") @SysLog(title = "领料出库", businessType = OperaType.INSERT, logType = 1,module = "仓储管理->领料出库") @PostMapping("/leaseOut") public AjaxResult leaseOut(@NotNull(message = "领料出库信息不能为空") @RequestBody LeaseOutRequestVo leaseOutRequestVo) { diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/purchase/controller/PurchaseBindController.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/purchase/controller/PurchaseBindController.java index 92fd8bdb..6a93e4df 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/purchase/controller/PurchaseBindController.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/purchase/controller/PurchaseBindController.java @@ -32,32 +32,6 @@ public class PurchaseBindController extends BaseController { @Resource private IPurchaseBindService purchaseBindService; - /** - * 一级分页查询 - */ -// @ApiOperation(value = "查询新购验收绑定详细列表") -// @RequiresPermissions("purchase:bind:list") -// @GetMapping(value = "/list") -// public TableDataInfo getList(PurchaseDto dto) { -// startPage(); -// List list = purchaseBindService.selectAll(dto); -// return getDataTable(list); -// } - - /** - * 获取新购绑定二级明细列表 - * @param - * @return - */ -// @ApiOperation(value = "获取新购绑定二级明细列表") -// @RequiresPermissions("purchase:bind:query") -// @GetMapping("/details") -// public TableDataInfo getDetails(PurchaseDto dto) { -// startPage(); -// List list = purchaseBindService.getDetails(dto); -// return getDataTable(list); -// } - /** * 绑定 * @param dto diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/purchase/controller/PurchaseCheckInfoController.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/purchase/controller/PurchaseCheckInfoController.java index bc77c5b9..b0b0e3f0 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/purchase/controller/PurchaseCheckInfoController.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/purchase/controller/PurchaseCheckInfoController.java @@ -9,6 +9,7 @@ import cn.hutool.core.convert.Convert; import com.bonus.common.biz.config.ListPagingUtil; import com.bonus.common.core.utils.ServletUtils; import com.bonus.common.log.enums.OperaType; +import com.bonus.common.security.annotation.RequiresPermissions; import com.bonus.material.common.annotation.PreventRepeatSubmit; import com.bonus.material.purchase.domain.PurchaseCheckDetails; import com.bonus.material.purchase.domain.dto.PurchaseCheckDto; diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/purchase/controller/PurchaseStorageController.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/purchase/controller/PurchaseStorageController.java index 4d0c0fbb..45b39f20 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/purchase/controller/PurchaseStorageController.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/purchase/controller/PurchaseStorageController.java @@ -30,33 +30,6 @@ public class PurchaseStorageController extends BaseController { @Resource private IPurchaseStorageService purchaseStorageService; - - /** - * 一级分页查询 - */ -// @ApiOperation(value = "查询新购验收入库详细列表") -// @RequiresPermissions("purchase:storage:list") -// @GetMapping(value = "/list") -// public TableDataInfo getList(PurchaseDto dto) { -// startPage(); -// List list = purchaseStorageService.selectAll(dto); -// return getDataTable(list); -// } - - /** - * 获取新购入库二级明细列表 - * @param - * @return - */ -// @ApiOperation(value = "获取新购入库二级明细列表") -// @RequiresPermissions("purchase:storage:details") -// @GetMapping("/details") -// public TableDataInfo getDetails(PurchaseDto dto) { -// startPage(); -// List list = purchaseStorageService.getDetails(dto); -// return getDataTable(list); -// } - /** * 入库或批量入库 * @param dto @@ -64,7 +37,7 @@ public class PurchaseStorageController extends BaseController { */ @ApiOperation(value = "入库或批量入库操作") @PreventRepeatSubmit - @RequiresPermissions("purchase:storage:warehouse") + @RequiresPermissions("purchase:storage:add") @PostMapping("/warehouse") public AjaxResult warehouse(@RequestBody PurchaseDto dto) { return purchaseStorageService.warehouse(dto); @@ -73,7 +46,7 @@ public class PurchaseStorageController extends BaseController { @ApiOperation(value = "查询待绑定编号机具详情") @PreventRepeatSubmit - @RequiresPermissions("purchase:storage:list") + @RequiresPermissions("purchase:storage:query") @PostMapping("/getMachineById") public AjaxResult getMachineById(@RequestBody PurchaseDto dto) { return purchaseStorageService.getMachineById(dto); diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/repair/controller/RepairController.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/repair/controller/RepairController.java index 49ed57e3..cdab1620 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/repair/controller/RepairController.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/repair/controller/RepairController.java @@ -87,6 +87,7 @@ public class RepairController extends BaseController { * 获取维修任务机具列表--Ⅱ级页面详情列表 */ @ApiOperation(value = "获取维修物资设备列表---不分页") + //@RequiresPermissions(value = "repair:manage:list") @GetMapping("/getAppRepairMaTypeList") public AjaxResult getAppRepairMaTypeList(RepairTaskDetails bean) { List list = service.getRepairDeviceSummary(bean); @@ -97,6 +98,7 @@ public class RepairController extends BaseController { * 查询维修单 */ @ApiOperation(value = "获取维修单详情") + //@RequiresPermissions(value = "repair:manage:query") @GetMapping("/getRepairDocumentInfo") public AjaxResult getRepairDocumentInfo(Long taskId) { return service.getRepairDocumentInfo(taskId); @@ -106,6 +108,7 @@ public class RepairController extends BaseController { * 新增维修记录 */ @ApiOperation(value = "新增维修记录") + //@RequiresPermissions(value = "repair:manage:submit") @PostMapping("/submitRepairApply") public AjaxResult submitRepairApply(@RequestBody @NotNull RepairApplyRecord bean) { try { @@ -160,6 +163,7 @@ public class RepairController extends BaseController { * 驳回退料--批量 */ @ApiOperation(value = "驳回退料--批量") + //@RequiresPermissions(value = "repair:manage:reject") @DeleteMapping("/{ids}") public AjaxResult rejectRepair(@PathVariable Long[] ids) { return service.rejectRepair(Arrays.asList(ids)); @@ -206,6 +210,7 @@ public class RepairController extends BaseController { @ApiOperation(value = "获取Ocr code") @RequestMapping(value = "getOcrCode", method = RequestMethod.POST) + //@RequiresPermissions("repair:manage:list") @ResponseBody public JSONObject getOcrCode(OCRBean o) { String url = "http://10.138.55.102:10000/api_gqj/pre";