From 134c875a7bd10c7054774b221deef16bdaab2078 Mon Sep 17 00:00:00 2001
From: guoyuji <guoyujie@ng.com>
Date: 星期四, 11 七月 2024 10:29:12 +0800
Subject: [PATCH] Merge branch 'master' of http://bore.pub:10439/r/ERP_override

---
 north-glass-erp/src/main/java/com/example/erp/controller/pp/ProcessCardController.java |   64 +++++++++++++++++++++++++++----
 1 files changed, 55 insertions(+), 9 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 0b299a5..16256e3 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
@@ -178,22 +178,31 @@
     }
 
     @ApiOperation("鎵撳嵃娴佺▼鍗℃暟鎹煡璇㈡帴鍙�")
-    @PostMapping("/getSelectPrinting")
-    public Result getSelectPrinting(@RequestBody Map<String, Object> object) {
-        return Result.seccess(flowCardService.getSelectPrintingSv(object));
+    @PostMapping("/getSelectPrinting/{printMerge}")
+    public Result getSelectPrinting(
+            @PathVariable String printMerge,
+            @RequestBody Map<String, Object> object) {
+        return Result.seccess(flowCardService.getSelectPrintingSv(object,printMerge));
     }
 
     @ApiOperation("鎵撳嵃鏍囩鏁版嵁鏌ヨ鎺ュ彛")
-    @PostMapping("/getSelectPrintLabel")
-    public Result getSelectPrintLabel(@RequestBody Map<String, Object> object) {
-        return Result.seccess(flowCardService.getSelectPrintLabelSv(object));
+    @PostMapping("/getSelectPrintLabel/{projectNo}")
+    public Result getSelectPrintLabel(@PathVariable String projectNo) {
+        return Result.seccess(flowCardService.getSelectPrintLabelSv(projectNo));
+    }
+
+    @ApiOperation("鎵撳嵃鏍囩鏌ヨ鎺ュ彛")
+    @PostMapping("/getSelectPrintLabel1")
+    public Result getSelectPrintLabel1(@RequestBody Map<String, Object> object) {
+        return Result.seccess(flowCardService.getSelectPrintLabelSv1(object));
     }
 
     @ApiOperation("鎵撳嵃鑷畾涔夋爣绛炬暟鎹煡璇㈡帴鍙�")
-    @PostMapping("/getSelectPrintCustomLabel/{type}")
+    @PostMapping("/getSelectPrintCustomLabel/{type}/{lableType}")
     public Result getSelectPrintCustomLabel( @PathVariable String type,
+                                             @PathVariable Integer lableType,
                                              @RequestBody Map<String, Object> object) {
-        return Result.seccess(flowCardService.getSelectPrintCustomLabelSv(type,object));
+        return Result.seccess(flowCardService.getSelectPrintCustomLabelSv(type,lableType,object));
 
     }
 
@@ -207,7 +216,7 @@
         return Result.seccess(flowCardService.updateComposingSv(object));
     }
 
-    @ApiOperation("娴佺▼鍗℃墦鍗版槑缁嗘暟鎹煡璇㈡帴鍙�")
+    @ApiOperation("娴佺▼鍗℃墦鍗版槑缁嗘暟鎹帓搴忔煡璇㈡帴鍙�")
     @PostMapping("/printFlowCardDetails/{processId}/{technologyNumber}")
     public Result printFlowCardDetails(@PathVariable String processId,
                                        @PathVariable String technologyNumber,
@@ -236,4 +245,41 @@
         return Result.seccess(flowCardService.getCustomLabelDetailSv(name,form,id, flowCard));
 
     }
+
+    @ApiOperation("宸ョ▼鎵撳嵃鏌ヨ鎺ュ彛")
+    @SaCheckPermission("SelectPrintFlowCard.search")
+    @PostMapping("/selectPrintPrintProject/{selectTime1}/{selectTime2}")
+    public Result selectPrintFlowCard(
+            @PathVariable Date selectTime1,
+            @PathVariable Date selectTime2) {
+        return Result.seccess(flowCardService.selectPrintFlowCard(selectTime1, selectTime2));
+    }
+
+    @ApiOperation("淇敼鏄惁鎵撳嵃鐘舵��")
+    @PostMapping("/updatePrintState/{printState}")
+    public Result updatePrintState(
+            @PathVariable Integer printState,
+            @RequestBody Map<String, Object> object
+    ) {
+
+        return Result.seccess(flowCardService.updatePrintStateSv(printState,object));
+    }
+
+    @ApiOperation("娴佺▼鍗℃墦鍗拌鍗曟暟鎹帓搴忔煡璇㈡帴鍙�")
+    @PostMapping("/printFlowCardOrderSort/{orderId}")
+    public Result printFlowCardOrderSort(@PathVariable String orderId,
+                                       @RequestBody FlowCard flowCard) {
+        return Result.seccess(flowCardService.printFlowCardOrderSortSv(orderId, flowCard));
+    }
+
+    @ApiOperation("淇濆瓨鎵撳嵃璁㈠崟鎺掑簭鎺ュ彛")
+    @PostMapping("/printOrderSort")
+    public Result printOrderSort(@RequestBody Map<String, Object> object) {
+        if (flowCardService.printOrderSort(object)) {
+            return Result.seccess();
+        } else {
+            throw new ServiceException(Constants.Code_500, "淇濆瓨澶辫触");
+
+        }
+    }
 }

--
Gitblit v1.8.0