From 02609fcedd8fb55383da0a1f823a8cba913510e7 Mon Sep 17 00:00:00 2001
From: guoyujie <guoyujie@ng.com>
Date: 星期一, 26 五月 2025 09:03:10 +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 | 151 +++++++++++++++++++++++++++++++++++++++++---------
1 files changed, 124 insertions(+), 27 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 3cda9d2..8ece1ca 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
@@ -16,6 +16,7 @@
import org.springframework.web.bind.annotation.*;
import java.sql.Date;
+import java.util.List;
import java.util.Map;
@RestController
@@ -27,21 +28,20 @@
//娴佺▼鍗＄鐞嗘煡璇�
@ApiOperation("娴佺▼鍗＄鐞嗘煡璇㈡帴鍙�")
- @SaCheckPermission("SelectProcessCard.search")
- @PostMapping("/flowCard/{pageNum}/{pageSize}/{selectTime1}/{selectTime2}")
+ @SaCheckPermission("selectProcessCard.search")
+ @PostMapping("/flowCard/{pageNum}/{pageSize}/{selectDate}")
public Result dateProcess(
@PathVariable Integer pageNum,
@PathVariable Integer pageSize,
- @PathVariable Date selectTime1,
- @PathVariable Date selectTime2,
+ @PathVariable List<String> selectDate,
@RequestBody FlowCard flowCard) {
- return Result.seccess(flowCardService.selectProcessCard(pageNum, pageSize, selectTime1, selectTime2, flowCard));
+ return Result.seccess(flowCardService.selectProcessCard(pageNum, pageSize,selectDate, flowCard));
}
//鍒嗘灦鏌ヨ
@ApiOperation("鍒嗘灦鏌ヨ鎺ュ彛")
- @SaCheckPermission("SelectAddProcess.search")
+ @SaCheckPermission("selectAddProcess.search")
@PostMapping("/selectAddProcess/{selectTime1}/{selectTime2}")
public Result selectAddProcess(
@PathVariable Date selectTime1,
@@ -52,7 +52,7 @@
//鍒嗘灦鏄庣粏鏌ヨ
@ApiOperation("鍒嗘灦鏄庣粏鏌ヨ鎺ュ彛")
- @SaCheckPermission("SplittingDetails.search")
+ @SaCheckPermission("splittingDetails.search")
@PostMapping("/detailsSelect/{orderId}")
public Result detailsSelect(
@PathVariable String orderId,
@@ -64,7 +64,7 @@
//鍒犻櫎娴佺▼鍗�
@ApiOperation("鍒犻櫎娴佺▼鍗℃帴鍙�")
- @SaCheckPermission("SelectProcessCard.delete")
+ @SaCheckPermission("selectProcessCard.delete")
@PostMapping("/deleteFlowCard/{orderId}/{processId}/{userId}/{userName}")
public Result deleteOrderWork(
@PathVariable String orderId,
@@ -83,7 +83,7 @@
//淇敼鎺掔増鐘舵��
@ApiOperation("淇敼鎺掔増鐘舵�佹帴鍙�")
- @SaCheckPermission("SelectProcessCard.review")
+ @SaCheckPermission("selectProcessCard.review")
@PostMapping("/updateLayoutStatus/{processId}/{state}")
public Result updateLayoutStatus(
@PathVariable String processId,
@@ -110,10 +110,10 @@
//娣诲姞娴佺▼鍗�
@ApiOperation("娴佺▼鍗″垱寤烘帴鍙�")
- @SaCheckPermission("AddProcessCard.add")
- @PostMapping("/addFlowCard")
- public Result AddOrderWork(@RequestBody Map<String, Object> object) {
- if (flowCardService.addFlowCardSv(object)) {
+ @SaCheckPermission("addProcessCard.add")
+ @PostMapping("/addFlowCard/{orderId}")
+ public Result AddOrderWork(@PathVariable String orderId,@RequestBody Map<String, Object> object) {
+ if (flowCardService.addFlowCardSv(orderId,object)) {
return Result.seccess();
} else {
throw new ServiceException(Constants.Code_500, "淇濆瓨澶辫触");
@@ -148,7 +148,7 @@
//娴佺▼鍗℃槑缁嗘煡璇�
@ApiOperation("娴佺▼鍗℃槑缁嗘煡璇㈡帴鍙�")
- @SaCheckPermission("SelectDetailProcessCard.search")
+ @SaCheckPermission("selectDetailProcessCard.search")
@PostMapping("/flowCardDetail/{processId}")
public Result flowCardDetail(
@PathVariable String processId,
@@ -158,20 +158,21 @@
}
@ApiOperation("娴佺▼鍗℃墦鍗版煡璇㈡帴鍙�")
- @SaCheckPermission("SelectPrintFlowCard.search")
- @PostMapping("/selectPrintFlowCard/{selectTime1}/{selectTime2}/{orderId}/{project}/{userId}")
+ @SaCheckPermission("selectPrintFlowCard.search")
+ @PostMapping("/selectPrintFlowCard/{selectTime1}/{selectTime2}/{orderId}/{project}/{userId}/{state}")
public Result selectPrintFlowCard(
@PathVariable Date selectTime1,
@PathVariable Date selectTime2,
@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, flowCard));
+ return Result.seccess(flowCardService.selectPrintFlowCardSv(selectTime1, selectTime2, orderId, project,userId,state, flowCard));
}
@ApiOperation("娴佺▼鍗℃槑缁嗘煡璇㈡帴鍙�")
- @SaCheckPermission("PrintFlowCard.search")
+ @SaCheckPermission("printFlowCard.search")
@PostMapping("/selectPrint/{inquiryMode}")
public Result selectPrint(
@PathVariable String inquiryMode,
@@ -181,12 +182,20 @@
}
@ApiOperation("鎵撳嵃娴佺▼鍗℃暟鎹煡璇㈡帴鍙�")
- @PostMapping("/getSelectPrinting/{printMerge}/{printLike}")
+ @PostMapping("/getSelectPrinting/{printMerge}/{printLike}/{merge}")
public Result getSelectPrinting(
@PathVariable String printMerge,
@PathVariable String printLike,
+ @PathVariable String merge,
@RequestBody Map<String, Object> object) {
- return Result.seccess(flowCardService.getSelectPrintingSv(object,printMerge,printLike));
+ return Result.seccess(flowCardService.getSelectPrintingSv(object,printMerge,printLike,merge));
+ }
+
+ @ApiOperation("宸ョ▼鎵撳嵃娴佺▼鍗℃暟鎹煡璇㈡帴鍙�")
+ @PostMapping("/getSelectPrintProject/{printProject}/{merge}")
+ public Result getSelectPrintProject(
+ @PathVariable String printProject,@PathVariable String merge) {
+ return Result.seccess(flowCardService.getSelectPrintProject(printProject,merge));
}
@ApiOperation("鎵撳嵃鏍囩鏁版嵁鏌ヨ鎺ュ彛")
@@ -207,7 +216,7 @@
return Result.seccess(flowCardService.getSelectPrintLabelDetails(object));
}
- @ApiOperation("鎵撳嵃鑷畾涔夋爣绛炬暟鎹煡璇㈡帴鍙�")
+ @ApiOperation("鎵撳嵃鑷畾涔夋爣绛炬暟鎹煡璇㈡帴鍙ｆ槑缁�")
@PostMapping("/getSelectPrintCustomLabel/{type}/{lableType}")
public Result getSelectPrintCustomLabel( @PathVariable String type,
@PathVariable Integer lableType,
@@ -216,8 +225,17 @@
}
+ @ApiOperation("鎵撳嵃鑷畾涔夋爣绛炬暟鎹煡璇㈡帴鍙�")
+ @PostMapping("/getSelectPrintCustomLabel2/{type}/{lableType}")
+ public Result getSelectPrintCustomLabel2( @PathVariable String type,
+ @PathVariable Integer lableType,
+ @RequestBody Map<String, Object> object) {
+ return Result.seccess(flowCardService.getSelectPrintCustomLabelSv2(type,lableType,object));
+
+ }
+
@ApiOperation("澶嶉�夋淇敼鎺掔増鐘舵��")
- @SaCheckPermission("SelectProcessCard.review")
+ @SaCheckPermission("selectProcessCard.review")
@PostMapping("/updateComposing")
public Result updateComposing(
@RequestBody Map<String, Object> object
@@ -226,6 +244,15 @@
return Result.seccess(flowCardService.updateComposingSv(object));
}
+ @ApiOperation("澶嶉�夋鎾ら攢鍙帓鐗堢姸鎬�")
+ @SaCheckPermission("selectProcessCard.review")
+ @PostMapping("/revokeComposing")
+ public Result revokeComposing(
+ @RequestBody Map<String, Object> object
+ ) {
+
+ return Result.seccess(flowCardService.revokeComposingSv(object));
+ }
@ApiOperation("娴佺▼鍗℃墦鍗版槑缁嗘暟鎹帓搴忔煡璇㈡帴鍙�")
@PostMapping("/printFlowCardDetails/{processId}/{technologyNumber}/{process}")
public Result printFlowCardDetails(@PathVariable String processId,
@@ -258,7 +285,7 @@
}
@ApiOperation("宸ョ▼鎵撳嵃鏌ヨ鎺ュ彛")
- @SaCheckPermission("SelectPrintFlowCard.search")
+ @SaCheckPermission("selectPrintFlowCard.search")
@PostMapping("/selectPrintPrintProject/{selectTime1}/{selectTime2}")
public Result selectPrintFlowCard(
@PathVariable Date selectTime1,
@@ -332,6 +359,14 @@
}
+ @ApiOperation("鎵撳嵃鑷畾涔夋爣绛炬暟鎹寜宸ョ▼鏌ヨ鎺ュ彛")
+ @PostMapping("/getPrintCustomDataProjectNo/{type}/{projectNo}")
+ public Result getPrintCustomDataProjectNo( @PathVariable String type,
+ @PathVariable String projectNo) {
+ return Result.seccess(flowCardService.getPrintCustomDataProjectNo(type,projectNo));
+
+ }
+
@ApiOperation("鎺掑簭姹囨�绘煡璇㈡帴鍙�")
@PostMapping("/selectSortTable")
public Result selectSortTable(
@@ -340,9 +375,10 @@
}
@ApiOperation("鍚堝苟娴佺▼鍗℃帴鍙�")
- @PostMapping("/mergeFlowCard")
- public Result mergeFlowCard(@RequestBody Map<String, Object> object) {
- return Result.seccess(flowCardService.mergeFlowCard(object));
+ @PostMapping("/mergeFlowCard/{merge}")
+ public Result mergeFlowCard(@RequestBody Map<String, Object> object,
+ @PathVariable Integer merge) {
+ return Result.seccess(flowCardService.mergeFlowCard(object,merge));
}
@ApiOperation("姹夌幓鑾峰彇娴佺▼鍗℃帴鍙�")
@PostMapping("/getProcessCardList/hanbo")
@@ -351,7 +387,7 @@
}
@ApiOperation("澶嶉�夋鍒犻櫎娴佺▼鍗�")
- @SaCheckPermission("SelectProcessCard.delete")
+ @SaCheckPermission("selectProcessCard.delete")
@PostMapping("/checkboxDelete")
public Result checkboxDelete(
@RequestBody Map<String, Object> object
@@ -360,4 +396,65 @@
return Result.seccess(flowCardService.checkboxDeleteSv(object));
}
+ @ApiOperation("宸ョ▼鏄庣粏鎵撳嵃鏌ヨ")
+ @PostMapping("/selectPrintProjectDetails/{projectNo}")
+ public Result selectPrintProjectDetails(
+ @PathVariable String projectNo) {
+ return Result.seccess(flowCardService.getPrintProjectDetails(projectNo));
+
+ }
+ @ApiOperation("宸ョ▼鏄庣粏鎵撳嵃鏍囩鏌ヨ")
+ @PostMapping("/getPrintCustomDataProjectNoDetail/{type}/{detailType}")
+ public Result getPrintCustomDataProjectNoDetail(
+ @PathVariable String type,
+ @PathVariable Integer detailType,
+ @RequestBody Map<String, Object> object) {
+ return Result.seccess(flowCardService.getPrintCustomDataProjectNoDetailSv(type,detailType,object));
+
+ }
+
+ @ApiOperation("淇敼宸ヨ壓娴佺▼")
+ @PostMapping("/updateProcess/{processId}/{technologyNumber}/{orderId}/{process}")
+ public Result updateProcess(
+ @PathVariable String processId,
+ @PathVariable String technologyNumber,
+ @PathVariable String orderId,
+ @PathVariable String process,
+ @RequestBody Map<String, Object> object
+ ) {
+
+ return Result.seccess(flowCardService.updateProcessSv(processId,technologyNumber,orderId,process,object));
+ }
+
+ @ApiOperation("宸ョ▼鎵撳嵃鏍囩娆℃暟淇敼")
+ @PostMapping("/updateProjectLabelPrintCount/{projectNo}")
+ public Result updateProjectLabelPrintCount(@PathVariable String projectNo){
+ return Result.seccess(flowCardService.updateProjectLabelPrintCount(projectNo));
+ }
+
+ @ApiOperation("宸ョ▼鎵撳嵃鏍囩娆℃暟淇敼")
+ @PostMapping("/updateProjectProcessPrintCount/{projectNo}")
+ public Result updateProjectProcessPrintCount(@PathVariable String projectNo){
+ return Result.seccess(flowCardService.updateProjectProcessPrintCount(projectNo));
+ }
+
+ @ApiOperation("娴佺▼鍗″悎鏋�")
+ @PostMapping("/flowCardDetail")
+ public Result flowCardDetail(
+ @RequestBody Map<String, Object> object) {
+ return Result.seccess(flowCardService.flowCardDetail(object));
+ }
+
+ @ApiOperation("淇濆瓨娴佺▼鍗″悎鏋�")
+ @PostMapping("/updateProcessCardRack")
+ public Result updateProcessCardRack(
+ @RequestBody Map<String, Object> object) {
+ return Result.seccess(flowCardService.updateProcessCardRack(object));
+ }
+
+ @ApiOperation("鏅鸿兘鍒嗘灦")
+ @PostMapping("/processCardAutoRack")
+ public Result processCardAutoRack(@ RequestBody Map<String, Object> object) {
+ return Result.seccess(flowCardService.processCardAutoRack(object));
+ }
}
--
Gitblit v1.8.0