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 | 48 ++++++++++++++++++++++++++++++++++++++----------
1 files changed, 38 insertions(+), 10 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 228c674..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;
@@ -431,11 +427,19 @@
@ApiOperation("宸ョ▼鏄庣粏鎵撳嵃鏌ヨ")
@PostMapping("/selectPrintProjectDetails/{projectNo}")
- public Result selectPrintProjectDetails(
- @PathVariable String 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(
@@ -444,6 +448,15 @@
@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("淇敼宸ヨ壓娴佺▼")
@@ -512,6 +525,15 @@
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(
@@ -521,4 +543,10 @@
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