楚江ERP：权限修改

@@ -199,7 +199,7 @@ public class PurchaseOrderInfoController extends DefaultBaseController {
      * 新增
      */
     @ApiOperation("新增")
-    @HasPermission({"purchaseOrderInfo:purchaseorderinfo:add"})
+    @HasPermission({"order-manage:order-list:add"})
     @PostMapping("/create")
     public InvokeResult<Void> create(@Valid @RequestBody CreatePurchaseOrderInfoVo vo) {
 
@@ -240,7 +240,7 @@ public class PurchaseOrderInfoController extends DefaultBaseController {
      */
     @ApiOperation("根据ID删除")
     @ApiImplicitParam(value = "id", name = "id", paramType = "query", required = true)
-    @HasPermission({"purchaseOrderInfo:purchaseorderinfo:delete"})
+    @HasPermission({"order-manage:order-list:delete"})
     @DeleteMapping("/deleteById")
     public InvokeResult<Void> deleteById(@NotBlank(message = "id不能为空！") String id) {
 

@@ -67,7 +67,7 @@ public class CarRequestPlanController extends DefaultBaseController {
      * 查询列表
      */
     @ApiOperation("查询列表")
-    @HasPermission({"carRequestPlan:carrequestplan:query"})
+    @HasPermission({"shipping-plan-manage:car-request-plan:query"})
     @GetMapping("/query")
     public InvokeResult<PageResult<GetCarRequestPlanBo>> query(@Valid QueryCarRequestPlanVo vo) {
 
@@ -88,7 +88,7 @@ public class CarRequestPlanController extends DefaultBaseController {
      */
     @ApiOperation("根据ID查询")
     @ApiImplicitParam(value = "id", name = "id", paramType = "query", required = true)
-    @HasPermission({"carRequestPlan:carrequestplan:query"})
+    @HasPermission({"shipping-plan-manage:car-request-plan:query"})
     @GetMapping
     public InvokeResult<GetCarRequestPlanBo> get(@NotBlank(message = "id不能为空！") String id) {
 
@@ -106,7 +106,7 @@ public class CarRequestPlanController extends DefaultBaseController {
      * 新增
      */
     @ApiOperation("新增")
-    @HasPermission({"carRequestPlan:carrequestplan:add"})
+    @HasPermission({"shipping-plan-manage:car-request-plan:add"})
     @PostMapping
     public InvokeResult<Void> create(@Valid @RequestBody CreateCarRequestPlanVo vo) {
 
@@ -119,7 +119,7 @@ public class CarRequestPlanController extends DefaultBaseController {
      * 修改
      */
     @ApiOperation("修改")
-    @HasPermission({"carRequestPlan:carrequestplan:modify"})
+    @HasPermission({"shipping-plan-manage:car-request-plan:modify", "shipping-plan-manage:car-request-plan:remark"})
     @PutMapping
     public InvokeResult<Void> update(@Valid @RequestBody UpdateCarRequestPlanVo vo) {
 
@@ -133,7 +133,7 @@ public class CarRequestPlanController extends DefaultBaseController {
      */
     @ApiOperation("根据ID删除")
     @ApiImplicitParam(value = "id", name = "id", paramType = "query", required = true)
-    @HasPermission({"carRequestPlan:carrequestplan:delete"})
+    @HasPermission({"shipping-plan-manage:car-request-plan:delete"})
     @DeleteMapping
     public InvokeResult<Void> deleteById(@NotBlank(message = "id不能为空！") String id) {
 

@@ -44,7 +44,7 @@ public class RequestCarTicketController extends DefaultBaseController {
      * 查询列表
      */
     @ApiOperation("查询列表")
-    @HasPermission({"requestCarTicket:requestcarticket:query"})
+    @HasPermission({"shipping-plan-manage:car-request-order:query"})
     @GetMapping("/query")
     public InvokeResult<PageResult<GetRequestCarTicketBo>> query(@Valid QueryRequestCarTicketVo vo) {
 
@@ -65,7 +65,7 @@ public class RequestCarTicketController extends DefaultBaseController {
      */
     @ApiOperation("根据ID查询")
     @ApiImplicitParam(value = "id", name = "id", paramType = "query", required = true)
-    @HasPermission({"requestCarTicket:requestcarticket:query"})
+    @HasPermission({"shipping-plan-manage:car-request-order:query"})
     @GetMapping
     public InvokeResult<GetRequestCarTicketBo> get(@NotBlank(message = "id不能为空！") String id) {
 
@@ -83,7 +83,7 @@ public class RequestCarTicketController extends DefaultBaseController {
      * 新增
      */
     @ApiOperation("新增")
-    @HasPermission({"requestCarTicket:requestcarticket:add"})
+    @HasPermission({"shipping-plan-manage:car-request-order:add"})
     @PostMapping
     public InvokeResult<Void> create(@Valid @RequestBody CreateRequestCarTicketVo vo) {
 
@@ -96,7 +96,7 @@ public class RequestCarTicketController extends DefaultBaseController {
      * 修改
      */
     @ApiOperation("修改")
-    @HasPermission({"requestCarTicket:requestcarticket:modify"})
+    @HasPermission({"shipping-plan-manage:car-request-order:modify"})
     @PutMapping
     public InvokeResult<Void> update(@Valid @RequestBody UpdateRequestCarTicketVo vo) {
 
@@ -109,7 +109,7 @@ public class RequestCarTicketController extends DefaultBaseController {
      * 取消
      */
     @ApiOperation("取消")
-    @HasPermission({"purchaseOrderRevoke:purchaseorderrevoke:cancel"})
+    @HasPermission({"shipping-plan-manage:car-request-order:cancel"})
     @GetMapping("/cancel")
     public InvokeResult<Void> cancel(@NotBlank(message = "id不能为空！") String id) {
 
@@ -123,7 +123,7 @@ public class RequestCarTicketController extends DefaultBaseController {
      */
     @ApiOperation("根据ID删除")
     @ApiImplicitParam(value = "id", name = "id", paramType = "query", required = true)
-    @HasPermission({"requestCarTicket:requestcarticket:delete"})
+    @HasPermission({"shipping-plan-manage:car-request-order:delete"})
     @DeleteMapping
     public InvokeResult<Void> deleteById(@NotBlank(message = "id不能为空！") String id) {
 

@@ -51,7 +51,7 @@ public class DelayedShipmentController extends DefaultBaseController {
      * 查询列表
      */
     @ApiOperation("查询列表")
-    @HasPermission({"delayedShipment:delayedshipment:query"})
+    @HasPermission({"shipping-plan-manage:delay-invoice:query"})
     @GetMapping("/query")
     public InvokeResult<PageResult<GetDelayedShipmentBo>> query(@Valid QueryDelayedShipmentVo vo) {
 
@@ -83,7 +83,9 @@ public class DelayedShipmentController extends DefaultBaseController {
      */
     @ApiOperation("根据ID查询")
     @ApiImplicitParam(value = "id", name = "id", paramType = "query", required = true)
-    @HasPermission({"delayedShipment:delayedshipment:query"})
+    @HasPermission({"shipping-plan-manage:delay-invoice:query",
+            "shipping-plan-manage:delay-invoice:approve",
+            "shipping-plan-manage:delay-invoice:review"})
     @GetMapping
     public InvokeResult<GetDelayedShipmentBo> get(@NotBlank(message = "id不能为空！") String id) {
 
@@ -105,7 +107,7 @@ public class DelayedShipmentController extends DefaultBaseController {
      * 新增
      */
     @ApiOperation("新增")
-    @HasPermission({"delayedShipment:delayedshipment:add"})
+    @HasPermission({"shipping-plan-manage:delay-invoice:add"})
     @PostMapping
     public InvokeResult<Void> create(@Valid @RequestBody CreateDelayedShipmentVo vo) {
 
@@ -118,7 +120,7 @@ public class DelayedShipmentController extends DefaultBaseController {
      * 修改
      */
     @ApiOperation("修改")
-    @HasPermission({"delayedShipment:delayedshipment:modify"})
+    @HasPermission({"shipping-plan-manage:delay-invoice:modify"})
     @PutMapping
     public InvokeResult<Void> update(@Valid @RequestBody UpdateDelayedShipmentVo vo) {
 
@@ -128,11 +130,24 @@ public class DelayedShipmentController extends DefaultBaseController {
     }
 
     /**
+     * 取消
+     */
+    @ApiOperation("取消")
+    @HasPermission({"shipping-plan-manage:delay-invoice:cancel"})
+    @PutMapping
+    public InvokeResult<Void> cancel(@Valid String id) {
+
+        delayedShipmentService.updateStatus(id, "CANCEL");
+
+        return InvokeResultBuilder.success();
+    }
+
+    /**
      * 根据ID删除
      */
     @ApiOperation("根据ID删除")
     @ApiImplicitParam(value = "id", name = "id", paramType = "query", required = true)
-    @HasPermission({"delayedShipment:delayedshipment:delete"})
+    @HasPermission({"shipping-plan-manage:delay-invoice:delete"})
     @DeleteMapping
     public InvokeResult<Void> deleteById(@NotBlank(message = "id不能为空！") String id) {
 

@@ -310,7 +310,7 @@ public class PurchaseOrderInfoServiceImpl extends BaseMpServiceImpl<PurchaseOrde
         if (StringUtils.isNotEmpty(data.getWorkshopId())) {
             Workshop workshop = workshopService.findById(data.getWorkshopId());
             if (workshop != null) {
-                data.setWorkshopName(workshop.getName());
+                data.setWorkshopCode(workshop.getCode());
             }
         }
         flowInstanceWrapperService.startInstance(BPM_FLAG, data.getId(), BPM_FLAG, data);