修改bug

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

@@ -385,8 +385,8 @@ public class StockInfoServiceImpl extends SuperServiceImpl<StockInfoMapper, Stoc
         StockInfo infoBean = new StockInfo();
         infoBean.setStorgeId(storgeId);
         infoBean.setLockStatus("1");
-        infoBean.setGoodsId(bomProcedureMeterial.getMeterialSpeId());
-        infoBean.setSpecId(bomProcedureMeterial.getMeterialSpeId());
+        infoBean.setGoodsId(bomProcedureMeterial.getMeterialId());
+        infoBean.setSpecId(bomProcedureMeterial.getMeterialId());
         infoBean.setGoodsType("1");
         infoBean.setNum(1);
         infoBean.setCompleteBatchNo(completeBatchNo);

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

@@ -314,26 +314,26 @@ public class RobotNodeServiceImpl implements NodeOperationService {
             case "柔性线机器人":
                 //操作柔性线边库 具有取、移动、放三种指令
                 //取放加工设备  设备存在缓存位
-                map = this.commandHandle(map, currStore,flikustockInfos,functionName);
+                map = this.commandHandle(map,flikustockInfos,functionName);
                 map.put("deviceUrl", ZK_ip_rxx);
                 break;
             case "智能单元机器人":
                 //操作智能单元线边库 具有取、移动、放三种指令
                 //取放加工设备 无缓存位处理
-                map = this.commandHandle(map, currStore , flikustockInfos,functionName);
+                map = this.commandHandle(map , flikustockInfos,functionName);
                 map.put("deviceUrl", ZK_ip_zndy);
                 break;
             case "舱体类加工单元":
                 //操作舱体线边库 具有取、移动、放三种指令
                 //取放加工设备
-                map = this.commandHandle(map, currStore,flikustockInfos, functionName);
+                map = this.commandHandle(map,flikustockInfos, functionName);
                 break;
             case "智能生产保障系统":
-                map = this.commandHandle(map, currStore,flikustockInfos, functionName);
+                map = this.commandHandle(map,flikustockInfos, functionName);
                 map.put("deviceUrl", ZK_ip_rxx);
                 break;
             case "框体类加工单元":
-                map = this.commandHandle(map, currStore,flikustockInfos, functionName);
+                map = this.commandHandle(map,flikustockInfos, functionName);
                 map.put("deviceUrl", ZK_ip_rxx);
                 break;
         }
@@ -362,10 +362,12 @@ public class RobotNodeServiceImpl implements NodeOperationService {
     }
 
     //机器人功能操作
-    private Map<String, Object>  commandHandle(Map<String, Object> dataMap, Storge startStore,List<StockInfo>flikustockInfos, String functionName){
+    private Map<String, Object>  commandHandle(Map<String, Object> dataMap, List<StockInfo>flikustockInfos, String functionName){
         TaskNode taskNode = (TaskNode) dataMap.get("taskNode");
         TTask task = (TTask) dataMap.get("task");
         int count = Integer.parseInt(dataMap.get(taskNode.getId().toString() + "count") == null ? "0" : dataMap.get(taskNode.getId().toString() + "count").toString());
+
+        Storge startStore = workpieceService.getWorkPieceStock(taskNode.getCompleteBatchNo(), false);
         //目的库位
         Storge jqrStorge = null;
         //缓存位判断处理