Skip to content

H
HYH.APSJ
Commit 6aaa43d8 authored by DESKTOP-VKRD9QF\Administration's avatar DESKTOP-VKRD9QF\Administration
Browse files
Options

工序链接修改

parent 243d5000
Hide whitespace changes
Inline Side-by-side
Showing with 17 additions and 15 deletions
src/main/java/com/aps/service/impl/LanuchServiceImpl.java
View file @ 6aaa43d8
...@@ -790,31 +790,33 @@ public class LanuchServiceImpl implements LanuchService { ...@@ -790,31 +790,33 @@ public class LanuchServiceImpl implements LanuchService {
ProdOrderProcess prodOrderProcess = new ProdOrderProcess(); ProdOrderProcess prodOrderProcess = new ProdOrderProcess();
String execId = routingDetailIdToExecIdMap.get(connection.getSourceoperationid());
String targetExecId = routingDetailIdToExecIdMap.get(connection.getDestoperationid());
if (connection.getDestoperationid() !=null && connection.getSourceoperationid() != null && execId != null && targetExecId != null) {
prodOrderProcess.setTaskSeq(getTaskSeqFromRoutingDetail(connection.getSourceoperationid(), connection.getSourceoperation()));
prodOrderProcess.setTaskSeq(getTaskSeqFromRoutingDetail(connection.getSourceoperationid(), connection.getSourceoperation()));
prodOrderProcess.setTargetTaskSeq(getTaskSeqFromRoutingDetail(connection.getDestoperationid(), connection.getDestoperation())); prodOrderProcess.setTargetTaskSeq(getTaskSeqFromRoutingDetail(connection.getDestoperationid(), connection.getDestoperation()));
prodOrderProcess.setSceneId(sceneId); prodOrderProcess.setSceneId(sceneId);
prodOrderProcess.setOrderId(prodOrderMain.getOrderId()); prodOrderProcess.setOrderId(prodOrderMain.getOrderId());
// prodOrderProcess.setTaskSeq(connection.getSourceoperation()); // prodOrderProcess.setTaskSeq(connection.getSourceoperation());
prodOrderProcess.setTargetOrderId(prodOrderMain.getOrderId()); prodOrderProcess.setTargetOrderId(prodOrderMain.getOrderId());
// prodOrderProcess.setTargetTaskSeq(connection.getDestoperation()); // prodOrderProcess.setTargetTaskSeq(connection.getDestoperation());
prodOrderProcess.setId(String.valueOf(SnowFlackIdWorker.getId())); prodOrderProcess.setId(String.valueOf(SnowFlackIdWorker.getId()));
String execId = routingDetailIdToExecIdMap.get(connection.getSourceoperationid());
String targetExecId = routingDetailIdToExecIdMap.get(connection.getDestoperationid());
if (execId != null) {
prodOrderProcess.setExecId(execId);
}
if (targetExecId != null) { if (execId != null) {
prodOrderProcess.setTargetExecId(targetExecId); prodOrderProcess.setExecId(execId);
} }
if (targetExecId != null) {
prodOrderProcess.setTargetExecId(targetExecId);
}
}
return prodOrderProcess; return prodOrderProcess;
} }
......
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