From 5a5e59f8aaa2a030511ef245886bf6d1db9bf774 Mon Sep 17 00:00:00 2001
From: 廖井涛 <2265517004@qq.com>
Date: 星期五, 15 三月 2024 14:40:14 +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 | 147 +++++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 147 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..6df94b7
--- /dev/null
+++ b/north-glass-erp/src/main/java/com/example/erp/controller/pp/ProcessCardController.java
@@ -0,0 +1,147 @@
+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 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;
+
+ //娴佺▼鍗＄鐞嗘煡璇�
+ @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(pageNum,pageSize,selectTime1,selectTime2,flowCard));
+
+ }
+
+ //鍒嗘灦鏌ヨ
+ @ApiOperation("鍒嗘灦鏌ヨ鎺ュ彛")
+ @PostMapping ("/selectAddProcess/{selectTime1}/{selectTime2}")
+ public Result selectAddProcess(
+ @PathVariable Date selectTime1,
+ @PathVariable Date selectTime2,
+ @RequestBody FlowCard flowCard){
+ return Result.seccess(flowCardService.selectAddProcess(selectTime1,selectTime2,flowCard));
+
+ }
+
+ //鍒嗘灦鏄庣粏鏌ヨ
+ @ApiOperation("鍒嗘灦鏄庣粏鏌ヨ鎺ュ彛")
+ @PostMapping ("/detailsSelect/{orderId}")
+
+ public Result detailsSelect(
+ @PathVariable String orderId,
+ @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)){
+ return Result.seccess();
+ }else {
+ throw new ServiceException(Constants.Code_500,"鍒犻櫎澶辫触,璇锋鏌ユ槸鍚﹀凡鎶ュ伐");
+
+ }
+ }
+
+ //淇敼鎺掔増鐘舵��
+ @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));
+
+ }
+
+ //娣诲姞娴佺▼鍗�
+ @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));
+
+ }
+ //鏌ヨ鎺掍骇鏁版嵁
+ @ApiOperation("娴佺▼鍗℃槑缁嗘煡璇㈡帴鍙�")
+ @PostMapping ("/flowCardDetail/{processId}")
+ public Result flowCardDetail(
+ @PathVariable String processId,
+ @RequestBody FlowCard flowCard){
+ return Result.seccess(flowCardService.flowCardDetailSv(processId,flowCard));
+
+ }
+}
--
Gitblit v1.8.0