|
@@ -340,6 +340,7 @@ public class ApsServiceImpl implements ApsService {
|
|
|
}
|
|
|
|
|
|
private void apsOrderScheduleNew(List<ApsBlankOrderVo> apsBlankOrders,SysUserVo currentUser,ApsTypeVo apsType,List<String> needUnLockProcessIdList){
|
|
|
+ logger.info("预排程开始...");
|
|
|
// 插单重排的优先排程
|
|
|
List<ApsBlankOrderVo> cdorders = apsBlankOrders.stream().filter(v -> "1".equals(v.getCdbs())).collect(Collectors.toList());
|
|
|
// 先按合金,合金状态分组,再每组分别排程
|
|
@@ -493,6 +494,7 @@ public class ApsServiceImpl implements ApsService {
|
|
|
* @param currentUser
|
|
|
*/
|
|
|
private void lzlxOrderSchedule(List<ApsBlankOrderVo> apsBlankOrders,SysUserVo currentUser,ApsTypeVo apsType,List<String> needUnLockProcessIdList){
|
|
|
+ logger.info("调度排程开始...");
|
|
|
// 坯料计划排序
|
|
|
Collections.sort(apsBlankOrders,(v1,v2)->{
|
|
|
// 合金
|