From 08004029f1fb93d5a433c55a53109b2d11caf96a Mon Sep 17 00:00:00 2001
From: chenrui <1187576398@qq.com>
Date: 星期三, 02 四月 2025 09:32:14 +0800
Subject: [PATCH] Merge branch 'radio_frequency' of http://114.132.189.42:9002/r/lims-ruoyi-after into radio_frequency
---
basic-server/src/main/java/com/ruoyi/basic/controller/CapacityScopeController.java | 23 +++++++++++++++++++----
1 files changed, 19 insertions(+), 4 deletions(-)
diff --git a/basic-server/src/main/java/com/ruoyi/basic/controller/CapacityScopeController.java b/basic-server/src/main/java/com/ruoyi/basic/controller/CapacityScopeController.java
index 113195d..9a4221a 100644
--- a/basic-server/src/main/java/com/ruoyi/basic/controller/CapacityScopeController.java
+++ b/basic-server/src/main/java/com/ruoyi/basic/controller/CapacityScopeController.java
@@ -3,13 +3,10 @@
import com.alibaba.excel.EasyExcel;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.ruoyi.basic.dto.ProductDto;
-import com.ruoyi.basic.dto.StructureTestObjectDto;
+import com.ruoyi.basic.dto.*;
import com.ruoyi.basic.excel.ExcelMultiSheetImporter;
import com.ruoyi.common.core.domain.Result;
import com.ruoyi.system.service.ISysDictTypeService;
-import com.ruoyi.basic.dto.PageTestObjectDto;
-import com.ruoyi.basic.dto.ProductDTO1;
import com.ruoyi.basic.excel.StructureTestObjectData;
import com.ruoyi.basic.excel.StructureTestObjectListener;
import com.ruoyi.basic.pojo.Product;
@@ -152,6 +149,24 @@
return Result.success(capacityScopeService.getItemTreeProduct(structureTestObjectDto));
}
+ /**
+ * 鏍规嵁浜у搧鑾峰彇鍨嬪彿
+ */
+ @ApiOperation(value = "鑾峰彇妫�楠屽璞℃爲")
+ @GetMapping("/getProductTypes")
+ public Result getProductTypes(ModelDto modelDto) {
+ return Result.success(capacityScopeService.getProductTypes(modelDto));
+ }
+
+ /**
+ * 鏍规嵁浜у搧鑾峰彇闆朵欢鍙�
+ */
+ @ApiOperation(value = "鑾峰彇妫�楠屽璞℃爲")
+ @GetMapping("/getPartNoList")
+ public Result getPartNoList(ProductPartDto productPartDto) {
+ return Result.success(capacityScopeService.getPartNoList(productPartDto));
+ }
+
@PostMapping("/importEquipData")
public Result importData(@RequestParam("file") MultipartFile file) {
// 璋冪敤瀵煎叆宸ュ叿
--
Gitblit v1.9.3