排程优化

rw-aps-server/src/main/java/com/rongwei/rwapsserver/aps/domain/ProductionProcesses.java

@@ -328,6 +328,11 @@ public class ProductionProcesses implements Serializable {
      */
     private String mergeThMainId;
 
+    /**
+     * 是否满炉退火
+     */
+    private String iffullth;
+
     /**
      * 根结点
      */
@@ -966,6 +971,14 @@ public class ProductionProcesses implements Serializable {
         this.processName = processName;
     }
 
+    public String getIffullth() {
+        return iffullth;
+    }
+
+    public void setIffullth(String iffullth) {
+        this.iffullth = iffullth;
+    }
+
     public String getSeriSort(){
         String sortStr = this.getId();
         if(this.getStartTime() != null){

rw-aps-server/src/main/java/com/rongwei/rwapsserver/aps/service/impl/ApsServiceImpl.java

@@ -354,6 +354,10 @@ public class ApsServiceImpl implements ApsService {
                                 mergePro.setVolumeWidth(mergePro.getVolumeWidth().multiply(new BigDecimal(thps.size())));
                                 mergePro.setSinglerollweight(mergePro.getSinglerollweight().multiply(new BigDecimal(thps.size())));
                                 mergePro.setOpeProducePcNum(thps.size());
+                                // 设置是否满炉
+                                if(thps.size() == a){
+                                    mergePro.setIffullth("y");
+                                }
                                 mergeprocesses.add(mergePro);
                             }
                         }
@@ -370,7 +374,7 @@ public class ApsServiceImpl implements ApsService {
      * 不同坯料计划之间的退火合并
      */
     private void mergeBlanksTh(List<ProductionProcesses> mergeprocesses){
-
+        // 过滤不满炉的
     }
 
     /**