From ef5a518c3e2c1fe41aa60f56ca31ddafa0cb1561 Mon Sep 17 00:00:00 2001
From: guoyuji <guoyujie@ng.com>
Date: 星期四, 23 五月 2024 08:32:36 +0800
Subject: [PATCH] 添加产品汇总报表

---
 north-glass-erp/src/main/java/com/example/erp/controller/pp/ProcessCardController.java |   31 ++++++++++++++++++++++++-------
 1 files changed, 24 insertions(+), 7 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 8c319cc..0360acd 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
@@ -1,7 +1,9 @@
 package com.example.erp.controller.pp;
 
+import cn.dev33.satoken.annotation.SaCheckPermission;
 import com.example.erp.common.Constants;
 import com.example.erp.entity.pp.FlowCard;
+import com.example.erp.entity.sd.DeliveryDetail;
 import com.example.erp.entity.sd.Order;
 import com.example.erp.common.Result;
 import com.example.erp.entity.sd.OrderDetail;
@@ -25,6 +27,7 @@
 
     //娴佺▼鍗$鐞嗘煡璇�
     @ApiOperation("娴佺▼鍗$鐞嗘煡璇㈡帴鍙�")
+    @SaCheckPermission("SelectProcessCard.search")
     @PostMapping  ("/flowCard/{pageNum}/{pageSize}/{selectTime1}/{selectTime2}")
     public Result dateProcess(
             @PathVariable Integer pageNum,
@@ -38,6 +41,7 @@
 
     //鍒嗘灦鏌ヨ
     @ApiOperation("鍒嗘灦鏌ヨ鎺ュ彛")
+    @SaCheckPermission("SelectAddProcess.search")
     @PostMapping  ("/selectAddProcess/{selectTime1}/{selectTime2}")
     public Result selectAddProcess(
             @PathVariable Date selectTime1,
@@ -48,8 +52,8 @@
 
     //鍒嗘灦鏄庣粏鏌ヨ
     @ApiOperation("鍒嗘灦鏄庣粏鏌ヨ鎺ュ彛")
+    @SaCheckPermission("SplittingDetails.search")
     @PostMapping  ("/detailsSelect/{orderId}")
-
     public Result detailsSelect(
             @PathVariable String orderId,
             @RequestBody FlowCard flowCard){
@@ -60,21 +64,24 @@
 
     //鍒犻櫎娴佺▼鍗�
     @ApiOperation("鍒犻櫎娴佺▼鍗℃帴鍙�")
+    @SaCheckPermission("SelectProcessCard.delete")
     @PostMapping("/deleteFlowCard/{orderId}/{processId}")
     public Result deleteOrderWork(
             @PathVariable String orderId,
             @PathVariable String processId
     ){
-        if(flowCardService.deleteFlowCardSv(orderId,processId)){
-            return Result.seccess();
-        }else {
-            throw new ServiceException(Constants.Code_500,"鍒犻櫎澶辫触,璇锋鏌ユ槸鍚﹀凡鎶ュ伐");
-
-        }
+//        if(flowCardService.deleteFlowCardSv(orderId,processId)){
+//            return Result.seccess();
+//        }else {
+//            throw new ServiceException(Constants.Code_500,"鍒犻櫎澶辫触,璇锋鏌ユ槸鍚﹀凡鎶ュ伐");
+//
+//        }
+        return  Result.seccess(flowCardService.deleteFlowCardSv(orderId,processId));
     }
 
     //淇敼鎺掔増鐘舵��
     @ApiOperation("淇敼鎺掔増鐘舵�佹帴鍙�")
+    @SaCheckPermission("SelectProcessCard.review")
     @PostMapping("/updateLayoutStatus/{processId}/{state}")
     public Result updateLayoutStatus(
             @PathVariable String processId,
@@ -101,6 +108,7 @@
 
     //娣诲姞娴佺▼鍗�
     @ApiOperation("娴佺▼鍗″垱寤烘帴鍙�")
+    @SaCheckPermission("AddProcessCard.add")
     @PostMapping("/addFlowCard")
     public Result AddOrderWork( @RequestBody Map<String,Object> object){
         if(flowCardService.addFlowCardSv(object)){
@@ -136,6 +144,7 @@
     }
     //娴佺▼鍗℃槑缁嗘煡璇�
     @ApiOperation("娴佺▼鍗℃槑缁嗘煡璇㈡帴鍙�")
+    @SaCheckPermission("SelectDetailProcessCard.search")
     @PostMapping  ("/flowCardDetail/{processId}")
     public Result flowCardDetail(
             @PathVariable String processId,
@@ -145,6 +154,7 @@
     }
 
     @ApiOperation("娴佺▼鍗℃墦鍗版煡璇㈡帴鍙�")
+    @SaCheckPermission("SelectPrintFlowCard.search")
     @PostMapping  ("/selectPrintFlowCard/{selectTime1}/{selectTime2}/{orderId}/{project}")
     public Result selectPrintFlowCard(
             @PathVariable Date selectTime1,
@@ -156,6 +166,7 @@
     }
 
     @ApiOperation("娴佺▼鍗℃槑缁嗘煡璇㈡帴鍙�")
+    @SaCheckPermission("PrintFlowCard.search")
     @PostMapping  ("/selectPrint/{orderId}")
     public Result selectPrint(
             @PathVariable String orderId,
@@ -163,4 +174,10 @@
         return Result.seccess(flowCardService.selectPrintSv(orderId,flowCard));
 
     }
+
+    @ApiOperation("鎵撳嵃娴佺▼鍗℃暟鎹煡璇㈡帴鍙�")
+    @PostMapping("/getSelectPrinting")
+    public Result getSelectPrinting( @RequestBody Map<String,Object> object){
+        return Result.seccess(flowCardService.getSelectPrintingSv(object));
+    }
 }

--
Gitblit v1.8.0