From 560c051b6ca86788ae84f22472d532e0b76f42b9 Mon Sep 17 00:00:00 2001
From: gongchunyi <deslre0381@gmail.com>
Date: 星期三, 29 四月 2026 16:51:42 +0800
Subject: [PATCH] fix: 指标维护新增工序修改
---
src/main/java/com/ruoyi/quality/pojo/QualityTestStandard.java | 5 +++++
src/main/java/com/ruoyi/quality/controller/QualityTestStandardController.java | 4 ++--
src/main/java/com/ruoyi/quality/service/impl/QualityTestStandardServiceImpl.java | 42 ++++++++++++++++++++++++++++++++++++++++++
src/main/java/com/ruoyi/quality/service/IQualityTestStandardService.java | 4 ++++
4 files changed, 53 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/ruoyi/quality/controller/QualityTestStandardController.java b/src/main/java/com/ruoyi/quality/controller/QualityTestStandardController.java
index 014729b..5f14221 100644
--- a/src/main/java/com/ruoyi/quality/controller/QualityTestStandardController.java
+++ b/src/main/java/com/ruoyi/quality/controller/QualityTestStandardController.java
@@ -40,7 +40,7 @@
*/
@PostMapping("/add")
public AjaxResult add(@RequestBody QualityTestStandard qualityTestStandard) {
- return AjaxResult.success(qualityTestStandardService.save(qualityTestStandard));
+ return AjaxResult.success(qualityTestStandardService.saveWithProcessTypeValidate(qualityTestStandard));
}
/**
@@ -63,7 +63,7 @@
*/
@PostMapping("/update")
public AjaxResult update(@RequestBody QualityTestStandard qualityTestStandard) {
- return AjaxResult.success(qualityTestStandardService.updateById(qualityTestStandard));
+ return AjaxResult.success(qualityTestStandardService.updateWithProcessTypeValidate(qualityTestStandard));
}
/**
diff --git a/src/main/java/com/ruoyi/quality/pojo/QualityTestStandard.java b/src/main/java/com/ruoyi/quality/pojo/QualityTestStandard.java
index 2a2c758..758b4be 100644
--- a/src/main/java/com/ruoyi/quality/pojo/QualityTestStandard.java
+++ b/src/main/java/com/ruoyi/quality/pojo/QualityTestStandard.java
@@ -6,8 +6,10 @@
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableLogic;
import com.baomidou.mybatisplus.annotation.TableName;
+
import java.io.Serializable;
import java.time.LocalDateTime;
+
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Getter;
@@ -70,6 +72,9 @@
@ApiModelProperty("宸ュ簭id")
private Integer processId;
+ @ApiModelProperty("宸ュ簭绫诲瀷")
+ private Integer processType;
+
@TableField(fill = FieldFill.INSERT)
private Long deptId;
}
diff --git a/src/main/java/com/ruoyi/quality/service/IQualityTestStandardService.java b/src/main/java/com/ruoyi/quality/service/IQualityTestStandardService.java
index 9f9881a..a51490b 100644
--- a/src/main/java/com/ruoyi/quality/service/IQualityTestStandardService.java
+++ b/src/main/java/com/ruoyi/quality/service/IQualityTestStandardService.java
@@ -25,4 +25,8 @@
List<QualityTestStandard> getQualityTestStandardByProductId(Long productId, Integer inspectType,String process);
int delQualityTestStandard(List<Integer> ids);
+
+ boolean saveWithProcessTypeValidate(QualityTestStandard qualityTestStandard);
+
+ boolean updateWithProcessTypeValidate(QualityTestStandard qualityTestStandard);
}
diff --git a/src/main/java/com/ruoyi/quality/service/impl/QualityTestStandardServiceImpl.java b/src/main/java/com/ruoyi/quality/service/impl/QualityTestStandardServiceImpl.java
index 371ab5d..bc48229 100644
--- a/src/main/java/com/ruoyi/quality/service/impl/QualityTestStandardServiceImpl.java
+++ b/src/main/java/com/ruoyi/quality/service/impl/QualityTestStandardServiceImpl.java
@@ -6,6 +6,9 @@
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ruoyi.basic.mapper.ProductModelMapper;
import com.ruoyi.basic.pojo.ProductModel;
+import com.ruoyi.common.exception.ServiceException;
+import com.ruoyi.common.utils.DictUtils;
+import com.ruoyi.common.utils.StringUtils;
import com.ruoyi.quality.mapper.QualityInspectMapper;
import com.ruoyi.quality.mapper.QualityTestStandardBindingMapper;
import com.ruoyi.quality.mapper.QualityTestStandardParamMapper;
@@ -19,7 +22,9 @@
import com.ruoyi.quality.service.QualityTestStandardParamService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+import java.util.Arrays;
import java.util.List;
import java.util.stream.Collectors;
@@ -87,5 +92,42 @@
return qualityTestStandardMapper.deleteBatchIds(ids);
}
+ @Override
+ @Transactional(rollbackFor = Exception.class)
+ public boolean saveWithProcessTypeValidate(QualityTestStandard qualityTestStandard) {
+ validateProcessType(qualityTestStandard);
+ return this.save(qualityTestStandard);
+ }
+
+ @Override
+ public boolean updateWithProcessTypeValidate(QualityTestStandard qualityTestStandard) {
+ validateProcessType(qualityTestStandard);
+ return this.updateById(qualityTestStandard);
+ }
+
+ private void validateProcessType(QualityTestStandard qualityTestStandard) {
+ if (qualityTestStandard == null || qualityTestStandard.getProcessType() == null) {
+ return;
+ }
+
+ String dictType = "product_process_type";
+ String input = String.valueOf(qualityTestStandard.getProcessType());
+
+ String dictValue = DictUtils.getDictValue(dictType, input);
+ if (StringUtils.isNotEmpty(dictValue)) {
+ qualityTestStandard.setProcessType(Integer.valueOf(dictValue));
+ return;
+ }
+
+ String dictValues = DictUtils.getDictValues(dictType);
+ if (StringUtils.isNotEmpty(dictValues)) {
+ List<String> valueList = Arrays.asList(dictValues.split(DictUtils.SEPARATOR));
+ if (valueList.contains(input)) {
+ return;
+ }
+ }
+
+ throw new ServiceException("宸ュ簭绫诲瀷銆�" + input + "銆戜笉瀛樺湪锛岃濉啓姝ｇ‘鐨勭被鍨嬶細" + DictUtils.getDictLabels(dictType));
+ }
}
--
Gitblit v1.9.3