From 876d72a43b52fd4de8c37196d4f8dfd92bab4b7e Mon Sep 17 00:00:00 2001
From: liyong <18434998025@163.com>
Date: 星期二, 23 十二月 2025 16:37:34 +0800
Subject: [PATCH] feat(production): 添加productId
---
src/main/java/com/ruoyi/production/dto/ProcessRouteDto.java | 5 ++++-
src/main/resources/mapper/production/ProcessRouteMapper.xml | 2 +-
src/main/resources/mapper/production/ProductStructureMapper.xml | 5 ++---
src/main/java/com/ruoyi/production/dto/ProcessRouteItemDto.java | 2 ++
src/main/resources/mapper/production/ProcessRouteItemMapper.xml | 3 ++-
src/main/java/com/ruoyi/production/dto/ProductStructureDto.java | 4 +++-
6 files changed, 14 insertions(+), 7 deletions(-)
diff --git a/src/main/java/com/ruoyi/production/dto/ProcessRouteDto.java b/src/main/java/com/ruoyi/production/dto/ProcessRouteDto.java
index e674af9..11c658e 100644
--- a/src/main/java/com/ruoyi/production/dto/ProcessRouteDto.java
+++ b/src/main/java/com/ruoyi/production/dto/ProcessRouteDto.java
@@ -7,8 +7,11 @@
@Data
public class ProcessRouteDto extends ProcessRoute {
- @ApiModelProperty(value = "浜у搧鍚嶇О")
+ @ApiModelProperty(value = "鐢熶骇鐐掓満")
private String speculativeTradingName;
private Long productId;
+
+ @ApiModelProperty("瑙勬牸")
+ private String model;
}
diff --git a/src/main/java/com/ruoyi/production/dto/ProcessRouteItemDto.java b/src/main/java/com/ruoyi/production/dto/ProcessRouteItemDto.java
index a5c55c4..6d32dfe 100644
--- a/src/main/java/com/ruoyi/production/dto/ProcessRouteItemDto.java
+++ b/src/main/java/com/ruoyi/production/dto/ProcessRouteItemDto.java
@@ -17,4 +17,6 @@
private String speculativeTradingName;
private Long productId;
+
+ private String model;
}
diff --git a/src/main/java/com/ruoyi/production/dto/ProductStructureDto.java b/src/main/java/com/ruoyi/production/dto/ProductStructureDto.java
index 3272f67..5376342 100644
--- a/src/main/java/com/ruoyi/production/dto/ProductStructureDto.java
+++ b/src/main/java/com/ruoyi/production/dto/ProductStructureDto.java
@@ -9,8 +9,10 @@
@ApiModelProperty(value = "宸ヨ壓鍚嶇О")
private String processName;
- @ApiModelProperty(value = "浜у搧鍚嶇О")
+ @ApiModelProperty(value = "鐢熶骇鐐掓満")
private String speculativeTradingName;
@ApiModelProperty(value = "浜у搧id")
private Long productId;
+
+ private String model;
}
diff --git a/src/main/resources/mapper/production/ProcessRouteItemMapper.xml b/src/main/resources/mapper/production/ProcessRouteItemMapper.xml
index c53259d..c62b6e0 100644
--- a/src/main/resources/mapper/production/ProcessRouteItemMapper.xml
+++ b/src/main/resources/mapper/production/ProcessRouteItemMapper.xml
@@ -17,7 +17,8 @@
pr.description ,
pp.name as process_name,
pm.speculative_trading_name,
- pm.product_id
+ pm.product_id,
+ pm.model
from
process_route_item pri
left join product_model pm on pri.product_model_id = pm.id
diff --git a/src/main/resources/mapper/production/ProcessRouteMapper.xml b/src/main/resources/mapper/production/ProcessRouteMapper.xml
index 51aa322..8cbd91e 100644
--- a/src/main/resources/mapper/production/ProcessRouteMapper.xml
+++ b/src/main/resources/mapper/production/ProcessRouteMapper.xml
@@ -13,7 +13,7 @@
</resultMap>
<select id="pageProcessRouteDto" resultType="com.ruoyi.production.dto.ProcessRouteDto">
- select ps.*, pm.speculative_trading_name,pm.product_id
+ select ps.*, pm.speculative_trading_name,pm.product_id,pm.model
from process_route ps
left join product_model pm on ps.product_model_id = pm.id
<where>
diff --git a/src/main/resources/mapper/production/ProductStructureMapper.xml b/src/main/resources/mapper/production/ProductStructureMapper.xml
index 5cd2deb..255173e 100644
--- a/src/main/resources/mapper/production/ProductStructureMapper.xml
+++ b/src/main/resources/mapper/production/ProductStructureMapper.xml
@@ -13,13 +13,12 @@
<result property="tenantId" column="tenant_id"/>
</resultMap>
-
-
<select id="listByproductModelId" resultType="com.ruoyi.production.dto.ProductStructureDto">
select ps.*,
pm.speculative_trading_name ,
pp.name as process_name,
- pm.product_id
+ pm.product_id,
+ pm.model
from
product_structure ps
left join product_model pm on ps.product_model_id = pm.id
--
Gitblit v1.9.3