From a49686ae25f3fc71306a1fd9ed117e8ca89da65b Mon Sep 17 00:00:00 2001
From: guoyuji <guoyujie@ng.com>
Date: 星期五, 27 九月 2024 08:42:18 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10101/r/ERP_override

---
 north-glass-erp/src/main/java/com/example/erp/controller/pp/ProcessCardController.java |   35 +++++++++++++++++++++--------------
 1 files changed, 21 insertions(+), 14 deletions(-)

diff --git a/north-glass-erp/src/main/java/com/example/erp/controller/pp/ProcessCardController.java b/north-glass-erp/src/main/java/com/example/erp/controller/pp/ProcessCardController.java
index cd54af1..06e8deb 100644
--- a/north-glass-erp/src/main/java/com/example/erp/controller/pp/ProcessCardController.java
+++ b/north-glass-erp/src/main/java/com/example/erp/controller/pp/ProcessCardController.java
@@ -27,7 +27,7 @@
 
     //娴佺▼鍗＄鐞嗘煡璇�
     @ApiOperation("娴佺▼鍗＄鐞嗘煡璇㈡帴鍙�")
-    @SaCheckPermission("SelectProcessCard.search")
+    @SaCheckPermission("selectProcessCard.search")
     @PostMapping("/flowCard/{pageNum}/{pageSize}/{selectTime1}/{selectTime2}")
     public Result dateProcess(
             @PathVariable Integer pageNum,
@@ -41,7 +41,7 @@
 
     //鍒嗘灦鏌ヨ
     @ApiOperation("鍒嗘灦鏌ヨ鎺ュ彛")
-    @SaCheckPermission("SelectAddProcess.search")
+    @SaCheckPermission("selectAddProcess.search")
     @PostMapping("/selectAddProcess/{selectTime1}/{selectTime2}")
     public Result selectAddProcess(
             @PathVariable Date selectTime1,
@@ -52,7 +52,7 @@
 
     //鍒嗘灦鏄庣粏鏌ヨ
     @ApiOperation("鍒嗘灦鏄庣粏鏌ヨ鎺ュ彛")
-    @SaCheckPermission("SplittingDetails.search")
+    @SaCheckPermission("splittingDetails.search")
     @PostMapping("/detailsSelect/{orderId}")
     public Result detailsSelect(
             @PathVariable String orderId,
@@ -64,7 +64,7 @@
 
     //鍒犻櫎娴佺▼鍗�
     @ApiOperation("鍒犻櫎娴佺▼鍗℃帴鍙�")
-    @SaCheckPermission("SelectProcessCard.delete")
+    @SaCheckPermission("selectProcessCard.delete")
     @PostMapping("/deleteFlowCard/{orderId}/{processId}/{userId}/{userName}")
     public Result deleteOrderWork(
             @PathVariable String orderId,
@@ -83,7 +83,7 @@
 
     //淇敼鎺掔増鐘舵��
     @ApiOperation("淇敼鎺掔増鐘舵�佹帴鍙�")
-    @SaCheckPermission("SelectProcessCard.review")
+    @SaCheckPermission("selectProcessCard.review")
     @PostMapping("/updateLayoutStatus/{processId}/{state}")
     public Result updateLayoutStatus(
             @PathVariable String processId,
@@ -110,7 +110,7 @@
 
     //娣诲姞娴佺▼鍗�
     @ApiOperation("娴佺▼鍗″垱寤烘帴鍙�")
-    @SaCheckPermission("AddProcessCard.add")
+    @SaCheckPermission("addProcessCard.add")
     @PostMapping("/addFlowCard")
     public Result AddOrderWork(@RequestBody Map<String, Object> object) {
         if (flowCardService.addFlowCardSv(object)) {
@@ -148,7 +148,7 @@
 
     //娴佺▼鍗℃槑缁嗘煡璇�
     @ApiOperation("娴佺▼鍗℃槑缁嗘煡璇㈡帴鍙�")
-    @SaCheckPermission("SelectDetailProcessCard.search")
+    @SaCheckPermission("selectDetailProcessCard.search")
     @PostMapping("/flowCardDetail/{processId}")
     public Result flowCardDetail(
             @PathVariable String processId,
@@ -158,7 +158,7 @@
     }
 
     @ApiOperation("娴佺▼鍗℃墦鍗版煡璇㈡帴鍙�")
-    @SaCheckPermission("SelectPrintFlowCard.search")
+    @SaCheckPermission("selectPrintFlowCard.search")
     @PostMapping("/selectPrintFlowCard/{selectTime1}/{selectTime2}/{orderId}/{project}/{userId}")
     public Result selectPrintFlowCard(
             @PathVariable Date selectTime1,
@@ -171,7 +171,7 @@
     }
 
     @ApiOperation("娴佺▼鍗℃槑缁嗘煡璇㈡帴鍙�")
-    @SaCheckPermission("PrintFlowCard.search")
+    @SaCheckPermission("printFlowCard.search")
     @PostMapping("/selectPrint/{inquiryMode}")
     public Result selectPrint(
             @PathVariable String inquiryMode,
@@ -201,6 +201,12 @@
         return Result.seccess(flowCardService.getSelectPrintLabelSv1(object));
     }
 
+    @ApiOperation("鎵撳嵃鏍囩鏄庣粏鏌ヨ鎺ュ彛")
+    @PostMapping("/getSelectPrintLabelDetails")
+    public Result getSelectPrintLabelDetails(@RequestBody Map<String, Object> object) {
+        return Result.seccess(flowCardService.getSelectPrintLabelDetails(object));
+    }
+
     @ApiOperation("鎵撳嵃鑷畾涔夋爣绛炬暟鎹煡璇㈡帴鍙�")
     @PostMapping("/getSelectPrintCustomLabel/{type}/{lableType}")
     public Result getSelectPrintCustomLabel( @PathVariable String type,
@@ -211,7 +217,7 @@
     }
 
     @ApiOperation("澶嶉�夋淇敼鎺掔増鐘舵��")
-    @SaCheckPermission("SelectProcessCard.review")
+    @SaCheckPermission("selectProcessCard.review")
     @PostMapping("/updateComposing")
     public Result updateComposing(
             @RequestBody Map<String, Object> object
@@ -252,7 +258,7 @@
     }
 
     @ApiOperation("宸ョ▼鎵撳嵃鏌ヨ鎺ュ彛")
-    @SaCheckPermission("SelectPrintFlowCard.search")
+    @SaCheckPermission("selectPrintFlowCard.search")
     @PostMapping("/selectPrintPrintProject/{selectTime1}/{selectTime2}")
     public Result selectPrintFlowCard(
             @PathVariable Date selectTime1,
@@ -308,11 +314,12 @@
     }
 
     @ApiOperation("娴佺▼鍗℃槑缁嗘寜缂栧彿鏌ヨ鎺ュ彛")
-    @PostMapping("/selectPrintDetails/{inquiryMode}")
+    @PostMapping("/selectPrintDetails/{inquiryMode}/{type}")
     public Result selectPrintDetails(
             @PathVariable String inquiryMode,
+            @PathVariable Integer type,
             @RequestBody Map<String, Object> object) {
-        return Result.seccess(flowCardService.selectPrintDetailsSv(object,inquiryMode));
+        return Result.seccess(flowCardService.selectPrintDetailsSv(object,inquiryMode,type));
 
     }
 
@@ -344,7 +351,7 @@
     }
 
     @ApiOperation("澶嶉�夋鍒犻櫎娴佺▼鍗�")
-    @SaCheckPermission("SelectProcessCard.delete")
+    @SaCheckPermission("selectProcessCard.delete")
     @PostMapping("/checkboxDelete")
     public Result checkboxDelete(
             @RequestBody Map<String, Object> object

--
Gitblit v1.8.0