From 8b7d4b9527b9e196df4b9ac7cf113f06798f7941 Mon Sep 17 00:00:00 2001
From: 廖井涛 <2265517004@qq.com>
Date: 星期四, 15 八月 2024 15:01:00 +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 | 141 ++++++++++++++++++++++++++++++++++++++---------
1 files changed, 114 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 63f5414..84a7bf1 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
@@ -3,7 +3,6 @@
import cn.dev33.satoken.annotation.SaCheckPermission;
import com.example.erp.common.Constants;
import com.example.erp.entity.pp.FlowCard;
-import com.example.erp.entity.pp.PrintSetup;
import com.example.erp.entity.sd.DeliveryDetail;
import com.example.erp.entity.sd.Order;
import com.example.erp.common.Result;
@@ -158,36 +157,55 @@
@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,
+ @PathVariable String userId,
@RequestBody FlowCard flowCard) {
- return Result.seccess(flowCardService.selectPrintFlowCardSv(selectTime1, selectTime2, orderId, project, 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")
- public Result getSelectPrintLabel(@RequestBody Map<String, Object> object) {
- return Result.seccess(flowCardService.getSelectPrintLabelSv(object));
+ @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("澶嶉�夋淇敼鎺掔増鐘舵��")
@@ -200,12 +218,13 @@
return Result.seccess(flowCardService.updateComposingSv(object));
}
- @ApiOperation("娴佺▼鍗℃墦鍗版槑缁嗘暟鎹煡璇㈡帴鍙�")
- @PostMapping("/printFlowCardDetails/{processId}/{technologyNumber}")
+ @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("淇濆瓨鎵撳嵃鎺掑簭鎺ュ彛")
@@ -219,19 +238,87 @@
}
}
- @ApiOperation("鎵撳嵃鏍囩璁剧疆鏌ヨ")
- @SaCheckPermission("PrintFlowCard.search")
- @PostMapping ("/printSetup")
- public Result printSetup(@RequestBody PrintSetup printSetup){
- return Result.seccess(flowCardService.printSetup(printSetup));
+ @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("PrintFlowCard.search")
- @PostMapping("/updatePrintSetup")
- public Result updatePrintSetup(@RequestBody Map<String,Object> object)
- {
- return Result.seccess(flowCardService.updatePrintSetup(object));
+ @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}")
+ public Result getSelectPrintingRefund(
+ @PathVariable String printMerge,
+ @PathVariable String printLike,
+ @RequestBody Map<String, Object> object) {
+ return Result.seccess(flowCardService.getSelectPrintingRefundSv(object,printMerge,printLike));
+ }
+
+ @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));
+
}
}
--
Gitblit v1.8.0