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 | 55 ++++++++++++++++++++++++++++++++++++++++++++++++++-----
1 files changed, 50 insertions(+), 5 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 8b1bd26..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
@@ -12,6 +12,7 @@
import org.springframework.web.bind.annotation.*;
import java.sql.Date;
+import java.util.Map;
@RestController
@RequestMapping("/processCard")
@@ -35,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));
}
@@ -45,7 +45,7 @@
public Result DetailsSelect(
@PathVariable String orderId,
- @RequestBody FlowCard flowCard){
+ @RequestBody FlowCard flowCard){
return Result.seccess(flowCardService.DetailsSelectSv(orderId,flowCard));
}
@@ -65,15 +65,60 @@
}
}
- //鍒嗘灦鏄庣粏鏌ヨ
- @PostMapping ("/selectNoCard/{orderId}/{productionId}")
+ //淇敼鎺掔増鐘舵��
+ @PostMapping("/updateLayoutStatus/{processId}")
+ public Result updateLayoutStatus(
+ @PathVariable String processId
+ ){
+ if(flowCardService.UpdateLayoutStatusSv(processId)){
+ return Result.seccess();
+ }else {
+ throw new ServiceException(Constants.Code_500,"淇敼澶辫触");
+ }
+ }
+
+ //鍒嗘灦鏂板鏄庣粏鏌ヨ
+ @PostMapping ("/selectNoCard/{orderId}/{productionId}")
public Result SelectNoCard(
@PathVariable String orderId,
@PathVariable String productionId,
- @RequestBody FlowCard flowCard){
+ @RequestBody FlowCard flowCard){
return Result.seccess(flowCardService.SelectNoCardSv(orderId,productionId,flowCard));
}
+ //娣诲姞娴佺▼鍗�
+ @PostMapping("/addFlowCard")
+ public Result AddOrderWork( @RequestBody Map<String,Object> object){
+ if(flowCardService.AddFlowCardSv(object)){
+ return Result.seccess();
+ }else {
+ throw new ServiceException(Constants.Code_500,"淇濆瓨澶辫触");
+
+ }
+ }
+
+ //鏌ヨ绗竴娆℃帓鐗堟暟鎹�
+ @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