Commit 7255d7ddfbdd6c1a27a63f6a011ef2d819a773ab

Authored by 房远帅
1 parent deddedd4

楚江ERP:订货单、撤销单-权限修改

@@ -143,7 +143,7 @@ public class PurchaseOrderInfoController extends DefaultBaseController { @@ -143,7 +143,7 @@ public class PurchaseOrderInfoController extends DefaultBaseController {
143 */ 143 */
144 @ApiOperation("根据ID查询") 144 @ApiOperation("根据ID查询")
145 @ApiImplicitParam(value = "id", name = "id", paramType = "query", required = true) 145 @ApiImplicitParam(value = "id", name = "id", paramType = "query", required = true)
146 - @HasPermission({"order-manage:order-list:query"}) 146 + @HasPermission({"order-manage:order-list:query","order-manage:order-list:review"})
147 @GetMapping("/get") 147 @GetMapping("/get")
148 public InvokeResult<GetPurchaseOrderInfoBo> get(@NotBlank(message = "id不能为空!") String id) { 148 public InvokeResult<GetPurchaseOrderInfoBo> get(@NotBlank(message = "id不能为空!") String id) {
149 149
@@ -207,7 +207,7 @@ public class PurchaseOrderInfoController extends DefaultBaseController { @@ -207,7 +207,7 @@ public class PurchaseOrderInfoController extends DefaultBaseController {
207 * 修改 207 * 修改
208 */ 208 */
209 @ApiOperation("修改") 209 @ApiOperation("修改")
210 - @HasPermission({"order-manage:order-list:modify"}) 210 + @HasPermission({"order-manage:order-list:modify","order-manage:order-list:approve"})
211 @PutMapping("/update") 211 @PutMapping("/update")
212 public InvokeResult<Void> update(@Valid @RequestBody UpdatePurchaseOrderInfoVo vo) { 212 public InvokeResult<Void> update(@Valid @RequestBody UpdatePurchaseOrderInfoVo vo) {
213 213
@@ -57,7 +57,7 @@ public class PurchaseOrderRevokeController extends DefaultBaseController { @@ -57,7 +57,7 @@ public class PurchaseOrderRevokeController extends DefaultBaseController {
57 * 查询列表 57 * 查询列表
58 */ 58 */
59 @ApiOperation("查询列表") 59 @ApiOperation("查询列表")
60 - @HasPermission({"purchaseOrderRevoke:purchaseorderrevoke:query"}) 60 + @HasPermission({"order-manage:revoke-list:query"})
61 @GetMapping("/query") 61 @GetMapping("/query")
62 public InvokeResult<PageResult<GetPurchaseOrderRevokeBo>> query(@Valid QueryPurchaseOrderRevokeVo vo) { 62 public InvokeResult<PageResult<GetPurchaseOrderRevokeBo>> query(@Valid QueryPurchaseOrderRevokeVo vo) {
63 63
@@ -89,7 +89,7 @@ public class PurchaseOrderRevokeController extends DefaultBaseController { @@ -89,7 +89,7 @@ public class PurchaseOrderRevokeController extends DefaultBaseController {
89 */ 89 */
90 @ApiOperation("根据ID查询") 90 @ApiOperation("根据ID查询")
91 @ApiImplicitParam(value = "id", name = "id", paramType = "query", required = true) 91 @ApiImplicitParam(value = "id", name = "id", paramType = "query", required = true)
92 - @HasPermission({"purchaseOrderRevoke:purchaseorderrevoke:query"}) 92 + @HasPermission({"order-manage:revoke-list:query","order-manage:revoke-list:review"})
93 @GetMapping("/get") 93 @GetMapping("/get")
94 public InvokeResult<GetPurchaseOrderRevokeBo> get(@NotBlank(message = "id不能为空!") String id) { 94 public InvokeResult<GetPurchaseOrderRevokeBo> get(@NotBlank(message = "id不能为空!") String id) {
95 95
@@ -114,7 +114,7 @@ public class PurchaseOrderRevokeController extends DefaultBaseController { @@ -114,7 +114,7 @@ public class PurchaseOrderRevokeController extends DefaultBaseController {
114 */ 114 */
115 @ApiOperation("根据ID查询") 115 @ApiOperation("根据ID查询")
116 @ApiImplicitParam(value = "id", name = "id", paramType = "query", required = true) 116 @ApiImplicitParam(value = "id", name = "id", paramType = "query", required = true)
117 - @HasPermission({"purchaseOrderRevoke:purchaseorderrevoke:query"}) 117 + @HasPermission({"order-manage:revoke-list:query"})
118 @GetMapping("/getByPurchaseOrderId") 118 @GetMapping("/getByPurchaseOrderId")
119 public InvokeResult<GetPurchaseOrderRevokeBo> getByPurchaseOrderId(@NotBlank(message = "id不能为空!") String id) { 119 public InvokeResult<GetPurchaseOrderRevokeBo> getByPurchaseOrderId(@NotBlank(message = "id不能为空!") String id) {
120 120
@@ -131,7 +131,7 @@ public class PurchaseOrderRevokeController extends DefaultBaseController { @@ -131,7 +131,7 @@ public class PurchaseOrderRevokeController extends DefaultBaseController {
131 * 新增 131 * 新增
132 */ 132 */
133 @ApiOperation("新增") 133 @ApiOperation("新增")
134 - @HasPermission({"purchaseOrderRevoke:purchaseorderrevoke:add"}) 134 + @HasPermission({"order-manage:revoke-list:add"})
135 @PostMapping("/create") 135 @PostMapping("/create")
136 public InvokeResult<Void> create(@Valid @RequestBody CreatePurchaseOrderRevokeVo vo) { 136 public InvokeResult<Void> create(@Valid @RequestBody CreatePurchaseOrderRevokeVo vo) {
137 137
@@ -144,7 +144,7 @@ public class PurchaseOrderRevokeController extends DefaultBaseController { @@ -144,7 +144,7 @@ public class PurchaseOrderRevokeController extends DefaultBaseController {
144 * 修改 144 * 修改
145 */ 145 */
146 @ApiOperation("修改") 146 @ApiOperation("修改")
147 - @HasPermission({"purchaseOrderRevoke:purchaseorderrevoke:modify"}) 147 + @HasPermission({"order-manage:revoke-list:modify","order-manage:revoke-list:approve"})
148 @PutMapping("/update") 148 @PutMapping("/update")
149 public InvokeResult<Void> update(@Valid @RequestBody UpdatePurchaseOrderRevokeVo vo) { 149 public InvokeResult<Void> update(@Valid @RequestBody UpdatePurchaseOrderRevokeVo vo) {
150 150
@@ -157,7 +157,7 @@ public class PurchaseOrderRevokeController extends DefaultBaseController { @@ -157,7 +157,7 @@ public class PurchaseOrderRevokeController extends DefaultBaseController {
157 * 取消 157 * 取消
158 */ 158 */
159 @ApiOperation("取消") 159 @ApiOperation("取消")
160 - @HasPermission({"purchaseOrderRevoke:purchaseorderrevoke:cancel"}) 160 + @HasPermission({"order-manage:revoke-list:cancel"})
161 @GetMapping("/cancel") 161 @GetMapping("/cancel")
162 public InvokeResult<Void> cancel(@NotBlank(message = "id不能为空!") String id, 162 public InvokeResult<Void> cancel(@NotBlank(message = "id不能为空!") String id,
163 @NotBlank(message = "status不能为空!") String status) { 163 @NotBlank(message = "status不能为空!") String status) {
@@ -172,7 +172,7 @@ public class PurchaseOrderRevokeController extends DefaultBaseController { @@ -172,7 +172,7 @@ public class PurchaseOrderRevokeController extends DefaultBaseController {
172 */ 172 */
173 @ApiOperation("根据ID删除") 173 @ApiOperation("根据ID删除")
174 @ApiImplicitParam(value = "id", name = "id", paramType = "query", required = true) 174 @ApiImplicitParam(value = "id", name = "id", paramType = "query", required = true)
175 - @HasPermission({"purchaseOrderRevoke:purchaseorderrevoke:delete"}) 175 + @HasPermission({"order-manage:revoke-list:delete"})
176 @DeleteMapping("/deleteById") 176 @DeleteMapping("/deleteById")
177 public InvokeResult<Void> deleteById(@NotBlank(message = "id不能为空!") String id) { 177 public InvokeResult<Void> deleteById(@NotBlank(message = "id不能为空!") String id) {
178 178