From b4a9e12e00b78e1aef8acda070434de9ffd0d66a Mon Sep 17 00:00:00 2001
From: yuan <123@>
Date: 星期五, 24 四月 2026 15:29:19 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_New_pro' into dev_New_pro
---
src/main/resources/mapper/production/ProductionPlanMapper.xml | 37 ++++++++++++++-----------------------
1 files changed, 14 insertions(+), 23 deletions(-)
diff --git a/src/main/resources/mapper/production/ProductionPlanMapper.xml b/src/main/resources/mapper/production/ProductionPlanMapper.xml
index a7ad8f7..da0d293 100644
--- a/src/main/resources/mapper/production/ProductionPlanMapper.xml
+++ b/src/main/resources/mapper/production/ProductionPlanMapper.xml
@@ -23,31 +23,25 @@
<select id="listPage" resultType="com.ruoyi.production.bean.vo.ProductionPlanVo">
SELECT
pp.*,
- pms.material_code AS materialCode,
- pmdl.model,
- pms.product_id AS productMaterialId,
+ pm.model,
+ p.id as productId,
p.product_name AS productName,
- pmdl.unit
+ pm.unit
FROM production_plan pp
- left join product_material_sku pms on pp.product_material_sku_id = pms.id
- left join product_model pmdl on pp.product_model_id = pmdl.id
- left join product p on pmdl.product_id = p.id
-
- ORDER BY COALESCE(pp.form_modified_time, pp.id) DESC
+ left join product_model pm on pp.product_model_id = pm.id
+ left join product p on pm.product_id = p.id
+ ORDER BY COALESCE(pp.id) DESC
</select>
<select id="selectWithMaterialByIds" resultType="com.ruoyi.production.bean.dto.ProductionPlanDto">
SELECT
pp.*,
- pms.material_code AS materialCode,
- pmdl.model,
+ pm.model,
p.product_name AS productName,
- pmdl.unit,
- pms.product_id AS productMaterialId
+ pm.unit
FROM production_plan pp
- LEFT JOIN product_material_sku pms ON pp.product_material_sku_id = pms.id
- LEFT JOIN product_model pmdl ON pp.product_model_id = pmdl.id
- LEFT JOIN product p ON pmdl.product_id = p.id
+ LEFT JOIN product_model pm ON pp.product_model_id = pm.id
+ LEFT JOIN product p ON pm.product_id = p.id
WHERE pp.id IN
<foreach collection="ids" item="id" open="(" separator="," close=")">
#{id}
@@ -57,15 +51,12 @@
<select id="selectProductionPlanDtoById" resultType="com.ruoyi.production.bean.dto.ProductionPlanDto">
SELECT
pp.*,
- pms.material_code AS materialCode,
- pmdl.model,
- pms.product_id AS productMaterialId,
+ pm.model,
p.product_name AS productName,
- pmdl.unit
+ pm.unit
FROM production_plan pp
- left join product_material_sku pms on pp.product_material_sku_id = pms.id
- left join product_model pmdl on pp.product_model_id = pmdl.id
- left join product p on pmdl.product_id = p.id
+ left join product_model pm on pp.product_model_id = pm.id
+ left join product p on pm.product_id = p.id
WHERE pp.id = #{productionPlanId}
</select>
</mapper>
--
Gitblit v1.9.3