From 5b334f63a33646b57a428c647bad9894cd3f3068 Mon Sep 17 00:00:00 2001
From: gongchunyi <deslre0381@gmail.com>
Date: 星期一, 16 三月 2026 15:40:00 +0800
Subject: [PATCH] feat: 新增工艺路线、工艺路线绑定工序、工序新增参数
---
src/main/java/com/ruoyi/production/service/ProcessRouteItemParamService.java | 25 ++
src/main/java/com/ruoyi/production/pojo/ProcessRouteItemParam.java | 70 +++++++
src/main/java/com/ruoyi/production/controller/ProcessRouteItemController.java | 8
src/main/java/com/ruoyi/production/dto/ProcessRouteItemParamDto.java | 35 +++
src/main/java/com/ruoyi/production/pojo/ProcessRoute.java | 3
src/main/resources/mapper/production/ProcessRouteMapper.xml | 27 +-
doc/宁夏-中盛建材.sql | 26 ++
src/main/java/com/ruoyi/production/service/ProcessRouteItemService.java | 2
src/main/resources/mapper/production/ProcessRouteItemParamMapper.xml | 68 +++++++
src/main/java/com/ruoyi/production/mapper/ProcessRouteItemParamMapper.java | 33 +++
src/main/resources/mapper/production/ProductProcessRouteItemMapper.xml | 13
src/main/java/com/ruoyi/production/controller/ProcessRouteItemParamController.java | 72 ++++++++
src/main/java/com/ruoyi/production/service/impl/ProcessRouteItemParamServiceImpl.java | 87 +++++++++
src/main/java/com/ruoyi/production/service/impl/ProcessRouteServiceImpl.java | 19 +
src/main/java/com/ruoyi/production/service/impl/ProcessRouteItemServiceImpl.java | 48 +++++
15 files changed, 505 insertions(+), 31 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 cf511bf..ce5f676 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"
@@ -235,6 +235,32 @@
ADD COLUMN `form_instance_id` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '瀹滄惌琛ㄥ崟瀹炰緥ID' AFTER `customer_type`,
ADD COLUMN `form_modified_time` datetime(0) NULL DEFAULT NULL COMMENT '瀹滄惌淇敼鏃堕棿' AFTER `form_instance_id`;
+ALTER TABLE `process_route`
+ ADD COLUMN `status` tinyint(1) NOT NULL DEFAULT '0' COMMENT '鐘舵�侊細0-鑽夌锛�1-宸叉壒鍑�' AFTER `bom_id`;
+
+CREATE TABLE `process_route_item_param`
+(
+ `id` bigint NOT NULL AUTO_INCREMENT COMMENT '涓婚敭ID',
+ `route_item_id` bigint NOT NULL COMMENT '鍏宠仈宸ヨ壓璺嚎鏄庣粏ID (process_route_item.id)',
+ `param_id` bigint NOT NULL COMMENT '鍏宠仈鍩虹鍙傛暟瀹氫箟ID (base_param.id)',
+ `process_param_id` bigint DEFAULT NULL COMMENT '鏉ユ簮宸ュ簭鍙傛暟ID',
+
+ `standard_value` varchar(200) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci 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 '鏄惁蹇呭～',
+
+ `sort` int NOT NULL DEFAULT '0' COMMENT '鎺掑簭',
+ `tenant_id` bigint DEFAULT NULL COMMENT '绉熸埛ID',
+ `create_time` datetime DEFAULT CURRENT_TIMESTAMP,
+ `update_time` datetime DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
+ PRIMARY KEY (`id`) USING BTREE,
+ KEY `idx_route_item_id` (`route_item_id`) USING BTREE,
+ KEY `idx_param_id` (`param_id`) USING BTREE
+) ENGINE = InnoDB
+ DEFAULT CHARSET = utf8mb4
+ COLLATE = utf8mb4_0900_ai_ci COMMENT ='宸ヨ壓璺嚎宸ュ簭鍙傛暟琛�';
+
ALTER TABLE `product-inventory-management-zsjc`.`quality_inspect`
ADD COLUMN `inspect_nature` varchar(255) NULL COMMENT '妫�娴嬫�ц川' AFTER `test_standard_id`,
diff --git a/src/main/java/com/ruoyi/production/controller/ProcessRouteItemController.java b/src/main/java/com/ruoyi/production/controller/ProcessRouteItemController.java
index 451548d..5c631e7 100644
--- a/src/main/java/com/ruoyi/production/controller/ProcessRouteItemController.java
+++ b/src/main/java/com/ruoyi/production/controller/ProcessRouteItemController.java
@@ -32,13 +32,13 @@
return R.ok(processRouteItemService.listProcessRouteItemDto(processRouteItemDto));
}
- @PostMapping ()
- @ApiOperation("鏂板淇敼")
+ @PostMapping()
+ @ApiOperation("鏂板淇敼宸ュ簭")
public R addOrUpdate(@RequestBody ProcessRouteItem processRouteItem) {
- return R.ok(processRouteItemService.saveOrUpdate(processRouteItem));
+ return R.ok(processRouteItemService.saveOrUpdateProcess(processRouteItem));
}
- @PostMapping ("/sort")
+ @PostMapping("/sort")
@ApiOperation("鎺掑簭")
public R sort(@RequestBody ProcessRouteItem processRouteItem) {
return R.ok(processRouteItemService.sort(processRouteItem));
diff --git a/src/main/java/com/ruoyi/production/controller/ProcessRouteItemParamController.java b/src/main/java/com/ruoyi/production/controller/ProcessRouteItemParamController.java
new file mode 100644
index 0000000..5c23804
--- /dev/null
+++ b/src/main/java/com/ruoyi/production/controller/ProcessRouteItemParamController.java
@@ -0,0 +1,72 @@
+package com.ruoyi.production.controller;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+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.ProcessRouteItemParamDto;
+import com.ruoyi.production.pojo.ProcessRouteItemParam;
+import com.ruoyi.production.service.ProcessRouteItemParamService;
+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.Arrays;
+
+/**
+ * <br>
+ * 宸ヨ壓璺嚎宸ュ簭鍙傛暟瀹炰緥鎺у埗灞�
+ * </br>
+ *
+ * @author deslrey
+ * @version 1.0
+ * @since 2026/03/16 11:15
+ */
+@RestController
+@RequestMapping("/ProcessRouteItemParam")
+@Api("宸ヨ壓璺嚎宸ュ簭鍙傛暟瀹炰緥鎺у埗灞�")
+public class ProcessRouteItemParamController {
+
+ @Autowired
+ private ProcessRouteItemParamService processRouteItemParamService;
+
+
+ @GetMapping("/pageList")
+ @ApiOperation("宸ヨ壓缁戝畾鐨勫伐搴忓弬鏁板垎椤垫煡璇�")
+ @Log(title = "宸ヨ壓缁戝畾鐨勫伐搴忓弬鏁板垎椤垫煡璇�", businessType = BusinessType.OTHER)
+ public AjaxResult listPage(Page<ProcessRouteItemParam> page, ProcessRouteItemParam param) {
+ IPage<ProcessRouteItemParamDto> paramIPage = processRouteItemParamService.pageList(page, param);
+ return AjaxResult.success(paramIPage);
+ }
+
+ @ApiOperation("淇敼鍙傛暟瀹炰緥鍊�")
+ @PutMapping("/edit")
+ @Log(title = "淇敼鍙傛暟", businessType = BusinessType.UPDATE)
+ public AjaxResult edit(@RequestBody ProcessRouteItemParam param) {
+ return AjaxResult.success(processRouteItemParamService.updateById(param));
+ }
+
+ @ApiOperation("鍒犻櫎鍙傛暟")
+ @DeleteMapping("/remove/{ids}")
+ @Log(title = "鍒犻櫎鍙傛暟", businessType = BusinessType.DELETE)
+ public AjaxResult remove(@PathVariable Long[] ids) {
+ return AjaxResult.success(processRouteItemParamService.removeByIds(Arrays.asList(ids)));
+ }
+
+ @ApiOperation("鍒濆鍖栧伐搴忓弬鏁�")
+ @PostMapping("/init")
+ @Log(title = "鍒濆鍖栧弬鏁�", businessType = BusinessType.INSERT)
+ public AjaxResult init(Long routeItemId, Long processId) {
+ return AjaxResult.success(processRouteItemParamService.initParams(routeItemId, processId));
+ }
+
+ @ApiOperation("鏂板鍗曚釜鍙傛暟瀹炰緥")
+ @PostMapping("/save")
+ @Log(title = "鏂板鍙傛暟", businessType = BusinessType.INSERT)
+ public AjaxResult save(@RequestBody ProcessRouteItemParam param) {
+ processRouteItemParamService.saveParam(param);
+ return AjaxResult.success();
+ }
+}
diff --git a/src/main/java/com/ruoyi/production/dto/ProcessRouteItemParamDto.java b/src/main/java/com/ruoyi/production/dto/ProcessRouteItemParamDto.java
new file mode 100644
index 0000000..fa4f057
--- /dev/null
+++ b/src/main/java/com/ruoyi/production/dto/ProcessRouteItemParamDto.java
@@ -0,0 +1,35 @@
+package com.ruoyi.production.dto;
+
+import com.ruoyi.production.pojo.ProcessRouteItemParam;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * <br>
+ * 宸ヨ壓璺嚎宸ュ簭鍙傛暟瀹炰緥Dto
+ * </br>
+ *
+ * @author deslrey
+ * @version 1.0
+ * @since 2026/03/16 11:23
+ */
+@Data
+public class ProcessRouteItemParamDto extends ProcessRouteItemParam {
+ @ApiModelProperty("鍙傛暟鍚嶇О")
+ private String paramName;
+
+ @ApiModelProperty("鍙傛暟鍞竴鏍囪瘑")
+ private String paramKey;
+
+ @ApiModelProperty("鍗曚綅")
+ private String unit;
+
+ @ApiModelProperty("鍙傛暟绫诲瀷(1鏁板瓧 2鏂囨湰 3涓嬫媺閫夋嫨 4鏃堕棿)")
+ private Integer paramType;
+
+ @ApiModelProperty("鍙傛暟鏍煎紡")
+ private String paramFormat;
+
+ @ApiModelProperty("鍊兼ā寮�(1鍗曞�� 2鍖洪棿)")
+ private Integer valueMode;
+}
\ No newline at end of file
diff --git a/src/main/java/com/ruoyi/production/mapper/ProcessRouteItemParamMapper.java b/src/main/java/com/ruoyi/production/mapper/ProcessRouteItemParamMapper.java
new file mode 100644
index 0000000..bf936c1
--- /dev/null
+++ b/src/main/java/com/ruoyi/production/mapper/ProcessRouteItemParamMapper.java
@@ -0,0 +1,33 @@
+package com.ruoyi.production.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.ruoyi.production.dto.ProcessRouteItemParamDto;
+import com.ruoyi.production.pojo.ProcessRouteItemParam;
+import org.apache.ibatis.annotations.Param;
+
+/**
+ * <br>
+ * 宸ヨ壓璺嚎宸ュ簭鍙傛暟瀹炰緥 Mapper
+ * </br>
+ *
+ * @author deslrey
+ * @version 1.0
+ * @since 2026/03/16 11:11
+ */
+public interface ProcessRouteItemParamMapper extends BaseMapper<ProcessRouteItemParam> {
+
+ IPage<ProcessRouteItemParamDto> selectParamPage(@Param("page") Page<ProcessRouteItemParam> page, @Param("p") ProcessRouteItemParam param);
+
+ /**
+ * 鏍规嵁宸ュ簭 ID 鍒濆鍖栧弬鏁板埌宸ヨ壓璺嚎鏄庣粏瀹炰緥
+ *
+ * @param routeItemId 宸ヨ壓璺嚎鏄庣粏ID
+ * @param processId 宸ュ簭ID
+ * @param tenantId 绉熸埛ID
+ */
+ int insertFromProcessTemplate(@Param("routeItemId") Long routeItemId, @Param("processId") Long processId, @Param("tenantId") Long tenantId);
+
+ Integer selectMaxSortByRouteItemId(Long routeItemId);
+}
\ No newline at end of file
diff --git a/src/main/java/com/ruoyi/production/pojo/ProcessRoute.java b/src/main/java/com/ruoyi/production/pojo/ProcessRoute.java
index 456a029..700a33e 100644
--- a/src/main/java/com/ruoyi/production/pojo/ProcessRoute.java
+++ b/src/main/java/com/ruoyi/production/pojo/ProcessRoute.java
@@ -41,4 +41,7 @@
@ApiModelProperty(value = "BOM鐨処D")
private Integer bomId;
+
+ @ApiModelProperty(value = "鐘舵�侊細0-鑽夌锛�1-宸叉壒鍑�")
+ private Boolean status;
}
diff --git a/src/main/java/com/ruoyi/production/pojo/ProcessRouteItemParam.java b/src/main/java/com/ruoyi/production/pojo/ProcessRouteItemParam.java
new file mode 100644
index 0000000..2eea851
--- /dev/null
+++ b/src/main/java/com/ruoyi/production/pojo/ProcessRouteItemParam.java
@@ -0,0 +1,70 @@
+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.Api;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.math.BigDecimal;
+import java.time.LocalDateTime;
+
+/**
+ * <br>
+ * 宸ヨ壓璺嚎宸ュ簭鍙傛暟瀹炰緥
+ * </br>
+ *
+ * @author deslrey
+ * @version 1.0
+ * @since 2026/03/16 11:07
+ */
+@Data
+@TableName("process_route_item_param")
+@ApiModel("宸ヨ壓璺嚎宸ュ簭鍙傛暟瀹炰緥琛�")
+public class ProcessRouteItemParam {
+
+ @TableId(value = "id", type = IdType.AUTO)
+ @ApiModelProperty("涓婚敭ID")
+ private Long id;
+
+ @ApiModelProperty("鍏宠仈宸ヨ壓璺嚎鏄庣粏ID (process_route_item.id)")
+ private Long routeItemId;
+
+ @ApiModelProperty("鍏宠仈鍩虹鍙傛暟瀹氫箟ID (base_param.id)")
+ private Long paramId;
+
+ @ApiModelProperty("鏉ユ簮宸ュ簭鍙傛暟ID")
+ private Long processParamId;
+
+ @ApiModelProperty("姝よ矾绾胯妭鐐硅瀹氱殑鏍囧噯鍊�")
+ private String standardValue;
+
+ @ApiModelProperty("姝よ矾绾胯妭鐐硅瀹氱殑鏍囧噯鏈�灏忓��")
+ private BigDecimal minValue;
+
+ @ApiModelProperty("姝よ矾绾胯妭鐐硅瀹氱殑鏍囧噯鏈�澶у��")
+ private BigDecimal maxValue;
+
+ @ApiModelProperty("鏄惁蹇呭～")
+ private Integer isRequired;
+
+ @ApiModelProperty("鎺掑簭")
+ private Integer sort;
+
+ @ApiModelProperty("绉熸埛ID")
+ private Long tenantId;
+
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ @ApiModelProperty("鍒涘缓鏃堕棿")
+ private LocalDateTime createTime;
+
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ @ApiModelProperty("鏇存柊鏃堕棿")
+ private LocalDateTime updateTime;
+}
\ No newline at end of file
diff --git a/src/main/java/com/ruoyi/production/service/ProcessRouteItemParamService.java b/src/main/java/com/ruoyi/production/service/ProcessRouteItemParamService.java
new file mode 100644
index 0000000..b108db7
--- /dev/null
+++ b/src/main/java/com/ruoyi/production/service/ProcessRouteItemParamService.java
@@ -0,0 +1,25 @@
+package com.ruoyi.production.service;
+
+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.production.dto.ProcessRouteItemParamDto;
+import com.ruoyi.production.pojo.ProcessRouteItemParam;
+
+/**
+ * <br>
+ * 宸ヨ壓璺嚎宸ュ簭鍙傛暟瀹炰緥 Service
+ * </br>
+ *
+ * @author deslrey
+ * @version 1.0
+ * @since 2026/03/16 11:11
+ */
+public interface ProcessRouteItemParamService extends IService<ProcessRouteItemParam> {
+
+ IPage<ProcessRouteItemParamDto> pageList(Page<ProcessRouteItemParam> page, ProcessRouteItemParam param);
+
+ boolean initParams(Long routeItemId, Long processId);
+
+ void saveParam(ProcessRouteItemParam param);
+}
\ No newline at end of file
diff --git a/src/main/java/com/ruoyi/production/service/ProcessRouteItemService.java b/src/main/java/com/ruoyi/production/service/ProcessRouteItemService.java
index 3299048..28c028a 100644
--- a/src/main/java/com/ruoyi/production/service/ProcessRouteItemService.java
+++ b/src/main/java/com/ruoyi/production/service/ProcessRouteItemService.java
@@ -15,4 +15,6 @@
int sort(ProcessRouteItem processRouteItem);
String batchDelete(Long id);
+
+ boolean saveOrUpdateProcess(ProcessRouteItem processRouteItem);
}
diff --git a/src/main/java/com/ruoyi/production/service/impl/ProcessRouteItemParamServiceImpl.java b/src/main/java/com/ruoyi/production/service/impl/ProcessRouteItemParamServiceImpl.java
new file mode 100644
index 0000000..70c388b
--- /dev/null
+++ b/src/main/java/com/ruoyi/production/service/impl/ProcessRouteItemParamServiceImpl.java
@@ -0,0 +1,87 @@
+package com.ruoyi.production.service.impl;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+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.pojo.BaseParam;
+import com.ruoyi.basic.service.BaseParamService;
+import com.ruoyi.common.exception.ServiceException;
+import com.ruoyi.common.utils.SecurityUtils;
+import com.ruoyi.production.dto.ProcessRouteItemParamDto;
+import com.ruoyi.production.mapper.ProcessRouteItemParamMapper;
+import com.ruoyi.production.pojo.ProcessRouteItemParam;
+import com.ruoyi.production.service.ProcessRouteItemParamService;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.time.LocalDateTime;
+
+/**
+ * <br>
+ * 宸ヨ壓璺嚎宸ュ簭鍙傛暟瀹炰緥 ServiceImpl
+ * </br>
+ *
+ * @author deslrey
+ * @version 1.0
+ * @since 2026/03/16 11:11
+ */
+@Slf4j
+@Service
+public class ProcessRouteItemParamServiceImpl extends ServiceImpl<ProcessRouteItemParamMapper, ProcessRouteItemParam> implements ProcessRouteItemParamService {
+
+ @Autowired
+ private BaseParamService baseParamService;
+
+ @Override
+ public IPage<ProcessRouteItemParamDto> pageList(Page<ProcessRouteItemParam> page, ProcessRouteItemParam param) {
+ return baseMapper.selectParamPage(page, param);
+ }
+
+ @Override
+ @Transactional(rollbackFor = Exception.class)
+ public boolean initParams(Long routeItemId, Long processId) {
+ Long tenantId = SecurityUtils.getLoginUser().getTenantId();
+ if (tenantId == null) {
+ tenantId = 208L;
+ }
+
+ return baseMapper.insertFromProcessTemplate(routeItemId, processId, tenantId) > 0;
+ }
+
+ @Override
+ @Transactional(rollbackFor = Exception.class)
+ public void saveParam(ProcessRouteItemParam param) {
+ if (param == null) {
+ throw new ServiceException("鏂板澶辫触,鍙傛暟涓嶈兘涓虹┖");
+ }
+ if (param.getRouteItemId() == null || param.getParamId() == null) {
+ throw new ServiceException("鍏宠仈宸ュ簭ID鍜屽弬鏁伴」ID涓嶈兘涓虹┖");
+ }
+
+ Long tenantId = SecurityUtils.getLoginUser().getTenantId();
+ Long count = baseMapper.selectCount(Wrappers.<ProcessRouteItemParam>lambdaQuery()
+ .eq(ProcessRouteItemParam::getRouteItemId, param.getRouteItemId())
+ .eq(ProcessRouteItemParam::getParamId, param.getParamId())
+ .eq(ProcessRouteItemParam::getTenantId, tenantId));
+ if (count > 0) {
+ throw new ServiceException("璇ュ伐搴忓凡瀛樺湪姝ゅ弬鏁伴」锛岃鍕块噸澶嶆坊鍔�");
+ }
+
+ BaseParam baseParam = baseParamService.getById(param.getParamId());
+ if (baseParam == null) {
+ throw new ServiceException("鏂板澶辫触,鏀瑰熀纭�鍙傛暟涓嶅瓨鍦�");
+ }
+
+ Integer maxSort = baseMapper.selectMaxSortByRouteItemId(param.getRouteItemId());
+ param.setId(null);
+ param.setProcessParamId(null);
+ param.setSort(maxSort);
+ param.setCreateTime(LocalDateTime.now());
+ param.setTenantId(tenantId);
+
+ this.save(param);
+ }
+}
\ No newline at end of file
diff --git a/src/main/java/com/ruoyi/production/service/impl/ProcessRouteItemServiceImpl.java b/src/main/java/com/ruoyi/production/service/impl/ProcessRouteItemServiceImpl.java
index 5614366..cc9e2fe 100644
--- a/src/main/java/com/ruoyi/production/service/impl/ProcessRouteItemServiceImpl.java
+++ b/src/main/java/com/ruoyi/production/service/impl/ProcessRouteItemServiceImpl.java
@@ -1,13 +1,17 @@
package com.ruoyi.production.service.impl;
-import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
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.common.exception.ServiceException;
+import com.ruoyi.common.utils.SecurityUtils;
import com.ruoyi.production.dto.ProcessRouteItemDto;
import com.ruoyi.production.mapper.ProcessRouteItemMapper;
+import com.ruoyi.production.mapper.ProcessRouteItemParamMapper;
import com.ruoyi.production.pojo.ProcessRouteItem;
+import com.ruoyi.production.pojo.ProcessRouteItemParam;
import com.ruoyi.production.service.ProcessRouteItemService;
+import com.ruoyi.production.service.ProductMaterialSkuService;
import lombok.AllArgsConstructor;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@@ -22,6 +26,12 @@
@Autowired
private ProcessRouteItemMapper processRouteItemMapper;
+
+ @Autowired
+ private ProcessRouteItemParamMapper processRouteItemParamMapper;
+
+ @Autowired
+ private ProductMaterialSkuService productMaterialSkuService;
@Override
public List<ProcessRouteItemDto> listProcessRouteItemDto(ProcessRouteItemDto processRouteItemDto) {
@@ -73,6 +83,9 @@
Long routeId = deleteProcessRouteItem.getRouteId();
// 鍒犻櫎鎸囧畾鏁版嵁
processRouteItemMapper.deleteById(id);
+ // 鍒犻櫎瀵瑰簲鐨勫弬鏁板垪琛�
+ processRouteItemParamMapper.delete(new LambdaQueryWrapper<ProcessRouteItemParam>().eq(ProcessRouteItemParam::getRouteItemId,id));
+
// 鏌ヨ璇ュ伐鑹鸿矾绾跨殑鎵�鏈夊伐搴忓苟鎸夌収椤哄簭鎺掑簭
List<ProcessRouteItem> processRouteItems = processRouteItemMapper.selectList(Wrappers.<ProcessRouteItem>lambdaQuery()
.eq(ProcessRouteItem::getRouteId, routeId)
@@ -87,4 +100,35 @@
}
return "鍒犻櫎鎴愬姛";
}
+
+ @Override
+ @Transactional(rollbackFor = Exception.class)
+ public boolean saveOrUpdateProcess(ProcessRouteItem processRouteItem) {
+ if (processRouteItem == null) {
+ throw new ServiceException("鏁版嵁涓嶈兘涓虹┖");
+ }
+ if (processRouteItem.getProductModelId() != null) {
+ Object product = productMaterialSkuService.getById(processRouteItem.getProductModelId());
+ if (product == null) {
+ throw new ServiceException("鎿嶄綔澶辫触锛氬叧鑱旂殑浜у搧(ID:" + processRouteItem.getProductModelId() + ")涓嶅瓨鍦�");
+ }
+ } else {
+ throw new ServiceException("浜у搧ID涓嶈兘涓虹┖");
+ }
+ Long tenantId = SecurityUtils.getLoginUser().getTenantId();
+ processRouteItem.setTenantId(tenantId);
+
+ boolean result;
+ if (processRouteItem.getId() == null) {
+ Long maxSort = processRouteItemMapper.selectCount(Wrappers.<ProcessRouteItem>lambdaQuery().eq(ProcessRouteItem::getRouteId, processRouteItem.getRouteId()));
+ processRouteItem.setDragSort((int) (maxSort + 1));
+
+ result = this.save(processRouteItem);
+ processRouteItemParamMapper.insertFromProcessTemplate(processRouteItem.getId(), processRouteItem.getProcessId(), tenantId);
+ } else {
+ result = this.updateById(processRouteItem);
+ }
+
+ return result;
+ }
}
diff --git a/src/main/java/com/ruoyi/production/service/impl/ProcessRouteServiceImpl.java b/src/main/java/com/ruoyi/production/service/impl/ProcessRouteServiceImpl.java
index b3beded..78e15d1 100644
--- a/src/main/java/com/ruoyi/production/service/impl/ProcessRouteServiceImpl.java
+++ b/src/main/java/com/ruoyi/production/service/impl/ProcessRouteServiceImpl.java
@@ -46,21 +46,24 @@
}
@Override
+ @Transactional(rollbackFor = Exception.class)
public Integer saveProcessRoute(ProcessRoute processRoute) {
- this.save(processRoute);
- String dateStr = LocalDate.now().format(DateTimeFormatter.ofPattern("yyyyMMdd"));
- String idStr = String.format("%06d", processRoute.getId());
- String newProductCode = "GYLX" + dateStr + idStr;
- // 鏇存柊鏁版嵁搴撲腑鐨刾roductCode
- processRoute.setProcessRouteCode(newProductCode);
- return processRouteMapper.updateById(processRoute);
+ save(processRoute);
+ if (processRoute.getProcessRouteCode() == null || processRoute.getProcessRouteCode().trim().isEmpty()) {
+ String dateStr = LocalDate.now().format(DateTimeFormatter.ofPattern("yyyyMMdd"));
+ String idStr = String.format("%06d", processRoute.getId());
+ String newProductCode = "GYLX" + dateStr + idStr;
+ processRoute.setProcessRouteCode(newProductCode);
+ return processRouteMapper.updateById(processRoute);
+ }
+ return 1;
}
@Override
public int batchDelete(List<Long> ids) {
//鍏堝垽鏂槸鍚﹀凡缁忓紩鐢ㄤ簡
List<ProductOrder> productOrders = productOrderMapper.selectList(Wrappers.<ProductOrder>lambdaQuery().in(ProductOrder::getRouteId, ids));
- if (productOrders.size()>0){
+ if (productOrders.size() > 0) {
throw new RuntimeException("璇ュ伐鑹鸿矾绾跨敓浜у凡寮曠敤锛屼笉鑳藉垹闄�");
}
//鍒犻櫎宸ヨ壓璺嚎璇︽儏
diff --git a/src/main/resources/mapper/production/ProcessRouteItemParamMapper.xml b/src/main/resources/mapper/production/ProcessRouteItemParamMapper.xml
new file mode 100644
index 0000000..1b662f2
--- /dev/null
+++ b/src/main/resources/mapper/production/ProcessRouteItemParamMapper.xml
@@ -0,0 +1,68 @@
+<?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.ProcessRouteItemParamMapper">
+
+ <resultMap id="ProcessRouteItemParamResultMap" type="com.ruoyi.production.pojo.ProcessRouteItemParam">
+ <id property="id" column="id"/>
+ <result property="routeItemId" column="route_item_id"/>
+ <result property="paramId" column="param_id"/>
+ <result property="processParamId" column="process_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>
+
+ <insert id="insertFromProcessTemplate">
+ INSERT INTO process_route_item_param (route_item_id, param_id, process_param_id,
+ standard_value, min_value, max_value,
+ is_required, sort, tenant_id, create_time)
+ SELECT #{routeItemId},
+ param_id,
+ id,
+ standard_value,
+ min_value,
+ max_value,
+ is_required,
+ sort,
+ #{tenantId},
+ NOW()
+ FROM product_process_param
+ WHERE process_id = #{processId}
+ </insert>
+
+ <select id="selectParamPage" resultType="com.ruoyi.production.dto.ProcessRouteItemParamDto">
+ select
+ prip.*,
+ bp.param_name,
+ bp.param_key,
+ bp.unit,
+ bp.param_type,
+ bp.param_format,
+ bp.value_mode
+ from process_route_item_param prip
+ left join base_param bp on prip.param_id = bp.id
+ <where>
+ <if test="p.routeItemId != null">
+ and prip.route_item_id = #{p.routeItemId}
+ </if>
+ <if test="p.tenantId != null">
+ and prip.tenant_id = #{p.tenantId}
+ </if>
+ </where>
+ order by prip.sort asc, prip.id asc
+ </select>
+
+ <select id="selectMaxSortByRouteItemId" resultType="java.lang.Integer">
+ SELECT MAX(sort)
+ FROM process_route_item_param
+ WHERE route_item_id = #{routeItemId}
+ </select>
+
+</mapper>
\ No newline at end of file
diff --git a/src/main/resources/mapper/production/ProcessRouteMapper.xml b/src/main/resources/mapper/production/ProcessRouteMapper.xml
index 51c11b4..76f2a97 100644
--- a/src/main/resources/mapper/production/ProcessRouteMapper.xml
+++ b/src/main/resources/mapper/production/ProcessRouteMapper.xml
@@ -4,25 +4,30 @@
<resultMap id="basicMap" type="com.ruoyi.production.pojo.ProcessRoute">
- <id property="id" column="id"/>
- <result property="productModelId" column="product_model_id"/>
- <result property="description" column="description"/>
- <result property="tenantId" column="tenant_id"/>
- <result property="createTime" column="create_time"/>
- <result property="updateTime" column="update_time"/>
+ <id property="id" column="id"/>
+ <result property="productModelId" column="product_model_id"/>
+ <result property="description" column="description"/>
+ <result property="tenantId" column="tenant_id"/>
+ <result property="createTime" column="create_time"/>
+ <result property="updateTime" column="update_time"/>
+ <result property="status" column="status"/>
</resultMap>
+
<select id="pageProcessRouteDto" resultType="com.ruoyi.production.dto.ProcessRouteDto">
- select ps.*, p.product_name,pm.product_id,pm.model,pb.bom_no
+ select
+ ps.*,
+ pm.product_name, pms.product_id, pms.model, pb.bom_no
from process_route ps
left join product_bom pb on ps.bom_id = pb.id
- left join product_model pm on ps.product_model_id = pm.id
- left join product p on pm.product_id = p.id
+ left join product_material_sku pms on ps.product_model_id = pms.id
+ left join product_material pm on pms.product_id = pm.id
<where>
<if test="c.model != null and c.model != ''">
- and pm.model like concat('%',#{c.model},'%')
+ and pms.model like concat('%', #{c.model}, '%')
</if>
</where>
- order by ps.id asc
+ order by ps.id
</select>
+
</mapper>
diff --git a/src/main/resources/mapper/production/ProductProcessRouteItemMapper.xml b/src/main/resources/mapper/production/ProductProcessRouteItemMapper.xml
index 302a0fb..f62140e 100644
--- a/src/main/resources/mapper/production/ProductProcessRouteItemMapper.xml
+++ b/src/main/resources/mapper/production/ProductProcessRouteItemMapper.xml
@@ -10,16 +10,17 @@
<result property="createTime" column="create_time"/>
<result property="updateTime" column="update_time"/>
</resultMap>
+
<select id="listItem" resultType="com.ruoyi.production.dto.ProductProcessRouteItemDto">
select ppri.*,
- pp.name as process_name,
- pm.model,
+ pp.name as process_name,
+ pms.model,
pm.unit,
- p.product_name,
- case when pwo.complete_quantity>0 then true else false end as is_complete
+ pm.product_name,
+ case when pwo.complete_quantity > 0 then true else false end as is_complete
from product_process_route_item ppri
- left join product_model pm on ppri.product_model_id = pm.id
- left join product p on pm.product_id = p.id
+ left join product_material_sku pms on ppri.product_model_id = pms.id
+ left join product_material pm on pms.product_id = pm.id
left join product_process pp on pp.id = ppri.process_id
left join product_work_order pwo on pwo.product_process_route_item_id = ppri.id
where ppri.product_order_id = #{orderId}
--
Gitblit v1.9.3