|
@@ -960,7 +960,7 @@ public class ApsBlankOrderServiceImpl extends ServiceImpl<ApsBlankOrderDao, ApsB
|
|
|
|
|
|
//更新生产状态为“待发布”(20)
|
|
|
List<ApsBlankOrderVo> toupstatus = apsBlankOrders.stream().filter(v ->
|
|
|
- blankids.contains(v.getId()) && (StringUtils.isBlank(v.getIfcp()) || "N".equals(v.getIfcp())))
|
|
|
+ blankids.contains(v.getId()) && (StringUtils.isBlank(v.getIfcp()) || "N".equals(v.getIfcp())))
|
|
|
.collect(Collectors.toList());
|
|
|
updateProductStatusByOrderIds(toupstatus);
|
|
|
// 自动加锁坯料计划下的工序作业
|
|
@@ -3977,8 +3977,10 @@ public class ApsBlankOrderServiceImpl extends ServiceImpl<ApsBlankOrderDao, ApsB
|
|
|
this.baseMapper.removeLockNextDayProcessEqu(needScheduleDate);
|
|
|
//解锁后天开工的所有作业明细
|
|
|
this.baseMapper.removeLockNextTwoDayProcessEqu(needScheduleDate);
|
|
|
+ //获取排程类型
|
|
|
+ ApsScheduleConfigDo apsScheduleConfigDo = apsScheduleConfigService.getById("1");
|
|
|
//重新排程
|
|
|
- apsService.apsSchedule(new ArrayList<>(), "mix", null);
|
|
|
+ apsService.apsSchedule(new ArrayList<>(), apsScheduleConfigDo.getScheduletype(), null);
|
|
|
}
|
|
|
}
|
|
|
}
|