更新测试后的理片逻辑

wu

2023-12-01 4f9f6a63ecdd3406c5e1f4db86232717824f469b

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

@@ -49,9 +49,6 @@
      // e.printStackTrace();
      // }
      
      
      
      
       List<Short> datas1List = S7control.getinstance().ReadWord("DB106.24", 1);// 获取prc进片请求数据
      List<Short> datas1ListState = S7control.getinstance().ReadWord("DB106.8", 1);// 获取进片车状态
      List<Short> datas1ListState2 = S7control.getinstance().ReadWord("DB105.16", 1);// 获取进片车任务是否启动
@@ -68,6 +65,7 @@
         spianMapper.UpdatetaskOut(B01glassid.toString()); // 完成上一次出片或者进片任务
         spianMapper.OverOutSlice(B01glassid.toString(),2);//完成出片队列任务
        S7control.getinstance().WriteWord("DB106.60", (short) 0);// 恢复B01小车应答改为0
        System.out.println("汇报时B01|" + B01glassid);
       
        //S7control.getinstance().WriteWord("DB105.48", (short) 1);//汇报B01小车收到
      }
@@ -80,6 +78,7 @@
        spianMapper.OverOutSlice(B02glassid.toString(),2);//完成出片队列任务
        S7control.getinstance().WriteWord("DB106.62", (short) 0);// 恢复B02小车应答改为0
        // S7control.getinstance().WriteWord("DB105.50", (short) 1);//汇报B02小车收到
        System.out.println("汇报时B02|" + B02glassid);
      }

      // 获取DO1数据
@@ -88,6 +87,7 @@
      StringBuilder queueid2 = spianService.queGlassid("DB103.58", 14);
      System.out.println("D01|" + queueid1);
      System.out.println("D02|" + queueid2);

      int questate = spianMapper.Selectquecount(queueid1.toString());// 判断扫码位是否有玻璃已确认
      // queueid1.toString().isEmpty()
      north_glass_buffer1 glass1 = spianMapper.selectGlass(queueid1.toString());// D01的玻璃信息
@@ -100,7 +100,9 @@
          spianMapper.Updatequeue(null,null,null,null, 0, null, null, null, null, 1);
        } else {
          
          spianMapper.Updatequeue(queueid1.toString(),glass1.getordernumber(),glass1.getlistnumber(),glass1.getboxnumber(),0,glass1.getglasslengthmm().toString(),glass1.getglassheightmm().toString(),glass1.getglasslength().toString(),glass1.getglassheight().toString(),1);
          spianMapper.Updatequeue(queueid1.toString(), glass1.getordernumber(), glass1.getlistnumber(),
              glass1.getboxnumber(), 0, glass1.getglasslengthmm().toString(), glass1.getglassheightmm().toString(),
              glass1.getglasslength().toString(), glass1.getglassheight().toString(), 1);
        }

      }
@@ -109,7 +111,9 @@
        if(glass2==null){
          spianMapper.Updatequeue(null,null,null,null, 0, null, null, null, null, 2);
        }else{
        spianMapper.Updatequeue(queueid2.toString(),glass2.getordernumber(),glass2.getlistnumber(),glass2.getboxnumber(),0,glass2.getglasslengthmm().toString(),glass2.getglassheightmm().toString(),glass2.getglasslength().toString(),glass2.getglassheight().toString(),2);
          spianMapper.Updatequeue(queueid2.toString(), glass2.getordernumber(), glass2.getlistnumber(),
              glass2.getboxnumber(), 0, glass2.getglasslengthmm().toString(), glass2.getglassheightmm().toString(),
              glass2.getglasslength().toString(), glass2.getglassheight().toString(), 2);
        spianMapper.overqueue2(queueid2.toString(), 0, 1);// 更改扫码位任务表的状态为0
        S7control.getinstance().WriteWord("DB105.16", (short) 0);//关闭任务启动
        }
@@ -156,7 +160,7 @@
          // 判断铝框出片队列表是否有待出片的玻璃
          String outglassid = spianMapper.SelectOutSlice();
          if (outglassid != null) {
            spianMapper.OverOutSlice(outglassid,1);
            
            spianService.selectout2(outglassid);
            outstate = false;
          }