From c46cb6a71c35f38c7f23a2d01ad686f46a3d0e0b Mon Sep 17 00:00:00 2001
From: 廖井涛 <2265517004@qq.com>
Date: 星期三, 26 六月 2024 15:14:44 +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 | 41 ++++++++++++++++++++++++++---------------
1 files changed, 26 insertions(+), 15 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..8038379 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;
@@ -185,9 +184,17 @@
}
@ApiOperation("鎵撳嵃鏍囩鏁版嵁鏌ヨ鎺ュ彛")
- @PostMapping("/getSelectPrintLabel")
- public Result getSelectPrintLabel(@RequestBody Map<String, Object> object) {
- return Result.seccess(flowCardService.getSelectPrintLabelSv(object));
+ @PostMapping("/getSelectPrintLabel/{projectNo}")
+ public Result getSelectPrintLabel(@PathVariable String projectNo) {
+ return Result.seccess(flowCardService.getSelectPrintLabelSv(projectNo));
+ }
+
+ @ApiOperation("鎵撳嵃鑷畾涔夋爣绛炬暟鎹煡璇㈡帴鍙�")
+ @PostMapping("/getSelectPrintCustomLabel/{type}")
+ public Result getSelectPrintCustomLabel( @PathVariable String type,
+ @RequestBody Map<String, Object> object) {
+ return Result.seccess(flowCardService.getSelectPrintCustomLabelSv(type,object));
+
}
@ApiOperation("澶嶉�夋淇敼鎺掔増鐘舵��")
@@ -219,19 +226,23 @@
}
}
- @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));
}
}
--
Gitblit v1.8.0