朱园亮 / xingyun-erp · Commits

Commit e1ea81cb7b95d901a54a0bfd05652b986e976091

Authored by yeqianyong
1 parent 869f923b

楚江erp：发货计划、发货单权限code修改

Inline Side-by-side
Showing 3 changed files with 12 additions and 19 deletions
... ... @@ -87,7 +87,7 @@ public class ShipmentsOrderInfoController extends DefaultBaseController {
87 87 * 查询列表
88 88 */
89 89 @ApiOperation("查询列表")
90   - @HasPermission({"shipments:order:query"})
  90 + @HasPermission({"shipping-plan-manage:invoice:query"})
91 91 @GetMapping("/query")
92 92 public InvokeResult<PageResult<QueryShipmentsOrderInfoBo>> query(@Valid QueryShipmentsOrderInfoVo vo) {
93 93 PageResult<ShipmentsOrderInfo> pageResult = shipmentsOrderInfoService.query(getPageIndex(vo), getPageSize(vo), vo);
... ... @@ -104,7 +104,7 @@ public class ShipmentsOrderInfoController extends DefaultBaseController {
104 104 */
105 105 @ApiOperation("根据ID查询")
106 106 @ApiImplicitParam(value = "id", name = "id", paramType = "query", required = true)
107   - @HasPermission({"shipments:order:query"})
  107 + @HasPermission({"shipping-plan-manage:invoice:query"})
108 108 @GetMapping
109 109 public InvokeResult<GetShipmentsOrderInfoBo> get(@NotBlank(message = "id不能为空！") String id) {
110 110 ShipmentsOrderInfo data = shipmentsOrderInfoService.findById(id);
... ... @@ -120,7 +120,7 @@ public class ShipmentsOrderInfoController extends DefaultBaseController {
120 120 * 新增
121 121 */
122 122 @ApiOperation("新增")
123   - @HasPermission({"shipments:order:add"})
  123 + @HasPermission({"shipping-plan-manage:invoice:add"})
124 124 @PostMapping
125 125 public InvokeResult<Void> create(@Valid CreateShipmentsOrderInfoVo vo) {
126 126 shipmentsOrderInfoService.create(vo);
... ... @@ -131,7 +131,7 @@ public class ShipmentsOrderInfoController extends DefaultBaseController {
131 131 * 修改
132 132 */
133 133 @ApiOperation("修改")
134   - @HasPermission({"shipments:order:modify"})
  134 + @HasPermission({"shipping-plan-manage:invoice:modify"})
135 135 @PutMapping
136 136 public InvokeResult<Void> update(@Valid UpdateShipmentsOrderInfoVo vo) {
137 137 shipmentsOrderInfoService.update(vo);
... ... @@ -143,7 +143,7 @@ public class ShipmentsOrderInfoController extends DefaultBaseController {
143 143 */
144 144 @ApiOperation("根据ID删除")
145 145 @ApiImplicitParam(value = "id", name = "id", paramType = "query", required = true)
146   - @HasPermission({"shipments:order:delete"})
  146 + @HasPermission({"shipping-plan-manage:invoice:delete"})
147 147 @DeleteMapping
148 148 public InvokeResult<Void> deleteById(@NotBlank(message = "id不能为空！") String id) {
149 149 shipmentsOrderInfoService.deleteById(id);
... ... @@ -155,7 +155,7 @@ public class ShipmentsOrderInfoController extends DefaultBaseController {
155 155 * 生成发货单和要车相关数据
156 156 */
157 157 @ApiOperation("生成发货单和要车相关数据")
158   - @HasPermission({"shipping-plan-manage:shipping-plan:generate"})
  158 + @HasPermission({"shipping-plan-manage:invoice:generate"})
159 159 @PostMapping("/generate")
160 160 public InvokeResult<Void> generate(@Valid @RequestBody GenerateShipmentsOrderVo vo) {
161 161 // 生成发货单和要车相关数据
... ... @@ -168,7 +168,7 @@ public class ShipmentsOrderInfoController extends DefaultBaseController {
168 168 * 发货单明细数据
169 169 */
170 170 @ApiOperation("发货单明细数据")
171   - @HasPermission({"shipping-plan-manage:shipping-plan:query"})
  171 + @HasPermission({"shipping-plan-manage:invoice:query"})
172 172 @GetMapping("/listByShipmentOrderId")
173 173 public InvokeResult<List<ShipmentsPlanDetailBo>> listByShipmentOrderId(@NotBlank(message = "发货单ID不能为空！") String shipmentsOrderId) {
174 174 List<ShipmentsPlanDetail> dataList = shipmentsPlanDetailService.listByShipmentOrderId(shipmentsOrderId);
... ... @@ -183,7 +183,7 @@ public class ShipmentsOrderInfoController extends DefaultBaseController {
183 183 * 明细数据补充录入
184 184 */
185 185 @ApiOperation("明细数据补充录入")
186   - @HasPermission({"shipping-plan-manage:shipping-plan:query"})
  186 + @HasPermission({"shipping-plan-manage:invoice:fill"})
187 187 @PostMapping("/dataReplenishInput")
188 188 public InvokeResult<Void> dataReplenishInput(@Valid @RequestBody ShipmentsOrderVo vo) {
189 189 shipmentsOrderInfoService.dataReplenishInput(vo);
... ... @@ -194,7 +194,7 @@ public class ShipmentsOrderInfoController extends DefaultBaseController {
194 194 * 保存签收单据
195 195 */
196 196 @ApiOperation("保存签收单据")
197   - @HasPermission({"shipping-plan-manage:shipping-plan:query"})
  197 + @HasPermission({"shipping-plan-manage:invoice:upload"})
198 198 @GetMapping("/saveSignInTicket")
199 199 public InvokeResult<Void> saveSignInTicket(@Valid SignInTicketVo vo) {
200 200 shipmentsOrderInfoService.saveSignInTicket(vo);
... ... @@ -206,7 +206,6 @@ public class ShipmentsOrderInfoController extends DefaultBaseController {
206 206 * 检查发货单相关数据
207 207 */
208 208 @ApiOperation("检查发货单相关数据")
209   - @HasPermission({"shipping-plan-manage:shipping-plan:query"})
210 209 @PostMapping("/check")
211 210 public InvokeResult<Void> saveSignInTicket(@RequestBody List<String> ids) {
212 211 // 获取发货单数据
... ...
... ... @@ -49,7 +49,7 @@ public class ShipmentsPlanController extends DefaultBaseController {
49 49 * 查询列表
50 50 */
51 51 @ApiOperation("查询列表")
52   - @HasPermission({"shipments:plan:query"})
  52 + @HasPermission({"shipping-plan-manage:shipping-plan:query"})
53 53 @GetMapping("/query")
54 54 public InvokeResult<PageResult<ShipmentsPlanBo>> query(@Valid QueryShipmentsPlanVo vo) {
55 55 PageResult<ShipmentsPlan> pageResult = shipmentsPlanService.query(getPageIndex(vo), getPageSize(vo), vo);
... ... @@ -66,7 +66,7 @@ public class ShipmentsPlanController extends DefaultBaseController {
66 66 */
67 67 @ApiOperation("根据ID查询")
68 68 @ApiImplicitParam(value = "id", name = "id", paramType = "query", required = true)
69   - @HasPermission({"shipments:plan:query"})
  69 + @HasPermission({"shipping-plan-manage:shipping-plan:query"})
70 70 @GetMapping
71 71 public InvokeResult<ShipmentsPlanBo> get(@NotBlank(message = "id不能为空！") String id) {
72 72 ShipmentsPlan data = shipmentsPlanService.findById(id);
... ... @@ -82,7 +82,7 @@ public class ShipmentsPlanController extends DefaultBaseController {
82 82 * 修改
83 83 */
84 84 @ApiOperation("修改")
85   - @HasPermission({"shipments:plan:modify"})
  85 + @HasPermission({"shipping-plan-manage:shipping-plan:modify"})
86 86 @PutMapping
87 87 public InvokeResult<Void> update(@Valid UpdateShipmentsPlanVo vo) {
88 88 shipmentsPlanService.update(vo);
... ...
... ... @@ -50,7 +50,6 @@ public class ShipmentsPlanDetailController extends DefaultBaseController {
50 50 * 查询列表
51 51 */
52 52 @ApiOperation("查询列表")
53   - @HasPermission({"shipments:plan:query"})
54 53 @GetMapping("/query")
55 54 public InvokeResult<PageResult<ShipmentsPlanDetailBo>> query(@Valid QueryShipmentsPlanDetailVo vo) {
56 55 PageResult<ShipmentsPlanDetail> pageResult = shipmentsPlanDetailService.query(getPageIndex(vo), getPageSize(vo), vo);
... ... @@ -67,7 +66,6 @@ public class ShipmentsPlanDetailController extends DefaultBaseController {
67 66 */
68 67 @ApiOperation("根据ID查询")
69 68 @ApiImplicitParam(value = "id", name = "id", paramType = "query", required = true)
70   - @HasPermission({"shipments:plan:query"})
71 69 @GetMapping
72 70 public InvokeResult<ShipmentsPlanDetailBo> get(@NotBlank(message = "id不能为空！") String id) {
73 71 ShipmentsPlanDetail data = shipmentsPlanDetailService.findById(id);
... ... @@ -92,7 +90,6 @@ public class ShipmentsPlanDetailController extends DefaultBaseController {
92 90 * 新增
93 91 */
94 92 @ApiOperation("新增")
95   - @HasPermission({"shipments:plan:add"})
96 93 @PostMapping
97 94 public InvokeResult<Void> batchAdd(@Valid @RequestBody CreateShipmentsPlanDetailVo vo) {
98 95 shipmentsPlanDetailService.create(vo);
... ... @@ -103,7 +100,6 @@ public class ShipmentsPlanDetailController extends DefaultBaseController {
103 100 * 修改
104 101 */
105 102 @ApiOperation("修改")
106   - @HasPermission({"shipments:plan:modify"})
107 103 @PutMapping
108 104 public InvokeResult<Void> update(@Valid UpdateShipmentsPlanDetailVo vo) {
109 105 shipmentsPlanDetailService.update(vo);
... ... @@ -128,7 +124,6 @@ public class ShipmentsPlanDetailController extends DefaultBaseController {
128 124 * 拆分
129 125 */
130 126 @ApiOperation("拆分")
131   - @HasPermission({"shipments:plan:add"})
132 127 @PostMapping("/split")
133 128 public InvokeResult<Void> split(@Valid @RequestBody ShipmentsPlanDetailSplitVo vo) {
134 129 shipmentsPlanDetailService.planDetailSplit(vo);
... ... @@ -139,7 +134,6 @@ public class ShipmentsPlanDetailController extends DefaultBaseController {
139 134 * 批量删除
140 135 */
141 136 @ApiOperation("批量删除")
142   - @HasPermission({"shipments:plan:add"})
143 137 @PostMapping("/batchDelete")
144 138 public InvokeResult<Void> batchDelete(@Valid @RequestBody List<String> ids) {
145 139 shipmentsPlanDetailService.batchDelete(ids);
... ...