From 34e986e6e158450ee35319f1cac872a4bc974a74 Mon Sep 17 00:00:00 2001
From: maven <2163098428@qq.com>
Date: 星期五, 16 一月 2026 18:02:41 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_New' into dev_New
---
src/main/resources/mapper/production/ProductionProductInputMapper.xml | 5 ++++-
1 files changed, 4 insertions(+), 1 deletions(-)
diff --git a/src/main/resources/mapper/production/ProductionProductInputMapper.xml b/src/main/resources/mapper/production/ProductionProductInputMapper.xml
index 7d203f3..a885977 100644
--- a/src/main/resources/mapper/production/ProductionProductInputMapper.xml
+++ b/src/main/resources/mapper/production/ProductionProductInputMapper.xml
@@ -13,11 +13,14 @@
<select id="listPageProductionProductInputDto" resultType="com.ruoyi.production.dto.ProductionProductInputDto">
select ppi.*,
pm.model as model,
- ppm.product_no as productNo
+ ppm.product_no as productNo,
+ p.product_name,
+ pm.unit
from
production_product_input ppi
left join production_product_main ppm on ppm.id = ppi.product_main_id
left join product_model pm on pm.id = ppi.product_model_id
+ left join product p on p.id = pm.product_id
<where>
<if test="c.productMainId != null and c.productMainId > 0">
and ppm.id = #{c.productMainId}
--
Gitblit v1.9.3