冷轧换辊周期

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

@@ -1098,6 +1098,27 @@ public class ApsServiceImpl implements ApsService {
                                 }
                             }
 
+                            Date lxDate = null;
+                            String lxrollerid = null;
+                            BigDecimal lxprowidth = null;
+                            if("冷轧".equals(operationDo.getProcess()) || "箔轧".equals(operationDo.getProcess())){
+                                for (int i = 0; i < lastpros.size(); i++) {
+                                    ApsProcessOperationDo apo = lastopsMap.get(lastpros.get(i).getProcessid());
+                                    Date planstartdate = lastpros.get(i).getPlanstartdate();
+                                    if(lxDate == null){
+                                        lxDate = planstartdate;
+                                        lxrollerid = lastpros.get(i).getRollerid();
+                                        lxprowidth = apo.getProwidth();
+                                    }else{
+                                        if(lxrollerid.equals(lastpros.get(i).getRollerid()) && apo.getProwidth().compareTo(lxprowidth)>=0){
+                                            lxDate = lastpros.get(i).getPlanstartdate();
+                                        }else{
+                                            break;
+                                        }
+                                    }
+                                }
+                            }
+
                             if(hasLast){
                                 ApsProcessOperationDo lastop = apsProcessOperationService.getById(lastpro.getProcessid());
                                 // 输出物料
@@ -1113,6 +1134,7 @@ 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);
                             }
                         }
                         // 设备占用时间段

cx-aps/cx-aps-entity/src/main/java/com/rongwei/bsentity/vo/Equipment.java

@@ -107,6 +107,11 @@ public class Equipment{
      */
     private String lastZjgid;
 
+    /**
+     * 当前设备最早工序的连续冷轧的开始时间
+     */
+    private Date lxzTime;
+
     /**
      * 关联设备，铸轧机关联的熔炼炉
      */