From 2f7a225c44a33c116fda47f61a4d27ed64a35356 Mon Sep 17 00:00:00 2001
From: guoyuji <guoyujie@ng.com>
Date: 星期四, 16 五月 2024 14:09:54 +0800
Subject: [PATCH] 修改抛出异常的问题
---
north-glass-erp/src/main/java/com/example/erp/controller/pp/ProcessCardController.java | 51 +++++++++++++++++++++++++++++++++++++++++++++++----
1 files changed, 47 insertions(+), 4 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 3247c6f..6af1dbf 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,19 +41,19 @@
//鍒嗘灦鏌ヨ
@ApiOperation("鍒嗘灦鏌ヨ鎺ュ彛")
+ @SaCheckPermission("SelectAddProcess.search")
@PostMapping ("/selectAddProcess/{selectTime1}/{selectTime2}")
public Result selectAddProcess(
@PathVariable Date selectTime1,
@PathVariable Date selectTime2,
@RequestBody FlowCard flowCard){
return Result.seccess(flowCardService.selectAddProcess(selectTime1,selectTime2,flowCard));
-
}
//鍒嗘灦鏄庣粏鏌ヨ
@ApiOperation("鍒嗘灦鏄庣粏鏌ヨ鎺ュ彛")
+ @SaCheckPermission("SplittingDetails.search")
@PostMapping ("/detailsSelect/{orderId}")
-
public Result detailsSelect(
@PathVariable String orderId,
@RequestBody FlowCard flowCard){
@@ -59,8 +62,9 @@
}
- //鍒犻櫎宸ュ崟
- @ApiOperation("鍒犻櫎宸ュ崟鎺ュ彛")
+ //鍒犻櫎娴佺▼鍗�
+ @ApiOperation("鍒犻櫎娴佺▼鍗℃帴鍙�")
+ @SaCheckPermission("SelectProcessCard.delete")
@PostMapping("/deleteFlowCard/{orderId}/{processId}")
public Result deleteOrderWork(
@PathVariable String orderId,
@@ -76,6 +80,7 @@
//淇敼鎺掔増鐘舵��
@ApiOperation("淇敼鎺掔増鐘舵�佹帴鍙�")
+ @SaCheckPermission("SelectProcessCard.review")
@PostMapping("/updateLayoutStatus/{processId}/{state}")
public Result updateLayoutStatus(
@PathVariable String processId,
@@ -102,6 +107,7 @@
//娣诲姞娴佺▼鍗�
@ApiOperation("娴佺▼鍗″垱寤烘帴鍙�")
+ @SaCheckPermission("AddProcessCard.add")
@PostMapping("/addFlowCard")
public Result AddOrderWork( @RequestBody Map<String,Object> object){
if(flowCardService.addFlowCardSv(object)){
@@ -135,5 +141,42 @@
return Result.seccess(flowCardService.selectSchedulingSv(selectTime1,selectTime2,orderId,processes,state,flowCard));
}
+ //娴佺▼鍗℃槑缁嗘煡璇�
+ @ApiOperation("娴佺▼鍗℃槑缁嗘煡璇㈡帴鍙�")
+ @SaCheckPermission("SelectDetailProcessCard.search")
+ @PostMapping ("/flowCardDetail/{processId}")
+ public Result flowCardDetail(
+ @PathVariable String processId,
+ @RequestBody FlowCard flowCard){
+ return Result.seccess(flowCardService.flowCardDetailSv(processId,flowCard));
+ }
+
+ @ApiOperation("娴佺▼鍗℃墦鍗版煡璇㈡帴鍙�")
+ @SaCheckPermission("SelectPrintFlowCard.search")
+ @PostMapping ("/selectPrintFlowCard/{selectTime1}/{selectTime2}/{orderId}/{project}")
+ public Result selectPrintFlowCard(
+ @PathVariable Date selectTime1,
+ @PathVariable Date selectTime2,
+ @PathVariable String orderId,
+ @PathVariable String project,
+ @RequestBody FlowCard flowCard){
+ return Result.seccess(flowCardService.selectPrintFlowCardSv(selectTime1,selectTime2,orderId,project,flowCard));
+ }
+
+ @ApiOperation("娴佺▼鍗℃槑缁嗘煡璇㈡帴鍙�")
+ @SaCheckPermission("PrintFlowCard.search")
+ @PostMapping ("/selectPrint/{orderId}")
+ public Result selectPrint(
+ @PathVariable String orderId,
+ @RequestBody FlowCard flowCard){
+ 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