From 1536165d57b3c8450cbd53f45c61c36f66cc177c Mon Sep 17 00:00:00 2001
From: gongchunyi <deslre0381@gmail.com>
Date: 星期四, 12 三月 2026 16:52:38 +0800
Subject: [PATCH] fix： 生产计划的产品规格与物料编码数据为空
---
src/main/resources/mapper/productionPlan/ProductionPlanMapper.xml | 34 ++++++++++++++++------------------
1 files changed, 16 insertions(+), 18 deletions(-)
diff --git a/src/main/resources/mapper/productionPlan/ProductionPlanMapper.xml b/src/main/resources/mapper/productionPlan/ProductionPlanMapper.xml
index 88ec8fb..204a386 100644
--- a/src/main/resources/mapper/productionPlan/ProductionPlanMapper.xml
+++ b/src/main/resources/mapper/productionPlan/ProductionPlanMapper.xml
@@ -11,10 +11,7 @@
<result property="serialNo" column="serial_no"/>
<result property="applyNo" column="apply_no"/>
<result property="customerName" column="customer_name"/>
- <result property="materialCode" column="material_code"/>
- <result property="productMaterialId" column="product_material_id"/>
- <result property="productName" column="product_name"/>
- <result property="productSpec" column="product_spec"/>
+ <result property="productMaterialSkuId" column="product_material_sku_id"/>
<result property="length" column="length"/>
<result property="width" column="width"/>
<result property="height" column="height"/>
@@ -38,28 +35,28 @@
<result property="totalCount" column="total_count"/>
</resultMap>
-
<select id="listPage" resultType="com.ruoyi.productionPlan.dto.ProductionPlanDto">
SELECT
pp.*,
- pm.product_name,
- pm.specification,
- pm.material_code,
+ pms.material_code AS materialCode,
+ pms.specification AS specification,
+ pm.material_name AS productName,
pm.base_unit
FROM production_plan pp
- left join product_material pm on pp.product_material_id = pm.id
+ left join product_material_sku pms on pp.product_material_sku_id = pms.id
+ left join product_material pm on pms.material_id = pm.id
WHERE 1 = 1
<if test="c.customerName != null and c.customerName != '' ">
AND pp.customer_name LIKE CONCAT('%',#{c.customerName},'%')
</if>
<if test="c.productName != null and c.productName != '' ">
- AND pm.product_name LIKE CONCAT('%',#{c.productName},'%')
- </if>
- <if test="c.specification != null and c.specification != '' ">
- AND pm.specification LIKE CONCAT('%',#{c.specification},'%')
+ AND pm.material_name LIKE CONCAT('%',#{c.productName},'%')
</if>
<if test="c.materialCode != null and c.materialCode != '' ">
- AND pm.material_code LIKE CONCAT('%',#{c.materialCode},'%')
+ AND pms.material_code LIKE CONCAT('%',#{c.materialCode},'%')
+ </if>
+ <if test="c.specification != null and c.specification != '' ">
+ AND pms.specification LIKE CONCAT('%',#{c.specification},'%')
</if>
<if test="c.startDate != null">
AND pp.start_date >= DATE_FORMAT(#{c.startDate},'%Y-%m-%d')
@@ -101,12 +98,13 @@
<select id="selectWithMaterialByIds" resultType="com.ruoyi.productionPlan.dto.ProductionPlanDto">
SELECT
pp.*,
- pm.product_name,
- pm.specification,
- pm.material_code,
+ pms.material_code AS materialCode,
+ pms.specification AS specification,
+ pm.material_name AS productName,
pm.base_unit
FROM production_plan pp
- LEFT JOIN product_material pm ON pp.product_material_id = pm.id
+ LEFT JOIN product_material_sku pms ON pp.product_material_sku_id = pms.id
+ LEFT JOIN product_material pm ON pms.material_id = pm.id
WHERE pp.id IN
<foreach collection="ids" item="id" open="(" separator="," close=")">
#{id}
--
Gitblit v1.9.3