From 27a40258eb823210af2b286a2b43404e6c49f9e3 Mon Sep 17 00:00:00 2001
From: gongchunyi <deslre0381@gmail.com>
Date: 星期一, 16 三月 2026 16:36:30 +0800
Subject: [PATCH] fix: 工艺路线内的工序产品名称未返回、工序对应的参数个数
---
src/main/java/com/ruoyi/production/mapper/ProductOrderMapper.java | 2 +-
src/main/java/com/ruoyi/production/service/impl/ProductOrderServiceImpl.java | 2 +-
src/main/resources/mapper/production/ProductOrderMapper.xml | 8 ++++----
src/main/java/com/ruoyi/production/controller/ProductOrderController.java | 2 +-
src/main/java/com/ruoyi/production/service/ProductOrderService.java | 2 +-
src/main/java/com/ruoyi/production/dto/ProcessRouteItemDto.java | 12 +++++-------
src/main/resources/mapper/production/ProcessRouteItemMapper.xml | 30 +++++++++++++++---------------
7 files changed, 28 insertions(+), 30 deletions(-)
diff --git a/src/main/java/com/ruoyi/production/controller/ProductOrderController.java b/src/main/java/com/ruoyi/production/controller/ProductOrderController.java
index 5a566a5..47dfade 100644
--- a/src/main/java/com/ruoyi/production/controller/ProductOrderController.java
+++ b/src/main/java/com/ruoyi/production/controller/ProductOrderController.java
@@ -30,7 +30,7 @@
@ApiOperation("鍒嗛〉鏌ヨ")
@GetMapping("page")
- public R page(ProductOrderDto productOrder, Page page) {
+ public R page(ProductOrderDto productOrder, Page<ProductOrder> page) {
return R.ok(productOrderService.pageProductOrder(page, productOrder));
}
diff --git a/src/main/java/com/ruoyi/production/dto/ProcessRouteItemDto.java b/src/main/java/com/ruoyi/production/dto/ProcessRouteItemDto.java
index 705354c..cb477d1 100644
--- a/src/main/java/com/ruoyi/production/dto/ProcessRouteItemDto.java
+++ b/src/main/java/com/ruoyi/production/dto/ProcessRouteItemDto.java
@@ -12,20 +12,18 @@
@ApiModelProperty(value = "宸ュ簭鍚嶇О")
private String processName;
- @ApiModelProperty(value = "宸ヨ壓璺嚎鍚嶇О")
- private String routeName;
-
- @ApiModelProperty(value = "鐢熶骇鐐掓満")
- private String speculativeTradingName;
-
@ApiModelProperty(value = "浜у搧鍚嶇О")
private String productName;
@ApiModelProperty(value = "鍗曚綅")
private String unit;
+ @ApiModelProperty(value = "浜у搧ID")
private Long productId;
-
+ @ApiModelProperty(value = "浜у搧瑙勬牸")
private String model;
+
+ @ApiModelProperty("宸ュ簭鍙傛暟涓暟")
+ private Integer paramCount;
}
diff --git a/src/main/java/com/ruoyi/production/mapper/ProductOrderMapper.java b/src/main/java/com/ruoyi/production/mapper/ProductOrderMapper.java
index 72aa6cd..d9dd4be 100644
--- a/src/main/java/com/ruoyi/production/mapper/ProductOrderMapper.java
+++ b/src/main/java/com/ruoyi/production/mapper/ProductOrderMapper.java
@@ -16,7 +16,7 @@
@Mapper
public interface ProductOrderMapper extends BaseMapper<ProductOrder> {
- IPage<ProductOrderDto> pageProductOrder(Page page, @Param("c") ProductOrderDto productOrder);
+ IPage<ProductOrderDto> pageProductOrder(Page<ProductOrder> page, @Param("c") ProductOrderDto productOrder);
List<ProcessRoute> listProcessRoute(@Param("productModelId") Long productModelId);
diff --git a/src/main/java/com/ruoyi/production/service/ProductOrderService.java b/src/main/java/com/ruoyi/production/service/ProductOrderService.java
index 7ae2381..f71df8f 100644
--- a/src/main/java/com/ruoyi/production/service/ProductOrderService.java
+++ b/src/main/java/com/ruoyi/production/service/ProductOrderService.java
@@ -14,7 +14,7 @@
public interface ProductOrderService extends IService<ProductOrder> {
- IPage<ProductOrderDto> pageProductOrder(Page page, ProductOrderDto productOrder);
+ IPage<ProductOrderDto> pageProductOrder(Page<ProductOrder> page, ProductOrderDto productOrder);
int bindingRoute(ProductOrder productOrder);
diff --git a/src/main/java/com/ruoyi/production/service/impl/ProductOrderServiceImpl.java b/src/main/java/com/ruoyi/production/service/impl/ProductOrderServiceImpl.java
index 15a2d3c..57800e6 100644
--- a/src/main/java/com/ruoyi/production/service/impl/ProductOrderServiceImpl.java
+++ b/src/main/java/com/ruoyi/production/service/impl/ProductOrderServiceImpl.java
@@ -77,7 +77,7 @@
private StockUtils stockUtils;
@Override
- public IPage<ProductOrderDto> pageProductOrder(Page page, ProductOrderDto productOrder) {
+ public IPage<ProductOrderDto> pageProductOrder(Page<ProductOrder> page, ProductOrderDto productOrder) {
return productOrderMapper.pageProductOrder(page, productOrder);
}
diff --git a/src/main/resources/mapper/production/ProcessRouteItemMapper.xml b/src/main/resources/mapper/production/ProcessRouteItemMapper.xml
index 1b5e2b4..b75244d 100644
--- a/src/main/resources/mapper/production/ProcessRouteItemMapper.xml
+++ b/src/main/resources/mapper/production/ProcessRouteItemMapper.xml
@@ -15,21 +15,21 @@
<select id="listProcessRouteItemDto" resultType="com.ruoyi.production.dto.ProcessRouteItemDto">
select pri.*,
- pr.description ,
- pp.name as process_name,
- pm.speculative_trading_name,
- pm.product_id,
- pm.model,
- p.product_name,
- pm.unit
- 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 product p on p.id = pm.product_id
- left join process_route pr on pr.id = pri.route_id
- where
- pri.route_id = #{c.routeId}
+ pr.description,
+ pp.name as process_name,
+ pms.product_id,
+ pms.model,
+ pm.product_name,
+ pm.unit,
+ (SELECT COUNT(1)
+ FROM process_route_item_param prip
+ WHERE prip.route_item_id = pri.id) as paramCount
+ from process_route_item pri
+ left join process_route pr on pr.id = pri.route_id
+ left join product_process pp on pp.id = pri.process_id
+ left join product_material_sku pms on pms.id = pri.product_model_id
+ left join product_material pm on pm.id = pms.product_id
+ where pri.route_id = #{c.routeId}
order by pri.drag_sort
</select>
</mapper>
diff --git a/src/main/resources/mapper/production/ProductOrderMapper.xml b/src/main/resources/mapper/production/ProductOrderMapper.xml
index 6f3176a..e5d318c 100644
--- a/src/main/resources/mapper/production/ProductOrderMapper.xml
+++ b/src/main/resources/mapper/production/ProductOrderMapper.xml
@@ -5,14 +5,14 @@
<resultMap id="basicMap" type="com.ruoyi.production.pojo.ProductOrder">
<id property="id" column="id"/>
- <result property="productModelId" column="product_model_id"/>
<result property="tenantId" column="tenant_id"/>
- <result property="salesLedgerId" column="sales_ledger_id"/>
<result property="routeId" column="route_id"/>
<result property="npsNo" column="nps_no"/>
<result property="createTime" column="create_time"/>
<result property="updateTime" column="update_time"/>
+ <result property="planCompleteTime" column="plan_complete_time"/>
</resultMap>
+
<select id="pageProductOrder" resultType="com.ruoyi.production.dto.ProductOrderDto">
select po.*,
ppr.process_route_code,
@@ -34,8 +34,8 @@
<select id="listProcessRoute" resultType="com.ruoyi.production.pojo.ProcessRoute">
select pr.*
from process_route pr
- left join product_model pm on pr.product_model_id = pm.id
- where pm.id = #{productModelId}
+ left join product_material_sku pms on pms.id = pr.product_model_id
+ where pms.id = #{productModelId}
</select>
<select id="listProcessBom" resultType="com.ruoyi.production.dto.ProductStructureDto">
select ps.id,
--
Gitblit v1.9.3