From d9ee1fb5190f91d79c003193b7f27ff7c5072227 Mon Sep 17 00:00:00 2001
From: liyong <18434998025@163.com>
Date: 星期二, 23 十二月 2025 13:50:05 +0800
Subject: [PATCH] feat(production): 添加工艺路线管理功能并重构产品结构相关代码
---
src/main/java/com/ruoyi/production/mapper/ProcessRouteMapper.java | 15 +++
src/main/java/com/ruoyi/production/pojo/ProductStructure.java | 2
src/main/java/com/ruoyi/production/service/impl/ProductStructureServiceImpl.java | 5
src/main/java/com/ruoyi/production/controller/ProductStructureController.java | 10 +-
doc/create_table_product_structure.sql | 2
src/main/java/com/ruoyi/production/mapper/ProductStructureMapper.java | 2
src/main/java/com/ruoyi/production/pojo/ProcessRoute.java | 33 ++++++++
doc/create_table_process_route_item.sql | 5
src/main/java/com/ruoyi/production/controller/ProcessRouteController.java | 44 +++++++++++
src/main/java/com/ruoyi/production/dto/ProcessRouteDto.java | 12 +++
src/main/java/com/ruoyi/production/service/ProductStructureService.java | 3
src/main/resources/mapper/production/ProcessRouteMapper.xml | 16 ++++
doc/create_table_process_route.sql | 2
src/main/resources/mapper/production/ProductStructureMapper.xml | 10 +-
src/main/java/com/ruoyi/production/service/ProcessRouteService.java | 12 +++
src/main/java/com/ruoyi/production/service/impl/ProcessRouteServiceImpl.java | 29 +++++++
src/main/java/com/ruoyi/production/dto/ProductStructureDto.java | 5 +
17 files changed, 187 insertions(+), 20 deletions(-)
diff --git a/doc/create_table_process_route.sql b/doc/create_table_process_route.sql
index 9bc08ec..4a453f8 100644
--- a/doc/create_table_process_route.sql
+++ b/doc/create_table_process_route.sql
@@ -3,7 +3,7 @@
create table process_route
(
id bigint auto_increment primary key,
- product_id bigint not null default 0 comment '浜у搧id',
+ product_model_id bigint not null default 0 comment '浜у搧id',
description varchar(255) not null default '' comment '鎻忚堪',
tenant_id bigint not null comment '绉熸埛id',
create_time datetime null comment '褰曞叆鏃堕棿',
diff --git a/doc/create_table_process_route_item.sql b/doc/create_table_process_route_item.sql
index 306deaf..facf74e 100644
--- a/doc/create_table_process_route_item.sql
+++ b/doc/create_table_process_route_item.sql
@@ -4,8 +4,9 @@
(
id bigint auto_increment primary key,
route_id bigint not null default 0 comment '宸ヨ壓璺嚎id',
- product_id bigint not null default 0 comment '浜у搧id',
+ product_model_id bigint not null default 0 comment '浜у搧id',
tenant_id bigint not null comment '绉熸埛id',
create_time datetime null comment '褰曞叆鏃堕棿',
- update_time datetime null comment '鏇存柊鏃堕棿'
+ update_time datetime null comment '鏇存柊鏃堕棿',
+ sort bigint not null comment '鎺掑簭'
);
diff --git a/doc/create_table_product_structure.sql b/doc/create_table_product_structure.sql
index b91b3a1..4f7d7f6 100644
--- a/doc/create_table_product_structure.sql
+++ b/doc/create_table_product_structure.sql
@@ -4,7 +4,7 @@
(
id bigint auto_increment
primary key,
- product_id bigint not null comment '浜у搧id',
+ product_model_id bigint not null comment '浜у搧id',
process_id bigint not null comment '宸ュ簭id',
unit_quantity numeric(16, 4) not null comment '鍗曚綅浜у嚭闇�瑕佹暟閲�',
demanded_quantity numeric(16, 4) not null comment '闇�姹傛暟閲�',
diff --git a/src/main/java/com/ruoyi/production/controller/ProcessRouteController.java b/src/main/java/com/ruoyi/production/controller/ProcessRouteController.java
new file mode 100644
index 0000000..c01d836
--- /dev/null
+++ b/src/main/java/com/ruoyi/production/controller/ProcessRouteController.java
@@ -0,0 +1,44 @@
+package com.ruoyi.production.controller;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.ruoyi.framework.web.domain.R;
+import com.ruoyi.production.dto.ProcessRouteDto;
+import com.ruoyi.production.pojo.ProcessRoute;
+import com.ruoyi.production.service.ProcessRouteService;
+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;
+
+@RestController
+@RequestMapping("processRoute")
+@Api(tags = "宸ヨ壓璺嚎")
+public class ProcessRouteController {
+
+ @Autowired
+ private ProcessRouteService processRouteService;
+
+ @GetMapping("page")
+ @ApiOperation("鍒嗛〉鏌ヨ")
+ public R page(Page<ProcessRouteDto> page, ProcessRouteDto processRouteDto) {
+ return R.ok(processRouteService.pageProcessRouteDto(page, processRouteDto));
+ }
+
+ @ApiOperation("鏂板宸ヨ壓璺嚎")
+ @PostMapping ()
+ public R add(@RequestBody ProcessRoute processRoute) {
+ return R.ok(processRouteService.save(processRoute));
+ }
+ @ApiOperation("淇敼宸ヨ壓璺嚎")
+ @PutMapping ()
+ public R update(@RequestBody ProcessRoute processRoute) {
+ return R.ok(processRouteService.updateById(processRoute));
+ }
+ @ApiOperation("鍒犻櫎宸ヨ壓璺嚎")
+ @DeleteMapping("/{ids}")
+ public R delete(@PathVariable("ids") Long[] ids) {
+ return R.ok(processRouteService.removeBatchByIds(Arrays.asList(ids)));
+ }
+}
diff --git a/src/main/java/com/ruoyi/production/controller/ProductStructureController.java b/src/main/java/com/ruoyi/production/controller/ProductStructureController.java
index 62d5fa9..a2ea47e 100644
--- a/src/main/java/com/ruoyi/production/controller/ProductStructureController.java
+++ b/src/main/java/com/ruoyi/production/controller/ProductStructureController.java
@@ -22,20 +22,20 @@
@ApiOperation("鏍规嵁productId鏌ヨ")
- @GetMapping("listByProductId")
- public R listByProductId( Long productId){
- return R.ok(productStructureService.listByProductId( productId));
+ @GetMapping("listByproductModelId")
+ public R listByproductModelId( Long productModelId){
+ return R.ok(productStructureService.listByproductModelId( productModelId));
}
@ApiOperation("鏂板浜у搧缁撴瀯")
@PostMapping()
- public R add(ProductStructure productStructure){
+ public R add(@RequestBody ProductStructure productStructure){
return R.ok(productStructureService.save(productStructure));
}
@ApiOperation("淇敼浜у搧缁撴瀯")
@PutMapping()
- public R update(ProductStructure productStructure){
+ public R update(@RequestBody ProductStructure productStructure){
return R.ok(productStructureService.updateById(productStructure));
}
diff --git a/src/main/java/com/ruoyi/production/dto/ProcessRouteDto.java b/src/main/java/com/ruoyi/production/dto/ProcessRouteDto.java
new file mode 100644
index 0000000..058251e
--- /dev/null
+++ b/src/main/java/com/ruoyi/production/dto/ProcessRouteDto.java
@@ -0,0 +1,12 @@
+package com.ruoyi.production.dto;
+
+import com.ruoyi.production.pojo.ProcessRoute;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+public class ProcessRouteDto extends ProcessRoute {
+
+ @ApiModelProperty(value = "浜у搧鍚嶇О")
+ private String speculativeTradingName;
+}
diff --git a/src/main/java/com/ruoyi/production/dto/ProductStructureDto.java b/src/main/java/com/ruoyi/production/dto/ProductStructureDto.java
index 8faf1a8..e57b11e 100644
--- a/src/main/java/com/ruoyi/production/dto/ProductStructureDto.java
+++ b/src/main/java/com/ruoyi/production/dto/ProductStructureDto.java
@@ -1,11 +1,14 @@
package com.ruoyi.production.dto;
import com.ruoyi.production.pojo.ProductStructure;
+import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@Data
public class ProductStructureDto extends ProductStructure {
+ @ApiModelProperty(value = "宸ヨ壓鍚嶇О")
private String processName;
- private String productName;
+ @ApiModelProperty(value = "浜у搧鍚嶇О")
+ private String speculativeTradingName;
}
diff --git a/src/main/java/com/ruoyi/production/mapper/ProcessRouteMapper.java b/src/main/java/com/ruoyi/production/mapper/ProcessRouteMapper.java
new file mode 100644
index 0000000..493b764
--- /dev/null
+++ b/src/main/java/com/ruoyi/production/mapper/ProcessRouteMapper.java
@@ -0,0 +1,15 @@
+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.ProcessRouteDto;
+import com.ruoyi.production.pojo.ProcessRoute;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+@Mapper
+public interface ProcessRouteMapper extends BaseMapper<ProcessRoute> {
+
+ IPage<ProcessRouteDto> pageProcessRouteDto(Page<ProcessRouteDto> page,@Param("c") ProcessRouteDto processRouteDto);
+}
diff --git a/src/main/java/com/ruoyi/production/mapper/ProductStructureMapper.java b/src/main/java/com/ruoyi/production/mapper/ProductStructureMapper.java
index 812ab37..0460c75 100644
--- a/src/main/java/com/ruoyi/production/mapper/ProductStructureMapper.java
+++ b/src/main/java/com/ruoyi/production/mapper/ProductStructureMapper.java
@@ -12,5 +12,5 @@
@Mapper
public interface ProductStructureMapper extends BaseMapper<ProductStructure> {
- List<ProductStructure> listByProductId(@Param("productId") Long productId);
+ List<ProductStructureDto> listByproductModelId(@Param("productModelId") Long productModelId);
}
diff --git a/src/main/java/com/ruoyi/production/pojo/ProcessRoute.java b/src/main/java/com/ruoyi/production/pojo/ProcessRoute.java
new file mode 100644
index 0000000..8ad74fc
--- /dev/null
+++ b/src/main/java/com/ruoyi/production/pojo/ProcessRoute.java
@@ -0,0 +1,33 @@
+package com.ruoyi.production.pojo;
+
+import com.baomidou.mybatisplus.annotation.FieldFill;
+import com.baomidou.mybatisplus.annotation.TableField;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.time.LocalDateTime;
+
+@Data
+public class ProcessRoute {
+
+ @ApiModelProperty(value = "搴忓彿")
+ private Long id;
+
+ @ApiModelProperty(value = "浜у搧ID")
+ private Long productModelId;
+
+ @ApiModelProperty(value = "鎻忚堪")
+ private String description;
+
+ @ApiModelProperty(value = "绉熸埛ID")
+ @TableField(fill = FieldFill.INSERT)
+ private Long tenantId;
+
+ @ApiModelProperty(value = "鍒涘缓鏃堕棿")
+ @TableField(fill = FieldFill.INSERT)
+ private LocalDateTime createTime;
+
+ @ApiModelProperty(value = "鏇存柊鏃堕棿")
+ @TableField(fill = FieldFill.UPDATE)
+ private LocalDateTime updateTime;
+}
diff --git a/src/main/java/com/ruoyi/production/pojo/ProductStructure.java b/src/main/java/com/ruoyi/production/pojo/ProductStructure.java
index dc2528f..f66536b 100644
--- a/src/main/java/com/ruoyi/production/pojo/ProductStructure.java
+++ b/src/main/java/com/ruoyi/production/pojo/ProductStructure.java
@@ -17,7 +17,7 @@
/**
* 浜у搧鍚嶇О
*/
- private Long productId;
+ private Long productModelId;
/**
* 宸ュ簭id
diff --git a/src/main/java/com/ruoyi/production/service/ProcessRouteService.java b/src/main/java/com/ruoyi/production/service/ProcessRouteService.java
new file mode 100644
index 0000000..804a461
--- /dev/null
+++ b/src/main/java/com/ruoyi/production/service/ProcessRouteService.java
@@ -0,0 +1,12 @@
+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.ProcessRouteDto;
+import com.ruoyi.production.pojo.ProcessRoute;
+
+public interface ProcessRouteService extends IService<ProcessRoute> {
+
+ IPage<ProcessRouteDto> pageProcessRouteDto(Page<ProcessRouteDto> page, ProcessRouteDto processRouteDto);
+}
diff --git a/src/main/java/com/ruoyi/production/service/ProductStructureService.java b/src/main/java/com/ruoyi/production/service/ProductStructureService.java
index 4969d42..d4637c2 100644
--- a/src/main/java/com/ruoyi/production/service/ProductStructureService.java
+++ b/src/main/java/com/ruoyi/production/service/ProductStructureService.java
@@ -1,6 +1,7 @@
package com.ruoyi.production.service;
import com.baomidou.mybatisplus.extension.service.IService;
+import com.ruoyi.production.dto.ProductStructureDto;
import com.ruoyi.production.pojo.ProductStructure;
import java.util.List;
@@ -8,5 +9,5 @@
public interface ProductStructureService extends IService<ProductStructure> {
- List<ProductStructure> listByProductId( Long productId);
+ List<ProductStructureDto> listByproductModelId(Long productId);
}
diff --git a/src/main/java/com/ruoyi/production/service/impl/ProcessRouteServiceImpl.java b/src/main/java/com/ruoyi/production/service/impl/ProcessRouteServiceImpl.java
new file mode 100644
index 0000000..1772404
--- /dev/null
+++ b/src/main/java/com/ruoyi/production/service/impl/ProcessRouteServiceImpl.java
@@ -0,0 +1,29 @@
+package com.ruoyi.production.service.impl;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.ruoyi.production.dto.ProcessRouteDto;
+import com.ruoyi.production.mapper.ProcessRouteMapper;
+import com.ruoyi.production.pojo.ProcessRoute;
+import com.ruoyi.production.service.ProcessRouteService;
+import lombok.AllArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+@Service
+@AllArgsConstructor
+@Slf4j
+public class ProcessRouteServiceImpl extends ServiceImpl<ProcessRouteMapper, ProcessRoute> implements ProcessRouteService {
+
+ @Autowired
+ private ProcessRouteMapper processRouteMapper;
+
+ @Override
+ public IPage<ProcessRouteDto> pageProcessRouteDto(Page<ProcessRouteDto> page, ProcessRouteDto processRouteDto) {
+
+ return processRouteMapper.pageProcessRouteDto(page, processRouteDto);
+ }
+}
diff --git a/src/main/java/com/ruoyi/production/service/impl/ProductStructureServiceImpl.java b/src/main/java/com/ruoyi/production/service/impl/ProductStructureServiceImpl.java
index 35d0366..a888a63 100644
--- a/src/main/java/com/ruoyi/production/service/impl/ProductStructureServiceImpl.java
+++ b/src/main/java/com/ruoyi/production/service/impl/ProductStructureServiceImpl.java
@@ -1,6 +1,7 @@
package com.ruoyi.production.service.impl;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.ruoyi.production.dto.ProductStructureDto;
import com.ruoyi.production.mapper.ProductStructureMapper;
import com.ruoyi.production.pojo.ProductStructure;
import com.ruoyi.production.service.ProductStructureService;
@@ -20,7 +21,7 @@
private ProductStructureMapper productStructureMapper;
@Override
- public List<ProductStructure> listByProductId(Long productId) {
- return productStructureMapper.listByProductId( productId);
+ public List<ProductStructureDto> listByproductModelId(Long productModelId) {
+ return productStructureMapper.listByproductModelId( productModelId);
}
}
diff --git a/src/main/resources/mapper/production/ProcessRouteMapper.xml b/src/main/resources/mapper/production/ProcessRouteMapper.xml
new file mode 100644
index 0000000..7caa0be
--- /dev/null
+++ b/src/main/resources/mapper/production/ProcessRouteMapper.xml
@@ -0,0 +1,16 @@
+<?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.ProcessRouteMapper">
+
+
+ <select id="pageProcessRouteDto" resultType="com.ruoyi.production.dto.ProcessRouteDto">
+ select ps.*, pm.speculative_trading_name
+ from process_route ps
+ left join product_model pm on ps.product_model_id = pm.id
+ <where>
+ <if test="c.speculativeTradingName != null || c.speculativeTradingName != ''">
+ and pm.speculative_trading_name like concat('%',#{c.speculativeTradingName},'%')
+ </if>
+ </where>
+ </select>
+</mapper>
diff --git a/src/main/resources/mapper/production/ProductStructureMapper.xml b/src/main/resources/mapper/production/ProductStructureMapper.xml
index bf69ed9..61a3f4a 100644
--- a/src/main/resources/mapper/production/ProductStructureMapper.xml
+++ b/src/main/resources/mapper/production/ProductStructureMapper.xml
@@ -3,14 +3,14 @@
<mapper namespace="com.ruoyi.production.mapper.ProductStructureMapper">
- <select id="listByProductId" resultType="com.ruoyi.production.pojo.ProductStructure">
+ <select id="listByproductModelId" resultType="com.ruoyi.production.dto.ProductStructureDto">
select ps.*,
- p.product_name as product_name,
+ pm.speculative_trading_name ,
pp.name as process_name
from
product_structure ps
- left join product p on ps.process_id = p.id
- left join product_process pp on ps.process_id = pp.process_id
- where p.id = #{productId}
+ left join product_model pm on ps.product_model_id = pm.id
+ left join product_process pp on ps.process_id = pp.id
+ where pm.id = #{productId}
</select>
</mapper>
--
Gitblit v1.9.3