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 | 106 +++++++++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 106 insertions(+), 0 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
new file mode 100644
index 0000000..a4ac0ee
--- /dev/null
+++ b/north-glass-erp/src/main/java/com/example/erp/controller/pp/ProcessCardController.java
@@ -0,0 +1,106 @@
+package com.example.erp.controller.pp;
+
+import com.example.erp.common.Constants;
+import com.example.erp.entity.pp.FlowCard;
+import com.example.erp.entity.sd.Order;
+import com.example.erp.common.Result;
+import com.example.erp.entity.sd.OrderDetail;
+import com.example.erp.entity.sd.OrderGlassDetail;
+import com.example.erp.exception.ServiceException;
+import com.example.erp.service.pp.FlowCardService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import java.sql.Date;
+import java.util.Map;
+
+@RestController
+@RequestMapping("/processCard")
+public class ProcessCardController {
+ @Autowired
+ FlowCardService flowCardService;
+
+ //娴佺▼鍗＄鐞嗘煡璇�
+ @PostMapping ("/flowCard/{selectTime1}/{selectTime2}")
+ public Result DateProcess(
+ @PathVariable Date selectTime1,
+ @PathVariable Date selectTime2,
+ @RequestBody FlowCard flowCard){
+ return Result.seccess(flowCardService.selectProcessCard(selectTime1,selectTime2,flowCard));
+
+ }
+
+ //鍒嗘灦鏌ヨ
+ @PostMapping ("/selectAddProcess/{selectTime1}/{selectTime2}")
+ public Result SelectAddProcess(
+ @PathVariable Date selectTime1,
+ @PathVariable Date selectTime2,
+ @RequestBody FlowCard flowCard){
+ // System.out.println(selectTime1+" "+selectTime2+" "+flowCard.toString());
+ return Result.seccess(flowCardService.selectAddProcess(selectTime1,selectTime2,flowCard));
+
+ }
+
+ //鍒嗘灦鏄庣粏鏌ヨ
+ @PostMapping ("/detailsSelect/{orderId}")
+
+ public Result DetailsSelect(
+ @PathVariable String orderId,
+ @RequestBody FlowCard flowCard){
+ return Result.seccess(flowCardService.DetailsSelectSv(orderId,flowCard));
+
+ }
+
+
+ //鍒犻櫎宸ュ崟
+ @PostMapping("/deleteFlowCard/{orderId}/{processId}")
+ public Result deleteOrderWork(
+ @PathVariable String orderId,
+ @PathVariable String processId
+ ){
+ if(flowCardService.DeleteFlowCardSv(orderId,processId)){
+ return Result.seccess();
+ }else {
+ throw new ServiceException(Constants.Code_500,"鍒犻櫎澶辫触");
+
+ }
+ }
+
+ //淇敼鎺掔増鐘舵��
+ @PostMapping("/updateLayoutStatus/{processId}")
+ public Result updateLayoutStatus(
+ @PathVariable String processId
+ ){
+ System.out.println(flowCardService.UpdateLayoutStatusSv(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){
+ 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