From fd2ec4214c6f8456b957c3545e7d67bcdbbb9985 Mon Sep 17 00:00:00 2001
From: 廖井涛 <2265517004@qq.com>
Date: 星期二, 02 十二月 2025 15:26:33 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10105/r/ERP_override
---
north-glass-erp/src/main/java/com/example/erp/controller/pp/ProcessCardController.java | 515 +++++++++++++++++++++++++++++++++++++++++++++++++++------
1 files changed, 460 insertions(+), 55 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 cbc1ec4..c019f24 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,23 +1,27 @@
package com.example.erp.controller.pp;
+import cn.dev33.satoken.annotation.SaCheckPermission;
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.dto.pp.FlowCardDTO;
+import com.example.erp.entity.pp.FlowCard;
import com.example.erp.exception.ServiceException;
import com.example.erp.service.pp.FlowCardService;
+import com.example.erp.tools.DownExcel;
+import com.fasterxml.jackson.core.JsonProcessingException;
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 javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.List;
import java.util.Map;
@RestController
-@Api(value="娴佺▼鍗ontroller",tags={"娴佺▼鍗℃搷浣滄帴鍙�"})
+@Api(value = "娴佺▼鍗ontroller", tags = {"娴佺▼鍗℃搷浣滄帴鍙�"})
@RequestMapping("/processCard")
public class ProcessCardController {
@Autowired
@@ -25,123 +29,524 @@
//娴佺▼鍗＄鐞嗘煡璇�
@ApiOperation("娴佺▼鍗＄鐞嗘煡璇㈡帴鍙�")
- @PostMapping ("/flowCard/{pageNum}/{pageSize}/{selectTime1}/{selectTime2}")
+ @SaCheckPermission("selectProcessCard.search")
+ @PostMapping("/flowCard/{pageNum}/{pageSize}/{selectDate}")
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));
-
+ @PathVariable List<String> selectDate,
+ @RequestBody FlowCard flowCard) {
+ return Result.success(flowCardService.selectProcessCard(pageNum, pageSize,selectDate, flowCard));
+
}
//鍒嗘灦鏌ヨ
@ApiOperation("鍒嗘灦鏌ヨ鎺ュ彛")
- @PostMapping ("/selectAddProcess/{selectTime1}/{selectTime2}")
+ @SaCheckPermission("selectAddProcess.search")
+ @PostMapping("/selectAddProcess/{selectDate}")
public Result selectAddProcess(
- @PathVariable Date selectTime1,
- @PathVariable Date selectTime2,
- @RequestBody FlowCard flowCard){
- return Result.seccess(flowCardService.selectAddProcess(selectTime1,selectTime2,flowCard));
-
+ @PathVariable List<String> selectDate,
+ @RequestBody FlowCard flowCard) {
+ return Result.success(flowCardService.selectAddProcess(selectDate, flowCard));
}
//鍒嗘灦鏄庣粏鏌ヨ
@ApiOperation("鍒嗘灦鏄庣粏鏌ヨ鎺ュ彛")
- @PostMapping ("/detailsSelect/{orderId}")
-
+ @SaCheckPermission("splittingDetails.search")
+ @PostMapping("/detailsSelect/{orderId}")
public Result detailsSelect(
@PathVariable String orderId,
- @RequestBody FlowCard flowCard){
- return Result.seccess(flowCardService.detailsSelectSv(orderId,flowCard));
+ @RequestBody FlowCard flowCard) {
+ return Result.success(flowCardService.detailsSelectSv(orderId, flowCard));
}
//鍒犻櫎娴佺▼鍗�
@ApiOperation("鍒犻櫎娴佺▼鍗℃帴鍙�")
- @PostMapping("/deleteFlowCard/{orderId}/{processId}")
+ @SaCheckPermission("selectProcessCard.delete")
+ @PostMapping("/deleteFlowCard/{orderId}/{processId}/{userId}/{userName}")
public Result deleteOrderWork(
@PathVariable String orderId,
- @PathVariable String processId
- ){
- if(flowCardService.deleteFlowCardSv(orderId,processId)){
- return Result.seccess();
- }else {
- throw new ServiceException(Constants.Code_500,"鍒犻櫎澶辫触,璇锋鏌ユ槸鍚﹀凡鎶ュ伐");
-
- }
+ @PathVariable String processId,
+ @PathVariable String userId,
+ @PathVariable String userName
+ ) {
+// if(flowCardService.deleteFlowCardSv(orderId,processId)){
+// return Result.success();
+// }else {
+// throw new ServiceException(Constants.Code_500,"鍒犻櫎澶辫触,璇锋鏌ユ槸鍚﹀凡鎶ュ伐");
+//
+// }
+ return Result.success(flowCardService.deleteFlowCardSv(orderId, processId,userId,userName));
}
//淇敼鎺掔増鐘舵��
@ApiOperation("淇敼鎺掔増鐘舵�佹帴鍙�")
+ @SaCheckPermission("selectProcessCard.review")
@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,"淇敼澶辫触");
+ ) {
+ if (flowCardService.updateLayoutStatusSv(processId, state)) {
+ return Result.success();
+ } else {
+ throw new ServiceException(Constants.Code_500, "淇敼澶辫触");
}
}
//鍒嗘灦鏂板鏄庣粏鏌ヨ
- @ApiOperation("鍒嗘灦鏄庣粏鏂板鎺ュ彛")
- @PostMapping ("/selectNoCard/{orderId}/{productionId}")
+ @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.success(flowCardService.selectNoCardSv(orderId, productionId, flowCard));
+
+ }
+
+ @ApiOperation("鍒嗘灦鏂板鏄庣粏鎺掑簭鏌ヨ")
+ @PostMapping("/selectSortingCard/{orderId}/{productionId}/{flashback}/{optionVal}")
+ public Result selectSortingCard(
+ @PathVariable String orderId,
+ @PathVariable String productionId,
+ @PathVariable String flashback,
+ @PathVariable String optionVal,
+ @RequestBody FlowCard flowCard) {
+ return Result.success(flowCardService.selectSortingCardSv(orderId, productionId,flashback,optionVal, 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,"淇濆瓨澶辫触");
+ @SaCheckPermission("addProcessCard.add")
+ @PostMapping("/addFlowCard/{orderId}")
+ public Result AddOrderWork(@PathVariable String orderId,@RequestBody Map<String, Object> object) {
+ if (flowCardService.addFlowCardSv(orderId,object)) {
+ return Result.success();
+ } else {
+ throw new ServiceException(Constants.Code_500, "淇濆瓨澶辫触");
}
}
//鏌ヨ绗竴娆℃帓浜ф暟鎹�
@ApiOperation("鎺掍骇鐣岄潰鍔犺浇鏌ヨ鎺ュ彛")
- @PostMapping ("/selectLastScheduling/{selectTime1}/{selectTime2}")
+ @PostMapping("/selectLastScheduling/{selectTime1}/{selectTime2}")
public Result selectLastScheduling(
@PathVariable String selectTime1,
@PathVariable String selectTime2,
- @RequestBody FlowCard flowCard){
- return Result.seccess(flowCardService.selectLastScheduling(selectTime1,selectTime2,flowCard));
+ @RequestBody FlowCard flowCard) {
+ return Result.success(flowCardService.selectLastScheduling(selectTime1, selectTime2, flowCard));
}
+
//鏌ヨ鎺掍骇鏁版嵁
@ApiOperation("鎺掍骇鐐瑰嚮鎸夐挳鏌ヨ鎺ュ彛")
- @PostMapping ("/selectScheduling/{selectTime1}/{selectTime2}/{orderId}/{processes}/{state}")
+ @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));
+ @RequestBody FlowCard flowCard) {
+ return Result.success(flowCardService.selectSchedulingSv(selectTime1, selectTime2, orderId, processes, state, flowCard));
}
+
//娴佺▼鍗℃槑缁嗘煡璇�
@ApiOperation("娴佺▼鍗℃槑缁嗘煡璇㈡帴鍙�")
- @PostMapping ("/flowCardDetail/{processId}")
+ @SaCheckPermission("selectDetailProcessCard.search")
+ @PostMapping("/flowCardDetail/{processId}")
public Result flowCardDetail(
@PathVariable String processId,
- @RequestBody FlowCard flowCard){
- return Result.seccess(flowCardService.flowCardDetailSv(processId,flowCard));
+ @RequestBody FlowCard flowCard) {
+ return Result.success(flowCardService.flowCardDetailSv(processId, flowCard));
}
+
+ @ApiOperation("娴佺▼鍗℃墦鍗版煡璇㈡帴鍙�")
+ @SaCheckPermission("selectPrintFlowCard.search")
+ @PostMapping("/selectPrintFlowCard/{selectDate}/{orderId}/{project}/{userId}/{state}")
+ public Result selectPrintFlowCard(
+ @PathVariable List<String> selectDate,
+ @PathVariable String orderId,
+ @PathVariable String project,
+ @PathVariable String userId,
+ @PathVariable Integer state,
+ @RequestBody FlowCard flowCard) {
+ return Result.success(flowCardService.selectPrintFlowCardSv(selectDate, orderId, project,userId,state, flowCard));
+ }
+
+ @ApiOperation("娴佺▼鍗℃槑缁嗘煡璇㈡帴鍙�")
+ @SaCheckPermission("printFlowCard.search")
+ @PostMapping("/selectPrint/{inquiryMode}")
+ public Result selectPrint(
+ @PathVariable String inquiryMode,
+ @RequestBody Map<String, Object> object) {
+ return Result.success(flowCardService.selectPrintSv(object,inquiryMode));
+
+ }
+
+ @ApiOperation("鎵撳嵃娴佺▼鍗℃暟鎹煡璇㈡帴鍙�")
+ @PostMapping("/getSelectPrinting/{printMerge}/{printLike}/{merge}/{flashback}/{compound}/{landingSequence}")
+ public Result getSelectPrinting(
+ @PathVariable String printMerge,
+ @PathVariable String printLike,
+ @PathVariable String merge,
+ @PathVariable String flashback,
+ @PathVariable String compound,
+ @PathVariable String landingSequence,
+ @RequestBody Map<String, Object> object) {
+ return Result.success(flowCardService.getSelectPrintingSv(object,printMerge,printLike,merge,flashback,compound,landingSequence));
+ }
+
+ @ApiOperation("宸ョ▼鎵撳嵃娴佺▼鍗℃暟鎹煡璇㈡帴鍙�")
+ @PostMapping("/getSelectPrintProject/{printProject}/{merge}/{flashback}/{landingSequence}")
+ public Result getSelectPrintProject(
+ @PathVariable String printProject,@PathVariable String merge,@PathVariable String flashback,@PathVariable String landingSequence) {
+ return Result.success(flowCardService.getSelectPrintProject(printProject,merge,flashback,landingSequence));
+ }
+
+ @ApiOperation("鎵撳嵃鏍囩鏁版嵁鏌ヨ鎺ュ彛")
+ @PostMapping("/getSelectPrintLabel/{projectNo}/{type}")
+ public Result getSelectPrintLabel(@PathVariable String projectNo,@PathVariable String type) {
+ return Result.success(flowCardService.getSelectPrintLabelSv(projectNo,type));
+ }
+
+ @ApiOperation("鎵撳嵃鏍囩鏌ヨ鎺ュ彛")
+ @PostMapping("/getSelectPrintLabel1")
+ public Result getSelectPrintLabel1(@RequestBody Map<String, Object> object) {
+ return Result.success(flowCardService.getSelectPrintLabelSv1(object));
+ }
+
+ @ApiOperation("鎵撳嵃鏍囩鏄庣粏鏌ヨ鎺ュ彛")
+ @PostMapping("/getSelectPrintLabelDetails")
+ public Result getSelectPrintLabelDetails(@RequestBody Map<String, Object> object) {
+ return Result.success(flowCardService.getSelectPrintLabelDetails(object));
+ }
+
+ @ApiOperation("鎵撳嵃鑷畾涔夋爣绛炬暟鎹煡璇㈡帴鍙ｆ槑缁�")
+ @PostMapping("/getSelectPrintCustomLabel/{type}/{lableType}")
+ public Result getSelectPrintCustomLabel( @PathVariable String type,
+ @PathVariable Integer lableType,
+ @RequestBody Map<String, Object> object) {
+ return Result.success(flowCardService.getSelectPrintCustomLabelSv(type,lableType,object));
+
+ }
+
+ @ApiOperation("鎵撳嵃鑷畾涔夋爣绛炬暟鎹煡璇㈡帴鍙�")
+ @PostMapping("/getSelectPrintCustomLabel2/{type}/{lableType}")
+ public Result getSelectPrintCustomLabel2( @PathVariable String type,
+ @PathVariable Integer lableType,
+ @RequestBody Map<String, Object> object) {
+ return Result.success(flowCardService.getSelectPrintCustomLabelSv2(type,lableType,object));
+
+ }
+
+ @ApiOperation("澶嶉�夋淇敼鎺掔増鐘舵��")
+ @SaCheckPermission("selectProcessCard.review")
+ @PostMapping("/updateComposing")
+ public Result updateComposing(
+ @RequestBody Map<String, Object> object
+ ) {
+
+ return Result.success(flowCardService.updateComposingSv(object));
+ }
+
+ @ApiOperation("澶嶉�夋鎾ら攢鍙帓鐗堢姸鎬�")
+ @SaCheckPermission("selectProcessCard.review")
+ @PostMapping("/revokeComposing")
+ public Result revokeComposing(
+ @RequestBody Map<String, Object> object
+ ) {
+
+ return Result.success(flowCardService.revokeComposingSv(object));
+ }
+ @ApiOperation("娴佺▼鍗℃墦鍗版槑缁嗘暟鎹帓搴忔煡璇㈡帴鍙�")
+ @PostMapping("/printFlowCardDetails/{processId}/{technologyNumber}/{process}")
+ public Result printFlowCardDetails(@PathVariable String processId,
+ @PathVariable String technologyNumber,
+ @PathVariable String process,
+ @RequestBody FlowCard flowCard) {
+ return Result.success(flowCardService.printFlowCardDetailsSv(processId, technologyNumber,process, flowCard));
+ }
+
+ @ApiOperation("淇濆瓨鎵撳嵃鎺掑簭鎺ュ彛")
+ @PostMapping("/printSort")
+ public Result printSort(@RequestBody Map<String, Object> object) {
+ if (flowCardService.printSortSv(object)) {
+ return Result.success();
+ } else {
+ throw new ServiceException(Constants.Code_500, "淇濆瓨澶辫触");
+
+ }
+ }
+
+ @ApiOperation("鑷畾涔夋爣绛炬墦鍗版槑缁嗘帴鍙�")
+ @PostMapping("/getCustomLabelDetail/{name}/{form}/{id}")
+ public Result getCustomLabelDetail(
+ @PathVariable String name,
+ @PathVariable String form,
+ @PathVariable String id,
+ @RequestBody FlowCard flowCard) {
+ return Result.success(flowCardService.getCustomLabelDetailSv(name,form,id, flowCard));
+
+ }
+
+ @ApiOperation("宸ョ▼鎵撳嵃鏌ヨ鎺ュ彛")
+ @SaCheckPermission("selectPrintFlowCard.search")
+ @PostMapping("/selectPrintPrintProject/{selectDate}")
+ public Result selectPrintFlowCard(
+ @PathVariable List<String> selectDate) {
+ return Result.success(flowCardService.selectPrintFlowCard(selectDate));
+ }
+
+ @ApiOperation("淇敼鏄惁鎵撳嵃鐘舵��")
+ @PostMapping("/updatePrintState/{printState}")
+ public Result updatePrintState(
+ @PathVariable Integer printState,
+ @RequestBody Map<String, Object> object
+ ) {
+
+ return Result.success(flowCardService.updatePrintStateSv(printState,object));
+ }
+
+ @ApiOperation("娴佺▼鍗℃墦鍗拌鍗曟暟鎹帓搴忔煡璇㈡帴鍙�")
+ @PostMapping("/printFlowCardOrderSort/{orderId}")
+ public Result printFlowCardOrderSort(@PathVariable String orderId,
+ @RequestBody FlowCard flowCard) {
+ return Result.success(flowCardService.printFlowCardOrderSortSv(orderId, flowCard));
+ }
+
+ @ApiOperation("淇濆瓨鎵撳嵃璁㈠崟鎺掑簭鎺ュ彛")
+ @PostMapping("/printOrderSort")
+ public Result printOrderSort(@RequestBody Map<String, Object> object) {
+ if (flowCardService.printOrderSort(object)) {
+ return Result.success();
+ } else {
+ throw new ServiceException(Constants.Code_500, "淇濆瓨澶辫触");
+
+ }
+ }
+
+ @ApiOperation("鎵撳嵃娴佺▼鍗¤ˉ鐗囨暟鎹煡璇㈡帴鍙�")
+ @PostMapping("/getSelectPrintingRefund/{printMerge}/{printLike}/{mergeTechnologyNumber}")
+ public Result getSelectPrintingRefund(
+ @PathVariable String printMerge,
+ @PathVariable String printLike,
+ @PathVariable String mergeTechnologyNumber,
+ @RequestBody Map<String, Object> object) {
+ return Result.success(flowCardService.getSelectPrintingRefundSv(object,printMerge,printLike,mergeTechnologyNumber));
+ }
+
+ @ApiOperation("鍚堝苟鎵撳嵃娴佺▼鍗¤ˉ鐗囨暟鎹煡璇㈡帴鍙�")
+ @PostMapping("/getSelectPrintingConsolidated/{printMerge}/{printLike}/{mergeTechnologyNumber}")
+ public Result getSelectPrintingConsolidated(
+ @PathVariable String printMerge,
+ @PathVariable String printLike,
+ @PathVariable String mergeTechnologyNumber,
+ @RequestBody Map<String, Object> object) {
+ return Result.success(flowCardService.getSelectPrintingConsolidatedSv(object,printMerge,printLike,mergeTechnologyNumber));
+ }
+
+ @ApiOperation("鎵撳嵃娴佺▼鍗¤繑宸ユ暟鎹煡璇㈡帴鍙�")
+ @PostMapping("/getSelectPrinRework/{printMerge}/{printLike}")
+ public Result getSelectPrinRework(
+ @PathVariable String printMerge,
+ @PathVariable String printLike,
+ @RequestBody Map<String, Object> object) {
+ return Result.success(flowCardService.getSelectPrinReworkSv(object,printMerge,printLike));
+ }
+
+ @ApiOperation("娴佺▼鍗℃槑缁嗘寜缂栧彿鏌ヨ鎺ュ彛")
+ @PostMapping("/selectPrintDetails/{inquiryMode}/{type}")
+ public Result selectPrintDetails(
+ @PathVariable String inquiryMode,
+ @PathVariable Integer type,
+ @RequestBody Map<String, Object> object) {
+ return Result.success(flowCardService.selectPrintDetailsSv(object,inquiryMode,type));
+
+ }
+
+ @ApiOperation("鎵撳嵃鑷畾涔夋爣绛炬暟鎹寜缂栧彿鏌ヨ鎺ュ彛")
+ @PostMapping("/getSelectPrintCustomLabelDetails/{type}/{lableType}")
+ public Result getSelectPrintCustomLabelDetails( @PathVariable String type,
+ @PathVariable Integer lableType,
+ @RequestBody Map<String, Object> object) {
+ return Result.success(flowCardService.getSelectPrintCustomLabelDetailsSv(type,lableType,object));
+
+ }
+
+ @ApiOperation("鎵撳嵃鑷畾涔夋爣绛炬暟鎹寜宸ョ▼鏌ヨ鎺ュ彛")
+ @PostMapping("/getPrintCustomDataProjectNo/{type}/{projectNo}")
+ public Result getPrintCustomDataProjectNo( @PathVariable String type,
+ @PathVariable String projectNo) {
+ return Result.success(flowCardService.getPrintCustomDataProjectNo(type,projectNo));
+
+ }
+
+ @ApiOperation("鎺掑簭姹囨�绘煡璇㈡帴鍙�")
+ @PostMapping("/selectSortTable")
+ public Result selectSortTable(
+ @RequestBody Map<String, Object> object) {
+ return Result.success(flowCardService.selectSortTableSv(object));
+ }
+
+ @ApiOperation("鍚堝苟娴佺▼鍗℃帴鍙�")
+ @PostMapping("/mergeFlowCard/{merge}")
+ public Result mergeFlowCard(@RequestBody Map<String, Object> object,
+ @PathVariable Integer merge) {
+ return Result.success(flowCardService.mergeFlowCard(object,merge));
+ }
+ @ApiOperation("姹夌幓鑾峰彇娴佺▼鍗℃帴鍙�")
+ @PostMapping("/getProcessCardList/hanbo")
+ public Result getProcessCard(@RequestBody Map<String,String> processCards) {
+ return Result.success(flowCardService.getProcessCard(processCards));
+ }
+
+ @ApiOperation("鑾峰彇娴佺▼鍗℃帴鍙�")
+ @PostMapping("/getProcessCardList/all")
+ public Result getProcessCardAll(@RequestBody Map<String,String> processCards) {
+ return Result.success(flowCardService.getProcessCardAll(processCards));
+ }
+
+ @ApiOperation("澶嶉�夋鍒犻櫎娴佺▼鍗�")
+ @SaCheckPermission("selectProcessCard.delete")
+ @PostMapping("/checkboxDelete")
+ public Result checkboxDelete(
+ @RequestBody Map<String, Object> object
+ ) {
+
+ return Result.success(flowCardService.checkboxDeleteSv(object));
+ }
+
+ @ApiOperation("宸ョ▼鏄庣粏鎵撳嵃鏌ヨ")
+ @PostMapping("/selectPrintProjectDetails/{projectNo}")
+ public Result selectPrintProjectDetails( @PathVariable String projectNo) {
+ return Result.success(flowCardService.getPrintProjectDetails(projectNo));
+
+ }
+
+ @ApiOperation("宸ョ▼鏄庣粏灏忕墖鎵撳嵃鏌ヨ")
+ @PostMapping("/selectPrintProjectDetailSmallPiece")
+ public Result selectPrintProjectDetailSmallPiece(
+ @RequestBody Map<String, Object> object) throws JsonProcessingException {
+ return Result.success(flowCardService.selectPrintProjectDetailSmallPiece(object));
+
+ }
+
+ @ApiOperation("宸ョ▼鏄庣粏鎵撳嵃鏍囩鏌ヨ")
+ @PostMapping("/getPrintCustomDataProjectNoDetail/{type}/{detailType}")
+ public Result getPrintCustomDataProjectNoDetail(
+ @PathVariable String type,
+ @PathVariable Integer detailType,
+ @RequestBody Map<String, Object> object) {
+ return Result.success(flowCardService.getPrintCustomDataProjectNoDetailSv(type,detailType,object));
+
+ }
+
+ @ApiOperation("鑾峰彇鏈�鎶ュ伐鏂板伐搴�")
+ @PostMapping("/getNewProcess/{processId}/{orderNumber}/{technologyNumber}/{orderProcess}")
+ public Result getNewProcess(@PathVariable String processId,
+ @PathVariable String orderNumber,
+ @PathVariable String technologyNumber,
+ @PathVariable List<String> orderProcess){
+ return Result.success(flowCardService.getNewProcessSv(processId,orderNumber,technologyNumber,orderProcess));
+ }
+
+ @ApiOperation("淇敼宸ヨ壓娴佺▼")
+ @PostMapping("/updateProcess/{processId}/{orderNumber}/{technologyNumber}/{orderId}/{process}")
+ public Result updateProcess(
+ @PathVariable String processId,
+ @PathVariable String orderNumber,
+ @PathVariable String technologyNumber,
+ @PathVariable String orderId,
+ @PathVariable String process,
+ @RequestBody Map<String, Object> object
+ ) {
+
+ return Result.success(flowCardService.updateProcessSv(processId,orderNumber,technologyNumber,orderId,process,object));
+ }
+
+ @ApiOperation("宸ョ▼鎵撳嵃鏍囩娆℃暟淇敼")
+ @PostMapping("/updateProjectLabelPrintCount/{projectNo}")
+ public Result updateProjectLabelPrintCount(@PathVariable String projectNo){
+ return Result.success(flowCardService.updateProjectLabelPrintCount(projectNo));
+ }
+
+ @ApiOperation("宸ョ▼鎵撳嵃鏍囩娆℃暟淇敼")
+ @PostMapping("/updateProjectProcessPrintCount/{projectNo}")
+ public Result updateProjectProcessPrintCount(@PathVariable String projectNo){
+ return Result.success(flowCardService.updateProjectProcessPrintCount(projectNo));
+ }
+
+ @ApiOperation("娴佺▼鍗″悎鏋�")
+ @PostMapping("/flowCardDetail")
+ public Result flowCardDetail(
+ @RequestBody Map<String, Object> object) {
+ return Result.success(flowCardService.flowCardDetail(object));
+ }
+
+ @ApiOperation("淇濆瓨娴佺▼鍗″悎鏋�")
+ @PostMapping("/updateProcessCardRack")
+ public Result updateProcessCardRack(
+ @RequestBody Map<String, Object> object) {
+ return Result.success(flowCardService.updateProcessCardRack(object));
+ }
+
+ @ApiOperation("鏅鸿兘鍒嗘灦")
+ @PostMapping("/processCardAutoRack")
+ public Result processCardAutoRack(@ RequestBody Map<String, Object> object) {
+ return Result.success(flowCardService.processCardAutoRack(object));
+ }
+
+ @ApiOperation("娴佺▼鍗℃煡璇㈠鍑�")
+ @PostMapping("/exportDateProcess")
+ public void exportDateProcess(HttpServletResponse response,
+ @RequestBody Map<String, Object> dates
+ ) throws IOException, IllegalAccessException, InstantiationException {
+ //鍙傛暟锛氱浉搴旂殑鏁版嵁锛屽疄浣撶被淇℃伅锛岀浉搴旂殑鏂规硶锛堟暟鎹幏鍙栵級锛岀敓鎴愮殑excel鍚嶅瓧
+ DownExcel.download(response, FlowCardDTO.class, flowCardService.exportDateProcessSv(dates), "DateProcess");
+ }
+
+ @ApiOperation("淇敼鐢熶骇缁堟鏁伴噺")
+ @PostMapping("/updateTermination/{processId}/{orderNumber}/{value}")
+ public Result updateTermination(
+ @PathVariable String processId,
+ @PathVariable Integer orderNumber,
+ @PathVariable Integer value
+ ) {
+
+ return Result.success(flowCardService.updateTerminationSv(processId,orderNumber,value));
+ }
+
+ @ApiOperation("鍙栨秷缁堟")
+ @PostMapping("/updateTerminationNo/{processId}/{orderNumber}")
+ public Result updateTerminationNo(
+ @PathVariable String processId,
+ @PathVariable Integer orderNumber) {
+
+ return Result.success(flowCardService.updateTerminationNoSv(processId,orderNumber));
+ }
+
+ @ApiOperation("鏌ヨ鐢ㄤ簬淇敼鐢熶骇缁堟鏁伴噺鐨勫畬宸ユ暟閲�")
+ @PostMapping("/selectCompleted/{processId}/{orderNumber}/{process}")
+ public Result selectCompleted(
+ @PathVariable String processId,
+ @PathVariable Integer orderNumber,
+ @PathVariable String process) {
+ return Result.success(flowCardService.selectCompletedSv(processId, orderNumber,process));
+
+ }
+
+ @ApiOperation("鏍规嵁涓嶅悓鍙傛暟鏌ヨ娴佺▼鍗＄敓浜ц繘搴�")
+ @PostMapping("/selectProcessCardProgress")
+ public Result selectProcessCardProgress(@RequestBody Map<String, String> object) {
+ return flowCardService.selectProcessCardProgressSv(object);
+ }
}
--
Gitblit v1.8.0