From fb40c4dfec5954c321f38bb86e9d07eb87b97bfd Mon Sep 17 00:00:00 2001
From: yuan <123@>
Date: 星期三, 18 三月 2026 08:21:29 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_衡阳_鹏创电子' into dev_衡阳_鹏创电子
---
src/main/resources/mapper/production/ProductionProductOutputMapper.xml | 3 ++-
1 files changed, 2 insertions(+), 1 deletions(-)
diff --git a/src/main/resources/mapper/production/ProductionProductOutputMapper.xml b/src/main/resources/mapper/production/ProductionProductOutputMapper.xml
index f73e5e4..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">
@@ -49,7 +50,7 @@
<select id="selectDailyOutputStats" resultType="java.util.Map">
SELECT
DATE_FORMAT(create_time, '%Y-%m-%d') as date,
- SUM(quantity) as quantity
+ SUM(quantity-scrap_qty) as quantity
FROM
production_product_output
WHERE
--
Gitblit v1.9.3