From 14999b3d001b6eff1220f7a6701c0796eee1089c Mon Sep 17 00:00:00 2001
From: gongchunyi <deslre0381@gmail.com>
Date: 星期六, 14 三月 2026 15:57:17 +0800
Subject: [PATCH] feat: 工序绑定参数列表
---
src/main/java/com/ruoyi/production/service/ProductProcessParamService.java | 30 ++
src/main/java/com/ruoyi/production/dto/ProductProcessParamDto.java | 73 ++++++
src/main/resources/mapper/production/ProductProcessParamMapper.xml | 45 ++++
src/main/java/com/ruoyi/basic/service/impl/BaseParamServiceImpl.java | 125 ++++++-----
src/main/java/com/ruoyi/basic/pojo/BaseParam.java | 11
src/main/java/com/ruoyi/production/dto/ProductProcessParamSortDTO.java | 35 +++
src/main/java/com/ruoyi/production/mapper/ProductProcessParamMapper.java | 24 ++
doc/宁夏-中盛建材.sql | 67 ++++-
src/main/java/com/ruoyi/production/controller/ProductProcessParamController.java | 71 ++++++
src/main/java/com/ruoyi/production/pojo/ProductProcessParam.java | 64 +++++
src/main/resources/mapper/basic/BaseParamMapper.xml | 3
src/main/java/com/ruoyi/production/pojo/ProductProcess.java | 7
src/main/java/com/ruoyi/production/service/impl/ProductProcessParamServiceImpl.java | 91 ++++++++
13 files changed, 557 insertions(+), 89 deletions(-)
diff --git "a/doc/\345\256\201\345\244\217-\344\270\255\347\233\233\345\273\272\346\235\220.sql" "b/doc/\345\256\201\345\244\217-\344\270\255\347\233\233\345\273\272\346\235\220.sql"
index d4e3800..bc95ed7 100644
--- "a/doc/\345\256\201\345\244\217-\344\270\255\347\233\233\345\273\272\346\235\220.sql"
+++ "b/doc/\345\256\201\345\244\217-\344\270\255\347\233\233\345\273\272\346\235\220.sql"
@@ -177,26 +177,59 @@
DROP COLUMN `data_sync_type`,
MODIFY COLUMN `data_source_type` tinyint NULL DEFAULT 1 COMMENT '鏁版嵁鏉ユ簮绫诲瀷锛�1=閽夐拤鍚屾 2=鎵嬪姩鏂板' AFTER `form_modified_time`;
+-- 鍒犻櫎鏃ц〃
DROP TABLE IF EXISTS `base_param`;
+DROP TABLE IF EXISTS `product_process_param`;
+
CREATE TABLE `base_param`
(
- id BIGINT PRIMARY KEY AUTO_INCREMENT COMMENT '涓婚敭ID',
- param_key VARCHAR(100) NOT NULL COMMENT '鍙傛暟鍞竴鏍囪瘑',
- param_name VARCHAR(100) NOT NULL COMMENT '鍙傛暟鍚嶇О',
- param_type TINYINT NOT NULL COMMENT '鍙傛暟绫诲瀷(1鏁板瓧 2鏂囨湰)',
- value_mode TINYINT DEFAULT 1 COMMENT '鍊兼ā寮�(1鍗曞�� 2鍖洪棿)',
- unit VARCHAR(50) COMMENT '鍗曚綅',
- default_value VARCHAR(200) COMMENT '榛樿鍊�(鍗曞�煎弬鏁�)',
- default_min DECIMAL(10, 2) COMMENT '榛樿鏈�灏忓��(鍖洪棿鍙傛暟)',
- default_max DECIMAL(10, 2) COMMENT '榛樿鏈�澶у��(鍖洪棿鍙傛暟)',
- is_required TINYINT DEFAULT 0 COMMENT '鏄惁蹇呭～(0鍚� 1鏄�)',
- remark VARCHAR(255) COMMENT '澶囨敞',
- create_user VARCHAR(64) COMMENT '鍒涘缓浜�',
- create_time DATETIME COMMENT '鍒涘缓鏃堕棿',
- update_user VARCHAR(64) COMMENT '淇敼浜�',
- update_time DATETIME COMMENT '淇敼鏃堕棿',
- tenant_id BIGINT NOT NULL COMMENT '绉熸埛ID'
-) COMMENT = '鍩虹鍙傛暟瀹氫箟琛�';
+ `id` bigint NOT NULL AUTO_INCREMENT COMMENT '涓婚敭ID',
+ `param_key` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '鍙傛暟鍞竴鏍囪瘑',
+ `param_name` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '鍙傛暟鍚嶇О',
+ `param_type` tinyint NOT NULL COMMENT '鍙傛暟绫诲瀷(1鏁板瓧 2鏂囨湰 3涓嬫媺閫夋嫨 4鏃堕棿)',
+ `param_format` varchar(255) DEFAULT NULL COMMENT '鍙傛暟鏍煎紡',
+ `value_mode` tinyint DEFAULT '1' COMMENT '鍊兼ā寮�(1鍗曞�� 2鍖洪棿)',
+ `unit` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '鍗曚綅',
+ `is_required` tinyint DEFAULT '0' COMMENT '鏄惁蹇呭～',
+ `remark` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '澶囨敞',
+ `create_user` varchar(64) DEFAULT NULL COMMENT '鍒涘缓浜�',
+ `create_time` datetime DEFAULT CURRENT_TIMESTAMP COMMENT '鍒涘缓鏃堕棿',
+ `update_user` varchar(64) DEFAULT NULL COMMENT '淇敼浜�',
+ `update_time` datetime DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '淇敼鏃堕棿',
+ `tenant_id` bigint DEFAULT NULL COMMENT '绉熸埛ID',
+ PRIMARY KEY (`id`) USING BTREE
+) ENGINE = InnoDB
+ AUTO_INCREMENT = 10
+ DEFAULT CHARSET = utf8mb4
+ COLLATE = utf8mb4_0900_ai_ci COMMENT ='鍩虹鍙傛暟瀹氫箟琛�';
+
+CREATE TABLE `product_process_param`
+(
+ `id` bigint NOT NULL AUTO_INCREMENT COMMENT '涓婚敭ID',
+ `process_id` bigint NOT NULL COMMENT '鎵�灞炲伐搴廔D (product_process.id)',
+ `param_id` bigint NOT NULL COMMENT '鍏宠仈鍩虹鍙傛暟ID (base_param.id)',
+ `standard_value` varchar(200) DEFAULT NULL COMMENT '鍦ㄦ宸ュ簭璁惧畾鐨勬爣鍑嗗��(鍗曞�兼ā寮�)',
+ `min_value` decimal(10, 2) DEFAULT NULL COMMENT '鍦ㄦ宸ュ簭璁惧畾鐨勬爣鍑嗘渶灏忓��(鍖洪棿妯″紡)',
+ `max_value` decimal(10, 2) DEFAULT NULL COMMENT '鍦ㄦ宸ュ簭璁惧畾鐨勬爣鍑嗘渶澶у��(鍖洪棿妯″紡)',
+ `is_required` tinyint NOT NULL DEFAULT '0' COMMENT '鍦ㄦ宸ュ簭涓槸鍚﹀繀濉�(0-鍚�, 1-鏄�)',
+ `sort` int NOT NULL DEFAULT '0' COMMENT '鎺掑簭鍙�',
+ `tenant_id` bigint DEFAULT NULL COMMENT '绉熸埛ID',
+ `create_time` datetime DEFAULT CURRENT_TIMESTAMP COMMENT '鍒涘缓鏃堕棿',
+ `update_time` datetime DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '鏇存柊鏃堕棿',
+ PRIMARY KEY (`id`) USING BTREE,
+ KEY `idx_process_id` (`process_id`) USING BTREE,
+ KEY `idx_param_id` (`param_id`) USING BTREE
+) ENGINE = InnoDB
+ AUTO_INCREMENT = 1
+ DEFAULT CHARSET = utf8mb4
+ COLLATE = utf8mb4_0900_ai_ci COMMENT ='宸ュ簭缁戝畾鍙傛暟琛�';
+
+ALTER TABLE `product_process` MODIFY COLUMN `name` varchar(255) COMMENT '宸ュ簭鍚嶇О';
+ALTER TABLE `product_process` MODIFY COLUMN `no` varchar(255) COMMENT '宸ュ簭缂栧彿';
+ALTER TABLE `product_process` ADD COLUMN `status` tinyint(1) DEFAULT '1' COMMENT '鐘舵�侊細0-鍋滅敤锛�1-鍚敤' AFTER `no`;
+ALTER TABLE `product_process` MODIFY COLUMN `type` bigint COMMENT '绫诲瀷锛�0-璁℃椂锛�1-璁′欢';
+ALTER TABLE `product_process` MODIFY COLUMN `create_time` datetime DEFAULT CURRENT_TIMESTAMP COMMENT '鍒涘缓鏃堕棿';
+ALTER TABLE `product_process` MODIFY COLUMN `update_time` datetime DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '淇敼鏃堕棿';
ALTER TABLE `product-inventory-management-zsjc`.`customer`
ADD COLUMN `form_instance_id` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '瀹滄惌琛ㄥ崟瀹炰緥ID' AFTER `customer_type`,
diff --git a/src/main/java/com/ruoyi/basic/pojo/BaseParam.java b/src/main/java/com/ruoyi/basic/pojo/BaseParam.java
index ab35ecd..458e7f7 100644
--- a/src/main/java/com/ruoyi/basic/pojo/BaseParam.java
+++ b/src/main/java/com/ruoyi/basic/pojo/BaseParam.java
@@ -36,7 +36,7 @@
@ApiModelProperty("鍙傛暟鍚嶇О")
private String paramName;
- @ApiModelProperty("鍙傛暟绫诲瀷(1鏁板瓧 2鏂囨湰)")
+ @ApiModelProperty("鍙傛暟绫诲瀷(1鏁板瓧 2鏂囨湰 3涓嬫媺閫夋嫨 4鏃堕棿)")
private Integer paramType;
@ApiModelProperty("鍙傛暟鏍煎紡")
@@ -47,15 +47,6 @@
@ApiModelProperty("鍗曚綅")
private String unit;
-
- @ApiModelProperty("榛樿鍊�(鍗曞�煎弬鏁�)")
- private String defaultValue;
-
- @ApiModelProperty("榛樿鏈�灏忓��(鍖洪棿鍙傛暟)")
- private BigDecimal defaultMin;
-
- @ApiModelProperty("榛樿鏈�澶у��(鍖洪棿鍙傛暟)")
- private BigDecimal defaultMax;
@ApiModelProperty("鏄惁蹇呭～(0鍚� 1鏄�)")
private Integer isRequired;
diff --git a/src/main/java/com/ruoyi/basic/service/impl/BaseParamServiceImpl.java b/src/main/java/com/ruoyi/basic/service/impl/BaseParamServiceImpl.java
index 6cf1af6..10cc41e 100644
--- a/src/main/java/com/ruoyi/basic/service/impl/BaseParamServiceImpl.java
+++ b/src/main/java/com/ruoyi/basic/service/impl/BaseParamServiceImpl.java
@@ -11,8 +11,8 @@
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Service;
-import java.math.BigDecimal;
import java.time.LocalDateTime;
+import java.time.format.DateTimeFormatter;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
@@ -41,21 +41,31 @@
if (list == null || list.isEmpty()) {
return new ArrayList<>(0);
}
+
+ // 澶勭悊鏃ユ湡鏍煎紡灞曠ず
+ list.forEach(item -> {
+ if (Integer.valueOf(4).equals(item.getParamType()) && StringUtils.isNotEmpty(item.getParamFormat())) {
+ item.setParamFormat(toUpperCasePattern(item.getParamFormat()));
+ }
+ });
+
return list;
}
@Override
public int addBaseParam(BaseParam baseParam) {
-
if (baseParam == null) {
throw new RuntimeException("鏂板鍙傛暟涓嶈兘涓虹┖");
}
// 鍙傛暟鏍￠獙
- checkBaseParam(baseParam, false);
+ checkBaseParam(baseParam);
// 鑷姩鐢熸垚paramKey
baseParam.setParamKey(generateParamKey());
baseParam.setCreateUser(SecurityUtils.getUsername());
baseParam.setCreateTime(LocalDateTime.now());
+ // 璁剧疆榛樿鍊�
+ if (baseParam.getIsRequired() == null) baseParam.setIsRequired(0);
+ if (baseParam.getValueMode() == null) baseParam.setValueMode(1);
return baseMapper.insert(baseParam);
}
@@ -66,7 +76,7 @@
throw new RuntimeException("淇敼鍙傛暟ID涓嶈兘涓虹┖");
}
// 鍙傛暟鏍￠獙
- checkBaseParam(baseParam, true);
+ checkBaseParam(baseParam);
baseParam.setUpdateUser(SecurityUtils.getUsername());
baseParam.setUpdateTime(LocalDateTime.now());
@@ -74,76 +84,76 @@
}
/**
- * 鐢熸垚鍙傛暟鍞竴key
+ * 鍙傛暟瀹氫箟鍚堟硶鏍￠獙
+ */
+ private void checkBaseParam(BaseParam baseParam) {
+ if (StringUtils.isEmpty(baseParam.getParamName())) {
+ throw new RuntimeException("鍙傛暟鍚嶇О涓嶈兘涓虹┖");
+ }
+
+ // 绫诲瀷鏍￠獙 (1:鏁板瓧, 2:鏂囨湰, 3:涓嬫媺閫夋嫨, 4:鏃ユ湡鏃堕棿)
+ List<Integer> validTypes = Arrays.asList(1, 2, 3, 4);
+ if (baseParam.getParamType() == null || !validTypes.contains(baseParam.getParamType())) {
+ throw new RuntimeException("闈炴硶鍙傛暟绫诲瀷");
+ }
+
+ // 濡傛灉鏄棩鏈熺被鍨嬶紝鏍￠獙鏃ユ湡鏍煎紡閰嶇疆
+ if (Integer.valueOf(4).equals(baseParam.getParamType())) {
+ if (StringUtils.isEmpty(baseParam.getParamFormat())) {
+ throw new RuntimeException("鏃ユ湡绫诲瀷蹇呴』閰嶇疆鍙傛暟鏍煎紡(濡�: yyyy-MM-dd)");
+ }
+ try {
+ String standardPattern = normalizePattern(baseParam.getParamFormat());
+ DateTimeFormatter.ofPattern(standardPattern);
+ baseParam.setParamFormat(standardPattern);
+ } catch (Exception e) {
+ throw new RuntimeException("鏃ユ湡鏍煎紡闈炴硶: " + baseParam.getParamFormat());
+ }
+ }
+ }
+
+ /**
+ * 鐢熸垚鍙傛暟鍞竴key (PARAM_XXX)
*/
private String generateParamKey() {
String prefix = "PARAM_";
- // 鏌ヨ褰撳墠鏈�澶ey
LambdaQueryWrapper<BaseParam> wrapper = new LambdaQueryWrapper<>();
wrapper.select(BaseParam::getParamKey)
.likeRight(BaseParam::getParamKey, prefix)
.orderByDesc(BaseParam::getParamKey)
.last("limit 1");
+
BaseParam last = baseMapper.selectOne(wrapper);
int nextNum = 1;
- if (last != null) {
- String lastKey = last.getParamKey();
- String numStr = lastKey.replace(prefix, "");
- nextNum = Integer.parseInt(numStr) + 1;
+ if (last != null && StringUtils.isNotEmpty(last.getParamKey())) {
+ try {
+ String numStr = last.getParamKey().replace(prefix, "");
+ nextNum = Integer.parseInt(numStr) + 1;
+ } catch (Exception e) {
+ log.error("瑙ｆ瀽ParamKey寮傚父", e);
+ }
}
return prefix + String.format("%04d", nextNum);
}
/**
- * 鍙傛暟鍚堟硶鎬ф牎楠�
+ * 鏃ユ湡鏍煎紡鍖�
*/
- private void checkBaseParam(BaseParam baseParam, boolean isUpdate) {
- if (baseParam == null) {
- throw new RuntimeException("鍙傛暟瀵硅薄涓嶈兘涓虹┖");
- }
- if (StringUtils.isEmpty(baseParam.getParamName())) {
- throw new RuntimeException("鍙傛暟鍚嶇О涓嶈兘涓虹┖");
- }
- if (baseParam.getParamType() == null ||
- !(baseParam.getParamType() == 1 || baseParam.getParamType() == 2)) {
- throw new RuntimeException("鍙傛暟绫诲瀷蹇呴』涓�1(鏁板瓧)鎴�2(鏂囨湰)");
- }
- if (baseParam.getValueMode() == null ||
- !(baseParam.getValueMode() == 1 || baseParam.getValueMode() == 2)) {
- throw new RuntimeException("鍊兼ā寮忓繀椤讳负1(鍗曞��)鎴�2(鍖洪棿)");
- }
+ private String normalizePattern(String pattern) {
+ if (StringUtils.isEmpty(pattern)) return "yyyy-MM-dd";
+ return pattern.replace("YYYY", "yyyy")
+ .replace("DD", "dd")
+ .replace("SS", "ss");
+ }
- // 鍗曞�兼ā寮�
- if (baseParam.getValueMode() == 1) {
- if (StringUtils.isEmpty(baseParam.getDefaultValue())) {
- throw new RuntimeException("鍗曞�煎弬鏁伴粯璁ゅ�间笉鑳戒负绌�");
- }
- if (baseParam.getParamType() == 1) {
- try {
- new BigDecimal(baseParam.getDefaultValue());
- } catch (Exception e) {
- throw new RuntimeException("榛樿鍊煎繀椤讳负鏁板瓧");
- }
- }
-
- baseParam.setDefaultMin(null);
- baseParam.setDefaultMax(null);
- }
-
- // 鍖洪棿妯″紡
- if (baseParam.getValueMode() == 2) {
- if (baseParam.getParamType() != 1) {
- throw new RuntimeException("鍙湁鏁板瓧绫诲瀷鎵嶈兘浣跨敤鍖洪棿妯″紡");
- }
- if (baseParam.getDefaultMin() == null || baseParam.getDefaultMax() == null) {
- throw new RuntimeException("鍖洪棿鍙傛暟鏈�灏忓�煎拰鏈�澶у�间笉鑳戒负绌�");
- }
- if (baseParam.getDefaultMin().compareTo(baseParam.getDefaultMax()) > 0) {
- throw new RuntimeException("鏈�灏忓�间笉鑳藉ぇ浜庢渶澶у��");
- }
-
- baseParam.setDefaultValue(null);
- }
+ /**
+ * 杞崲涓哄叏澶у啓鏄剧ず
+ */
+ private String toUpperCasePattern(String pattern) {
+ if (StringUtils.isEmpty(pattern)) return "";
+ return pattern.replace("yyyy", "YYYY")
+ .replace("dd", "DD")
+ .replace("ss", "SS");
}
@Override
@@ -151,7 +161,6 @@
if (ids == null || ids.length == 0) {
throw new RuntimeException("鍒犻櫎ID涓嶈兘涓虹┖");
}
-
return baseMapper.deleteBatchIds(Arrays.asList(ids));
}
}
diff --git a/src/main/java/com/ruoyi/production/controller/ProductProcessParamController.java b/src/main/java/com/ruoyi/production/controller/ProductProcessParamController.java
new file mode 100644
index 0000000..566261f
--- /dev/null
+++ b/src/main/java/com/ruoyi/production/controller/ProductProcessParamController.java
@@ -0,0 +1,71 @@
+package com.ruoyi.production.controller;
+
+import com.ruoyi.framework.aspectj.lang.annotation.Log;
+import com.ruoyi.framework.aspectj.lang.enums.BusinessType;
+import com.ruoyi.framework.web.domain.AjaxResult;
+import com.ruoyi.production.dto.ProductProcessParamSortDTO;
+import com.ruoyi.production.pojo.ProductProcessParam;
+import com.ruoyi.production.service.ProductProcessParamService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+
+/**
+ * <br>
+ * 宸ュ簭缁戝畾鍙傛暟鎺у埗灞�
+ * </br>
+ *
+ * @author deslrey
+ * @version 1.0
+ * @since 2026/03/14 13:33
+ */
+@RestController
+@RequestMapping("/productProcessParam")
+@Api(tags = "宸ュ簭鍙傛暟缁戝畾绠＄悊")
+public class ProductProcessParamController {
+
+ @Autowired
+ private ProductProcessParamService productProcessParamService;
+
+ @GetMapping("/list/{productProcessId}")
+ @Log(title = "鏍规嵁宸ュ簭ID鏌ヨ瀵瑰簲鐨勫弬鏁�", businessType = BusinessType.OTHER)
+ @ApiOperation("鏍规嵁宸ュ簭ID鏌ヨ瀵瑰簲鐨勫弬鏁�")
+ public AjaxResult listByProcessId(@PathVariable("productProcessId") Long productProcessId) {
+ return AjaxResult.success(productProcessParamService.listByProcessId(productProcessId));
+ }
+
+ @PostMapping("/add")
+ @Log(title = "鏂板宸ュ簭缁戝畾鍙傛暟", businessType = BusinessType.INSERT)
+ @ApiOperation("鏂板宸ュ簭缁戝畾鍙傛暟")
+ public AjaxResult add(@RequestBody ProductProcessParam productProcessParam) {
+ productProcessParamService.add(productProcessParam);
+ return AjaxResult.success();
+ }
+
+ @PutMapping("/edit")
+ @Log(title = "淇敼宸ュ簭缁戝畾鍙傛暟", businessType = BusinessType.UPDATE)
+ @ApiOperation("淇敼宸ュ簭缁戝畾鍙傛暟")
+ public AjaxResult edit(@RequestBody ProductProcessParam productProcessParam) {
+ productProcessParamService.edit(productProcessParam);
+ return AjaxResult.success();
+ }
+
+ @DeleteMapping("/{ids}")
+ @Log(title = "鍒犻櫎宸ュ簭缁戝畾鍙傛暟", businessType = BusinessType.DELETE)
+ @ApiOperation("鍒犻櫎宸ュ簭缁戝畾鍙傛暟")
+ public AjaxResult remove(@PathVariable List<Long> ids) {
+ productProcessParamService.deleteByIds(ids);
+ return AjaxResult.success();
+ }
+
+ @PutMapping("/sort")
+ @Log(title = "鏇存柊宸ュ簭鍙傛暟鎺掑簭", businessType = BusinessType.UPDATE)
+ @ApiOperation("鏇存柊宸ュ簭鍙傛暟鎺掑簭")
+ public AjaxResult updateSort(@RequestBody ProductProcessParamSortDTO dto) {
+ productProcessParamService.updateSort(dto);
+ return AjaxResult.success();
+ }
+}
diff --git a/src/main/java/com/ruoyi/production/dto/ProductProcessParamDto.java b/src/main/java/com/ruoyi/production/dto/ProductProcessParamDto.java
new file mode 100644
index 0000000..4b919bc
--- /dev/null
+++ b/src/main/java/com/ruoyi/production/dto/ProductProcessParamDto.java
@@ -0,0 +1,73 @@
+package com.ruoyi.production.dto;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.math.BigDecimal;
+import java.util.Date;
+
+/**
+ * <br>
+ * 宸ュ簭缁戝畾鍙傛暟Dto
+ * </br>
+ *
+ * @author deslrey
+ * @version 1.0
+ * @since 2026/03/14 15:33
+ */
+@Data
+@ApiModel(value = "ProductProcessParamDto瀵硅薄", description = "宸ュ簭缁戝畾鍙傛暟Dto")
+public class ProductProcessParamDto {
+
+ @ApiModelProperty("涓婚敭ID")
+ private Long id;
+
+ @ApiModelProperty("鎵�灞炲伐搴廔D (product_process.id)")
+ private Long processId;
+
+ @ApiModelProperty("鍏宠仈鍩虹鍙傛暟ID (base_param.id)")
+ private Long paramId;
+
+ @ApiModelProperty("鍦ㄦ宸ュ簭璁惧畾鐨勬爣鍑嗗��(鍗曞�兼ā寮忎娇鐢�)")
+ private String standardValue;
+
+ @ApiModelProperty("鍦ㄦ宸ュ簭璁惧畾鐨勬爣鍑嗘渶灏忓��(鍖洪棿妯″紡浣跨敤)")
+ private BigDecimal minValue;
+
+ @ApiModelProperty("鍦ㄦ宸ュ簭璁惧畾鐨勬爣鍑嗘渶澶у��(鍖洪棿妯″紡浣跨敤)")
+ private BigDecimal maxValue;
+
+ @ApiModelProperty("鍦ㄦ宸ュ簭涓槸鍚﹀繀濉�(0-鍚�, 1-鏄�)")
+ private Integer isRequired;
+
+ @ApiModelProperty("鎺掑簭鍙�")
+ private Integer sort;
+
+ @ApiModelProperty("鍙傛暟鍚嶇О")
+ private String paramName;
+
+ @ApiModelProperty("鍙傛暟绫诲瀷(1鏁板瓧 2鏂囨湰 3涓嬫媺閫夋嫨 4鏃堕棿)")
+ private Integer paramType;
+
+ @ApiModelProperty("鍙傛暟鏍煎紡")
+ private String paramFormat;
+
+ @ApiModelProperty("鍊兼ā寮�(1鍗曞�� 2鍖洪棿)")
+ private Integer valueMode;
+
+ @ApiModelProperty("鍗曚綅")
+ private String unit;
+
+ @ApiModelProperty("鍒涘缓鏃堕棿")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date createTime;
+
+ @ApiModelProperty("鏇存柊鏃堕棿")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date updateTime;
+}
diff --git a/src/main/java/com/ruoyi/production/dto/ProductProcessParamSortDTO.java b/src/main/java/com/ruoyi/production/dto/ProductProcessParamSortDTO.java
new file mode 100644
index 0000000..0116ad5
--- /dev/null
+++ b/src/main/java/com/ruoyi/production/dto/ProductProcessParamSortDTO.java
@@ -0,0 +1,35 @@
+package com.ruoyi.production.dto;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * <br>
+ * 宸ュ簭鍙傛暟鎺掑簭 DTO
+ * </br>
+ *
+ * @author deslrey
+ * @version 1.0
+ * @since 2026/03/14 14:25
+ */
+@Data
+@ApiModel("宸ュ簭鍙傛暟鎺掑簭鍏ュ弬")
+public class ProductProcessParamSortDTO {
+
+ @ApiModelProperty("鎺掑簭椤瑰垪琛�")
+ private List<SortItem> items;
+
+ @Data
+ @ApiModel("鎺掑簭椤�")
+ public static class SortItem {
+
+ @ApiModelProperty("璁板綍ID")
+ private Long id;
+
+ @ApiModelProperty("鎺掑簭鍙�")
+ private Integer sort;
+ }
+}
diff --git a/src/main/java/com/ruoyi/production/mapper/ProductProcessParamMapper.java b/src/main/java/com/ruoyi/production/mapper/ProductProcessParamMapper.java
new file mode 100644
index 0000000..a313f7d
--- /dev/null
+++ b/src/main/java/com/ruoyi/production/mapper/ProductProcessParamMapper.java
@@ -0,0 +1,24 @@
+package com.ruoyi.production.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.ruoyi.production.dto.ProductProcessParamDto;
+import com.ruoyi.production.pojo.ProductProcessParam;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+/**
+ * <br>
+ * 宸ュ簭缁戝畾鍙傛暟 Mapper 鎺ュ彛
+ * </br>
+ *
+ * @author deslrey
+ * @version 1.0
+ * @since 2026/03/14 13:16
+ */
+public interface ProductProcessParamMapper extends BaseMapper<ProductProcessParam> {
+
+ List<ProductProcessParamDto> selectDtoListByProcessId(@Param("processId") Long processId);
+
+
+}
\ No newline at end of file
diff --git a/src/main/java/com/ruoyi/production/pojo/ProductProcess.java b/src/main/java/com/ruoyi/production/pojo/ProductProcess.java
index e55ab4f..b399d67 100644
--- a/src/main/java/com/ruoyi/production/pojo/ProductProcess.java
+++ b/src/main/java/com/ruoyi/production/pojo/ProductProcess.java
@@ -42,6 +42,11 @@
@Excel(name = "澶囨敞")
private String remark;
+ /**
+ * 鐘舵�侊細0-鍋滅敤锛�1-鍚敤
+ */
+ private Boolean status;
+
/**
* 宸ヨ祫瀹氶
@@ -75,7 +80,7 @@
@TableField(fill = FieldFill.INSERT)
private Long tenantId;
- @ApiModelProperty(value ="鏄惁璐ㄦ")
+ @ApiModelProperty(value = "鏄惁璐ㄦ")
private Boolean isQuality;
diff --git a/src/main/java/com/ruoyi/production/pojo/ProductProcessParam.java b/src/main/java/com/ruoyi/production/pojo/ProductProcessParam.java
new file mode 100644
index 0000000..079771c
--- /dev/null
+++ b/src/main/java/com/ruoyi/production/pojo/ProductProcessParam.java
@@ -0,0 +1,64 @@
+package com.ruoyi.production.pojo;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.util.Date;
+
+/**
+ * 宸ュ簭缁戝畾鍙傛暟瀹炰綋绫�
+ *
+ * @author deslrey
+ * @version 1.0
+ * @since 2026/03/14 13:14
+ */
+@Data
+@TableName("product_process_param")
+@ApiModel(value = "ProductProcessParam瀵硅薄", description = "宸ュ簭缁戝畾鍙傛暟琛�")
+public class ProductProcessParam implements Serializable {
+
+ private static final long serialVersionUID = 1L;
+
+ @ApiModelProperty("涓婚敭ID")
+ @TableId(value = "id", type = IdType.AUTO)
+ private Long id;
+
+ @ApiModelProperty("鎵�灞炲伐搴廔D (product_process.id)")
+ private Long processId;
+
+ @ApiModelProperty("鍏宠仈鍩虹鍙傛暟ID (base_param.id)")
+ private Long paramId;
+
+ @ApiModelProperty("鍦ㄦ宸ュ簭璁惧畾鐨勬爣鍑嗗��(鍗曞�兼ā寮忎娇鐢�)")
+ private String standardValue;
+
+ @ApiModelProperty("鍦ㄦ宸ュ簭璁惧畾鐨勬爣鍑嗘渶灏忓��(鍖洪棿妯″紡浣跨敤)")
+ private BigDecimal minValue;
+
+ @ApiModelProperty("鍦ㄦ宸ュ簭璁惧畾鐨勬爣鍑嗘渶澶у��(鍖洪棿妯″紡浣跨敤)")
+ private BigDecimal maxValue;
+
+ @ApiModelProperty("鍦ㄦ宸ュ簭涓槸鍚﹀繀濉�(0-鍚�, 1-鏄�)")
+ private Integer isRequired;
+
+ @ApiModelProperty("鎺掑簭鍙�")
+ private Integer sort;
+
+ @ApiModelProperty("绉熸埛ID")
+ private Long tenantId;
+
+ @ApiModelProperty("鍒涘缓鏃堕棿")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date createTime;
+
+ @ApiModelProperty("鏇存柊鏃堕棿")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date updateTime;
+}
\ No newline at end of file
diff --git a/src/main/java/com/ruoyi/production/service/ProductProcessParamService.java b/src/main/java/com/ruoyi/production/service/ProductProcessParamService.java
new file mode 100644
index 0000000..ae2f276
--- /dev/null
+++ b/src/main/java/com/ruoyi/production/service/ProductProcessParamService.java
@@ -0,0 +1,30 @@
+package com.ruoyi.production.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.ruoyi.production.dto.ProductProcessParamDto;
+import com.ruoyi.production.dto.ProductProcessParamSortDTO;
+import com.ruoyi.production.pojo.ProductProcessParam;
+
+import java.util.List;
+
+/**
+ * <br>
+ * 宸ュ簭缁戝畾鍙傛暟鎺ュ彛
+ * </br>
+ *
+ * @author deslrey
+ * @version 1.0
+ * @since 2026/03/14 13:17
+ */
+public interface ProductProcessParamService extends IService<ProductProcessParam> {
+
+ List<ProductProcessParamDto> listByProcessId(Long processId);
+
+ void add(ProductProcessParam productProcessParam);
+
+ void edit(ProductProcessParam productProcessParam);
+
+ void deleteByIds(List<Long> ids);
+
+ void updateSort(ProductProcessParamSortDTO dto);
+}
diff --git a/src/main/java/com/ruoyi/production/service/impl/ProductProcessParamServiceImpl.java b/src/main/java/com/ruoyi/production/service/impl/ProductProcessParamServiceImpl.java
new file mode 100644
index 0000000..e3244bb
--- /dev/null
+++ b/src/main/java/com/ruoyi/production/service/impl/ProductProcessParamServiceImpl.java
@@ -0,0 +1,91 @@
+package com.ruoyi.production.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.ruoyi.basic.service.BaseParamService;
+import com.ruoyi.production.dto.ProductProcessParamDto;
+import com.ruoyi.production.dto.ProductProcessParamSortDTO;
+import com.ruoyi.production.mapper.ProductProcessParamMapper;
+import com.ruoyi.production.pojo.ProductProcessParam;
+import com.ruoyi.production.service.ProductProcessParamService;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+
+/**
+ * <br>
+ * 宸ュ簭缁戝畾鍙傛暟鎺ュ彛瀹炵幇绫�
+ * </br>
+ *
+ * @author deslrey
+ * @version 1.0
+ * @since 2026/03/14 13:18
+ */
+@Slf4j
+@Service
+public class ProductProcessParamServiceImpl extends ServiceImpl<ProductProcessParamMapper, ProductProcessParam> implements ProductProcessParamService {
+
+ @Autowired
+ private BaseParamService baseParamService;
+
+ @Override
+ public List<ProductProcessParamDto> listByProcessId(Long processId) {
+ if (processId == null) {
+ throw new IllegalArgumentException("宸ュ簭ID涓嶈兘涓虹┖");
+ }
+ return baseMapper.selectDtoListByProcessId(processId);
+ }
+
+ @Override
+ public void add(ProductProcessParam productProcessParam) {
+ if (productProcessParam.getProcessId() == null) {
+ throw new IllegalArgumentException("鍏宠仈宸ュ簭ID涓嶈兘涓虹┖");
+ }
+ if (productProcessParam.getParamId() == null) {
+ throw new IllegalArgumentException("鍏宠仈鍩虹鍙傛暟ID涓嶈兘涓虹┖");
+ }
+ productProcessParam.setCreateTime(new Date());
+ if (!this.save(productProcessParam)) {
+ throw new RuntimeException("鏂板澶辫触");
+ }
+ }
+
+ @Override
+ public void edit(ProductProcessParam productProcessParam) {
+ if (productProcessParam.getId() == null) {
+ throw new IllegalArgumentException("ID涓嶈兘涓虹┖");
+ }
+ productProcessParam.setUpdateTime(new Date());
+ if (!this.updateById(productProcessParam)) {
+ throw new RuntimeException("淇敼澶辫触");
+ }
+ }
+
+ @Override
+ public void deleteByIds(List<Long> ids) {
+ if (ids == null || ids.isEmpty()) {
+ throw new IllegalArgumentException("ID涓嶈兘涓虹┖");
+ }
+ if (!this.removeByIds(ids)) {
+ throw new RuntimeException("鍒犻櫎澶辫触");
+ }
+ }
+
+ @Override
+ public void updateSort(ProductProcessParamSortDTO dto) {
+ if (dto == null || dto.getItems() == null || dto.getItems().isEmpty()) {
+ throw new IllegalArgumentException("鎺掑簭鏁版嵁涓嶈兘涓虹┖");
+ }
+ List<ProductProcessParam> list = new ArrayList<>();
+ for (ProductProcessParamSortDTO.SortItem item : dto.getItems()) {
+ ProductProcessParam param = new ProductProcessParam();
+ param.setId(item.getId());
+ param.setSort(item.getSort());
+ list.add(param);
+ }
+ this.updateBatchById(list);
+ }
+}
diff --git a/src/main/resources/mapper/basic/BaseParamMapper.xml b/src/main/resources/mapper/basic/BaseParamMapper.xml
index d46168f..0f19254 100644
--- a/src/main/resources/mapper/basic/BaseParamMapper.xml
+++ b/src/main/resources/mapper/basic/BaseParamMapper.xml
@@ -10,9 +10,6 @@
<result column="param_format" property="paramFormat"/>
<result column="value_mode" property="valueMode"/>
<result column="unit" property="unit"/>
- <result column="default_value" property="defaultValue"/>
- <result column="default_min" property="defaultMin"/>
- <result column="default_max" property="defaultMax"/>
<result column="is_required" property="isRequired"/>
<result column="remark" property="remark"/>
<result column="create_user" property="createUser"/>
diff --git a/src/main/resources/mapper/production/ProductProcessParamMapper.xml b/src/main/resources/mapper/production/ProductProcessParamMapper.xml
new file mode 100644
index 0000000..1ccaeb5
--- /dev/null
+++ b/src/main/resources/mapper/production/ProductProcessParamMapper.xml
@@ -0,0 +1,45 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+ "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.ruoyi.production.mapper.ProductProcessParamMapper">
+
+ <resultMap id="ProductProcessParamResult" type="com.ruoyi.production.pojo.ProductProcessParam">
+ <id property="id" column="id"/>
+ <result property="processId" column="process_id"/>
+ <result property="paramId" column="param_id"/>
+ <result property="standardValue" column="standard_value"/>
+ <result property="minValue" column="min_value"/>
+ <result property="maxValue" column="max_value"/>
+ <result property="isRequired" column="is_required"/>
+ <result property="sort" column="sort"/>
+ <result property="tenantId" column="tenant_id"/>
+ <result property="createTime" column="create_time"/>
+ <result property="updateTime" column="update_time"/>
+ </resultMap>
+
+ <select id="selectDtoListByProcessId" resultType="com.ruoyi.production.dto.ProductProcessParamDto"
+ parameterType="java.lang.Long">
+ SELECT ppp.id,
+ ppp.process_id,
+ ppp.param_id,
+ ppp.standard_value,
+ ppp.min_value,
+ ppp.max_value,
+ ppp.is_required,
+ ppp.sort,
+ ppp.create_time,
+ ppp.update_time,
+ bp.param_name,
+ bp.param_type,
+ bp.param_format,
+ bp.value_mode,
+ bp.unit
+ FROM product_process_param ppp
+ LEFT JOIN base_param bp ON ppp.param_id = bp.id
+ WHERE ppp.process_id = #{processId}
+ ORDER BY ppp.sort ASC
+ </select>
+
+
+</mapper>
\ No newline at end of file
--
Gitblit v1.9.3