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 @@ AND a.OrderNo LIKE #{orderNo} - - - + and a.status in ('已下达','已发料','已入库','已开工','已排产') AND a.EnterDate >= #{startDate1}