From 8b749305a8e8c3f4bf669f6980edf2bbb7bfa9c7 Mon Sep 17 00:00:00 2001
From: chenhj <1263187585@qq.com>
Date: 星期五, 24 四月 2026 11:14:34 +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/ProductionPlanMapper.xml | 68 ++++++++++++++++++++++++++-------
1 files changed, 53 insertions(+), 15 deletions(-)
diff --git a/src/main/resources/mapper/production/ProductionPlanMapper.xml b/src/main/resources/mapper/production/ProductionPlanMapper.xml
index 3e3a683..da0d293 100644
--- a/src/main/resources/mapper/production/ProductionPlanMapper.xml
+++ b/src/main/resources/mapper/production/ProductionPlanMapper.xml
@@ -4,21 +4,59 @@
<!-- 閫氱敤鏌ヨ鏄犲皠缁撴灉 -->
<resultMap id="BaseResultMap" type="com.ruoyi.production.pojo.ProductionPlan">
- <id column="id" property="id" />
- <result column="mps_no" property="mpsNo" />
- <result column="required_date" property="requiredDate" />
- <result column="remark" property="remark" />
- <result column="create_time" property="createTime" />
- <result column="update_time" property="updateTime" />
- <result column="create_user" property="createUser" />
- <result column="update_user" property="updateUser" />
- <result column="product_model_id" property="productModelId" />
- <result column="qty_required" property="qtyRequired" />
- <result column="state" property="state" />
- <result column="issued" property="issued" />
- <result column="source" property="source" />
- <result column="is_audit" property="isAudit" />
- <result column="promised_delivery_date" property="promisedDeliveryDate" />
+ <id column="id" property="id"/>
+ <result column="mps_no" property="mpsNo"/>
+ <result column="required_date" property="requiredDate"/>
+ <result column="remark" property="remark"/>
+ <result column="create_time" property="createTime"/>
+ <result column="update_time" property="updateTime"/>
+ <result column="create_user" property="createUser"/>
+ <result column="update_user" property="updateUser"/>
+ <result column="product_model_id" property="productModelId"/>
+ <result column="qty_required" property="qtyRequired"/>
+ <result column="issued" property="issued"/>
+ <result column="source" property="source"/>
+ <result column="is_audit" property="isAudit"/>
+ <result column="promised_delivery_date" property="promisedDeliveryDate"/>
</resultMap>
+ <select id="listPage" resultType="com.ruoyi.production.bean.vo.ProductionPlanVo">
+ SELECT
+ pp.*,
+ pm.model,
+ p.id as productId,
+ p.product_name AS productName,
+ pm.unit
+ FROM production_plan pp
+ 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.*,
+ pm.model,
+ p.product_name AS productName,
+ pm.unit
+ FROM production_plan pp
+ 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}
+ </foreach>
+ ORDER BY pp.id ASC
+ </select>
+ <select id="selectProductionPlanDtoById" resultType="com.ruoyi.production.bean.dto.ProductionPlanDto">
+ SELECT
+ pp.*,
+ pm.model,
+ p.product_name AS productName,
+ pm.unit
+ FROM production_plan pp
+ 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