Merge branch 'master' of http://10.153.19.150:10101/r/CanadaMes

clll

2023-09-11 0bb9ea08c62cc463203def30429fec3b66f9513d

Merge branch 'master' of http://10.153.19.150:10101/r/CanadaMes

 springboot-vue3/package-lock.json

New file
@@ -0,0 +1,6 @@
{
  "name": "springboot-vue3",
  "lockfileVersion": 3,
  "requires": true,
  "packages": {}
}

 springboot-vue3/src/main/java/com/example/springboot/component/PlcHold.java

@@ -24,7 +24,7 @@
      }
      spianService = WebSocketServer.applicationContext.getBean(SpianService.class);
      //spianService.selectout("112");

  
      //判断进片请求 
       List<Short> datas1List=S7control.getinstance().ReadWord("DB106.24", 1);
       List<Short> datas1ListState=S7control.getinstance().ReadWord("DB106.8", 1);

 springboot-vue3/src/main/java/com/example/springboot/controller/SpianController.java

@@ -31,7 +31,7 @@
@GetMapping("/all2")
    public void selectdd(String orderid){
       SpianService service=new SpianService();
       service.selectadd(orderid);
       service.selectout(orderid);
    
}