From b0edff4c02128b722a9a6674b016536d4395872d Mon Sep 17 00:00:00 2001
From: 廖井涛 <2265517004@qq.com>
Date: 星期五, 23 二月 2024 13:39:44 +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 | 41 ++++++++++++++++++++++++++++++++++++-----
1 files changed, 36 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 1d33630..8b1bd26 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
@@ -1,9 +1,12 @@
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.*;
@@ -16,32 +19,60 @@
@Autowired
FlowCardService flowCardService;
+ //娴佺▼鍗＄鐞嗘煡璇�
@PostMapping ("/flowCard/{selectTime1}/{selectTime2}")
public Result DateProcess(
@PathVariable Date selectTime1,
@PathVariable Date selectTime2,
@RequestBody FlowCard flowCard){
- System.out.println(selectTime1+" "+selectTime2+" "+flowCard.toString());
return Result.seccess(flowCardService.selectProcessCard(selectTime1,selectTime2,flowCard));
}
+ //鍒嗘灦鏌ヨ
@PostMapping ("/selectAddProcess/{selectTime1}/{selectTime2}")
public Result SelectAddProcess(
@PathVariable Date selectTime1,
@PathVariable Date selectTime2,
- @RequestBody Order order){
+ @RequestBody FlowCard flowCard){
// System.out.println(selectTime1+" "+selectTime2+" "+flowCard.toString());
- return Result.seccess(flowCardService.selectAddProcess(selectTime1,selectTime2,order));
+ return Result.seccess(flowCardService.selectAddProcess(selectTime1,selectTime2,flowCard));
}
+ //鍒嗘灦鏄庣粏鏌ヨ
@PostMapping ("/detailsSelect/{orderId}")
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));
+
+ }
+
+
+ //鍒犻櫎宸ュ崟
+ @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 ("/selectNoCard/{orderId}/{productionId}")
+
+ public Result SelectNoCard(
+ @PathVariable String orderId,
+ @PathVariable String productionId,
+ @RequestBody FlowCard flowCard){
+ return Result.seccess(flowCardService.SelectNoCardSv(orderId,productionId,flowCard));
}
--
Gitblit v1.8.0