From a0c2c050bfde573bc748d7bbdf732cc50e004be8 Mon Sep 17 00:00:00 2001
From: gongchunyi <deslre0381@gmail.com>
Date: 星期四, 12 三月 2026 17:23:21 +0800
Subject: [PATCH] fix: 生产计划查询未携带申请单编号
---
src/main/resources/mapper/productionPlan/ProductionPlanMapper.xml | 42 +++++++++++++++++++++++++-----------------
1 files changed, 25 insertions(+), 17 deletions(-)
diff --git a/src/main/resources/mapper/productionPlan/ProductionPlanMapper.xml b/src/main/resources/mapper/productionPlan/ProductionPlanMapper.xml
index 204a386..a7c1b84 100644
--- a/src/main/resources/mapper/productionPlan/ProductionPlanMapper.xml
+++ b/src/main/resources/mapper/productionPlan/ProductionPlanMapper.xml
@@ -40,6 +40,7 @@
pp.*,
pms.material_code AS materialCode,
pms.specification AS specification,
+ pms.material_id AS productMaterialId,
pm.material_name AS productName,
pm.base_unit
FROM production_plan pp
@@ -58,6 +59,9 @@
<if test="c.specification != null and c.specification != '' ">
AND pms.specification LIKE CONCAT('%',#{c.specification},'%')
</if>
+ <if test="c.applyNo != null and c.applyNo != '' ">
+ AND pp.apply_no LIKE CONCAT('%',#{c.applyNo},'%')
+ </if>
<if test="c.startDate != null">
AND pp.start_date >= DATE_FORMAT(#{c.startDate},'%Y-%m-%d')
</if>
@@ -68,31 +72,35 @@
<select id="selectSummaryByProductType" resultType="com.ruoyi.productionPlan.dto.ProductionPlanSummaryDto">
SELECT
- material_code,
- product_name,
- product_spec,
- length,
- width,
- height,
- COALESCE(SUM(quantity),0) AS quantity,
- COALESCE(SUM(volume),0) AS volume
- FROM production_plan
+ sku.material_code,
+ pm.material_name AS product_name,
+ sku.specification AS product_spec,
+ pp.length,
+ pp.width,
+ pp.height,
+ COALESCE(SUM(pp.quantity),0) AS quantity,
+ COALESCE(SUM(pp.volume),0) AS volume
+ FROM production_plan pp
+ LEFT JOIN product_material_sku sku
+ ON pp.product_material_sku_id = sku.id
+ LEFT JOIN product_material pm
+ ON sku.material_id = pm.id
<where>
<if test="materialCode != null and materialCode != ''">
- AND material_code LIKE CONCAT('%', #{materialCode}, '%')
+ AND sku.material_code LIKE CONCAT('%', #{materialCode}, '%')
</if>
<if test="productName != null and productName != ''">
- AND product_name LIKE CONCAT('%', #{productName}, '%')
+ AND pm.material_name LIKE CONCAT('%', #{productName}, '%')
</if>
</where>
GROUP BY
- material_code,
- product_name,
- product_spec,
- length,
- width,
- height
+ sku.material_code,
+ pm.material_name,
+ sku.specification,
+ pp.length,
+ pp.width,
+ pp.height
</select>
<select id="selectWithMaterialByIds" resultType="com.ruoyi.productionPlan.dto.ProductionPlanDto">
--
Gitblit v1.9.3