From f00a59b4f30accf2b23ae0d58fac23d966a48d24 Mon Sep 17 00:00:00 2001
From: yuan <123@>
Date: 星期六, 13 六月 2026 20:11:51 +0800
Subject: [PATCH] fix: 优化生产订单查询
---
src/main/resources/mapper/production/ProductionProductInputMapper.xml | 54 ++++++++++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 52 insertions(+), 2 deletions(-)
diff --git a/src/main/resources/mapper/production/ProductionProductInputMapper.xml b/src/main/resources/mapper/production/ProductionProductInputMapper.xml
index bd92aaf..f04a824 100644
--- a/src/main/resources/mapper/production/ProductionProductInputMapper.xml
+++ b/src/main/resources/mapper/production/ProductionProductInputMapper.xml
@@ -1,6 +1,56 @@
-<?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.ProductionProductInputMapper">
+ <!-- 閫氱敤鏌ヨ鏄犲皠缁撴灉 -->
+ <resultMap id="BaseResultMap" type="com.ruoyi.production.pojo.ProductionProductInput">
+ <id column="id" property="id" />
+ <result column="input_quantity" property="inputQuantity" />
+ <result column="production_product_main_id" property="productionProductMainId" />
+ <result column="product_model_id" property="productModelId" />
+ <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="listPageProductionProductInputDto" resultType="com.ruoyi.production.bean.dto.ProductionProductInputDto">
+ select ppi.*,
+ ppm.product_no as productNo,
+ pm.model,
+ p.product_name as productName,
+ pm.unit
+ from production_product_input ppi
+ 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 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 != ''">
+ and ppm.product_no like concat('%', #{c.productNo}, '%')
+ </if>
+ <if test="c.model != null and c.model != ''">
+ and pm.model like concat('%', #{c.model}, '%')
+ </if>
+ <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_FORMAT(create_time, '%Y-%m-%d') as statDate,
+ sum(ifnull(quantity, 0)) as quantity
+# sum(ifnull(scrap_qty, 0)) as scrapQty
+ from production_product_input
+ where create_time >= #{startDate}
+ and create_time <= #{endDate}
+ group by DATE_FORMAT(create_time, '%Y-%m-%d')
+ order by statDate asc
+ </select>
</mapper>
--
Gitblit v1.9.3