From fcd6de629c4f6b8d9e610da854f15ef40115b058 Mon Sep 17 00:00:00 2001
From: guoyuji <guoyujie@ng.com>
Date: 星期二, 07 五月 2024 17:03:49 +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 | 30 ++++++++++++++++++++++++++++--
1 files changed, 28 insertions(+), 2 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 6df94b7..09ae89a 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
@@ -2,6 +2,7 @@
import com.example.erp.common.Constants;
import com.example.erp.entity.pp.FlowCard;
+import com.example.erp.entity.sd.DeliveryDetail;
import com.example.erp.entity.sd.Order;
import com.example.erp.common.Result;
import com.example.erp.entity.sd.OrderDetail;
@@ -44,7 +45,6 @@
@PathVariable Date selectTime2,
@RequestBody FlowCard flowCard){
return Result.seccess(flowCardService.selectAddProcess(selectTime1,selectTime2,flowCard));
-
}
//鍒嗘灦鏄庣粏鏌ヨ
@@ -135,7 +135,7 @@
return Result.seccess(flowCardService.selectSchedulingSv(selectTime1,selectTime2,orderId,processes,state,flowCard));
}
- //鏌ヨ鎺掍骇鏁版嵁
+ //娴佺▼鍗℃槑缁嗘煡璇�
@ApiOperation("娴佺▼鍗℃槑缁嗘煡璇㈡帴鍙�")
@PostMapping ("/flowCardDetail/{processId}")
public Result flowCardDetail(
@@ -144,4 +144,30 @@
return Result.seccess(flowCardService.flowCardDetailSv(processId,flowCard));
}
+
+ @ApiOperation("娴佺▼鍗℃墦鍗版煡璇㈡帴鍙�")
+ @PostMapping ("/selectPrintFlowCard/{selectTime1}/{selectTime2}/{orderId}/{project}")
+ 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));
+ }
+
+ @ApiOperation("娴佺▼鍗℃槑缁嗘煡璇㈡帴鍙�")
+ @PostMapping ("/selectPrint/{orderId}")
+ public Result selectPrint(
+ @PathVariable String orderId,
+ @RequestBody FlowCard flowCard){
+ return Result.seccess(flowCardService.selectPrintSv(orderId,flowCard));
+
+ }
+
+ @ApiOperation("鎵撳嵃娴佺▼鍗℃暟鎹煡璇㈡帴鍙�")
+ @PostMapping("/getSelectPrinting")
+ public Result getSelectPrinting( @RequestBody Map<String,Object> object){
+ return Result.seccess(flowCardService.getSelectPrintingSv(object));
+ }
}
--
Gitblit v1.8.0