From 926a1e8b90381c7aa085d5462d78de9d2cc6034d Mon Sep 17 00:00:00 2001
From: 廖井涛 <2265517004@qq.com>
Date: 星期二, 27 二月 2024 08:58:15 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10101/r/ERP_override
---
north-glass-erp/src/main/java/com/example/erp/controller/pp/ProcessCardController.java | 23 ++++++++++++++++++-----
1 files changed, 18 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 0a57bd4..a4ac0ee 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));
}
@@ -67,7 +68,7 @@
//淇敼鎺掔増鐘舵��
@PostMapping("/updateLayoutStatus/{processId}")
- public Result updateLayoutStatus(
+ public Result updateLayoutStatus(
@PathVariable String processId
){
System.out.println(flowCardService.UpdateLayoutStatusSv(processId));
@@ -85,9 +86,21 @@
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,"淇濆瓨澶辫触");
+
+ }
+ }
+
}
--
Gitblit v1.8.0