From 91ab1a15515c4c213b2ac4f777a7f20c3d0d59ad Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期五, 28 三月 2025 13:49:53 +0800
Subject: [PATCH] 一个订单在每个站点检验都需要扫码入库报检,在中间站点复核继续试验之后默认自动将样品出库,且在列表中也不需要再展示出来,到最后一步复核结束反而是需要手动去出库不能自动出库,且出库之后也不需要在页面展示
---
inspect-server/src/main/java/com/yuanchu/mom/controller/StandardTreeController.java | 26 +++++++++++++++++++++-----
1 files changed, 21 insertions(+), 5 deletions(-)
diff --git a/inspect-server/src/main/java/com/yuanchu/mom/controller/StandardTreeController.java b/inspect-server/src/main/java/com/yuanchu/mom/controller/StandardTreeController.java
index 82511d8..92e2acc 100644
--- a/inspect-server/src/main/java/com/yuanchu/mom/controller/StandardTreeController.java
+++ b/inspect-server/src/main/java/com/yuanchu/mom/controller/StandardTreeController.java
@@ -11,11 +11,16 @@
import com.yuanchu.mom.service.StandardProductListService;
import com.yuanchu.mom.service.StandardTreeService;
import com.yuanchu.mom.vo.Result;
-import io.swagger.annotations.*;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiImplicitParams;
+import io.swagger.annotations.ApiOperation;
import lombok.AllArgsConstructor;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.multipart.MultipartFile;
+import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
import java.util.Map;
@RestController
@@ -41,7 +46,7 @@
@ApiOperation(value = "鑾峰彇鏍囧噯鏍�(妫�楠屼笅鍗�)")
@GetMapping("/selectStandardTreeList2")
public Result selectStandardTreeList2() {
- return Result.success(standardTreeService.selectStandardTreeList());
+ return Result.success(standardTreeService.selectStandardTreeList2());
}
@ValueClassify("鏍囧噯搴�")
@@ -168,12 +173,23 @@
@ValueClassify("鏍囧噯搴�")
@ApiOperation("瀵煎叆鏍囧噯搴�")
- @PostMapping("/inExcelOfTree")
- public Result inExcelOfTree(@RequestParam("file") MultipartFile file) {
- standardTreeService.inExcelOfTree(file);
+ @PostMapping("/inExcelOfTree/{isEquipment}")
+ public Result inExcelOfTree(@RequestParam("file") MultipartFile file, @PathVariable("isEquipment") Boolean isEquipment) {
+ if (!isEquipment) {
+ standardTreeService.inExcelOfTree(file);
+ } else {
+ standardTreeService.importWorkstationExcel(file);
+ }
return Result.success();
}
+ @ValueClassify("鏍囧噯搴�")
+ @ApiOperation("瀵煎嚭鏍囧噯搴�")
+ @GetMapping("/exportStandTree")
+ public void exportStandTree(HttpServletResponse response) throws IOException {
+ standardTreeService.exportStandTree(response);
+ }
+
@ValueAuth
@ApiOperation("閲嶇疆鏍囧噯搴撳崟浠�")
@PostMapping("/resetTreeOfPrice")
--
Gitblit v1.9.3