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/service/CapacityScopeService.java | 10 +++-
basic-server/src/main/java/com/ruoyi/basic/service/impl/CapacityScopeServiceImpl.java | 23 ++++++++---
inspect-server/src/main/java/com/ruoyi/inspect/pojo/ReliabilityPlanProduct.java | 2
basic-server/src/main/java/com/ruoyi/basic/controller/CapacityScopeController.java | 23 +++++++++--
basic-server/src/main/java/com/ruoyi/basic/dto/ProductPartDto.java | 1
inspect-server/src/main/java/com/ruoyi/inspect/service/impl/ReliabilityPlanProductServiceImpl.java | 10 ++--
basic-server/src/main/java/com/ruoyi/basic/dto/ModelDto.java | 2 +
7 files changed, 51 insertions(+), 20 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) {
// 璋冪敤瀵煎叆宸ュ叿
diff --git a/basic-server/src/main/java/com/ruoyi/basic/dto/ModelDto.java b/basic-server/src/main/java/com/ruoyi/basic/dto/ModelDto.java
index 5f8321e..395316c 100644
--- a/basic-server/src/main/java/com/ruoyi/basic/dto/ModelDto.java
+++ b/basic-server/src/main/java/com/ruoyi/basic/dto/ModelDto.java
@@ -11,5 +11,7 @@
private String value;
+ private Integer productId;
+
}
diff --git a/basic-server/src/main/java/com/ruoyi/basic/dto/ProductPartDto.java b/basic-server/src/main/java/com/ruoyi/basic/dto/ProductPartDto.java
index 638afee..b739b6c 100644
--- a/basic-server/src/main/java/com/ruoyi/basic/dto/ProductPartDto.java
+++ b/basic-server/src/main/java/com/ruoyi/basic/dto/ProductPartDto.java
@@ -6,5 +6,6 @@
public class ProductPartDto {
private Integer id;
+ private Integer productId;
}
diff --git a/basic-server/src/main/java/com/ruoyi/basic/service/CapacityScopeService.java b/basic-server/src/main/java/com/ruoyi/basic/service/CapacityScopeService.java
index ef27aea..0a48424 100644
--- a/basic-server/src/main/java/com/ruoyi/basic/service/CapacityScopeService.java
+++ b/basic-server/src/main/java/com/ruoyi/basic/service/CapacityScopeService.java
@@ -3,11 +3,11 @@
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.IService;
-import com.ruoyi.basic.dto.PageTestObjectDto;
-import com.ruoyi.basic.dto.StructureTestObjectDto;
-import com.ruoyi.basic.dto.TestItemDto;
+import com.ruoyi.basic.dto.*;
import com.ruoyi.basic.excel.StructureTestObjectData;
+import com.ruoyi.basic.pojo.Model;
+import com.ruoyi.basic.pojo.ProductPart;
import com.ruoyi.basic.pojo.StructureItemParameter;
import com.ruoyi.basic.pojo.StructureTestObject;
@@ -48,5 +48,9 @@
void importPartExcel(List<StructureTestObjectData> list);
List<TestItemDto> getItemTreeProduct(StructureTestObjectDto structureTestObjectDto);
+
+ List<Model> getProductTypes(ModelDto modelDto);
+
+ List<ProductPart> getPartNoList(ProductPartDto productPartDto);
}
diff --git a/basic-server/src/main/java/com/ruoyi/basic/service/impl/CapacityScopeServiceImpl.java b/basic-server/src/main/java/com/ruoyi/basic/service/impl/CapacityScopeServiceImpl.java
index 4f790a1..c8b730b 100644
--- a/basic-server/src/main/java/com/ruoyi/basic/service/impl/CapacityScopeServiceImpl.java
+++ b/basic-server/src/main/java/com/ruoyi/basic/service/impl/CapacityScopeServiceImpl.java
@@ -7,13 +7,11 @@
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.ruoyi.basic.dto.StructureTestObjectDto;
+import com.ruoyi.basic.dto.*;
import com.ruoyi.basic.excel.StructureTestObjectData;
import com.ruoyi.basic.service.*;
import com.ruoyi.common.exception.base.BaseException;
import com.ruoyi.common.utils.QueryWrappers;
-import com.ruoyi.basic.dto.PageTestObjectDto;
-import com.ruoyi.basic.dto.TestItemDto;
import com.ruoyi.basic.mapper.*;
import com.ruoyi.basic.pojo.*;
import com.ruoyi.common.utils.StringUtils;
@@ -57,7 +55,9 @@
private StructureItemParameterService structureItemParameterService;
private WorkShopMapper workShopMapper;
-
+
+ private ModelMapper modelMapper;
+
@Override
public IPage<StructureItemParameter> selectItemParameterList(Page page, StructureItemParameter itemParameter) {
return structureItemParameterMapper.selectItemParameterList(page, QueryWrappers.queryWrappers(itemParameter));
@@ -68,8 +68,7 @@
if (itemParameter.getBsm().equals("") || itemParameter.getBsm() == null) {
itemParameter.setBsm("0");
}
- int insert = structureItemParameterMapper.insert(itemParameter);
- return insert;
+ return structureItemParameterMapper.insert(itemParameter);
}
@Override
@@ -195,7 +194,17 @@
public List<TestItemDto> getItemTreeProduct(StructureTestObjectDto structureTestObjectDto) {
return structureItemParameterMapper.getItemTreeProduct(structureTestObjectDto.getObjectType());
}
-
+
+ @Override
+ public List<Model> getProductTypes(ModelDto modelDto) {
+ return modelMapper.selectList(Wrappers.<Model>lambdaQuery().eq(Model::getProductId,modelDto.getProductId()));
+ }
+
+ @Override
+ public List<ProductPart> getPartNoList(ProductPartDto productPartDto) {
+ return productPartMapper.selectList(Wrappers.<ProductPart>lambdaQuery().eq(ProductPart::getProductId,productPartDto.getProductId()));
+ }
+
@Transactional(rollbackFor = Exception.class)
@Override
public void importPartExcel(List<StructureTestObjectData> list) {
diff --git a/inspect-server/src/main/java/com/ruoyi/inspect/pojo/ReliabilityPlanProduct.java b/inspect-server/src/main/java/com/ruoyi/inspect/pojo/ReliabilityPlanProduct.java
index ded59c8..d42ce40 100644
--- a/inspect-server/src/main/java/com/ruoyi/inspect/pojo/ReliabilityPlanProduct.java
+++ b/inspect-server/src/main/java/com/ruoyi/inspect/pojo/ReliabilityPlanProduct.java
@@ -36,7 +36,7 @@
private String partNo;
@ApiModelProperty("瀹℃牳鐘舵��")
- private String state;
+ private Integer state;
@ApiModelProperty("鏄惁閫氳繃")
private String isPass;
diff --git a/inspect-server/src/main/java/com/ruoyi/inspect/service/impl/ReliabilityPlanProductServiceImpl.java b/inspect-server/src/main/java/com/ruoyi/inspect/service/impl/ReliabilityPlanProductServiceImpl.java
index cb7d510..5d5158d 100644
--- a/inspect-server/src/main/java/com/ruoyi/inspect/service/impl/ReliabilityPlanProductServiceImpl.java
+++ b/inspect-server/src/main/java/com/ruoyi/inspect/service/impl/ReliabilityPlanProductServiceImpl.java
@@ -3,7 +3,6 @@
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ruoyi.common.utils.QueryWrappers;
-import com.ruoyi.common.utils.StringUtils;
import com.ruoyi.inspect.dto.ReliabilityPlanProductDto;
import com.ruoyi.inspect.pojo.ReliabilityPlanProduct;
import com.ruoyi.inspect.mapper.ReliabilityPlanProductMapper;
@@ -36,12 +35,13 @@
@Override
public int addOrUpdateProduct(ReliabilityPlanProductDto reliabilityPlanProductDto) {
if (Objects.isNull(reliabilityPlanProductDto.getId())) {
- reliabilityPlanProductDto.setState(null);
+ reliabilityPlanProductDto.setState(0);
return reliabilityPlanProductMapper.insert(reliabilityPlanProductDto);
} else {
- //1宸插鏍�
- if (!StringUtils.isNotBlank(reliabilityPlanProductDto.getState())) {
- reliabilityPlanProductDto.setState(null);
+ // 瀹℃牳鐘舵�� 0.寰呮彁浜�1.寰呭鏍�2.閫氳繃3.涓嶉�氳繃
+ int state = reliabilityPlanProductDto.getState();
+ if (state != 0 && state != 1 && state != 2) {
+ reliabilityPlanProductDto.setState(3);
}
return reliabilityPlanProductMapper.updateById(reliabilityPlanProductDto);
}
--
Gitblit v1.9.3