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