获取千机质检结果

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

@@ -1841,6 +1841,8 @@ public class TaskNodeServiceImpl extends SuperServiceImpl<TaskNodeMapper, TaskNo
             Object qj = msgUtil.redis_get("QJ:" + taskNode.getId());
             if(qj!=null){
                 taskNode.setTestResult(qj.toString());
+                currWorkpiece.setTestResult(qj.toString());
+                workpieceService.updateById(currWorkpiece);
             }
 
             updateAllById(taskNode);

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

@@ -394,8 +394,8 @@ public class MachineNodeServiceImpl implements NodeOperationService {
                     String bomAlias = bBom.getPartsNo(); //产品零件号
                     String num = String.format("%04d", tWorkpiece.getSerialNo()); //流水号
                     //String content = bomAlias + "-" + batchNo + "-" +  num + "-" + bBom.getRemark();
-                    String content = taskNode.getCompleteBatchNo();
-
+                    //String content = taskNode.getCompleteBatchNo();
+                    String content = tWorkpiece.getUniqueCode();
                     map.put("method", moduleInstructions.get(0).getCode());
                     map.put("url",plcInfo.get("url"));
                     map.put("port",plcInfo.get("port"));

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

@@ -3,6 +3,7 @@ package com.github.zuihou.business.productionResourceCenter.service.impl;
 
 import cn.hutool.core.collection.CollectionUtil;
 import cn.hutool.core.util.IdUtil;
+import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
@@ -249,6 +250,7 @@ public class RobotNodeServiceImpl implements NodeOperationService {
                 }
             }
         }
+        log.info(taskNode.getId()+"_获取机器人资源:{}", JSON.toJSONString(robotList));
         //jbwArr = modules.stream().map(Module::getNo).toArray(String[]::new);
         // 获取机器人抓取、放可操作的接驳位(依据产线  待定)
 //        List<Productionresource> dataList = productionresourceService.list(new QueryWrapper<Productionresource>().like("name", robotType));