伺服舵机三坐标真实调制及问题修改

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

@@ -163,11 +163,11 @@ public class MachineNodeServiceImpl implements NodeOperationService {
         String paramKey = zZone.getNo() + "_plc";
         instructionUrl = (null == msgUtil.redis_get(ParameterKey.PARAMETERS)? "": ((Map<String,String>)msgUtil.redis_get(ParameterKey.PARAMETERS)).get(paramKey).toString());
         // TODO 后续删除代码，目前条用模拟接口
-        if("framework".equals(zZone.getNo())){
-            instructionUrl = instructionUrl.replace("8086","8083");
-        }else{
+//        if("framework".equals(zZone.getNo())){
+//            instructionUrl = instructionUrl.replace("8086","8083");
+//        }else{
             instructionUrl = instructionUrl.replace("8081","8083");
-        }
+//        }
     }
 
     @Override
@@ -225,6 +225,7 @@ public class MachineNodeServiceImpl implements NodeOperationService {
             case "打标机":
                 //执行打标程序
                 if("2".equals(functionType) && moduleInstructions.size() == 1){
+                    instructionUrl = instructionUrl.replace("8083","8081");
                     //打标
 //                    map.put("zkIp", ZK_ip_rxx);
 //                    map.put(DemoLineConstant.DEMOLINE_BIZ_TYPE, "print");
@@ -241,9 +242,9 @@ public class MachineNodeServiceImpl implements NodeOperationService {
                     JSONObject data = new JSONObject();
                     //默认配置  后期可改可去
 
-                    if("capsule".equals(zZone.getNo())){
+                    if("capsule".equals(bomzZone.getNo())){
                         data.put("typeNo", "C");
-                    }else if("framework".equals(zZone.getNo())){
+                    }else if("framework".equals(bomzZone.getNo())){
                         data.put("typeNo", "K");
                     }
                     // TODO工件增加流水号

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

@@ -172,9 +172,9 @@ public class RobotNodeServiceImpl implements NodeOperationService {
         instructionUrl = (null == msgUtil.redis_get(ParameterKey.PARAMETERS)? "": ((Map<String,String>)msgUtil.redis_get(ParameterKey.PARAMETERS)).get(paramKey).toString());
 
         // TODO 后续删除，目前条用模拟接口
-        if("safeguard".equals(zZone.getNo())){
-            instructionUrl = instructionUrl.replace("8081","8083");
-        }
+//        if("safeguard".equals(zZone.getNo())){
+//            instructionUrl = instructionUrl.replace("8081","8083");
+//        }
     }
 
     @Override

imcs-admin-boot/imcs-business-biz/src/main/resources/mapper_business/base/edgeLibrary/StockInfoMapper.xml

@@ -199,6 +199,7 @@
             ON ippp.storge_id = issi.storge_id
         WHERE ippp.resource_id IN (${resourceIds})
         AND issi.storge_id IS NULL
+        AND ippp.status = '1'
         ORDER BY ippp.storge_id
     </select>
 </mapper>