Browse Source

0412更新

master
ruanqi 3 years ago
parent
commit
88fdd0ae3b
  1. 2
      src/main/java/com/heai/modules/production/dao/DailyPlanMapper.java
  2. 2
      src/main/java/com/heai/modules/production/service/impl/DailyPlanServiceImpl.java
  3. 4
      src/main/resources/mapper/production/DailyPlanMapper.xml

2
src/main/java/com/heai/modules/production/dao/DailyPlanMapper.java

@ -321,7 +321,7 @@ public interface DailyPlanMapper {
/** /**
* @Description TODO * @Description TODO
* @Title 修改数量 * @Title 修改数量
* @param inData
* @param inData
* @author rq * @author rq
* @date 2022/8/2 22:49 * @date 2022/8/2 22:49
* @return void * @return void

2
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); Integer histSeqNo=dailyPlanMapper.getHistSeqNo(inData);
sfdcTimeHistData.setHistSeqNo(histSeqNo); sfdcTimeHistData.setHistSeqNo(histSeqNo);
dailyPlanMapper.saveSfdcTimeHistDataStart(sfdcTimeHistData); dailyPlanMapper.saveSfdcTimeHistDataStart(sfdcTimeHistData);

4
src/main/resources/mapper/production/DailyPlanMapper.xml

@ -245,9 +245,7 @@
<if test="orderNo != null and orderNo != ''"> <if test="orderNo != null and orderNo != ''">
AND a.OrderNo LIKE #{orderNo} AND a.OrderNo LIKE #{orderNo}
</if> </if>
<!-- <if test="status !=null and status != ''">-->
<!-- AND a.Status IN ${status}-->
<!-- </if>-->
and a.status in ('已下达','已发料','已入库','已开工','已排产')
<if test="startDate1 != null "> <if test="startDate1 != null ">
AND a.EnterDate >= #{startDate1} AND a.EnterDate >= #{startDate1}
</if> </if>

Loading…
Cancel
Save