工序链接修改

src/main/java/com/aps/service/impl/LanuchServiceImpl.java

@@ -790,31 +790,33 @@ public class LanuchServiceImpl implements LanuchService {
         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.setOrderId(prodOrderMain.getOrderId());
+    prodOrderProcess.setSceneId(sceneId);
+    prodOrderProcess.setOrderId(prodOrderMain.getOrderId());
 //        prodOrderProcess.setTaskSeq(connection.getSourceoperation());
-        prodOrderProcess.setTargetOrderId(prodOrderMain.getOrderId());
+    prodOrderProcess.setTargetOrderId(prodOrderMain.getOrderId());
 //        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) {
-            prodOrderProcess.setTargetExecId(targetExecId);
-        }
+    if (execId != null) {
+        prodOrderProcess.setExecId(execId);
+    }
 
+    if (targetExecId != null) {
+        prodOrderProcess.setTargetExecId(targetExecId);
+    }
+}
         return prodOrderProcess;
     }