From 7be1cd12e081cad2942c02b4c287d2562274d15f Mon Sep 17 00:00:00 2001
From: guoyuji <guoyujie@ng.com>
Date: 星期五, 01 三月 2024 08:03:51 +0800
Subject: [PATCH] 订单相关程序
---
north-glass-erp/src/main/java/com/example/erp/controller/pp/ProcessCardController.java | 44 +++++++++++++++++++++++++++++++++++++++-----
1 files changed, 39 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 bca0cc6..6fd4571 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")
@@ -45,8 +46,8 @@
public Result DetailsSelect(
@PathVariable String orderId,
- @RequestBody OrderDetail orderDetail){
- return Result.seccess(flowCardService.DetailsSelectSv(orderId,orderDetail));
+ @RequestBody FlowCard flowCard){
+ return Result.seccess(flowCardService.DetailsSelectSv(orderId,flowCard));
}
@@ -81,12 +82,45 @@
//鍒嗘灦鏂板鏄庣粏鏌ヨ
@PostMapping ("/selectNoCard/{orderId}/{productionId}")
-
public Result SelectNoCard(
@PathVariable String orderId,
@PathVariable String productionId,
- @RequestBody OrderDetail orderDetail){
- return Result.seccess(flowCardService.SelectNoCardSv(orderId,productionId,orderDetail));
+ @RequestBody FlowCard flowCard){
+ return Result.seccess(flowCardService.SelectNoCardSv(orderId,productionId,flowCard));
+
+ }
+
+ //娣诲姞娴佺▼鍗�
+ @PostMapping("/addFlowCard")
+ public Result AddOrderWork( @RequestBody Map<String,Object> object){
+ System.out.println("obj:"+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