From db85e062349683b3131726fe90dcc99d4aff35ba Mon Sep 17 00:00:00 2001
From: liding <756868258@qq.com>
Date: 星期二, 06 一月 2026 13:29:00 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/jtwy' into jtwy
---
src/main/resources/mapper/production/ProductionProductInputMapper.xml | 24 +++++++++++++++++++++++-
1 files changed, 23 insertions(+), 1 deletions(-)
diff --git a/src/main/resources/mapper/production/ProductionProductInputMapper.xml b/src/main/resources/mapper/production/ProductionProductInputMapper.xml
index bd92aaf..eab625b 100644
--- a/src/main/resources/mapper/production/ProductionProductInputMapper.xml
+++ b/src/main/resources/mapper/production/ProductionProductInputMapper.xml
@@ -2,5 +2,27 @@
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.ruoyi.production.mapper.ProductionProductInputMapper">
-
+ <resultMap id="basicMap" type="com.ruoyi.production.pojo.ProductionProductInput">
+ <id property="id" column="id"/>
+ <result property="productMainId" column="product_main_id"/>
+ <result property="productModelId" column="product_model_id"/>
+ <result property="quantity" column="quantity"/>
+ <result property="tenantId" column="tenant_id"/>
+ <result property="createTime" column="create_time"/>
+ </resultMap>
+ <select id="listPageProductionProductInputDto" resultType="com.ruoyi.production.dto.ProductionProductInputDto">
+ select ppi.*,
+ pm.model as model,
+ ppm.product_no as productNo
+ 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
+ <where>
+ <if test="c.productMainId != null and c.productMainId > 0">
+ and ppm.id = #{c.productMainId}
+ </if>
+ </where>
+ order by ppi.id
+ </select>
</mapper>
--
Gitblit v1.9.3