From f4f50d9377ecbaddec6cbb9f0b73bfc0ad308609 Mon Sep 17 00:00:00 2001
From: starrysky <838252223@qq.com>
Date: Mon, 24 Feb 2020 22:58:48 +0800
Subject: [PATCH] =?UTF-8?q?=E9=87=87=E8=B4=AD=E5=8D=95=E6=8D=AE=E6=9D=83?=
 =?UTF-8?q?=E9=99=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../wms/purchase/rest/ConsumablesPurchaseOrderController.java | 4 +++-
 .../wms/purchase/rest/ProductPurchaseOrderController.java     | 4 +++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/wms/purchase/rest/ConsumablesPurchaseOrderController.java b/eladmin-system/src/main/java/me/zhengjie/modules/wms/purchase/rest/ConsumablesPurchaseOrderController.java
index 84f8a076..d28002a7 100644
--- a/eladmin-system/src/main/java/me/zhengjie/modules/wms/purchase/rest/ConsumablesPurchaseOrderController.java
+++ b/eladmin-system/src/main/java/me/zhengjie/modules/wms/purchase/rest/ConsumablesPurchaseOrderController.java
@@ -78,7 +78,7 @@ public class ConsumablesPurchaseOrderController {
     @Log("审核耗材采购单")
     @ApiOperation(value = "审核耗材采购单")
     @PostMapping(value = "/auditConsumablesPurchaseOrder")
-    @PreAuthorize("hasAnyRole('ADMIN','PRODUCTPURCHASEORDER_ALL','PRODUCTPURCHASEORDER_DELETE')")
+    @PreAuthorize("hasAnyRole('ADMIN','PRODUCTPURCHASEORDER_ALL','PRODUCTPURCHASEORDER_AUDIT')")
     public ResponseEntity auditConsumablesPurchaseOrder(@Validated @RequestBody AuditConsumablesPurchaseOrderRequest auditConsumablesPurchaseOrderRequest){
         consumablesPurchaseOrderService.auditConsumablesPurchaseOrder(auditConsumablesPurchaseOrderRequest);
         return new ResponseEntity(HttpStatus.OK);
@@ -86,6 +86,7 @@ public class ConsumablesPurchaseOrderController {
 
     @Log("初始化耗材采购单编号")
     @GetMapping(value = "/initConsumablesPurchaseOrderCode")
+    @PreAuthorize("hasAnyRole('ADMIN','PRODUCTPURCHASEORDER_ALL')")
     public ResponseEntity initConsumablesPurchaseOrderCode(){
         DateTimeFormatter fmt = DateTimeFormatter.ofPattern("yyyyMMddHHmmssSSS");//设置日期格式
         String supplierCode = "CP"+ LocalDateTime.now().format(fmt);
@@ -95,6 +96,7 @@ public class ConsumablesPurchaseOrderController {
     @Log("查看耗材采购详情")
     @ApiOperation(value = "查看产品采购详情")
     @GetMapping(value = "/consumablesPurchaseOrder/{id}")
+    @PreAuthorize("hasAnyRole('ADMIN','PRODUCTPURCHASEORDER_ALL','PRODUCTPURCHASEORDER_DETAIL_BY_I')")
     public ResponseEntity getOutSourceInspectionCertificate(@PathVariable Long id){
         return new ResponseEntity(consumablesPurchaseOrderService.findById(id), HttpStatus.OK);
     }
diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/wms/purchase/rest/ProductPurchaseOrderController.java b/eladmin-system/src/main/java/me/zhengjie/modules/wms/purchase/rest/ProductPurchaseOrderController.java
index b5ae34f2..bd3b9435 100644
--- a/eladmin-system/src/main/java/me/zhengjie/modules/wms/purchase/rest/ProductPurchaseOrderController.java
+++ b/eladmin-system/src/main/java/me/zhengjie/modules/wms/purchase/rest/ProductPurchaseOrderController.java
@@ -70,7 +70,7 @@ public class ProductPurchaseOrderController {
     @Log("审核产品采购单")
     @ApiOperation(value = "审核产品采购单")
     @PostMapping(value = "/auditProductPurchaseOrder")
-    @PreAuthorize("hasAnyRole('ADMIN','PRODUCTPURCHASEORDER_ALL','PRODUCTPURCHASEORDER_DELETE')")
+    @PreAuthorize("hasAnyRole('ADMIN','PRODUCTPURCHASEORDER_ALL','PRODUCTPURCHASEORDER_AUDIT')")
     public ResponseEntity auditProductPurchaseOrder(@Validated @RequestBody AuditProductPurchaseOrderRequest auditProductPurchaseOrderRequest){
         productPurchaseOrderService.auditProductPurchaseOrder(auditProductPurchaseOrderRequest);
         return new ResponseEntity(HttpStatus.OK);
@@ -78,6 +78,7 @@ public class ProductPurchaseOrderController {
 
     @Log("初始化产品采购单编号")
     @GetMapping(value = "/initProductPurchaseOrderCode")
+    @PreAuthorize("hasAnyRole('ADMIN','PRODUCTPURCHASEORDER_ALL')")
     public ResponseEntity initProductPurchaseOrderCode(){
         DateTimeFormatter fmt = DateTimeFormatter.ofPattern("yyyyMMddHHmmssSSS");//设置日期格式
         String supplierCode = "PP"+ LocalDateTime.now().format(fmt);
@@ -87,6 +88,7 @@ public class ProductPurchaseOrderController {
     @Log("查看产品采购详情")
     @ApiOperation(value = "查看产品采购详情")
     @GetMapping(value = "/productPurchaseOrder/{id}")
+    @PreAuthorize("hasAnyRole('ADMIN','PRODUCTPURCHASEORDER_ALL','PRODUCTPURCHASEORDER_DETAIL_BY_ID')")
     public ResponseEntity getOutSourceInspectionCertificate(@PathVariable Long id){
         return new ResponseEntity(productPurchaseOrderService.findById(id), HttpStatus.OK);
     }