From 5df5dba2a321098fd0fc7e18b71549f5c2312049 Mon Sep 17 00:00:00 2001
From: chenlu <1320612696@qq.com>
Date: 星期二, 27 八月 2024 17:19:13 +0800
Subject: [PATCH] Merge branch 'master' of http://bore.pub:10439/r/ERP_override
---
north-glass-erp/src/main/java/com/example/erp/controller/pp/ProcessCardController.java | 254 +++++++++++++++++++++++++++++++++++++++++---------
1 files changed, 206 insertions(+), 48 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 4785612..fc6c6b1 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
@@ -19,7 +19,7 @@
import java.util.Map;
@RestController
-@Api(value="娴佺▼鍗ontroller",tags={"娴佺▼鍗℃搷浣滄帴鍙�"})
+@Api(value = "娴佺▼鍗ontroller", tags = {"娴佺▼鍗℃搷浣滄帴鍙�"})
@RequestMapping("/processCard")
public class ProcessCardController {
@Autowired
@@ -28,36 +28,36 @@
//娴佺▼鍗＄鐞嗘煡璇�
@ApiOperation("娴佺▼鍗＄鐞嗘煡璇㈡帴鍙�")
@SaCheckPermission("SelectProcessCard.search")
- @PostMapping ("/flowCard/{pageNum}/{pageSize}/{selectTime1}/{selectTime2}")
+ @PostMapping("/flowCard/{pageNum}/{pageSize}/{selectTime1}/{selectTime2}")
public Result dateProcess(
@PathVariable Integer pageNum,
@PathVariable Integer pageSize,
@PathVariable Date selectTime1,
@PathVariable Date selectTime2,
- @RequestBody FlowCard flowCard){
- return Result.seccess(flowCardService.selectProcessCard(pageNum,pageSize,selectTime1,selectTime2,flowCard));
-
+ @RequestBody FlowCard flowCard) {
+ return Result.seccess(flowCardService.selectProcessCard(pageNum, pageSize, selectTime1, selectTime2, flowCard));
+
}
//鍒嗘灦鏌ヨ
@ApiOperation("鍒嗘灦鏌ヨ鎺ュ彛")
@SaCheckPermission("SelectAddProcess.search")
- @PostMapping ("/selectAddProcess/{selectTime1}/{selectTime2}")
+ @PostMapping("/selectAddProcess/{selectTime1}/{selectTime2}")
public Result selectAddProcess(
@PathVariable Date selectTime1,
@PathVariable Date selectTime2,
- @RequestBody FlowCard flowCard){
- return Result.seccess(flowCardService.selectAddProcess(selectTime1,selectTime2,flowCard));
+ @RequestBody FlowCard flowCard) {
+ return Result.seccess(flowCardService.selectAddProcess(selectTime1, selectTime2, flowCard));
}
//鍒嗘灦鏄庣粏鏌ヨ
@ApiOperation("鍒嗘灦鏄庣粏鏌ヨ鎺ュ彛")
@SaCheckPermission("SplittingDetails.search")
- @PostMapping ("/detailsSelect/{orderId}")
+ @PostMapping("/detailsSelect/{orderId}")
public Result detailsSelect(
@PathVariable String orderId,
- @RequestBody FlowCard flowCard){
- return Result.seccess(flowCardService.detailsSelectSv(orderId,flowCard));
+ @RequestBody FlowCard flowCard) {
+ return Result.seccess(flowCardService.detailsSelectSv(orderId, flowCard));
}
@@ -65,18 +65,20 @@
//鍒犻櫎娴佺▼鍗�
@ApiOperation("鍒犻櫎娴佺▼鍗℃帴鍙�")
@SaCheckPermission("SelectProcessCard.delete")
- @PostMapping("/deleteFlowCard/{orderId}/{processId}")
+ @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();
// }else {
// throw new ServiceException(Constants.Code_500,"鍒犻櫎澶辫触,璇锋鏌ユ槸鍚﹀凡鎶ュ伐");
//
// }
- return Result.seccess(flowCardService.deleteFlowCardSv(orderId,processId));
+ return Result.seccess(flowCardService.deleteFlowCardSv(orderId, processId,userId,userName));
}
//淇敼鎺掔増鐘舵��
@@ -86,23 +88,23 @@
public Result updateLayoutStatus(
@PathVariable String processId,
@PathVariable Integer state
- ){
- if(flowCardService.updateLayoutStatusSv(processId,state)){
+ ) {
+ if (flowCardService.updateLayoutStatusSv(processId, state)) {
return Result.seccess();
- }else {
- throw new ServiceException(Constants.Code_500,"淇敼澶辫触");
+ } else {
+ throw new ServiceException(Constants.Code_500, "淇敼澶辫触");
}
}
//鍒嗘灦鏂板鏄庣粏鏌ヨ
@ApiOperation("鍒嗘灦鏄庣粏鏂板鎺ュ彛")
- @PostMapping ("/selectNoCard/{orderId}/{productionId}")
+ @PostMapping("/selectNoCard/{orderId}/{productionId}")
public Result SelectNoCard(
@PathVariable String orderId,
@PathVariable String productionId,
- @RequestBody FlowCard flowCard){
- return Result.seccess(flowCardService.selectNoCardSv(orderId,productionId,flowCard));
+ @RequestBody FlowCard flowCard) {
+ return Result.seccess(flowCardService.selectNoCardSv(orderId, productionId, flowCard));
}
@@ -110,84 +112,240 @@
@ApiOperation("娴佺▼鍗″垱寤烘帴鍙�")
@SaCheckPermission("AddProcessCard.add")
@PostMapping("/addFlowCard")
- public Result AddOrderWork( @RequestBody Map<String,Object> object){
- if(flowCardService.addFlowCardSv(object)){
+ public Result AddOrderWork(@RequestBody Map<String, Object> object) {
+ if (flowCardService.addFlowCardSv(object)) {
return Result.seccess();
- }else {
- throw new ServiceException(Constants.Code_500,"淇濆瓨澶辫触");
+ } else {
+ throw new ServiceException(Constants.Code_500, "淇濆瓨澶辫触");
}
}
//鏌ヨ绗竴娆℃帓浜ф暟鎹�
@ApiOperation("鎺掍骇鐣岄潰鍔犺浇鏌ヨ鎺ュ彛")
- @PostMapping ("/selectLastScheduling/{selectTime1}/{selectTime2}")
+ @PostMapping("/selectLastScheduling/{selectTime1}/{selectTime2}")
public Result selectLastScheduling(
@PathVariable String selectTime1,
@PathVariable String selectTime2,
- @RequestBody FlowCard flowCard){
- return Result.seccess(flowCardService.selectLastScheduling(selectTime1,selectTime2,flowCard));
+ @RequestBody FlowCard flowCard) {
+ return Result.seccess(flowCardService.selectLastScheduling(selectTime1, selectTime2, flowCard));
}
+
//鏌ヨ鎺掍骇鏁版嵁
@ApiOperation("鎺掍骇鐐瑰嚮鎸夐挳鏌ヨ鎺ュ彛")
- @PostMapping ("/selectScheduling/{selectTime1}/{selectTime2}/{orderId}/{processes}/{state}")
+ @PostMapping("/selectScheduling/{selectTime1}/{selectTime2}/{orderId}/{processes}/{state}")
public Result selectScheduling(
@PathVariable String selectTime1,
@PathVariable String selectTime2,
@PathVariable String orderId,
@PathVariable String processes,
@PathVariable Integer state,
- @RequestBody FlowCard flowCard){
- return Result.seccess(flowCardService.selectSchedulingSv(selectTime1,selectTime2,orderId,processes,state,flowCard));
+ @RequestBody FlowCard flowCard) {
+ return Result.seccess(flowCardService.selectSchedulingSv(selectTime1, selectTime2, orderId, processes, state, flowCard));
}
+
//娴佺▼鍗℃槑缁嗘煡璇�
@ApiOperation("娴佺▼鍗℃槑缁嗘煡璇㈡帴鍙�")
@SaCheckPermission("SelectDetailProcessCard.search")
- @PostMapping ("/flowCardDetail/{processId}")
+ @PostMapping("/flowCardDetail/{processId}")
public Result flowCardDetail(
@PathVariable String processId,
- @RequestBody FlowCard flowCard){
- return Result.seccess(flowCardService.flowCardDetailSv(processId,flowCard));
+ @RequestBody FlowCard flowCard) {
+ return Result.seccess(flowCardService.flowCardDetailSv(processId, flowCard));
}
@ApiOperation("娴佺▼鍗℃墦鍗版煡璇㈡帴鍙�")
@SaCheckPermission("SelectPrintFlowCard.search")
- @PostMapping ("/selectPrintFlowCard/{selectTime1}/{selectTime2}/{orderId}/{project}")
+ @PostMapping("/selectPrintFlowCard/{selectTime1}/{selectTime2}/{orderId}/{project}/{userId}")
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));
+ @PathVariable String userId,
+ @RequestBody FlowCard flowCard) {
+ return Result.seccess(flowCardService.selectPrintFlowCardSv(selectTime1, selectTime2, orderId, project,userId, flowCard));
}
@ApiOperation("娴佺▼鍗℃槑缁嗘煡璇㈡帴鍙�")
@SaCheckPermission("PrintFlowCard.search")
- @PostMapping ("/selectPrint/{orderId}")
+ @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}")
+ public Result getSelectPrinting(
+ @PathVariable String printMerge,
+ @PathVariable String printLike,
+ @RequestBody Map<String, Object> object) {
+ return Result.seccess(flowCardService.getSelectPrintingSv(object,printMerge,printLike));
+ }
+
+ @ApiOperation("鎵撳嵃鏍囩鏁版嵁鏌ヨ鎺ュ彛")
+ @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("/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("澶嶉�夋淇敼鎺掔増鐘舵��")
@SaCheckPermission("SelectProcessCard.review")
@PostMapping("/updateComposing")
public Result updateComposing(
- @RequestBody Map<String,Object> object
- ){
+ @RequestBody Map<String, Object> object
+ ) {
- return Result.seccess(flowCardService.updateComposingSv(object));
+ return Result.seccess(flowCardService.updateComposingSv(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,process, flowCard));
+ }
+
+ @ApiOperation("淇濆瓨鎵撳嵃鎺掑簭鎺ュ彛")
+ @PostMapping("/printSort")
+ public Result printSort(@RequestBody Map<String, Object> object) {
+ if (flowCardService.printSortSv(object)) {
+ return Result.seccess();
+ } else {
+ throw new ServiceException(Constants.Code_500, "淇濆瓨澶辫触");
+
+ }
+ }
+
+ @ApiOperation("鑷畾涔夋爣绛炬墦鍗版槑缁嗘帴鍙�")
+ @PostMapping("/getCustomLabelDetail/{name}/{form}/{id}")
+ public Result getCustomLabelDetail(
+ @PathVariable String name,
+ @PathVariable String form,
+ @PathVariable String id,
+ @RequestBody FlowCard flowCard) {
+ return Result.seccess(flowCardService.getCustomLabelDetailSv(name,form,id, flowCard));
+
+ }
+
+ @ApiOperation("宸ョ▼鎵撳嵃鏌ヨ鎺ュ彛")
+ @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}")
+ public Result selectPrintDetails(
+ @PathVariable String inquiryMode,
+ @RequestBody Map<String, Object> object) {
+ return Result.seccess(flowCardService.selectPrintDetailsSv(object,inquiryMode));
+
+ }
+
+ @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("/selectSortTable")
+ public Result selectSortTable(
+ @RequestBody Map<String, Object> object) {
+ return Result.seccess(flowCardService.selectSortTableSv(object));
+ }
+
+ @ApiOperation("鍚堝苟娴佺▼鍗℃帴鍙�")
+ @PostMapping("/mergeFlowCard")
+ public Result mergeFlowCard(@RequestBody Map<String, Object> object) {
+ return Result.seccess(flowCardService.mergeFlowCard(object));
+ }
+ @ApiOperation("姹夌幓鑾峰彇娴佺▼鍗℃帴鍙�")
+ @PostMapping("/getProcessCardList/hanbo")
+ public Result getProcessCard() {
+ return Result.seccess(flowCardService.getProcessCard());
+ }
+
+ @ApiOperation("姹夌幓纭鎺ユ敹鎺ュ彛")
+ @PostMapping("/updateProcessCardState/hanbo")
+ public Result updateProcessCardState(@RequestBody Integer id) {
+ return Result.seccess(flowCardService.updateProcessCardState(id));
}
}
--
Gitblit v1.8.0