From 91b61fe723df498d62c596372521d426299f0f8b Mon Sep 17 00:00:00 2001
From: guoyujie <guoyujie@ng.com>
Date: 星期一, 09 六月 2025 16:54:26 +0800
Subject: [PATCH] 标签不显示标题问题
---
north-glass-erp/src/main/java/com/example/erp/controller/pp/ProcessCardController.java | 290 ++++++++++++++++++++++++++++++++++++++++++++++++++-------
1 files changed, 251 insertions(+), 39 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 8038379..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,11 +64,13 @@
//鍒犻櫎娴佺▼鍗�
@ApiOperation("鍒犻櫎娴佺▼鍗℃帴鍙�")
- @SaCheckPermission("SelectProcessCard.delete")
- @PostMapping("/deleteFlowCard/{orderId}/{processId}")
+ @SaCheckPermission("selectProcessCard.delete")
+ @PostMapping("/deleteFlowCard/{orderId}/{processId}/{userId}/{userName}")
public Result deleteOrderWork(
@PathVariable String orderId,
- @PathVariable String processId
+ @PathVariable String processId,
+ @PathVariable String userId,
+ @PathVariable String userName
) {
// if(flowCardService.deleteFlowCardSv(orderId,processId)){
// return Result.seccess();
@@ -76,12 +78,12 @@
// throw new ServiceException(Constants.Code_500,"鍒犻櫎澶辫触,璇锋鏌ユ槸鍚﹀凡鎶ュ伐");
//
// }
- return Result.seccess(flowCardService.deleteFlowCardSv(orderId, processId));
+ return Result.seccess(flowCardService.deleteFlowCardSv(orderId, processId,userId,userName));
}
//淇敼鎺掔増鐘舵��
@ApiOperation("淇敼鎺掔増鐘舵�佹帴鍙�")
- @SaCheckPermission("SelectProcessCard.review")
+ @SaCheckPermission("selectProcessCard.review")
@PostMapping("/updateLayoutStatus/{processId}/{state}")
public Result updateLayoutStatus(
@PathVariable String processId,
@@ -108,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, "淇濆瓨澶辫触");
@@ -146,7 +148,7 @@
//娴佺▼鍗℃槑缁嗘煡璇�
@ApiOperation("娴佺▼鍗℃槑缁嗘煡璇㈡帴鍙�")
- @SaCheckPermission("SelectDetailProcessCard.search")
+ @SaCheckPermission("selectDetailProcessCard.search")
@PostMapping("/flowCardDetail/{processId}")
public Result flowCardDetail(
@PathVariable String processId,
@@ -156,49 +158,84 @@
}
@ApiOperation("娴佺▼鍗℃墦鍗版煡璇㈡帴鍙�")
- @SaCheckPermission("SelectPrintFlowCard.search")
- @PostMapping("/selectPrintFlowCard/{selectTime1}/{selectTime2}/{orderId}/{project}")
+ @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, flowCard));
+ return Result.seccess(flowCardService.selectPrintFlowCardSv(selectTime1, selectTime2, orderId, project,userId,state, flowCard));
}
@ApiOperation("娴佺▼鍗℃槑缁嗘煡璇㈡帴鍙�")
- @SaCheckPermission("PrintFlowCard.search")
- @PostMapping("/selectPrint/{orderId}")
+ @SaCheckPermission("printFlowCard.search")
+ @PostMapping("/selectPrint/{inquiryMode}")
public Result selectPrint(
- @PathVariable String orderId,
- @RequestBody FlowCard flowCard) {
- return Result.seccess(flowCardService.selectPrintSv(orderId, flowCard));
+ @PathVariable String inquiryMode,
+ @RequestBody Map<String, Object> object) {
+ return Result.seccess(flowCardService.selectPrintSv(object,inquiryMode));
}
@ApiOperation("鎵撳嵃娴佺▼鍗℃暟鎹煡璇㈡帴鍙�")
- @PostMapping("/getSelectPrinting")
- public Result getSelectPrinting(@RequestBody Map<String, Object> object) {
- return Result.seccess(flowCardService.getSelectPrintingSv(object));
+ @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,merge));
+ }
+
+ @ApiOperation("宸ョ▼鎵撳嵃娴佺▼鍗℃暟鎹煡璇㈡帴鍙�")
+ @PostMapping("/getSelectPrintProject/{printProject}/{merge}")
+ public Result getSelectPrintProject(
+ @PathVariable String printProject,@PathVariable String merge) {
+ return Result.seccess(flowCardService.getSelectPrintProject(printProject,merge));
}
@ApiOperation("鎵撳嵃鏍囩鏁版嵁鏌ヨ鎺ュ彛")
- @PostMapping("/getSelectPrintLabel/{projectNo}")
- public Result getSelectPrintLabel(@PathVariable String projectNo) {
- return Result.seccess(flowCardService.getSelectPrintLabelSv(projectNo));
+ @PostMapping("/getSelectPrintLabel/{projectNo}/{type}")
+ public Result getSelectPrintLabel(@PathVariable String projectNo,@PathVariable String type) {
+ return Result.seccess(flowCardService.getSelectPrintLabelSv(projectNo,type));
+ }
+
+ @ApiOperation("鎵撳嵃鏍囩鏌ヨ鎺ュ彛")
+ @PostMapping("/getSelectPrintLabel1")
+ public Result getSelectPrintLabel1(@RequestBody Map<String, Object> object) {
+ return Result.seccess(flowCardService.getSelectPrintLabelSv1(object));
+ }
+
+ @ApiOperation("鎵撳嵃鏍囩鏄庣粏鏌ヨ鎺ュ彛")
+ @PostMapping("/getSelectPrintLabelDetails")
+ public Result getSelectPrintLabelDetails(@RequestBody Map<String, Object> object) {
+ return Result.seccess(flowCardService.getSelectPrintLabelDetails(object));
+ }
+
+ @ApiOperation("鎵撳嵃鑷畾涔夋爣绛炬暟鎹煡璇㈡帴鍙ｆ槑缁�")
+ @PostMapping("/getSelectPrintCustomLabel/{type}/{lableType}")
+ public Result getSelectPrintCustomLabel( @PathVariable String type,
+ @PathVariable Integer lableType,
+ @RequestBody Map<String, Object> object) {
+ return Result.seccess(flowCardService.getSelectPrintCustomLabelSv(type,lableType,object));
+
}
@ApiOperation("鎵撳嵃鑷畾涔夋爣绛炬暟鎹煡璇㈡帴鍙�")
- @PostMapping("/getSelectPrintCustomLabel/{type}")
- public Result getSelectPrintCustomLabel( @PathVariable String type,
+ @PostMapping("/getSelectPrintCustomLabel2/{type}/{lableType}")
+ public Result getSelectPrintCustomLabel2( @PathVariable String type,
+ @PathVariable Integer lableType,
@RequestBody Map<String, Object> object) {
- return Result.seccess(flowCardService.getSelectPrintCustomLabelSv(type,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
@@ -207,12 +244,22 @@
return Result.seccess(flowCardService.updateComposingSv(object));
}
- @ApiOperation("娴佺▼鍗℃墦鍗版槑缁嗘暟鎹煡璇㈡帴鍙�")
- @PostMapping("/printFlowCardDetails/{processId}/{technologyNumber}")
+ @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,
@PathVariable String technologyNumber,
+ @PathVariable String process,
@RequestBody FlowCard flowCard) {
- return Result.seccess(flowCardService.printFlowCardDetailsSv(processId, technologyNumber, flowCard));
+ return Result.seccess(flowCardService.printFlowCardDetailsSv(processId, technologyNumber,process, flowCard));
}
@ApiOperation("淇濆瓨鎵撳嵃鎺掑簭鎺ュ彛")
@@ -238,11 +285,176 @@
}
@ApiOperation("宸ョ▼鎵撳嵃鏌ヨ鎺ュ彛")
- @SaCheckPermission("SelectPrintFlowCard.search")
+ @SaCheckPermission("selectPrintFlowCard.search")
@PostMapping("/selectPrintPrintProject/{selectTime1}/{selectTime2}")
public Result selectPrintFlowCard(
@PathVariable Date selectTime1,
@PathVariable Date selectTime2) {
return Result.seccess(flowCardService.selectPrintFlowCard(selectTime1, selectTime2));
}
+
+ @ApiOperation("淇敼鏄惁鎵撳嵃鐘舵��")
+ @PostMapping("/updatePrintState/{printState}")
+ public Result updatePrintState(
+ @PathVariable Integer printState,
+ @RequestBody Map<String, Object> object
+ ) {
+
+ return Result.seccess(flowCardService.updatePrintStateSv(printState,object));
+ }
+
+ @ApiOperation("娴佺▼鍗℃墦鍗拌鍗曟暟鎹帓搴忔煡璇㈡帴鍙�")
+ @PostMapping("/printFlowCardOrderSort/{orderId}")
+ public Result printFlowCardOrderSort(@PathVariable String orderId,
+ @RequestBody FlowCard flowCard) {
+ return Result.seccess(flowCardService.printFlowCardOrderSortSv(orderId, flowCard));
+ }
+
+ @ApiOperation("淇濆瓨鎵撳嵃璁㈠崟鎺掑簭鎺ュ彛")
+ @PostMapping("/printOrderSort")
+ public Result printOrderSort(@RequestBody Map<String, Object> object) {
+ if (flowCardService.printOrderSort(object)) {
+ return Result.seccess();
+ } else {
+ throw new ServiceException(Constants.Code_500, "淇濆瓨澶辫触");
+
+ }
+ }
+
+ @ApiOperation("鎵撳嵃娴佺▼鍗¤ˉ鐗囨暟鎹煡璇㈡帴鍙�")
+ @PostMapping("/getSelectPrintingRefund/{printMerge}/{printLike}/{mergeTechnologyNumber}")
+ public Result getSelectPrintingRefund(
+ @PathVariable String printMerge,
+ @PathVariable String printLike,
+ @PathVariable String mergeTechnologyNumber,
+ @RequestBody Map<String, Object> object) {
+ return Result.seccess(flowCardService.getSelectPrintingRefundSv(object,printMerge,printLike,mergeTechnologyNumber));
+ }
+
+ @ApiOperation("鎵撳嵃娴佺▼鍗¤繑宸ユ暟鎹煡璇㈡帴鍙�")
+ @PostMapping("/getSelectPrinRework/{printMerge}/{printLike}")
+ public Result getSelectPrinRework(
+ @PathVariable String printMerge,
+ @PathVariable String printLike,
+ @RequestBody Map<String, Object> object) {
+ return Result.seccess(flowCardService.getSelectPrinReworkSv(object,printMerge,printLike));
+ }
+
+ @ApiOperation("娴佺▼鍗℃槑缁嗘寜缂栧彿鏌ヨ鎺ュ彛")
+ @PostMapping("/selectPrintDetails/{inquiryMode}/{type}")
+ public Result selectPrintDetails(
+ @PathVariable String inquiryMode,
+ @PathVariable Integer type,
+ @RequestBody Map<String, Object> object) {
+ return Result.seccess(flowCardService.selectPrintDetailsSv(object,inquiryMode,type));
+
+ }
+
+ @ApiOperation("鎵撳嵃鑷畾涔夋爣绛炬暟鎹寜缂栧彿鏌ヨ鎺ュ彛")
+ @PostMapping("/getSelectPrintCustomLabelDetails/{type}/{lableType}")
+ public Result getSelectPrintCustomLabelDetails( @PathVariable String type,
+ @PathVariable Integer lableType,
+ @RequestBody Map<String, Object> object) {
+ return Result.seccess(flowCardService.getSelectPrintCustomLabelDetailsSv(type,lableType,object));
+
+ }
+
+ @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(
+ @RequestBody Map<String, Object> object) {
+ return Result.seccess(flowCardService.selectSortTableSv(object));
+ }
+
+ @ApiOperation("鍚堝苟娴佺▼鍗℃帴鍙�")
+ @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")
+ public Result getProcessCard(@RequestBody Map<String,String> processCards) {
+ return Result.seccess(flowCardService.getProcessCard(processCards));
+ }
+
+ @ApiOperation("澶嶉�夋鍒犻櫎娴佺▼鍗�")
+ @SaCheckPermission("selectProcessCard.delete")
+ @PostMapping("/checkboxDelete")
+ public Result checkboxDelete(
+ @RequestBody Map<String, Object> object
+ ) {
+
+ 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