From dd930102c5f6832e8ed52aa76645bd46c38d2f32 Mon Sep 17 00:00:00 2001
From: 云 <2163098428@qq.com>
Date: 星期二, 30 六月 2026 13:43:56 +0800
Subject: [PATCH] 修改bug

---
 src/main/resources/mapper/production/ProductionProductInputMapper.xml |   17 +++++++++++++++--
 1 files changed, 15 insertions(+), 2 deletions(-)

diff --git a/src/main/resources/mapper/production/ProductionProductInputMapper.xml b/src/main/resources/mapper/production/ProductionProductInputMapper.xml
index f5e79cc..1a57f9e 100644
--- a/src/main/resources/mapper/production/ProductionProductInputMapper.xml
+++ b/src/main/resources/mapper/production/ProductionProductInputMapper.xml
@@ -14,7 +14,7 @@
         <result column="update_user" property="updateUser" />
     </resultMap>
 
-    <select id="listPageProductionProductInputDto" resultType="com.ruoyi.production.dto.ProductionProductInputDto">
+    <select id="listPageProductionProductInputDto" resultType="com.ruoyi.production.bean.dto.ProductionProductInputDto">
         select ppi.*,
                ppm.product_no as productNo,
                pm.model,
@@ -24,7 +24,7 @@
                  left join production_product_main ppm on ppi.production_product_main_id = ppm.id
                  left join production_operation_task pot on ppm.production_operation_task_id = pot.id
                  left join production_order po on pot.production_order_id = po.id
-                 left join product_model pm on po.product_model_id = pm.id
+                 left join product_model pm on ppi.product_model_id = pm.id
                  left join product p on pm.product_id = p.id
         <where>
             <if test="c.productNo != null and c.productNo != ''">
@@ -36,8 +36,21 @@
             <if test="c.productName != null and c.productName != ''">
                 and p.product_name like concat('%', #{c.productName}, '%')
             </if>
+            <if test="c.productMainId != null and c.productMainId != ''">
+                and ppm.id = #{c.productMainId}
+            </if>
         </where>
         order by ppi.create_time desc
     </select>
 
+    <select id="selectInputStats" resultType="java.util.Map">
+        select date(create_time) as date,
+               sum(ifnull(input_quantity, 0)) as quantity
+        from production_product_input
+        where create_time &gt;= #{startDate}
+          and create_time &lt;= #{endDate}
+        group by date(create_time)
+        order by date asc
+    </select>
+
 </mapper>

--
Gitblit v1.9.3