From 2f640b1038fa331954f78ed1f4317212cf5bb34d Mon Sep 17 00:00:00 2001
From: chenlu <1320612696@qq.com>
Date: 星期五, 07 六月 2024 16:56:06 +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 | 74 +++++++++++++++++++++++++++++++-----
1 files changed, 63 insertions(+), 11 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 1a594be..01b2fb1 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,23 +62,26 @@
}
- //鍒犻櫎宸ュ崟
- @ApiOperation("鍒犻櫎宸ュ崟鎺ュ彛")
+ //鍒犻櫎娴佺▼鍗�
+ @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,
@@ -102,6 +108,7 @@
//娣诲姞娴佺▼鍗�
@ApiOperation("娴佺▼鍗″垱寤烘帴鍙�")
+ @SaCheckPermission("AddProcessCard.add")
@PostMapping("/addFlowCard")
public Result AddOrderWork( @RequestBody Map<String,Object> object){
if(flowCardService.addFlowCardSv(object)){
@@ -135,8 +142,9 @@
return Result.seccess(flowCardService.selectSchedulingSv(selectTime1,selectTime2,orderId,processes,state,flowCard));
}
- //鏌ヨ鎺掍骇鏁版嵁
+ //娴佺▼鍗℃槑缁嗘煡璇�
@ApiOperation("娴佺▼鍗℃槑缁嗘煡璇㈡帴鍙�")
+ @SaCheckPermission("SelectDetailProcessCard.search")
@PostMapping ("/flowCardDetail/{processId}")
public Result flowCardDetail(
@PathVariable String processId,
@@ -144,4 +152,48 @@
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));
+ }
+
+ @ApiOperation("鎵撳嵃鏍囩鏁版嵁鏌ヨ鎺ュ彛")
+ @PostMapping("/getSelectPrintLabel")
+ public Result getSelectPrintLabel( @RequestBody Map<String,Object> object){
+ return Result.seccess(flowCardService.getSelectPrintLabelSv(object));
+ }
+
+ @ApiOperation("澶嶉�夋淇敼鎺掔増鐘舵��")
+ @SaCheckPermission("SelectProcessCard.review")
+ @PostMapping("/updateComposing")
+ public Result updateComposing(
+ @RequestBody Map<String,Object> object
+ ){
+
+ return Result.seccess(flowCardService.updateComposingSv(object));
+ }
}
--
Gitblit v1.8.0