|
@@ -46,7 +46,7 @@ public class ProcurementWarehouseReceiveOrderController extends DefaultBaseContr |
|
@@ -46,7 +46,7 @@ public class ProcurementWarehouseReceiveOrderController extends DefaultBaseContr |
|
46
|
private ProcurementWarehouseReceiveOrderService warehouseReceiveOrderService;
|
46
|
private ProcurementWarehouseReceiveOrderService warehouseReceiveOrderService;
|
|
47
|
|
47
|
|
|
48
|
@ApiOperation("分页查询仓库收料单")
|
48
|
@ApiOperation("分页查询仓库收料单")
|
|
49
|
- @HasPermission({"warehouse-manage:warehouse-receive:query"})
|
49
|
+ @HasPermission({"warehouse-manage:warehouse-material:query"})
|
|
50
|
@GetMapping("/query")
|
50
|
@GetMapping("/query")
|
|
51
|
public InvokeResult<PageResult<GetWarehouseReceiveOrderBo>> query(
|
51
|
public InvokeResult<PageResult<GetWarehouseReceiveOrderBo>> query(
|
|
52
|
@Valid QueryWarehouseReceiveOrderVo vo) {
|
52
|
@Valid QueryWarehouseReceiveOrderVo vo) {
|
|
@@ -67,7 +67,7 @@ public class ProcurementWarehouseReceiveOrderController extends DefaultBaseContr |
|
@@ -67,7 +67,7 @@ public class ProcurementWarehouseReceiveOrderController extends DefaultBaseContr |
|
67
|
|
67
|
|
|
68
|
@ApiOperation("查询仓库收料单详情")
|
68
|
@ApiOperation("查询仓库收料单详情")
|
|
69
|
@ApiImplicitParam(value = "ID", name = "id", paramType = "query", required = true)
|
69
|
@ApiImplicitParam(value = "ID", name = "id", paramType = "query", required = true)
|
|
70
|
- @HasPermission({"warehouse-manage:warehouse-receive:query", "warehouse-manage:warehouse-receive:review"})
|
70
|
+ @HasPermission({"warehouse-manage:warehouse-material:query", "warehouse-manage:warehouse-material:review"})
|
|
71
|
@GetMapping("")
|
71
|
@GetMapping("")
|
|
72
|
public InvokeResult<GetWarehouseReceiveOrderBo> findById(
|
72
|
public InvokeResult<GetWarehouseReceiveOrderBo> findById(
|
|
73
|
@NotBlank(message = "ID不能为空!") String id) {
|
73
|
@NotBlank(message = "ID不能为空!") String id) {
|
|
@@ -89,7 +89,7 @@ public class ProcurementWarehouseReceiveOrderController extends DefaultBaseContr |
|
@@ -89,7 +89,7 @@ public class ProcurementWarehouseReceiveOrderController extends DefaultBaseContr |
|
89
|
}
|
89
|
}
|
|
90
|
|
90
|
|
|
91
|
@ApiOperation("新增仓库收料单(草稿,原料核算岗-供应管理科)")
|
91
|
@ApiOperation("新增仓库收料单(草稿,原料核算岗-供应管理科)")
|
|
92
|
- @HasPermission({"warehouse-manage:warehouse-receive:add"})
|
92
|
+ @HasPermission({"warehouse-manage:warehouse-material:add"})
|
|
93
|
@PostMapping("")
|
93
|
@PostMapping("")
|
|
94
|
public InvokeResult<String> create(@RequestBody @Valid CreateWarehouseReceiveOrderVo vo) {
|
94
|
public InvokeResult<String> create(@RequestBody @Valid CreateWarehouseReceiveOrderVo vo) {
|
|
95
|
String id = warehouseReceiveOrderService.create(vo);
|
95
|
String id = warehouseReceiveOrderService.create(vo);
|
|
@@ -97,7 +97,7 @@ public class ProcurementWarehouseReceiveOrderController extends DefaultBaseContr |
|
@@ -97,7 +97,7 @@ public class ProcurementWarehouseReceiveOrderController extends DefaultBaseContr |
|
97
|
}
|
97
|
}
|
|
98
|
|
98
|
|
|
99
|
@ApiOperation("修改仓库收料单(仅草稿、已驳回可修改)")
|
99
|
@ApiOperation("修改仓库收料单(仅草稿、已驳回可修改)")
|
|
100
|
- @HasPermission({"warehouse-manage:warehouse-receive:modify"})
|
100
|
+ @HasPermission({"warehouse-manage:warehouse-material:modify", "warehouse-manage:warehouse-material:approve"})
|
|
101
|
@PutMapping("")
|
101
|
@PutMapping("")
|
|
102
|
public InvokeResult<Void> update(@RequestBody @Valid UpdateWarehouseReceiveOrderVo vo) {
|
102
|
public InvokeResult<Void> update(@RequestBody @Valid UpdateWarehouseReceiveOrderVo vo) {
|
|
103
|
warehouseReceiveOrderService.update(vo);
|
103
|
warehouseReceiveOrderService.update(vo);
|
|
@@ -106,7 +106,7 @@ public class ProcurementWarehouseReceiveOrderController extends DefaultBaseContr |
|
@@ -106,7 +106,7 @@ public class ProcurementWarehouseReceiveOrderController extends DefaultBaseContr |
|
106
|
|
106
|
|
|
107
|
@ApiOperation("提交仓库收料单审核")
|
107
|
@ApiOperation("提交仓库收料单审核")
|
|
108
|
@ApiImplicitParam(value = "ID", name = "id", paramType = "query", required = true)
|
108
|
@ApiImplicitParam(value = "ID", name = "id", paramType = "query", required = true)
|
|
109
|
- @HasPermission({"warehouse-manage:warehouse-receive:submit"})
|
109
|
+ @HasPermission({"warehouse-manage:warehouse-material:submit"})
|
|
110
|
@PutMapping("/submit")
|
110
|
@PutMapping("/submit")
|
|
111
|
public InvokeResult<Void> submit(@NotBlank(message = "ID不能为空!") String id) {
|
111
|
public InvokeResult<Void> submit(@NotBlank(message = "ID不能为空!") String id) {
|
|
112
|
warehouseReceiveOrderService.submit(id);
|
112
|
warehouseReceiveOrderService.submit(id);
|
|
@@ -114,7 +114,7 @@ public class ProcurementWarehouseReceiveOrderController extends DefaultBaseContr |
|
@@ -114,7 +114,7 @@ public class ProcurementWarehouseReceiveOrderController extends DefaultBaseContr |
|
114
|
}
|
114
|
}
|
|
115
|
|
115
|
|
|
116
|
@ApiOperation("调整实收数(仅审核中且流程节点为分厂仓库统计员环节可调整,合计由前端计算传入)")
|
116
|
@ApiOperation("调整实收数(仅审核中且流程节点为分厂仓库统计员环节可调整,合计由前端计算传入)")
|
|
117
|
- @HasPermission({"warehouse-manage:warehouse-receive:modify"})
|
117
|
+ @HasPermission({"warehouse-manage:warehouse-material:modify", "warehouse-manage:warehouse-material:approve"})
|
|
118
|
@PutMapping("/actualQuantity")
|
118
|
@PutMapping("/actualQuantity")
|
|
119
|
public InvokeResult<Void> updateActualQuantity(
|
119
|
public InvokeResult<Void> updateActualQuantity(
|
|
120
|
@RequestBody @Valid UpdateWarehouseReceiveActualQuantityVo vo) {
|
120
|
@RequestBody @Valid UpdateWarehouseReceiveActualQuantityVo vo) {
|
|
@@ -124,7 +124,7 @@ public class ProcurementWarehouseReceiveOrderController extends DefaultBaseContr |
|
@@ -124,7 +124,7 @@ public class ProcurementWarehouseReceiveOrderController extends DefaultBaseContr |
|
124
|
|
124
|
|
|
125
|
@ApiOperation("取消仓库收料单(草稿、已驳回状态可取消)")
|
125
|
@ApiOperation("取消仓库收料单(草稿、已驳回状态可取消)")
|
|
126
|
@ApiImplicitParam(value = "ID", name = "id", paramType = "query", required = true)
|
126
|
@ApiImplicitParam(value = "ID", name = "id", paramType = "query", required = true)
|
|
127
|
- @HasPermission({"warehouse-manage:warehouse-receive:cancel"})
|
127
|
+ @HasPermission({"warehouse-manage:warehouse-material:cancel"})
|
|
128
|
@PutMapping("/cancel")
|
128
|
@PutMapping("/cancel")
|
|
129
|
public InvokeResult<Void> cancel(@NotBlank(message = "ID不能为空!") String id) {
|
129
|
public InvokeResult<Void> cancel(@NotBlank(message = "ID不能为空!") String id) {
|
|
130
|
warehouseReceiveOrderService.cancel(id);
|
130
|
warehouseReceiveOrderService.cancel(id);
|