From 7998ad65e1a632b02e9aaca1ca9e575a13b3e203 Mon Sep 17 00:00:00 2001
From: liyong <18434998025@163.com>
Date: 星期二, 23 十二月 2025 14:40:42 +0800
Subject: [PATCH] feat(production): 添加工艺路线明细管理功能
---
src/main/java/com/ruoyi/basic/controller/ProductController.java | 8 +
src/main/java/com/ruoyi/basic/mapper/ProductModelMapper.java | 6 +
src/main/java/com/ruoyi/basic/service/IProductService.java | 4
src/main/java/com/ruoyi/production/controller/ProcessRouteItemController.java | 37 +++++++
src/main/java/com/ruoyi/production/dto/ProcessRouteItemDto.java | 18 +++
src/main/java/com/ruoyi/production/mapper/ProcessRouteItemMapper.java | 19 +++
doc/create_table_process_route_item.sql | 4
src/main/resources/mapper/production/ProcessRouteMapper.xml | 9 +
src/main/resources/mapper/basic/ProductModelMapper.xml | 35 +++++++
src/main/java/com/ruoyi/production/service/ProcessRouteItemService.java | 14 ++
src/main/resources/mapper/production/ProductStructureMapper.xml | 12 ++
src/main/java/com/ruoyi/basic/service/impl/ProductServiceImpl.java | 6 +
src/main/resources/mapper/production/ProcessRouteItemMapper.xml | 30 ++++++
src/main/java/com/ruoyi/production/pojo/ProcessRouteItem.java | 38 +++++++
src/main/java/com/ruoyi/production/service/impl/ProcessRouteItemServiceImpl.java | 27 +++++
15 files changed, 264 insertions(+), 3 deletions(-)
diff --git a/doc/create_table_process_route_item.sql b/doc/create_table_process_route_item.sql
index facf74e..baab7d9 100644
--- a/doc/create_table_process_route_item.sql
+++ b/doc/create_table_process_route_item.sql
@@ -5,8 +5,8 @@
id bigint auto_increment primary key,
route_id bigint not null default 0 comment '宸ヨ壓璺嚎id',
product_model_id bigint not null default 0 comment '浜у搧id',
+ process_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 '鏇存柊鏃堕棿',
- sort bigint not null comment '鎺掑簭'
+ update_time datetime null comment '鏇存柊鏃堕棿'
);
diff --git a/src/main/java/com/ruoyi/basic/controller/ProductController.java b/src/main/java/com/ruoyi/basic/controller/ProductController.java
index a586d4b..2e39db8 100644
--- a/src/main/java/com/ruoyi/basic/controller/ProductController.java
+++ b/src/main/java/com/ruoyi/basic/controller/ProductController.java
@@ -12,6 +12,8 @@
import com.ruoyi.framework.aspectj.lang.enums.BusinessType;
import com.ruoyi.framework.web.controller.BaseController;
import com.ruoyi.framework.web.domain.AjaxResult;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
import lombok.AllArgsConstructor;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.multipart.MultipartFile;
@@ -94,6 +96,12 @@
return productModelService.modelListPage(page, productDto);
}
+ @ApiOperation("鍒嗛〉鏌ヨ鎵�鏈変骇鍝佸瀷鍙�")
+ @GetMapping("/pageModel")
+ public IPage<ProductModel> listPageProductModel(Page<ProductModel> page, ProductModel productModel) {
+ return productService.listPageProductModel(page, productModel);
+ }
+
/**
* 瀵煎叆浜у搧
*/
diff --git a/src/main/java/com/ruoyi/basic/mapper/ProductModelMapper.java b/src/main/java/com/ruoyi/basic/mapper/ProductModelMapper.java
index 2248421..697a3a6 100644
--- a/src/main/java/com/ruoyi/basic/mapper/ProductModelMapper.java
+++ b/src/main/java/com/ruoyi/basic/mapper/ProductModelMapper.java
@@ -1,7 +1,10 @@
package com.ruoyi.basic.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.basic.pojo.ProductModel;
+import org.apache.ibatis.annotations.Param;
/**
@@ -11,5 +14,6 @@
* @date 2025-05-19
*/
public interface ProductModelMapper extends BaseMapper<ProductModel> {
-
+
+ IPage<ProductModel> listPageProductModel(Page<ProductModel> page, @Param("c") ProductModel productModel);
}
diff --git a/src/main/java/com/ruoyi/basic/service/IProductService.java b/src/main/java/com/ruoyi/basic/service/IProductService.java
index cd9bdff..7fba662 100644
--- a/src/main/java/com/ruoyi/basic/service/IProductService.java
+++ b/src/main/java/com/ruoyi/basic/service/IProductService.java
@@ -1,9 +1,12 @@
package com.ruoyi.basic.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.basic.dto.ProductDto;
import com.ruoyi.basic.dto.ProductTreeDto;
import com.ruoyi.basic.pojo.Product;
+import com.ruoyi.basic.pojo.ProductModel;
import java.util.List;
@@ -15,4 +18,5 @@
List<ProductTreeDto> selectProductList(ProductDto productDto);
+ IPage<ProductModel> listPageProductModel(Page<ProductModel> page, ProductModel productModel);
}
diff --git a/src/main/java/com/ruoyi/basic/service/impl/ProductServiceImpl.java b/src/main/java/com/ruoyi/basic/service/impl/ProductServiceImpl.java
index b93e14a..fdf2dd3 100644
--- a/src/main/java/com/ruoyi/basic/service/impl/ProductServiceImpl.java
+++ b/src/main/java/com/ruoyi/basic/service/impl/ProductServiceImpl.java
@@ -1,6 +1,8 @@
package com.ruoyi.basic.service.impl;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+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.basic.dto.ProductDto;
import com.ruoyi.basic.dto.ProductTreeDto;
@@ -52,6 +54,10 @@
return tree;
}
+ @Override
+ public IPage<ProductModel> listPageProductModel(Page<ProductModel> page, ProductModel productModel) {
+ return productModelMapper.listPageProductModel(page, productModel);
+ }
// 閫掑綊鏋勫缓瀛愯妭鐐�
diff --git a/src/main/java/com/ruoyi/production/controller/ProcessRouteItemController.java b/src/main/java/com/ruoyi/production/controller/ProcessRouteItemController.java
new file mode 100644
index 0000000..d55c2c9
--- /dev/null
+++ b/src/main/java/com/ruoyi/production/controller/ProcessRouteItemController.java
@@ -0,0 +1,37 @@
+package com.ruoyi.production.controller;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.ruoyi.framework.web.domain.R;
+import com.ruoyi.production.dto.ProcessRouteItemDto;
+import com.ruoyi.production.pojo.ProcessRouteItem;
+import com.ruoyi.production.service.ProcessRouteItemService;
+import io.swagger.annotations.Api;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.Arrays;
+import java.util.List;
+
+@RestController
+@RequestMapping("processRouteItem")
+@Api(tags = "宸ヨ壓璺嚎鏄庣粏")
+public class ProcessRouteItemController {
+ @Autowired
+ private ProcessRouteItemService processRouteItemService;
+
+ @GetMapping("list")
+ public R listProcessRouteItemDto(ProcessRouteItemDto processRouteItemDto) {
+ return R.ok(processRouteItemService.listProcessRouteItemDto(processRouteItemDto));
+ }
+
+ @PostMapping ()
+ public R add(@RequestBody List<ProcessRouteItem> processRouteItem) {
+ return R.ok(processRouteItemService.saveBatch(processRouteItem));
+ }
+ @PutMapping ()
+ public R update(@RequestBody List<ProcessRouteItem> processRouteItem) {
+ processRouteItemService.remove(new QueryWrapper<ProcessRouteItem>().lambda().eq(ProcessRouteItem::getRouteId, processRouteItem.get(0).getRouteId()));
+ return R.ok(processRouteItemService.saveBatch(processRouteItem));
+ }
+}
diff --git a/src/main/java/com/ruoyi/production/dto/ProcessRouteItemDto.java b/src/main/java/com/ruoyi/production/dto/ProcessRouteItemDto.java
new file mode 100644
index 0000000..8b31f7d
--- /dev/null
+++ b/src/main/java/com/ruoyi/production/dto/ProcessRouteItemDto.java
@@ -0,0 +1,18 @@
+package com.ruoyi.production.dto;
+
+import com.ruoyi.production.pojo.ProcessRouteItem;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+public class ProcessRouteItemDto extends ProcessRouteItem {
+
+ @ApiModelProperty(value = "宸ュ簭鍚嶇О")
+ private String processName;
+
+ @ApiModelProperty(value = "宸ヨ壓璺嚎鍚嶇О")
+ private String routeName;
+
+ @ApiModelProperty(value = "浜у搧鍚嶇О")
+ private String speculativeTradingName;
+}
diff --git a/src/main/java/com/ruoyi/production/mapper/ProcessRouteItemMapper.java b/src/main/java/com/ruoyi/production/mapper/ProcessRouteItemMapper.java
new file mode 100644
index 0000000..394c3a7
--- /dev/null
+++ b/src/main/java/com/ruoyi/production/mapper/ProcessRouteItemMapper.java
@@ -0,0 +1,19 @@
+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.ProcessRouteItemDto;
+import com.ruoyi.production.pojo.ProcessRouteItem;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+@Mapper
+public interface ProcessRouteItemMapper extends BaseMapper<ProcessRouteItem> {
+
+
+ List<ProcessRouteItemDto> listProcessRouteItemDto(@Param("c") ProcessRouteItemDto processRouteItemDto);
+
+}
diff --git a/src/main/java/com/ruoyi/production/pojo/ProcessRouteItem.java b/src/main/java/com/ruoyi/production/pojo/ProcessRouteItem.java
new file mode 100644
index 0000000..9cfd326
--- /dev/null
+++ b/src/main/java/com/ruoyi/production/pojo/ProcessRouteItem.java
@@ -0,0 +1,38 @@
+package com.ruoyi.production.pojo;
+
+import com.baomidou.mybatisplus.annotation.FieldFill;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.time.LocalDateTime;
+
+@Data
+public class ProcessRouteItem {
+
+ @TableId(type = IdType.AUTO)
+ private Long id;
+
+ @ApiModelProperty(value = "宸ヨ壓璺嚎id")
+ private Long routeId;
+
+ @ApiModelProperty(value = "宸ュ簭id")
+ private Long processId;
+
+ @ApiModelProperty(value ="浜у搧id")
+ private Long productModelId;
+
+ @ApiModelProperty(value = "绉熸埛ID")
+ @TableField(fill = FieldFill.INSERT)
+ private Long tenantId;
+ @TableField(fill = FieldFill.INSERT)
+ @ApiModelProperty(value = "鍒涘缓鏃堕棿")
+ private LocalDateTime createTime;
+ @ApiModelProperty(value = "鏇存柊鏃堕棿")
+ @TableField(fill = FieldFill.UPDATE)
+ private LocalDateTime updateTime;
+
+
+}
diff --git a/src/main/java/com/ruoyi/production/service/ProcessRouteItemService.java b/src/main/java/com/ruoyi/production/service/ProcessRouteItemService.java
new file mode 100644
index 0000000..1872eee
--- /dev/null
+++ b/src/main/java/com/ruoyi/production/service/ProcessRouteItemService.java
@@ -0,0 +1,14 @@
+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.framework.web.domain.R;
+import com.ruoyi.production.dto.ProcessRouteItemDto;
+import com.ruoyi.production.pojo.ProcessRouteItem;
+
+import java.util.List;
+
+public interface ProcessRouteItemService extends IService<ProcessRouteItem> {
+ List<ProcessRouteItemDto> listProcessRouteItemDto( ProcessRouteItemDto processRouteItemDto);
+}
diff --git a/src/main/java/com/ruoyi/production/service/impl/ProcessRouteItemServiceImpl.java b/src/main/java/com/ruoyi/production/service/impl/ProcessRouteItemServiceImpl.java
new file mode 100644
index 0000000..86df76a
--- /dev/null
+++ b/src/main/java/com/ruoyi/production/service/impl/ProcessRouteItemServiceImpl.java
@@ -0,0 +1,27 @@
+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.ProcessRouteItemDto;
+import com.ruoyi.production.mapper.ProcessRouteItemMapper;
+import com.ruoyi.production.pojo.ProcessRouteItem;
+import com.ruoyi.production.service.ProcessRouteItemService;
+import lombok.AllArgsConstructor;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+@Service
+@AllArgsConstructor
+public class ProcessRouteItemServiceImpl extends ServiceImpl<ProcessRouteItemMapper, ProcessRouteItem> implements ProcessRouteItemService {
+
+ @Autowired
+ private ProcessRouteItemMapper processRouteItemMapper;
+
+ @Override
+ public List<ProcessRouteItemDto> listProcessRouteItemDto(ProcessRouteItemDto processRouteItemDto) {
+ return processRouteItemMapper.listProcessRouteItemDto( processRouteItemDto);
+ }
+}
diff --git a/src/main/resources/mapper/basic/ProductModelMapper.xml b/src/main/resources/mapper/basic/ProductModelMapper.xml
new file mode 100644
index 0000000..ef786c4
--- /dev/null
+++ b/src/main/resources/mapper/basic/ProductModelMapper.xml
@@ -0,0 +1,35 @@
+<?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.basic.mapper.ProductModelMapper">
+
+ <!-- 閫氱敤鏌ヨ鏄犲皠缁撴灉 -->
+ <!-- 閫氱敤鏌ヨ鏄犲皠缁撴灉 -->
+ <resultMap id="BaseResultMap" type="com.ruoyi.basic.pojo.ProductModel">
+ <id column="id" property="id" />
+ <result column="product_id" property="productId" />
+ <result column="model" property="model" />
+ <result column="unit" property="unit" />
+ <result column="speculative_trading_name" property="speculativeTradingName" />
+ <result column="tenant_id" property="tenantId" />
+ <result column="product_name" property="productName" />
+ <result column="product_id" property="productId" />
+ </resultMap>
+ <select id="listPageProductModel" resultType="com.ruoyi.basic.pojo.ProductModel">
+ select pm.*,p.product_name
+ from product_model pm
+ left join product p on pm.product_id = p.id
+ <where>
+ <if test="c.model != null || c.model != ''">
+ and pm.model = like concat('%',#{c.model},'%')
+ </if>
+ <if test="c.productName != null || c.productName != ''">
+ and p.product_name = like concat('%',#{c.productName},'%')
+ </if>
+ <if test="c.speculativeTradingName != null || c.speculativeTradingName != ''">
+ and pm.speculative_trading_name like concat('%',#{c.speculativeTradingName},'%')
+ </if>
+ </where>
+ </select>
+
+
+</mapper>
\ No newline at end of file
diff --git a/src/main/resources/mapper/production/ProcessRouteItemMapper.xml b/src/main/resources/mapper/production/ProcessRouteItemMapper.xml
new file mode 100644
index 0000000..54a5e04
--- /dev/null
+++ b/src/main/resources/mapper/production/ProcessRouteItemMapper.xml
@@ -0,0 +1,30 @@
+<?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.ProcessRouteItemMapper">
+
+ <resultMap id="basicMap" type="com.ruoyi.production.pojo.ProcessRouteItem">
+ <id property="id" column="id"/>
+ <result property="routeId" column="route_id"/>
+ <result property="processId" column="process_id"/>
+ <result property="productModelId" column="product_model_id"/>
+ <result property="tenantId" column="tenant_id"/>
+ <result property="createTime" column="create_time"/>
+ <result property="updateTime" column="update_time"/>
+ </resultMap>
+
+ <select id="listProcessRouteItemDto" resultType="com.ruoyi.production.dto.ProcessRouteItemDto">
+ select pri.*,
+ pr.description ,
+ pp.name as process_name,
+ pm.speculative_trading_name
+ from
+ process_route_item pri
+ left join product_model pm on pri.product_model_id = pm.id
+ left join product_process pp on pp.id = pri.process_id
+ left join process_route pr on pr.id = pri.route_id
+ where
+ pri.route_id = #{c.routeId}
+
+
+ </select>
+</mapper>
diff --git a/src/main/resources/mapper/production/ProcessRouteMapper.xml b/src/main/resources/mapper/production/ProcessRouteMapper.xml
index 7caa0be..058faf3 100644
--- a/src/main/resources/mapper/production/ProcessRouteMapper.xml
+++ b/src/main/resources/mapper/production/ProcessRouteMapper.xml
@@ -3,6 +3,15 @@
<mapper namespace="com.ruoyi.production.mapper.ProcessRouteMapper">
+ <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"/>
+ </resultMap>
+
<select id="pageProcessRouteDto" resultType="com.ruoyi.production.dto.ProcessRouteDto">
select ps.*, pm.speculative_trading_name
from process_route ps
diff --git a/src/main/resources/mapper/production/ProductStructureMapper.xml b/src/main/resources/mapper/production/ProductStructureMapper.xml
index 61a3f4a..995be50 100644
--- a/src/main/resources/mapper/production/ProductStructureMapper.xml
+++ b/src/main/resources/mapper/production/ProductStructureMapper.xml
@@ -2,6 +2,18 @@
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.ruoyi.production.mapper.ProductStructureMapper">
+ <resultMap id="basicMap" type="com.ruoyi.production.pojo.ProductStructure">
+ <id property="id" column="id"/>
+ <result property="productModelId" column="product_model_id"/>
+ <result property="processId" column="process_id"/>
+ <result property="unitQuantity" column="unit_quantity"/>
+ <result property="demandedQuantity" column="demanded_quantity"/>
+ <result property="unit" column="unit"/>
+ <result property="diskQuantity" column="disk_quantity"/>
+ <result property="tenantId" column="tenant_id"/>
+ </resultMap>
+
+
<select id="listByproductModelId" resultType="com.ruoyi.production.dto.ProductStructureDto">
select ps.*,
--
Gitblit v1.9.3