From 7104751e2f26872d4891d01d42ee88cf19715d01 Mon Sep 17 00:00:00 2001
From: guoyujie <guoyujie@ng.com>
Date: 星期二, 08 七月 2025 17:46:01 +0800
Subject: [PATCH] Merge branch 'master' of http://bore.pub:10439/r/ERP_override
---
north-glass-erp/src/main/java/com/example/erp/controller/pp/ProcessCardController.java | 113 +++++++++++++++++++++++++++++++++++++++++++++++++-------
1 files changed, 98 insertions(+), 15 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 0a0b4ed..e9d2fba 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,6 +2,8 @@
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;
@@ -10,12 +12,16 @@
import com.example.erp.entity.sd.OrderGlassDetail;
import com.example.erp.exception.ServiceException;
import com.example.erp.service.pp.FlowCardService;
+import com.example.erp.tools.DownExcel;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
+import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
import java.sql.Date;
+import java.util.List;
import java.util.Map;
@RestController
@@ -28,14 +34,13 @@
//娴佺▼鍗＄鐞嗘煡璇�
@ApiOperation("娴佺▼鍗＄鐞嗘煡璇㈡帴鍙�")
@SaCheckPermission("selectProcessCard.search")
- @PostMapping("/flowCard/{pageNum}/{pageSize}/{selectTime1}/{selectTime2}")
+ @PostMapping("/flowCard/{pageNum}/{pageSize}/{selectDate}")
public Result dateProcess(
@PathVariable Integer pageNum,
@PathVariable Integer pageSize,
- @PathVariable Date selectTime1,
- @PathVariable Date selectTime2,
+ @PathVariable List<String> selectDate,
@RequestBody FlowCard flowCard) {
- return Result.seccess(flowCardService.selectProcessCard(pageNum, pageSize, selectTime1, selectTime2, flowCard));
+ return Result.seccess(flowCardService.selectProcessCard(pageNum, pageSize,selectDate, flowCard));
}
@@ -111,9 +116,9 @@
//娣诲姞娴佺▼鍗�
@ApiOperation("娴佺▼鍗″垱寤烘帴鍙�")
@SaCheckPermission("addProcessCard.add")
- @PostMapping("/addFlowCard")
- public Result AddOrderWork(@RequestBody Map<String, Object> object) {
- if (flowCardService.addFlowCardSv(object)) {
+ @PostMapping("/addFlowCard/{orderId}")
+ public Result AddOrderWork(@PathVariable String orderId,@RequestBody Map<String, Object> object) {
+ if (flowCardService.addFlowCardSv(orderId,object)) {
return Result.seccess();
} else {
throw new ServiceException(Constants.Code_500, "淇濆瓨澶辫触");
@@ -159,15 +164,16 @@
@ApiOperation("娴佺▼鍗℃墦鍗版煡璇㈡帴鍙�")
@SaCheckPermission("selectPrintFlowCard.search")
- @PostMapping("/selectPrintFlowCard/{selectTime1}/{selectTime2}/{orderId}/{project}/{userId}")
+ @PostMapping("/selectPrintFlowCard/{selectTime1}/{selectTime2}/{orderId}/{project}/{userId}/{state}")
public Result selectPrintFlowCard(
@PathVariable Date selectTime1,
@PathVariable Date selectTime2,
@PathVariable String orderId,
@PathVariable String project,
@PathVariable String userId,
+ @PathVariable Integer state,
@RequestBody FlowCard flowCard) {
- return Result.seccess(flowCardService.selectPrintFlowCardSv(selectTime1, selectTime2, orderId, project,userId, flowCard));
+ return Result.seccess(flowCardService.selectPrintFlowCardSv(selectTime1, selectTime2, orderId, project,userId,state, flowCard));
}
@ApiOperation("娴佺▼鍗℃槑缁嗘煡璇㈡帴鍙�")
@@ -181,12 +187,23 @@
}
@ApiOperation("鎵撳嵃娴佺▼鍗℃暟鎹煡璇㈡帴鍙�")
- @PostMapping("/getSelectPrinting/{printMerge}/{printLike}")
+ @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.seccess(flowCardService.getSelectPrintingSv(object,printMerge,printLike));
+ return Result.seccess(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));
}
@ApiOperation("鎵撳嵃鏍囩鏁版嵁鏌ヨ鎺ュ彛")
@@ -207,12 +224,21 @@
return Result.seccess(flowCardService.getSelectPrintLabelDetails(object));
}
- @ApiOperation("鎵撳嵃鑷畾涔夋爣绛炬暟鎹煡璇㈡帴鍙�")
+ @ApiOperation("鎵撳嵃鑷畾涔夋爣绛炬暟鎹煡璇㈡帴鍙ｆ槑缁�")
@PostMapping("/getSelectPrintCustomLabel/{type}/{lableType}")
public Result getSelectPrintCustomLabel( @PathVariable String type,
@PathVariable Integer lableType,
@RequestBody Map<String, Object> object) {
return Result.seccess(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.seccess(flowCardService.getSelectPrintCustomLabelSv2(type,lableType,object));
}
@@ -226,6 +252,15 @@
return Result.seccess(flowCardService.updateComposingSv(object));
}
+ @ApiOperation("澶嶉�夋鎾ら攢鍙帓鐗堢姸鎬�")
+ @SaCheckPermission("selectProcessCard.review")
+ @PostMapping("/revokeComposing")
+ public Result revokeComposing(
+ @RequestBody Map<String, Object> object
+ ) {
+
+ return Result.seccess(flowCardService.revokeComposingSv(object));
+ }
@ApiOperation("娴佺▼鍗℃墦鍗版槑缁嗘暟鎹帓搴忔煡璇㈡帴鍙�")
@PostMapping("/printFlowCardDetails/{processId}/{technologyNumber}/{process}")
public Result printFlowCardDetails(@PathVariable String processId,
@@ -348,14 +383,21 @@
}
@ApiOperation("鍚堝苟娴佺▼鍗℃帴鍙�")
- @PostMapping("/mergeFlowCard")
- public Result mergeFlowCard(@RequestBody Map<String, Object> object) {
- return Result.seccess(flowCardService.mergeFlowCard(object));
+ @PostMapping("/mergeFlowCard/{merge}")
+ public Result mergeFlowCard(@RequestBody Map<String, Object> object,
+ @PathVariable Integer merge) {
+ return Result.seccess(flowCardService.mergeFlowCard(object,merge));
}
@ApiOperation("姹夌幓鑾峰彇娴佺▼鍗℃帴鍙�")
@PostMapping("/getProcessCardList/hanbo")
public Result getProcessCard(@RequestBody Map<String,String> processCards) {
return Result.seccess(flowCardService.getProcessCard(processCards));
+ }
+
+ @ApiOperation("鑾峰彇娴佺▼鍗℃帴鍙�")
+ @PostMapping("/getProcessCardList/all")
+ public Result getProcessCardAll(@RequestBody Map<String,String> processCards) {
+ return Result.seccess(flowCardService.getProcessCardAll(processCards));
}
@ApiOperation("澶嶉�夋鍒犻櫎娴佺▼鍗�")
@@ -397,4 +439,45 @@
return Result.seccess(flowCardService.updateProcessSv(processId,technologyNumber,orderId,process,object));
}
+
+ @ApiOperation("宸ョ▼鎵撳嵃鏍囩娆℃暟淇敼")
+ @PostMapping("/updateProjectLabelPrintCount/{projectNo}")
+ public Result updateProjectLabelPrintCount(@PathVariable String projectNo){
+ return Result.seccess(flowCardService.updateProjectLabelPrintCount(projectNo));
+ }
+
+ @ApiOperation("宸ョ▼鎵撳嵃鏍囩娆℃暟淇敼")
+ @PostMapping("/updateProjectProcessPrintCount/{projectNo}")
+ public Result updateProjectProcessPrintCount(@PathVariable String projectNo){
+ return Result.seccess(flowCardService.updateProjectProcessPrintCount(projectNo));
+ }
+
+ @ApiOperation("娴佺▼鍗″悎鏋�")
+ @PostMapping("/flowCardDetail")
+ public Result flowCardDetail(
+ @RequestBody Map<String, Object> object) {
+ return Result.seccess(flowCardService.flowCardDetail(object));
+ }
+
+ @ApiOperation("淇濆瓨娴佺▼鍗″悎鏋�")
+ @PostMapping("/updateProcessCardRack")
+ public Result updateProcessCardRack(
+ @RequestBody Map<String, Object> object) {
+ return Result.seccess(flowCardService.updateProcessCardRack(object));
+ }
+
+ @ApiOperation("鏅鸿兘鍒嗘灦")
+ @PostMapping("/processCardAutoRack")
+ public Result processCardAutoRack(@ RequestBody Map<String, Object> object) {
+ return Result.seccess(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");
+ }
}
--
Gitblit v1.8.0