冷轧换辊周期

cx-aps/cx-aps-common/src/main/java/com/rongwei/bscommon/sys/service/impl/ApsServiceImpl.java

@@ -144,7 +144,7 @@ public class ApsServiceImpl implements ApsService {
                     logger.info("解锁重排订单："+repcIds);
                 }
                 // 冷轧连续性问题重排
-                if(StrUtil.isNotBlank(apsType.getMixIf()) && "mix".equals(apsType.getMixIf())){
+                if(apsType != null && StrUtil.isNotBlank(apsType.getMixIf()) && "mix".equals(apsType.getMixIf())){
                     lzlxOrderSchedule(apsBlankOrders,currentUser,apsType);
                 }else{
                     apsOrderScheduleNew(apsBlankOrders,currentUser,apsType);
@@ -1134,8 +1134,8 @@ public class ApsServiceImpl implements ApsService {
                                 equipment.setLastSeriesProduceMark(lastop.getMetal() + "^_^" + lastop.getProducttype() + "^_^" + lastop.getProwidth() + "^_^" + lastop.getThickness() + "^_^" + outMaterDos.get(0).getThickness());
                                 equipment.setLastProcessCutfinishmin(lastop.getCutfinishmin() == null ? null : lastop.getCutfinishmin().intValue());
                                 equipment.setLastZjgid(lastpro.getRollerid());
-                                equipment.setLxzTime(lxDate);
                             }
+                            equipment.setLxzTime(lxDate);
                         }
                         // 设备占用时间段
                         List<EquipmentRunTime> equipmentRunTimes = new ArrayList<>();