From 81cad8df0f1b33700e7fc80f271eda7f1180efb0 Mon Sep 17 00:00:00 2001
From: guoyujie <guoyujie@ng.com>
Date: 星期二, 14 十月 2025 14:51:17 +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 |   57 +++++++++++++++++++++++++++++++++++++++++++--------------
 1 files changed, 43 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 5b933be..ecf474c 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
@@ -47,12 +47,11 @@
     //鍒嗘灦鏌ヨ
     @ApiOperation("鍒嗘灦鏌ヨ鎺ュ彛")
     @SaCheckPermission("selectAddProcess.search")
-    @PostMapping("/selectAddProcess/{selectTime1}/{selectTime2}")
+    @PostMapping("/selectAddProcess/{selectDate}")
     public Result selectAddProcess(
-            @PathVariable Date selectTime1,
-            @PathVariable Date selectTime2,
+            @PathVariable List<String> selectDate,
             @RequestBody FlowCard flowCard) {
-        return Result.seccess(flowCardService.selectAddProcess(selectTime1, selectTime2, flowCard));
+        return Result.seccess(flowCardService.selectAddProcess(selectDate, flowCard));
     }
 
     //鍒嗘灦鏄庣粏鏌ヨ
@@ -176,16 +175,15 @@
 
     @ApiOperation("娴佺▼鍗℃墦鍗版煡璇㈡帴鍙�")
     @SaCheckPermission("selectPrintFlowCard.search")
-    @PostMapping("/selectPrintFlowCard/{selectTime1}/{selectTime2}/{orderId}/{project}/{userId}/{state}")
+    @PostMapping("/selectPrintFlowCard/{selectDate}/{orderId}/{project}/{userId}/{state}")
     public Result selectPrintFlowCard(
-            @PathVariable Date selectTime1,
-            @PathVariable Date selectTime2,
+            @PathVariable List<String> selectDate,
             @PathVariable String orderId,
             @PathVariable String project,
             @PathVariable String userId,
             @PathVariable Integer state,
             @RequestBody FlowCard flowCard) {
-        return Result.seccess(flowCardService.selectPrintFlowCardSv(selectTime1, selectTime2, orderId, project,userId,state, flowCard));
+        return Result.seccess(flowCardService.selectPrintFlowCardSv(selectDate, orderId, project,userId,state, flowCard));
     }
 
     @ApiOperation("娴佺▼鍗℃槑缁嗘煡璇㈡帴鍙�")
@@ -306,11 +304,10 @@
 
     @ApiOperation("宸ョ▼鎵撳嵃鏌ヨ鎺ュ彛")
     @SaCheckPermission("selectPrintFlowCard.search")
-    @PostMapping("/selectPrintPrintProject/{selectTime1}/{selectTime2}")
+    @PostMapping("/selectPrintPrintProject/{selectDate}")
     public Result selectPrintFlowCard(
-            @PathVariable Date selectTime1,
-            @PathVariable Date selectTime2) {
-        return Result.seccess(flowCardService.selectPrintFlowCard(selectTime1, selectTime2));
+            @PathVariable List<String> selectDate) {
+        return Result.seccess(flowCardService.selectPrintFlowCard(selectDate));
     }
 
     @ApiOperation("淇敼鏄惁鎵撳嵃鐘舵��")
@@ -349,6 +346,16 @@
             @PathVariable String mergeTechnologyNumber,
             @RequestBody Map<String, Object> object) {
         return Result.seccess(flowCardService.getSelectPrintingRefundSv(object,printMerge,printLike,mergeTechnologyNumber));
+    }
+
+    @ApiOperation("鍚堝苟鎵撳嵃娴佺▼鍗¤ˉ鐗囨暟鎹煡璇㈡帴鍙�")
+    @PostMapping("/getSelectPrintingConsolidated/{printMerge}/{printLike}/{mergeTechnologyNumber}")
+    public Result getSelectPrintingConsolidated(
+            @PathVariable String printMerge,
+            @PathVariable String printLike,
+            @PathVariable String mergeTechnologyNumber,
+            @RequestBody Map<String, Object> object) {
+        return Result.seccess(flowCardService.getSelectPrintingConsolidatedSv(object,printMerge,printLike,mergeTechnologyNumber));
     }
 
     @ApiOperation("鎵撳嵃娴佺▼鍗¤繑宸ユ暟鎹煡璇㈡帴鍙�")
@@ -440,16 +447,17 @@
     }
 
     @ApiOperation("淇敼宸ヨ壓娴佺▼")
-    @PostMapping("/updateProcess/{processId}/{technologyNumber}/{orderId}/{process}")
+    @PostMapping("/updateProcess/{processId}/{orderNumber}/{technologyNumber}/{orderId}/{process}")
     public Result updateProcess(
             @PathVariable String processId,
+            @PathVariable String orderNumber,
             @PathVariable String technologyNumber,
             @PathVariable String orderId,
             @PathVariable String process,
             @RequestBody Map<String, Object> object
     ) {
 
-        return Result.seccess(flowCardService.updateProcessSv(processId,technologyNumber,orderId,process,object));
+        return Result.seccess(flowCardService.updateProcessSv(processId,orderNumber,technologyNumber,orderId,process,object));
     }
 
     @ApiOperation("宸ョ▼鎵撳嵃鏍囩娆℃暟淇敼")
@@ -492,4 +500,25 @@
         //鍙傛暟锛氱浉搴旂殑鏁版嵁锛屽疄浣撶被淇℃伅锛岀浉搴旂殑鏂规硶锛堟暟鎹幏鍙栵級锛岀敓鎴愮殑excel鍚嶅瓧
         DownExcel.download(response, FlowCardDTO.class, flowCardService.exportDateProcessSv(dates), "DateProcess");
     }
+
+    @ApiOperation("淇敼鐢熶骇缁堟鏁伴噺")
+    @PostMapping("/updateTermination/{processId}/{orderNumber}/{value}")
+    public Result updateTermination(
+            @PathVariable String processId,
+            @PathVariable Integer orderNumber,
+            @PathVariable Integer value
+    ) {
+
+        return Result.seccess(flowCardService.updateTerminationSv(processId,orderNumber,value));
+    }
+
+    @ApiOperation("鏌ヨ鐢ㄤ簬淇敼鐢熶骇缁堟鏁伴噺鐨勫畬宸ユ暟閲�")
+    @PostMapping("/selectCompleted/{processId}/{orderNumber}/{process}")
+    public Result selectCompleted(
+            @PathVariable String processId,
+            @PathVariable Integer orderNumber,
+            @PathVariable String process) {
+        return Result.seccess(flowCardService.selectCompletedSv(processId, orderNumber,process));
+
+    }
 }

--
Gitblit v1.8.0