Merge branch 'master' of ssh://10.153.19.150:29418/CanadaMes

wu

2023-09-08 9020f58f9c945d8a99493eb4da2253b6937909fe

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

@@ -1,9 +1,11 @@
package com.example.springboot.component;

import java.util.ArrayList;
import java.util.List;

import javax.websocket.Session;

import com.example.springboot.controller.SpianController;
import com.example.springboot.mapper.AlarmMapper;

import cn.hutool.json.JSONArray;
@@ -24,12 +26,39 @@
        e.printStackTrace();
      }
      List<Boolean> bitlist = S7control.getinstance().ReadBits("DB2.0.0", 100);

      List<Short> paramlist = S7control.getinstance().ReadWord("DB100.6", 1);
      

      //判断进片请求 
      List<Short> datas1List=S7control.getinstance().ReadWord("DB106.24", 1);
    
      // List<Short> datas1List=S7control.getinstance().ReadWord("DB106.24", 1);
      // List<Short> datas1ListState=S7control.getinstance().ReadWord("DB106.8", 1);
      SpianController spianController=new SpianController();
      List<Short> datas1List1=new ArrayList<>();
      List<Short> datas1List2=new ArrayList<>();
      datas1List1.add((short)1);
      datas1List2.add((short)0);
      //获取prc进片请求数据
      boolean exist = datas1List1.contains((short)1); 
      boolean exist1 = datas1List2.contains((short)0); 
      //进片请求为1时
      if(exist=true){
        //当进片车空闲时
        if(exist=true){
        List<Short> datas1ListID=S7control.getinstance().ReadWord("DB106.26", 13);
        //获取玻璃id
        for(Short list1:datas1ListID)
        spianController.selectAll(list1);
        }
        //System.out.println(exist);

      }
            //获取进片id
            // List<Short> datas1ListID=S7control.getinstance().ReadWord("DB106.26", 13);
            
            
            
        
      
      // 查询数据库
      // 推送到前端