From a97c0e84c8d1f50aa65935643a580527f30b7ece Mon Sep 17 00:00:00 2001
From: 廖井涛 <2265517004@qq.com>
Date: 星期二, 12 三月 2024 08:39:38 +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 | 88 +++++++++++++++++++++++++++++++++++++-------
1 files changed, 74 insertions(+), 14 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..3247c6f 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
@@ -8,71 +8,131 @@
import com.example.erp.entity.sd.OrderGlassDetail;
import com.example.erp.exception.ServiceException;
import com.example.erp.service.pp.FlowCardService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import java.sql.Date;
+import java.util.Map;
@RestController
+@Api(value="娴佺▼鍗ontroller",tags={"娴佺▼鍗℃搷浣滄帴鍙�"})
@RequestMapping("/processCard")
public class ProcessCardController {
@Autowired
FlowCardService flowCardService;
//娴佺▼鍗＄鐞嗘煡璇�
- @PostMapping ("/flowCard/{selectTime1}/{selectTime2}")
- public Result DateProcess(
+ @ApiOperation("娴佺▼鍗＄鐞嗘煡璇㈡帴鍙�")
+ @PostMapping ("/flowCard/{pageNum}/{pageSize}/{selectTime1}/{selectTime2}")
+ public Result dateProcess(
+ @PathVariable Integer pageNum,
+ @PathVariable Integer pageSize,
@PathVariable Date selectTime1,
@PathVariable Date selectTime2,
@RequestBody FlowCard flowCard){
- return Result.seccess(flowCardService.selectProcessCard(selectTime1,selectTime2,flowCard));
+ return Result.seccess(flowCardService.selectProcessCard(pageNum,pageSize,selectTime1,selectTime2,flowCard));
}
//鍒嗘灦鏌ヨ
+ @ApiOperation("鍒嗘灦鏌ヨ鎺ュ彛")
@PostMapping ("/selectAddProcess/{selectTime1}/{selectTime2}")
- public Result SelectAddProcess(
+ 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));
}
//鍒嗘灦鏄庣粏鏌ヨ
+ @ApiOperation("鍒嗘灦鏄庣粏鏌ヨ鎺ュ彛")
@PostMapping ("/detailsSelect/{orderId}")
- public Result DetailsSelect(
+ public Result detailsSelect(
@PathVariable String orderId,
- @RequestBody FlowCard flowCard){
- return Result.seccess(flowCardService.DetailsSelectSv(orderId,flowCard));
+ @RequestBody FlowCard flowCard){
+ return Result.seccess(flowCardService.detailsSelectSv(orderId,flowCard));
}
//鍒犻櫎宸ュ崟
+ @ApiOperation("鍒犻櫎宸ュ崟鎺ュ彛")
@PostMapping("/deleteFlowCard/{orderId}/{processId}")
public Result deleteOrderWork(
@PathVariable String orderId,
@PathVariable String processId
){
- if(flowCardService.DeleteFlowCardSv(orderId,processId)){
+ if(flowCardService.deleteFlowCardSv(orderId,processId)){
return Result.seccess();
}else {
- throw new ServiceException(Constants.Code_500,"鍒犻櫎澶辫触");
+ throw new ServiceException(Constants.Code_500,"鍒犻櫎澶辫触,璇锋鏌ユ槸鍚﹀凡鎶ュ伐");
}
}
- //鍒嗘灦鏄庣粏鏌ヨ
- @PostMapping ("/selectNoCard/{orderId}/{productionId}")
+ //淇敼鎺掔増鐘舵��
+ @ApiOperation("淇敼鎺掔増鐘舵�佹帴鍙�")
+ @PostMapping("/updateLayoutStatus/{processId}/{state}")
+ public Result updateLayoutStatus(
+ @PathVariable String processId,
+ @PathVariable Integer state
+ ){
+ if(flowCardService.updateLayoutStatusSv(processId,state)){
+ return Result.seccess();
+ }else {
+ throw new ServiceException(Constants.Code_500,"淇敼澶辫触");
+ }
+ }
+
+ //鍒嗘灦鏂板鏄庣粏鏌ヨ
+ @ApiOperation("鍒嗘灦鏄庣粏鏂板鎺ュ彛")
+ @PostMapping ("/selectNoCard/{orderId}/{productionId}")
public Result SelectNoCard(
@PathVariable String orderId,
@PathVariable String productionId,
- @RequestBody FlowCard flowCard){
- return Result.seccess(flowCardService.SelectNoCardSv(orderId,productionId,flowCard));
+ @RequestBody FlowCard flowCard){
+ return Result.seccess(flowCardService.selectNoCardSv(orderId,productionId,flowCard));
+
+ }
+
+ //娣诲姞娴佺▼鍗�
+ @ApiOperation("娴佺▼鍗″垱寤烘帴鍙�")
+ @PostMapping("/addFlowCard")
+ public Result AddOrderWork( @RequestBody Map<String,Object> object){
+ if(flowCardService.addFlowCardSv(object)){
+ return Result.seccess();
+ }else {
+ throw new ServiceException(Constants.Code_500,"淇濆瓨澶辫触");
+
+ }
+ }
+
+ //鏌ヨ绗竴娆℃帓浜ф暟鎹�
+ @ApiOperation("鎺掍骇鐣岄潰鍔犺浇鏌ヨ鎺ュ彛")
+ @PostMapping ("/selectLastScheduling/{selectTime1}/{selectTime2}")
+ public Result selectLastScheduling(
+ @PathVariable String selectTime1,
+ @PathVariable String selectTime2,
+ @RequestBody FlowCard flowCard){
+ return Result.seccess(flowCardService.selectLastScheduling(selectTime1,selectTime2,flowCard));
+
+ }
+ //鏌ヨ鎺掍骇鏁版嵁
+ @ApiOperation("鎺掍骇鐐瑰嚮鎸夐挳鏌ヨ鎺ュ彛")
+ @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