From 3a7b7ec0a0988c3a7e84431e609b2734870dfe1e Mon Sep 17 00:00:00 2001
From: ruanqi <qi.ruan@xujiesoft.com>
Date: Mon, 17 Feb 2025 16:58:40 +0800
Subject: [PATCH] =?UTF-8?q?0412=E6=9B=B4=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../modules/production/service/impl/DailyPlanServiceImpl.java  | 2 +-
 src/main/resources/mapper/production/DailyPlanMapper.xml       | 3 +++
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/main/java/com/heai/modules/production/service/impl/DailyPlanServiceImpl.java b/src/main/java/com/heai/modules/production/service/impl/DailyPlanServiceImpl.java
index e6b7712..46216e4 100644
--- a/src/main/java/com/heai/modules/production/service/impl/DailyPlanServiceImpl.java
+++ b/src/main/java/com/heai/modules/production/service/impl/DailyPlanServiceImpl.java
@@ -504,7 +504,7 @@ public class DailyPlanServiceImpl implements DailyPlanService {
         int year = Integer.parseInt(format.format(date).substring(0,4));
         //获取下周的第一天和最后一天
         String day1= DateUtil.getStringDate(WeekUtil.getFirstDayOfWeek(year,week));
-        String day2=DateUtil.getStringDate(DateUtil.getAddDate(WeekUtil.getLastDayOfWeek(year,week),7));
+        String day2=DateUtil.getStringDate(DateUtil.getAddDate(WeekUtil.getLastDayOfWeek(year,week),21));
         dailyPlanInData.setSql(day2);
         List<ViewKanbanSoHunlianPlanData> list =boardMapper.productionBlankingSearch(dailyPlanInData);
         if(list.size()>0){
diff --git a/src/main/resources/mapper/production/DailyPlanMapper.xml b/src/main/resources/mapper/production/DailyPlanMapper.xml
index e912dac..6c87264 100644
--- a/src/main/resources/mapper/production/DailyPlanMapper.xml
+++ b/src/main/resources/mapper/production/DailyPlanMapper.xml
@@ -919,6 +919,9 @@
             <if test="partNo != null and partNo != ''">
                 AND b.PartNo LIKE  #{partNo}
             </if>
+            <if test="status != null and status != ''">
+                AND case when a.status ='已入库' then '已入库' else '未入库' end LIKE  #{status}
+            </if>
             </where>
             ORDER BY a.TransDate
     </select>