From 46b2ee5f0d9fc6ffaffee1f9de3f4f56d63355b4 Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期五, 13 三月 2026 13:31:28 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_宁夏_中盛建材' into dev_宁夏_中盛建材

---
 src/main/resources/mapper/productionPlan/ProductionPlanMapper.xml |    5 +++++
 1 files changed, 5 insertions(+), 0 deletions(-)

diff --git a/src/main/resources/mapper/productionPlan/ProductionPlanMapper.xml b/src/main/resources/mapper/productionPlan/ProductionPlanMapper.xml
index 83fc71c..faa92ae 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,12 +59,16 @@
         <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 &gt;= DATE_FORMAT(#{c.startDate},'%Y-%m-%d')
         </if>
         <if test="c.endDate != null">
             AND pp.end_date &lt;= DATE_FORMAT(#{c.endDate},'%Y-%m-%d')
         </if>
+        ORDER BY pp.id DESC
     </select>
 
     <select id="selectSummaryByProductType" resultType="com.ruoyi.productionPlan.dto.ProductionPlanSummaryDto">

--
Gitblit v1.9.3