上传附件参数调整

imcs-admin-boot/imcs-business-biz/src/main/java/com/github/zuihou/business/mq/TaskWorkNode.java

@@ -997,6 +997,7 @@ public class TaskWorkNode {
         jsonObject.put("carryType", conMap.get("carryType"));
         jsonObject.put("url", conMap.get("url"));
         jsonObject.put("port", conMap.get("port"));
+        jsonObject.put("machineType", conMap.get("machineType"));
         Map data = (Map)conMap.get("data");
         jsonObject.put("data", data);
 

imcs-admin-boot/imcs-business-biz/src/main/java/com/github/zuihou/business/productionResourceCenter/service/impl/MachineNodeServiceImpl.java

@@ -668,7 +668,9 @@ public class MachineNodeServiceImpl implements NodeOperationService {
             case "永进tv158b":
                 Productionresource productionresource8 =  productionresourceBizMapper.selectOne(Wraps.<Productionresource>lbQ().eq(Productionresource::getId,taskNode.getTargetResourceId()));
                 map.put("url",productionresource8.getIp());
+                map.put("ip",productionresource8.getIp());
                 map.put("port",productionresource8.getPort());
+
                 if ("1".equals(functionType)) {
                     //程序文件上传
                     List<BomProcedureProgram>procedureProgramList = bomProcedureProgramMapper.selectList(Wraps.<BomProcedureProgram>lbQ().eq(BomProcedureProgram::getProcedureId,task.getProcedureId()));
@@ -702,6 +704,8 @@ public class MachineNodeServiceImpl implements NodeOperationService {
 
                         if(productionresource.getModeSpecification().contains("HELLER"))  data.put("HELLER","HELLER"); //内部调用标识*/
                         map.put("data", data);
+                        map.put("fun", "UploadFile");
+                        map.put("machineType", "fanuc");
                         map.put("result", true);
                     }
                 }else if ("2".equals(functionType)) {