From e52dfc522497311025b277b5e0ef3590fb3de990 Mon Sep 17 00:00:00 2001
From: huminmin <mac@MacBook-Pro.local>
Date: 星期三, 11 三月 2026 16:41:49 +0800
Subject: [PATCH] 主生产计划：优化合并下发，根据剩余下发数量对比需要下发的数量

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

diff --git a/src/main/resources/mapper/productionPlan/ProductionPlanMapper.xml b/src/main/resources/mapper/productionPlan/ProductionPlanMapper.xml
index 4bf0e0d..b4bea0a 100644
--- a/src/main/resources/mapper/productionPlan/ProductionPlanMapper.xml
+++ b/src/main/resources/mapper/productionPlan/ProductionPlanMapper.xml
@@ -54,6 +54,12 @@
         <if test="c.materialCode != null and c.materialCode != '' ">
             AND pp.material_code LIKE CONCAT('%',#{c.materialCode},'%')
         </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>
     </select>
 
     <select id="selectSummaryByProductType" resultType="com.ruoyi.productionPlan.dto.ProductionPlanSummaryDto">

--
Gitblit v1.9.3