bom

src/main/java/com/aps/service/Algorithm/GeneticDecoder.java

@@ -690,11 +690,11 @@ public class GeneticDecoder {
         long slowOpThresholdNs = 500_000_000L; // 500ms
 
 
-
+Map<Integer, Integer> targetGroupEnd=new HashMap<>();
         for (int groupId : chromosome.getOperationSequencing()) {
             int scheduledCount = orderProcessCounter.get(groupId);
 
-            if(groupId==1)
+            if(groupId==15||groupId==16)
             {
                 int i=0;
             }
@@ -723,7 +723,7 @@ public class GeneticDecoder {
                     orderAnchor =bom.computeHybridSemiAnchor(this,groupId, entrysBygroupId,
                             opMachineKeyMap, chromosome, scheduleIndexById,
                             machineTasksCache, machineIdMap, entryIndexById,
-                            reForwardFinishedOrderIds,_globalParam,order);
+                            reForwardFinishedOrderIds,_globalParam,order,targetGroupEnd);
 
                     if (orderAnchor < 0) {
                         orderIsJit = false;
@@ -742,7 +742,7 @@ public class GeneticDecoder {
                 } else {
                     orderAnchor = bom.computeSemiFinishedAnchor(this, groupId, entrysBygroupId,
                             opMachineKeyMap, chromosome,
-                            scheduleIndexById, machineTasksCache, machineIdMap, entryIndexById,_globalParam.isIsCheckMp());
+                            scheduleIndexById, machineTasksCache, machineIdMap, entryIndexById,_globalParam.isIsCheckMp(),targetGroupEnd);
                     if (orderAnchor < 0) {
                         orderIsJit = false;
                         orderSchedulingInfo.put(groupId,
@@ -859,6 +859,11 @@ public class GeneticDecoder {
             opCount++;
 
 
+            if(currentOp.getId()==60)
+            {
+                int k=0;
+            }
+
             orderProcessCounter.put(groupId, orderProcessCounter.get(groupId) + 1);
             orderLastEndTime.put(groupId, actualEndTime);
 

src/main/java/com/aps/service/plan/PlanResultService.java

@@ -297,7 +297,7 @@ public class PlanResultService {
             if (!saved) {
                 throw new BusinessException("排产计算结果保存失败，请稍后重试或联系管理员");
             }
-            //WriteScheduleSummary(chromosome);
+            WriteScheduleSummary(chromosome);
 
             return chromosome;
 

src/test/java/com/aps/demo/PlanResultServiceTest.java

@@ -43,9 +43,9 @@ public class PlanResultServiceTest {
 
      //     planResultService.execute2("64E64F6B68094AF38CEDC418630C3CC2");//2000
            //  planResultService.execute2("E1448B3C9C8743DEAB39708F2CFE348A");//倒排bomces
-     // planResultService.execute2("85DA28EC5F4643449E65A51253D5F127"); //bom 多半成品
+      planResultService.execute2("85DA28EC5F4643449E65A51253D5F127"); //bom 多半成品
 
-        planResultService.execute2("FB14AF1623CB461D9BEDAFC35DBF0AFC"); //重叠
+      //  planResultService.execute2("FB14AF1623CB461D9BEDAFC35DBF0AFC"); //重叠
 
         //  planResultService.execute2("F8F147BD627C47B1A190399DD7A697F6");