0412更新

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){

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>