From 1bbe6f787d58b768dce5370aa4e0d242c5e4b62d Mon Sep 17 00:00:00 2001
From: chenhj <1263187585@qq.com>
Date: 星期二, 21 四月 2026 17:26:53 +0800
Subject: [PATCH] Merge branch 'dev_New_pro' of http://114.132.189.42:9002/r/product-inventory-management-after into dev_New_pro

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

diff --git a/src/main/resources/mapper/production/ProductionProductOutputMapper.xml b/src/main/resources/mapper/production/ProductionProductOutputMapper.xml
index 3b44135..0656e91 100644
--- a/src/main/resources/mapper/production/ProductionProductOutputMapper.xml
+++ b/src/main/resources/mapper/production/ProductionProductOutputMapper.xml
@@ -1,61 +1,18 @@
-<?xml version="1.0" encoding="UTF-8" ?> <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
-        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.ruoyi.production.mapper.ProductionProductOutputMapper">
 
-    <resultMap id="basicMap" type="com.ruoyi.production.pojo.ProductionProductOutput">
-        <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 id="BaseResultMap" type="com.ruoyi.production.pojo.ProductionProductOutput">
+        <id column="id" property="id" />
+        <result column="production_product_main_id" property="productionProductMainId" />
+        <result column="product_model_id" property="productModelId" />
+        <result column="quantity" property="quantity" />
+        <result column="scrap_qty" property="scrapQty" />
+        <result column="update_time" property="updateTime" />
+        <result column="create_user" property="createUser" />
+        <result column="create_time" property="createTime" />
+        <result column="update_user" property="updateUser" />
     </resultMap>
 
-    <select id="listPageProductionProductOutputDto" resultType="com.ruoyi.production.dto.ProductionProductOutputDto">
-        select ppo.*,
-        pm.model as model,
-        ppm.product_no as productNo
-        from
-        production_product_output ppo
-        left join production_product_main ppm on ppm.id = ppo.product_main_id
-        left join product_model pm on pm.id = ppo.product_model_id
-        <where>
-            <if test="c.productMainId != null and c.productMainId > 0">
-                and ppm.id = #{c.productMainId}
-            </if>
-        </where>
-        order by ppo.id
-    </select>
-
-    <delete id="deleteByProductMainIds" parameterType="java.util.List">
-        DELETE FROM production_product_output
-        WHERE product_main_id IN
-        <foreach collection="productMainIds" item="id" open="(" separator="," close=")">
-            #{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