|
@@ -299,6 +299,8 @@ public class MachineNodeServiceImpl implements NodeOperationService {
|
|
msgUtil.redis_set(DemoLineConstant.DEMOLINE_HEIDENHAIN_FILE_URL+"_"+task.getId(), uploadInfo.toJSONString(), 30, TimeUnit.DAYS);
|
|
msgUtil.redis_set(DemoLineConstant.DEMOLINE_HEIDENHAIN_FILE_URL+"_"+task.getId(), uploadInfo.toJSONString(), 30, TimeUnit.DAYS);
|
|
data.put("fileName", "");
|
|
data.put("fileName", "");
|
|
}
|
|
}
|
|
|
|
+
|
|
|
|
+ if(productionresource.getModeSpecification().contains("HELLER")) map.put("HELLER","HELLER"); //内部调用标识
|
|
map.put("data", data);
|
|
map.put("data", data);
|
|
map.put("result", true);
|
|
map.put("result", true);
|
|
}
|
|
}
|
|
@@ -315,12 +317,8 @@ public class MachineNodeServiceImpl implements NodeOperationService {
|
|
//String fileName = "";
|
|
//String fileName = "";
|
|
//String fileNames[] = fileName.split(",");
|
|
//String fileNames[] = fileName.split(",");
|
|
JSONObject data = new JSONObject();
|
|
JSONObject data = new JSONObject();
|
|
- if(productionresource.getModeSpecification().contains("HELLER")){
|
|
|
|
- data.put("remotePath", "3");
|
|
|
|
|
|
+ data.put("remotePath", procedureProgramList.get(0).getSubmittedFileName());
|
|
|
|
|
|
- }else{
|
|
|
|
- data.put("remotePath", procedureProgramList.get(0).getSubmittedFileName());
|
|
|
|
- }
|
|
|
|
map.put("data", data);
|
|
map.put("data", data);
|
|
map.put("method", "StartNCProgram");
|
|
map.put("method", "StartNCProgram");
|
|
map.put("result", true);
|
|
map.put("result", true);
|