From a96948456e0a21ab33deeb2edfdd7ef343aec5bf Mon Sep 17 00:00:00 2001
From: huminmin <mac@MacBook-Pro.local>
Date: 星期六, 25 四月 2026 16:20: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 | 48 ++++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 46 insertions(+), 2 deletions(-)
diff --git a/src/main/resources/mapper/production/ProductionPlanMapper.xml b/src/main/resources/mapper/production/ProductionPlanMapper.xml
index da0d293..a389d32 100644
--- a/src/main/resources/mapper/production/ProductionPlanMapper.xml
+++ b/src/main/resources/mapper/production/ProductionPlanMapper.xml
@@ -16,7 +16,6 @@
<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>
@@ -26,10 +25,36 @@
pm.model,
p.id as productId,
p.product_name AS productName,
- pm.unit
+ pm.unit,
+ sl.sales_contract_no,
+ sl.customer_name,
+ sl.project_name
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
+ left join sales_ledger sl on pp.sales_ledger_id = sl.id
+ <where>
+ <if test="c != null">
+ <if test="c.id != null">
+ and pp.id = #{c.id}
+ </if>
+ <if test="c.productName != null and c.productName != ''">
+ and p.product_name like concat('%', #{c.productName}, '%')
+ </if>
+ <if test="c.model != null and c.model != ''">
+ and pm.model like concat('%', #{c.model}, '%')
+ </if>
+ <if test="c.status != null">
+ and pp.status = #{c.status}
+ </if>
+ <if test="c.mpsNo != null and c.mpsNo != ''">
+ and pp.mps_no like concat('%', #{c.mpsNo}, '%')
+ </if>
+ <if test="c.requiredDateStart != null and c.requiredDateEnd != null">
+ and pp.required_date between #{c.requiredDateStart} and #{c.requiredDateEnd}
+ </if>
+ </if>
+ </where>
ORDER BY COALESCE(pp.id) DESC
</select>
@@ -59,4 +84,23 @@
left join product p on pm.product_id = p.id
WHERE pp.id = #{productionPlanId}
</select>
+ <select id="getSource" resultType="com.ruoyi.production.bean.vo.ProductionPlanVo">
+ SELECT
+ pp.*,
+ pm.model,
+ p.product_name AS productName,
+ pm.unit,
+ sl.sales_contract_no,
+ sl.customer_name,
+ sl.project_name
+ 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
+ left join sales_ledger sl on pp.sales_ledger_id = sl.id
+ WHERE pp.id IN
+ <foreach collection="ids" item="id" open="(" separator="," close=")">
+ #{id}
+ </foreach>
+ ORDER BY pp.id ASC
+ </select>
</mapper>
--
Gitblit v1.9.3