From 88fdd0ae3b9d59eff91bf35c4cf7b4229f2a7e9e Mon Sep 17 00:00:00 2001
From: ruanqi <qi.ruan@xujiesoft.com>
Date: Thu, 20 Jul 2023 18:09:41 +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

---
 .../com/heai/modules/production/dao/DailyPlanMapper.java    | 6 +++---
 .../production/service/impl/DailyPlanServiceImpl.java       | 2 +-
 src/main/resources/mapper/production/DailyPlanMapper.xml    | 4 +---
 3 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/src/main/java/com/heai/modules/production/dao/DailyPlanMapper.java b/src/main/java/com/heai/modules/production/dao/DailyPlanMapper.java
index ddffa6f..9db8704 100644
--- a/src/main/java/com/heai/modules/production/dao/DailyPlanMapper.java
+++ b/src/main/java/com/heai/modules/production/dao/DailyPlanMapper.java
@@ -317,11 +317,11 @@ public interface DailyPlanMapper {
      * @throw
      */
     void saveScheduleForSOTask(ScheduleData inData);
-    
+
     /**
      * @Description TODO
-     * @Title 修改数量 
-      * @param inData 
+     * @Title 修改数量
+     * @param inData
      * @author rq
      * @date 2022/8/2 22:49
      * @return void
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 409d550..3d9b277 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
@@ -1010,7 +1010,7 @@ public class DailyPlanServiceImpl implements DailyPlanService {
                 }
             }
         }
-        //----------检查下前道工序是否报工-----------------start
+        //----------检查下前道工序是否报工-----------------end
         Integer histSeqNo=dailyPlanMapper.getHistSeqNo(inData);
         sfdcTimeHistData.setHistSeqNo(histSeqNo);
         dailyPlanMapper.saveSfdcTimeHistDataStart(sfdcTimeHistData);
diff --git a/src/main/resources/mapper/production/DailyPlanMapper.xml b/src/main/resources/mapper/production/DailyPlanMapper.xml
index 8470f1c..5e4b0fb 100644
--- a/src/main/resources/mapper/production/DailyPlanMapper.xml
+++ b/src/main/resources/mapper/production/DailyPlanMapper.xml
@@ -245,9 +245,7 @@
             <if test="orderNo != null and orderNo != ''">
                 AND a.OrderNo LIKE  #{orderNo}
             </if>
-<!--            <if test="status !=null and status != ''">-->
-<!--                AND a.Status IN ${status}-->
-<!--            </if>-->
+               and a.status in ('已下达','已发料','已入库','已开工','已排产')
             <if test="startDate1 != null ">
                 AND a.EnterDate >=   #{startDate1}
             </if>