From 2ad08ea181d8ec1e2b4b90bd1ddd40a2ba595b59 Mon Sep 17 00:00:00 2001
From: chenlu <1320612696@qq.com>
Date: 星期四, 07 三月 2024 08:08:25 +0800
Subject: [PATCH] 提交更新
---
north-glass-erp/src/main/java/com/example/erp/controller/pp/ProcessCardController.java | 26 ++++++++++++++++++++++----
1 files changed, 22 insertions(+), 4 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 a4ac0ee..d3f27fd 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
@@ -36,7 +36,6 @@
@PathVariable Date selectTime1,
@PathVariable Date selectTime2,
@RequestBody FlowCard flowCard){
- // System.out.println(selectTime1+" "+selectTime2+" "+flowCard.toString());
return Result.seccess(flowCardService.selectAddProcess(selectTime1,selectTime2,flowCard));
}
@@ -71,7 +70,6 @@
public Result updateLayoutStatus(
@PathVariable String processId
){
- System.out.println(flowCardService.UpdateLayoutStatusSv(processId));
if(flowCardService.UpdateLayoutStatusSv(processId)){
return Result.seccess();
}else {
@@ -82,7 +80,6 @@
//鍒嗘灦鏂板鏄庣粏鏌ヨ
@PostMapping ("/selectNoCard/{orderId}/{productionId}")
-
public Result SelectNoCard(
@PathVariable String orderId,
@PathVariable String productionId,
@@ -94,7 +91,6 @@
//娣诲姞娴佺▼鍗�
@PostMapping("/addFlowCard")
public Result AddOrderWork( @RequestBody Map<String,Object> object){
- System.out.println("obj:"+object);
if(flowCardService.AddFlowCardSv(object)){
return Result.seccess();
}else {
@@ -103,4 +99,26 @@
}
}
+ //鏌ヨ绗竴娆℃帓鐗堟暟鎹�
+ @PostMapping ("/selectLastScheduling/{selectTime1}/{selectTime2}")
+ public Result selectLastScheduling(
+ @PathVariable String selectTime1,
+ @PathVariable String selectTime2,
+ @RequestBody FlowCard flowCard){
+ return Result.seccess(flowCardService.selectLastScheduling(selectTime1,selectTime2,flowCard));
+
+ }
+ //鏌ヨ鎺掔増鏁版嵁
+ @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));
+
+ }
+
}
--
Gitblit v1.8.0