Merge branch 'master' of http://10.153.19.25:10101/r/Albania_Mes

wu

2024-04-11 fdf078d0adec8aaa4bdf39a61db38ed68184b50d

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

@@ -4,13 +4,12 @@
import com.example.springboot.service.StorageCageService;
import com.example.springboot.entity.GlassInfo;
import com.example.springboot.entity.device.PlcParameterObject;
import com.example.springboot.mapper.AlarmMapper;
import com.example.springboot.mapper.AlbaniaMapper;


public class PlcHoldNew extends Thread {

  private AlarmMapper alarmMapper;
 

  @Autowired
  private AlbaniaMapper albaniaMapper;
@@ -24,9 +23,8 @@
    while (this != null) {
      try {

        Thread.sleep(100);
        Thread.sleep(500);
      } catch (InterruptedException e) {
        // \\ TODO Auto-generated catch block
        e.printStackTrace();
      }

@@ -39,35 +37,33 @@
      PlcParameterObject plcmes=PLCAutoMes.PlcMesObject;
      if(plcmes.getPlcParameter("PLCToMES").getValue()!=null){
        
      // spianService.Mestast("1234567890123",40,0,2,"MESID1");
      // S7control.getinstance().WriteWord(plcmes.getPlcParameter("MESToPLC").getAddress(), (short)2);//出片任务启动
      // spianService.Mestast("NG0001-1",40,1,0,"MESID1",1);
      // spianService.Mestast("NG0001-2",40,2,0,"MESID2",2);
      // spianService.Mestast("NG0001-3",40,2,1,"MESID3",3);
    
      String ExportTOMES1=plcmes.getPlcParameter("ExportTOMES1").getValue();//出片请求一线
      String ExportToMES2=plcmes.getPlcParameter("ExportToMES2").getValue();//出片请求二线
      String PLCToMES=plcmes.getPlcParameter("PLCToMES").getValue();//运送车请求
      //String B01State=plcmes.getPlcParameter("B01State").getValue();//运送车请求
      String IDStatus1=plcmes.getPlcParameter("IDStatus1").getValue();//1号任务完成
      String MESToPLCStatus1=plcmes.getPlcParameter("MESToPLCStatus1").getValue();//1号确认字
      String MESToPLC=plcmes.getPlcParameter("MESToPLC").getValue();//发送任务字
      
      //一号线请求
      if(ExportTOMES1!=null){
      if (ExportTOMES1.equals("1") == true&&PLCToMES.equals("1")==true) {
        //将运输车状态改为忙碌
      if(ExportTOMES1!=null&&MESToPLC!=null){
      if (ExportTOMES1.equals("1") == true&&MESToPLC.equals("0")==true) {
        spianService.selectout(1);
      }
    }
      // //二线号请求时
      if(ExportToMES2!=null ){
      if (ExportToMES2.equals("1") == true&&PLCToMES.equals("1")==true) {
        //将运输车状态改为忙碌
        S7control.getinstance().WriteWord(plcmes.getPlcParameter("B01report").getAddress(), (short) 1);
      if(ExportToMES2!=null &&MESToPLC!=null){
      if (ExportToMES2.equals("1") == true&&MESToPLC.equals("0")==true) {
        spianService.selectout(2);
      }
    }
      //进片请求时
      GlassInfo glass=albaniaMapper.SelectGlass();
      if(PLCToMES!=null && glass!=null){
      if(PLCToMES.equals("1")==true&&glass!=null){        
      if(PLCToMES!=null && glass!=null&&MESToPLC!=null){
      if(PLCToMES.equals("1")==true&&MESToPLC.equals("0")==true){        
        spianService.selectAll(glass);
      }
    }
@@ -80,22 +76,18 @@
          
          String Tastover=plcmes.getPlcParameter("IDStatus"+i).getValue();//PLC理片任务状态汇报
          String Glassid=plcmes.getPlcParameter("MESID"+i).getValueString();//MES玻璃ID
          
          GlassInfo id=albaniaMapper.SelectTaskId(Glassid);
          if(Tastover.equals("1")){
            if(id!=null){
          GlassInfo id=albaniaMapper.SelectTaskId(Glassid);       
            if(id!=null&&Tastover.equals("1")){
              //调用完成任务 Glassid
              storageCageService.FinishTask(id.getId());
            }    
              S7control.getinstance().WriteWord(plcmes.getPlcParameter("MESToPLC").getAddress(), (short) 0);//清除任务字
            }               
              S7control.getinstance().WriteWord(plcmes.getPlcParameter("MESToPLCStatus"+i).getAddress(), (short) 1);//完成确认字
             
            }
              S7control.getinstance().WriteWord(plcmes.getPlcParameter("MESToPLC").getAddress(), (short) 0);//清除任务发送字
          }
          
          
          
        }
      }
        
      
      //汇报取消时
      if(IDStatus1.equals("0")==true &&MESToPLCStatus1.equals("1")){
        
@@ -103,10 +95,7 @@
        for(int i=1;i<7;i++){
          String Tastover=plcmes.getPlcParameter("IDStatus"+i).getValue();//依次获取任务汇报
          if(Tastover.equals("0")){
            //S7control.getinstance().WriteWord(plcmes.getPlcParameter("IDStatus"+i).getAddress(), (short) 0);//清除确认字
            S7control.getinstance().WriteWord(plcmes.getPlcParameter("MESToPLCStatus"+i).getAddress(), (short) 0);//清除确认字
            // System.out.println(plcmes.getPlcParameter("MESToPLCStatus1").getValue());
            // System.out.println(S7control.getinstance().ReadWord("DB14.158", 1));
          }
        }
      }