下发修改

parent fee91466
...@@ -6,6 +6,7 @@ import com.aps.common.util.SnowFlackIdWorker; ...@@ -6,6 +6,7 @@ import com.aps.common.util.SnowFlackIdWorker;
import com.aps.entity.*; import com.aps.entity.*;
import com.aps.entity.Algorithm.Chromosome; import com.aps.entity.Algorithm.Chromosome;
import com.aps.entity.Algorithm.GAScheduleResult; import com.aps.entity.Algorithm.GAScheduleResult;
import com.aps.entity.basic.Entry;
import com.aps.entity.basic.Order; import com.aps.entity.basic.Order;
import com.aps.mapper.RoutingDetailMapper; import com.aps.mapper.RoutingDetailMapper;
import com.aps.mapper.RoutingHeaderMapper; import com.aps.mapper.RoutingHeaderMapper;
...@@ -245,15 +246,13 @@ public class LanuchServiceImpl implements LanuchService { ...@@ -245,15 +246,13 @@ public class LanuchServiceImpl implements LanuchService {
throw new RuntimeException("插入mes_order失败"); throw new RuntimeException("插入mes_order失败");
} }
List<ProdProcessExec> processExecList = prodProcessExecService.lambdaQuery() List<Entry> entrys= chromosome.getAllOperations();
.eq(ProdProcessExec::getSceneId, sceneId)
.list();
// 遍历GAScheduleResult结果并转换为dispatch // 遍历GAScheduleResult结果并转换为dispatch
List<Dispatch> dispatches = new ArrayList<>(); List<Dispatch> dispatches = new ArrayList<>();
for (GAScheduleResult gaResult : chromosome.getResult()) { for (GAScheduleResult gaResult : chromosome.getResult()) {
ProdProcessExec prodProcessExec = processExecList.stream() Entry entry1 = entrys.stream()
.filter(processExec -> processExec.getExecId().equals(gaResult.getExecId())) .filter(entry -> entry.getExecId().equals(gaResult.getExecId()))
.findFirst() .findFirst()
.orElse(null); .orElse(null);
...@@ -267,10 +266,10 @@ public class LanuchServiceImpl implements LanuchService { ...@@ -267,10 +266,10 @@ public class LanuchServiceImpl implements LanuchService {
dispatch.setEndTime(baseTime.plusSeconds(gaResult.getEndTime())); dispatch.setEndTime(baseTime.plusSeconds(gaResult.getEndTime()));
dispatch.setENof(gaResult.getOrderId()); dispatch.setENof(gaResult.getOrderId());
// 设置状态等其他字段 // 设置状态等其他字段
dispatch.setTaskSeq(prodProcessExec.getTaskSeq()); dispatch.setTaskSeq(entry1.getTaskSeq());
dispatch.setMesCode(gaResult.getOrderId()); dispatch.setMesCode(gaResult.getOrderId());
dispatch.setRoutingDetailId(prodProcessExec.getRoutingDetailId()); dispatch.setRoutingDetailId(entry1.getRoutingDetailId());
dispatch.setOpe(prodProcessExec.getRoutingDetailName()); dispatch.setOpe(entry1.getRoutingDetailName());
// 添加到列表中 // 添加到列表中
dispatches.add(dispatch); dispatches.add(dispatch);
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment