工序链接修改

parent 243d5000
...@@ -790,6 +790,9 @@ public class LanuchServiceImpl implements LanuchService { ...@@ -790,6 +790,9 @@ 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()));
...@@ -804,8 +807,7 @@ public class LanuchServiceImpl implements LanuchService { ...@@ -804,8 +807,7 @@ public class LanuchServiceImpl implements LanuchService {
// 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) { if (execId != null) {
prodOrderProcess.setExecId(execId); prodOrderProcess.setExecId(execId);
...@@ -814,7 +816,7 @@ public class LanuchServiceImpl implements LanuchService { ...@@ -814,7 +816,7 @@ public class LanuchServiceImpl implements LanuchService {
if (targetExecId != null) { if (targetExecId != null) {
prodOrderProcess.setTargetExecId(targetExecId); 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