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 | 150 +++++++++++++++++++++++++++++--------------------
1 files changed, 89 insertions(+), 61 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 ecf474c..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
@@ -2,17 +2,13 @@
import cn.dev33.satoken.annotation.SaCheckPermission;
import com.example.erp.common.Constants;
-import com.example.erp.dto.pp.FlowCardDTO;
-import com.example.erp.dto.pp.TeamOutputDTO;
-import com.example.erp.entity.pp.FlowCard;
-import com.example.erp.entity.sd.DeliveryDetail;
-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;
@@ -20,7 +16,7 @@
import javax.servlet.http.HttpServletResponse;
import java.io.IOException;
-import java.sql.Date;
+import java.util.ArrayList;
import java.util.List;
import java.util.Map;
@@ -40,7 +36,7 @@
@PathVariable Integer pageSize,
@PathVariable List<String> selectDate,
@RequestBody FlowCard flowCard) {
- return Result.seccess(flowCardService.selectProcessCard(pageNum, pageSize,selectDate, flowCard));
+ return Result.success(flowCardService.selectProcessCard(pageNum, pageSize,selectDate, flowCard));
}
@@ -51,7 +47,7 @@
public Result selectAddProcess(
@PathVariable List<String> selectDate,
@RequestBody FlowCard flowCard) {
- return Result.seccess(flowCardService.selectAddProcess(selectDate, flowCard));
+ return Result.success(flowCardService.selectAddProcess(selectDate, flowCard));
}
//鍒嗘灦鏄庣粏鏌ヨ
@@ -61,7 +57,7 @@
public Result detailsSelect(
@PathVariable String orderId,
@RequestBody FlowCard flowCard) {
- return Result.seccess(flowCardService.detailsSelectSv(orderId, flowCard));
+ return Result.success(flowCardService.detailsSelectSv(orderId, flowCard));
}
@@ -77,12 +73,12 @@
@PathVariable String userName
) {
// if(flowCardService.deleteFlowCardSv(orderId,processId)){
-// return Result.seccess();
+// return Result.success();
// }else {
// throw new ServiceException(Constants.Code_500,"鍒犻櫎澶辫触,璇锋鏌ユ槸鍚﹀凡鎶ュ伐");
//
// }
- return Result.seccess(flowCardService.deleteFlowCardSv(orderId, processId,userId,userName));
+ return Result.success(flowCardService.deleteFlowCardSv(orderId, processId,userId,userName));
}
//淇敼鎺掔増鐘舵��
@@ -94,7 +90,7 @@
@PathVariable Integer state
) {
if (flowCardService.updateLayoutStatusSv(processId, state)) {
- return Result.seccess();
+ return Result.success();
} else {
throw new ServiceException(Constants.Code_500, "淇敼澶辫触");
@@ -108,7 +104,7 @@
@PathVariable String orderId,
@PathVariable String productionId,
@RequestBody FlowCard flowCard) {
- return Result.seccess(flowCardService.selectNoCardSv(orderId, productionId, flowCard));
+ return Result.success(flowCardService.selectNoCardSv(orderId, productionId, flowCard));
}
@@ -120,7 +116,7 @@
@PathVariable String flashback,
@PathVariable String optionVal,
@RequestBody FlowCard flowCard) {
- return Result.seccess(flowCardService.selectSortingCardSv(orderId, productionId,flashback,optionVal, flowCard));
+ return Result.success(flowCardService.selectSortingCardSv(orderId, productionId,flashback,optionVal, flowCard));
}
@@ -130,7 +126,7 @@
@PostMapping("/addFlowCard/{orderId}")
public Result AddOrderWork(@PathVariable String orderId,@RequestBody Map<String, Object> object) {
if (flowCardService.addFlowCardSv(orderId,object)) {
- return Result.seccess();
+ return Result.success();
} else {
throw new ServiceException(Constants.Code_500, "淇濆瓨澶辫触");
@@ -144,7 +140,7 @@
@PathVariable String selectTime1,
@PathVariable String selectTime2,
@RequestBody FlowCard flowCard) {
- return Result.seccess(flowCardService.selectLastScheduling(selectTime1, selectTime2, flowCard));
+ return Result.success(flowCardService.selectLastScheduling(selectTime1, selectTime2, flowCard));
}
@@ -158,7 +154,7 @@
@PathVariable String processes,
@PathVariable Integer state,
@RequestBody FlowCard flowCard) {
- return Result.seccess(flowCardService.selectSchedulingSv(selectTime1, selectTime2, orderId, processes, state, flowCard));
+ return Result.success(flowCardService.selectSchedulingSv(selectTime1, selectTime2, orderId, processes, state, flowCard));
}
@@ -169,7 +165,7 @@
public Result flowCardDetail(
@PathVariable String processId,
@RequestBody FlowCard flowCard) {
- return Result.seccess(flowCardService.flowCardDetailSv(processId, flowCard));
+ return Result.success(flowCardService.flowCardDetailSv(processId, flowCard));
}
@@ -183,7 +179,7 @@
@PathVariable String userId,
@PathVariable Integer state,
@RequestBody FlowCard flowCard) {
- return Result.seccess(flowCardService.selectPrintFlowCardSv(selectDate, orderId, project,userId,state, flowCard));
+ return Result.success(flowCardService.selectPrintFlowCardSv(selectDate, orderId, project,userId,state, flowCard));
}
@ApiOperation("娴佺▼鍗℃槑缁嗘煡璇㈡帴鍙�")
@@ -192,7 +188,7 @@
public Result selectPrint(
@PathVariable String inquiryMode,
@RequestBody Map<String, Object> object) {
- return Result.seccess(flowCardService.selectPrintSv(object,inquiryMode));
+ return Result.success(flowCardService.selectPrintSv(object,inquiryMode));
}
@@ -206,32 +202,32 @@
@PathVariable String compound,
@PathVariable String landingSequence,
@RequestBody Map<String, Object> object) {
- return Result.seccess(flowCardService.getSelectPrintingSv(object,printMerge,printLike,merge,flashback,compound,landingSequence));
+ 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.seccess(flowCardService.getSelectPrintProject(printProject,merge,flashback,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.seccess(flowCardService.getSelectPrintLabelSv(projectNo,type));
+ return Result.success(flowCardService.getSelectPrintLabelSv(projectNo,type));
}
@ApiOperation("鎵撳嵃鏍囩鏌ヨ鎺ュ彛")
@PostMapping("/getSelectPrintLabel1")
public Result getSelectPrintLabel1(@RequestBody Map<String, Object> object) {
- return Result.seccess(flowCardService.getSelectPrintLabelSv1(object));
+ return Result.success(flowCardService.getSelectPrintLabelSv1(object));
}
@ApiOperation("鎵撳嵃鏍囩鏄庣粏鏌ヨ鎺ュ彛")
@PostMapping("/getSelectPrintLabelDetails")
public Result getSelectPrintLabelDetails(@RequestBody Map<String, Object> object) {
- return Result.seccess(flowCardService.getSelectPrintLabelDetails(object));
+ return Result.success(flowCardService.getSelectPrintLabelDetails(object));
}
@ApiOperation("鎵撳嵃鑷畾涔夋爣绛炬暟鎹煡璇㈡帴鍙f槑缁�")
@@ -239,7 +235,7 @@
public Result getSelectPrintCustomLabel( @PathVariable String type,
@PathVariable Integer lableType,
@RequestBody Map<String, Object> object) {
- return Result.seccess(flowCardService.getSelectPrintCustomLabelSv(type,lableType,object));
+ return Result.success(flowCardService.getSelectPrintCustomLabelSv(type,lableType,object));
}
@@ -248,7 +244,7 @@
public Result getSelectPrintCustomLabel2( @PathVariable String type,
@PathVariable Integer lableType,
@RequestBody Map<String, Object> object) {
- return Result.seccess(flowCardService.getSelectPrintCustomLabelSv2(type,lableType,object));
+ return Result.success(flowCardService.getSelectPrintCustomLabelSv2(type,lableType,object));
}
@@ -259,7 +255,7 @@
@RequestBody Map<String, Object> object
) {
- return Result.seccess(flowCardService.updateComposingSv(object));
+ return Result.success(flowCardService.updateComposingSv(object));
}
@ApiOperation("澶嶉�夋鎾ら攢鍙帓鐗堢姸鎬�")
@@ -269,7 +265,7 @@
@RequestBody Map<String, Object> object
) {
- return Result.seccess(flowCardService.revokeComposingSv(object));
+ return Result.success(flowCardService.revokeComposingSv(object));
}
@ApiOperation("娴佺▼鍗℃墦鍗版槑缁嗘暟鎹帓搴忔煡璇㈡帴鍙�")
@PostMapping("/printFlowCardDetails/{processId}/{technologyNumber}/{process}")
@@ -277,14 +273,14 @@
@PathVariable String technologyNumber,
@PathVariable String process,
@RequestBody FlowCard flowCard) {
- return Result.seccess(flowCardService.printFlowCardDetailsSv(processId, technologyNumber,process, 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.seccess();
+ return Result.success();
} else {
throw new ServiceException(Constants.Code_500, "淇濆瓨澶辫触");
@@ -298,7 +294,7 @@
@PathVariable String form,
@PathVariable String id,
@RequestBody FlowCard flowCard) {
- return Result.seccess(flowCardService.getCustomLabelDetailSv(name,form,id, flowCard));
+ return Result.success(flowCardService.getCustomLabelDetailSv(name,form,id, flowCard));
}
@@ -307,7 +303,7 @@
@PostMapping("/selectPrintPrintProject/{selectDate}")
public Result selectPrintFlowCard(
@PathVariable List<String> selectDate) {
- return Result.seccess(flowCardService.selectPrintFlowCard(selectDate));
+ return Result.success(flowCardService.selectPrintFlowCard(selectDate));
}
@ApiOperation("淇敼鏄惁鎵撳嵃鐘舵��")
@@ -317,21 +313,21 @@
@RequestBody Map<String, Object> object
) {
- return Result.seccess(flowCardService.updatePrintStateSv(printState,object));
+ return Result.success(flowCardService.updatePrintStateSv(printState,object));
}
@ApiOperation("娴佺▼鍗℃墦鍗拌鍗曟暟鎹帓搴忔煡璇㈡帴鍙�")
@PostMapping("/printFlowCardOrderSort/{orderId}")
public Result printFlowCardOrderSort(@PathVariable String orderId,
@RequestBody FlowCard flowCard) {
- return Result.seccess(flowCardService.printFlowCardOrderSortSv(orderId, 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.seccess();
+ return Result.success();
} else {
throw new ServiceException(Constants.Code_500, "淇濆瓨澶辫触");
@@ -345,7 +341,7 @@
@PathVariable String printLike,
@PathVariable String mergeTechnologyNumber,
@RequestBody Map<String, Object> object) {
- return Result.seccess(flowCardService.getSelectPrintingRefundSv(object,printMerge,printLike,mergeTechnologyNumber));
+ return Result.success(flowCardService.getSelectPrintingRefundSv(object,printMerge,printLike,mergeTechnologyNumber));
}
@ApiOperation("鍚堝苟鎵撳嵃娴佺▼鍗¤ˉ鐗囨暟鎹煡璇㈡帴鍙�")
@@ -355,7 +351,7 @@
@PathVariable String printLike,
@PathVariable String mergeTechnologyNumber,
@RequestBody Map<String, Object> object) {
- return Result.seccess(flowCardService.getSelectPrintingConsolidatedSv(object,printMerge,printLike,mergeTechnologyNumber));
+ return Result.success(flowCardService.getSelectPrintingConsolidatedSv(object,printMerge,printLike,mergeTechnologyNumber));
}
@ApiOperation("鎵撳嵃娴佺▼鍗¤繑宸ユ暟鎹煡璇㈡帴鍙�")
@@ -364,7 +360,7 @@
@PathVariable String printMerge,
@PathVariable String printLike,
@RequestBody Map<String, Object> object) {
- return Result.seccess(flowCardService.getSelectPrinReworkSv(object,printMerge,printLike));
+ return Result.success(flowCardService.getSelectPrinReworkSv(object,printMerge,printLike));
}
@ApiOperation("娴佺▼鍗℃槑缁嗘寜缂栧彿鏌ヨ鎺ュ彛")
@@ -373,7 +369,7 @@
@PathVariable String inquiryMode,
@PathVariable Integer type,
@RequestBody Map<String, Object> object) {
- return Result.seccess(flowCardService.selectPrintDetailsSv(object,inquiryMode,type));
+ return Result.success(flowCardService.selectPrintDetailsSv(object,inquiryMode,type));
}
@@ -382,7 +378,7 @@
public Result getSelectPrintCustomLabelDetails( @PathVariable String type,
@PathVariable Integer lableType,
@RequestBody Map<String, Object> object) {
- return Result.seccess(flowCardService.getSelectPrintCustomLabelDetailsSv(type,lableType,object));
+ return Result.success(flowCardService.getSelectPrintCustomLabelDetailsSv(type,lableType,object));
}
@@ -390,7 +386,7 @@
@PostMapping("/getPrintCustomDataProjectNo/{type}/{projectNo}")
public Result getPrintCustomDataProjectNo( @PathVariable String type,
@PathVariable String projectNo) {
- return Result.seccess(flowCardService.getPrintCustomDataProjectNo(type,projectNo));
+ return Result.success(flowCardService.getPrintCustomDataProjectNo(type,projectNo));
}
@@ -398,25 +394,25 @@
@PostMapping("/selectSortTable")
public Result selectSortTable(
@RequestBody Map<String, Object> object) {
- return Result.seccess(flowCardService.selectSortTableSv(object));
+ return Result.success(flowCardService.selectSortTableSv(object));
}
@ApiOperation("鍚堝苟娴佺▼鍗℃帴鍙�")
@PostMapping("/mergeFlowCard/{merge}")
public Result mergeFlowCard(@RequestBody Map<String, Object> object,
@PathVariable Integer merge) {
- return Result.seccess(flowCardService.mergeFlowCard(object,merge));
+ return Result.success(flowCardService.mergeFlowCard(object,merge));
}
@ApiOperation("姹夌幓鑾峰彇娴佺▼鍗℃帴鍙�")
@PostMapping("/getProcessCardList/hanbo")
public Result getProcessCard(@RequestBody Map<String,String> processCards) {
- return Result.seccess(flowCardService.getProcessCard(processCards));
+ return Result.success(flowCardService.getProcessCard(processCards));
}
@ApiOperation("鑾峰彇娴佺▼鍗℃帴鍙�")
@PostMapping("/getProcessCardList/all")
public Result getProcessCardAll(@RequestBody Map<String,String> processCards) {
- return Result.seccess(flowCardService.getProcessCardAll(processCards));
+ return Result.success(flowCardService.getProcessCardAll(processCards));
}
@ApiOperation("澶嶉�夋鍒犻櫎娴佺▼鍗�")
@@ -426,24 +422,41 @@
@RequestBody Map<String, Object> object
) {
- return Result.seccess(flowCardService.checkboxDeleteSv(object));
+ return Result.success(flowCardService.checkboxDeleteSv(object));
}
@ApiOperation("宸ョ▼鏄庣粏鎵撳嵃鏌ヨ")
@PostMapping("/selectPrintProjectDetails/{projectNo}")
- public Result selectPrintProjectDetails(
- @PathVariable String projectNo) {
- return Result.seccess(flowCardService.getPrintProjectDetails(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.seccess(flowCardService.getPrintCustomDataProjectNoDetailSv(type,detailType,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("淇敼宸ヨ壓娴佺▼")
@@ -457,39 +470,39 @@
@RequestBody Map<String, Object> object
) {
- return Result.seccess(flowCardService.updateProcessSv(processId,orderNumber,technologyNumber,orderId,process,object));
+ return Result.success(flowCardService.updateProcessSv(processId,orderNumber,technologyNumber,orderId,process,object));
}
@ApiOperation("宸ョ▼鎵撳嵃鏍囩娆℃暟淇敼")
@PostMapping("/updateProjectLabelPrintCount/{projectNo}")
public Result updateProjectLabelPrintCount(@PathVariable String projectNo){
- return Result.seccess(flowCardService.updateProjectLabelPrintCount(projectNo));
+ return Result.success(flowCardService.updateProjectLabelPrintCount(projectNo));
}
@ApiOperation("宸ョ▼鎵撳嵃鏍囩娆℃暟淇敼")
@PostMapping("/updateProjectProcessPrintCount/{projectNo}")
public Result updateProjectProcessPrintCount(@PathVariable String projectNo){
- return Result.seccess(flowCardService.updateProjectProcessPrintCount(projectNo));
+ return Result.success(flowCardService.updateProjectProcessPrintCount(projectNo));
}
@ApiOperation("娴佺▼鍗″悎鏋�")
@PostMapping("/flowCardDetail")
public Result flowCardDetail(
@RequestBody Map<String, Object> object) {
- return Result.seccess(flowCardService.flowCardDetail(object));
+ return Result.success(flowCardService.flowCardDetail(object));
}
@ApiOperation("淇濆瓨娴佺▼鍗″悎鏋�")
@PostMapping("/updateProcessCardRack")
public Result updateProcessCardRack(
@RequestBody Map<String, Object> object) {
- return Result.seccess(flowCardService.updateProcessCardRack(object));
+ return Result.success(flowCardService.updateProcessCardRack(object));
}
@ApiOperation("鏅鸿兘鍒嗘灦")
@PostMapping("/processCardAutoRack")
public Result processCardAutoRack(@ RequestBody Map<String, Object> object) {
- return Result.seccess(flowCardService.processCardAutoRack(object));
+ return Result.success(flowCardService.processCardAutoRack(object));
}
@ApiOperation("娴佺▼鍗℃煡璇㈠鍑�")
@@ -509,7 +522,16 @@
@PathVariable Integer value
) {
- return Result.seccess(flowCardService.updateTerminationSv(processId,orderNumber,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("鏌ヨ鐢ㄤ簬淇敼鐢熶骇缁堟鏁伴噺鐨勫畬宸ユ暟閲�")
@@ -518,7 +540,13 @@
@PathVariable String processId,
@PathVariable Integer orderNumber,
@PathVariable String process) {
- return Result.seccess(flowCardService.selectCompletedSv(processId, orderNumber,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