From ba78a4af86a2916ecec4a92bfef6bc4f5a4e6d8e Mon Sep 17 00:00:00 2001
From: chenlu <1320612696@qq.com>
Date: 星期四, 07 三月 2024 13:44:02 +0800
Subject: [PATCH] 排产删除、审核，修改代码格式

---
 north-glass-erp/src/main/java/com/example/erp/controller/pp/ProcessCardController.java |   40 +++++++++++++++++++++++++++-------------
 1 files changed, 27 insertions(+), 13 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 d3f27fd..cd4b6dd 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
@@ -8,6 +8,8 @@
 import com.example.erp.entity.sd.OrderGlassDetail;
 import com.example.erp.exception.ServiceException;
 import com.example.erp.service.pp.FlowCardService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
@@ -15,24 +17,29 @@
 import java.util.Map;
 
 @RestController
+@Api(value="娴佺▼鍗ontroller",tags={"娴佺▼鍗℃搷浣滄帴鍙�"})
 @RequestMapping("/processCard")
 public class ProcessCardController {
     @Autowired
     FlowCardService flowCardService;
 
     //娴佺▼鍗＄鐞嗘煡璇�
-    @PostMapping  ("/flowCard/{selectTime1}/{selectTime2}")
-    public Result DateProcess(
+    @ApiOperation("娴佺▼鍗＄鐞嗘煡璇㈡帴鍙�")
+    @PostMapping  ("/flowCard/{pageNum}/{pageSize}/{selectTime1}/{selectTime2}")
+    public Result dateProcess(
+            @PathVariable Integer pageNum,
+            @PathVariable Integer pageSize,
             @PathVariable Date selectTime1,
             @PathVariable Date selectTime2,
             @RequestBody FlowCard  flowCard){
-        return Result.seccess(flowCardService.selectProcessCard(selectTime1,selectTime2,flowCard));
+        return Result.seccess(flowCardService.selectProcessCard(pageNum,pageSize,selectTime1,selectTime2,flowCard));
         
     }
 
     //鍒嗘灦鏌ヨ
+    @ApiOperation("鍒嗘灦鏌ヨ鎺ュ彛")
     @PostMapping  ("/selectAddProcess/{selectTime1}/{selectTime2}")
-    public Result SelectAddProcess(
+    public Result selectAddProcess(
             @PathVariable Date selectTime1,
             @PathVariable Date selectTime2,
             @RequestBody FlowCard  flowCard){
@@ -41,23 +48,25 @@
     }
 
     //鍒嗘灦鏄庣粏鏌ヨ
+    @ApiOperation("鍒嗘灦鏄庣粏鏌ヨ鎺ュ彛")
     @PostMapping  ("/detailsSelect/{orderId}")
 
-    public Result DetailsSelect(
+    public Result detailsSelect(
             @PathVariable String orderId,
             @RequestBody FlowCard flowCard){
-        return Result.seccess(flowCardService.DetailsSelectSv(orderId,flowCard));
+        return Result.seccess(flowCardService.detailsSelectSv(orderId,flowCard));
 
     }
 
 
     //鍒犻櫎宸ュ崟
+    @ApiOperation("鍒犻櫎宸ュ崟鎺ュ彛")
     @PostMapping("/deleteFlowCard/{orderId}/{processId}")
     public Result deleteOrderWork(
             @PathVariable String orderId,
             @PathVariable String processId
     ){
-        if(flowCardService.DeleteFlowCardSv(orderId,processId)){
+        if(flowCardService.deleteFlowCardSv(orderId,processId)){
             return Result.seccess();
         }else {
             throw new ServiceException(Constants.Code_500,"鍒犻櫎澶辫触");
@@ -66,11 +75,12 @@
     }
 
     //淇敼鎺掔増鐘舵��
+    @ApiOperation("淇敼鎺掔増鐘舵�佹帴鍙�")
     @PostMapping("/updateLayoutStatus/{processId}")
     public Result updateLayoutStatus(
             @PathVariable String processId
     ){
-        if(flowCardService.UpdateLayoutStatusSv(processId)){
+        if(flowCardService.updateLayoutStatusSv(processId)){
             return Result.seccess();
         }else {
             throw new ServiceException(Constants.Code_500,"淇敼澶辫触");
@@ -79,19 +89,21 @@
     }
 
     //鍒嗘灦鏂板鏄庣粏鏌ヨ
+    @ApiOperation("鍒嗘灦鏄庣粏鏂板鎺ュ彛")
     @PostMapping  ("/selectNoCard/{orderId}/{productionId}")
     public Result SelectNoCard(
             @PathVariable String orderId,
             @PathVariable String productionId,
             @RequestBody FlowCard flowCard){
-        return Result.seccess(flowCardService.SelectNoCardSv(orderId,productionId,flowCard));
+        return Result.seccess(flowCardService.selectNoCardSv(orderId,productionId,flowCard));
 
     }
 
     //娣诲姞娴佺▼鍗�
+    @ApiOperation("娴佺▼鍗″垱寤烘帴鍙�")
     @PostMapping("/addFlowCard")
     public Result AddOrderWork( @RequestBody Map<String,Object> object){
-        if(flowCardService.AddFlowCardSv(object)){
+        if(flowCardService.addFlowCardSv(object)){
             return Result.seccess();
         }else {
             throw new ServiceException(Constants.Code_500,"淇濆瓨澶辫触");
@@ -99,7 +111,8 @@
         }
     }
 
-    //鏌ヨ绗竴娆℃帓鐗堟暟鎹�
+    //鏌ヨ绗竴娆℃帓浜ф暟鎹�
+    @ApiOperation("鎺掍骇鐣岄潰鍔犺浇鏌ヨ鎺ュ彛")
     @PostMapping  ("/selectLastScheduling/{selectTime1}/{selectTime2}")
     public Result selectLastScheduling(
             @PathVariable String selectTime1,
@@ -108,7 +121,8 @@
         return Result.seccess(flowCardService.selectLastScheduling(selectTime1,selectTime2,flowCard));
 
     }
-    //鏌ヨ鎺掔増鏁版嵁
+    //鏌ヨ鎺掍骇鏁版嵁
+    @ApiOperation("鎺掍骇鐐瑰嚮鎸夐挳鏌ヨ鎺ュ彛")
     @PostMapping  ("/selectScheduling/{selectTime1}/{selectTime2}/{orderId}/{processes}/{state}")
     public Result selectScheduling(
             @PathVariable String selectTime1,
@@ -117,7 +131,7 @@
             @PathVariable String processes,
             @PathVariable Integer state,
             @RequestBody FlowCard flowCard){
-        return Result.seccess(flowCardService.SelectSchedulingSv(selectTime1,selectTime2,orderId,processes,state,flowCard));
+        return Result.seccess(flowCardService.selectSchedulingSv(selectTime1,selectTime2,orderId,processes,state,flowCard));
 
     }
 

--
Gitblit v1.8.0