From f4c288c55d08c04cd026508b358beebfcdce5fc2 Mon Sep 17 00:00:00 2001
From: liding <756868258@qq.com>
Date: 星期五, 22 五月 2026 09:29:09 +0800
Subject: [PATCH] feat(product): 添加产品型号向下复制功能并优化生产报工重量计算 - 在ProductController中新增downCopy接口实现产品型号批量复制功能 - 将ProductionProductMainDto中的bomInputQty字段重命名为inputWeight - 在ProductionProductMainServiceImpl中添加JSON解析逻辑支持从otherData中提取投入重量 - 新增resolveInputWeight、findParameterValue、findFieldValue等工具方法处理复杂参数解析 - 为ProductModelDto添加targetProductId字段用于指定复制目标 - 修复销售台账按调度员ID和姓名分组的SQL查询问题 - 优化库存服务中剩余数量计算的空值处理逻辑 - 完善生产投料数量为空时的默认值处理机制

---
 src/main/resources/mapper/production/ProductionProductOutputMapper.xml |   25 +++++++++++++++++++++++++
 1 files changed, 25 insertions(+), 0 deletions(-)

diff --git a/src/main/resources/mapper/production/ProductionProductOutputMapper.xml b/src/main/resources/mapper/production/ProductionProductOutputMapper.xml
index e5d17fc..fad5b62 100644
--- a/src/main/resources/mapper/production/ProductionProductOutputMapper.xml
+++ b/src/main/resources/mapper/production/ProductionProductOutputMapper.xml
@@ -9,6 +9,7 @@
         <result property="quantity" column="quantity"/>
         <result property="tenantId" column="tenant_id"/>
         <result property="createTime" column="create_time"/>
+        <result property="otherData" column="other_data"/>
     </resultMap>
 
     <select id="listPageProductionProductOutputDto" resultType="com.ruoyi.production.dto.ProductionProductOutputDto">
@@ -34,4 +35,28 @@
             #{id}
         </foreach>
     </delete>
+    <select id="selectOutputStats" resultType="com.ruoyi.production.dto.ProductionProductOutputDto">
+        SELECT
+            create_time,
+            quantity,
+            scrap_qty
+        FROM
+            production_product_output
+        WHERE
+            create_time &gt;= #{startDate}
+            AND create_time &lt;= #{endDate}
+    </select>
+
+    <select id="selectDailyOutputStats" resultType="java.util.Map">
+        SELECT
+            DATE_FORMAT(create_time, '%Y-%m-%d') as date,
+            SUM(quantity-scrap_qty) as quantity
+        FROM
+            production_product_output
+        WHERE
+            create_time &gt;= #{startDate}
+            AND create_time &lt;= #{endDate}
+        GROUP BY
+            DATE_FORMAT(create_time, '%Y-%m-%d')
+    </select>
 </mapper>

--
Gitblit v1.9.3