From 15e254a574f0c8bc2f7054d9d09c89f95afdd6bb Mon Sep 17 00:00:00 2001
From: guoyuji <guoyujie@ng.com>
Date: 星期三, 10 七月 2024 12:22:58 +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 |   28 ++++++++++++++++++++++++++++
 1 files changed, 28 insertions(+), 0 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 1a66b50..5680d66 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
@@ -252,4 +252,32 @@
             @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