修改IP进行打包，修改进片方法参数

ZengTao

2024-04-23 d3784e22324ba6ae25fffc0e19874a07dd0d12ae

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

@@ -37,49 +37,31 @@
      spianService = WebSocketServer.applicationContext.getBean(SpianService.class);
      spianMapper = WebSocketServer.applicationContext.getBean(SpianMapper.class);
      jdbcConnections = WebSocketServer.applicationContext.getBean(JdbcConnections.class);
      // 根据玻璃id获取订单号,单独数据源
      // try {
      // north_glass_buffer1 glass = jdbcConnections.selectGlass(112);
      // // System.out.println(glass.getOrderId());
      // } catch (SQLException e) {
      // // TODO Auto-generated catch block
      // e.printStackTrace();
      // }

      //读取DB105区文件
      PlcParameterObject plcParameterObjects=PLCAutoMes.PlcMesObject;
      PlcParameterObject plcmes=PLCAutoMes.PlcMesObject;
      //读106
      PlcParameterObject plcParameterObjects2=PLCAutoMes.PlcReadObject;
      // List<String> addresses105 = new ArrayList<>();
      // addresses105.add("OutRequest");// 出片请求字
      // List<String> addresses106 = new ArrayList<>();
      // addresses106.add("OutActivate");// 出片启动  
      PlcParameterObject plcread=PLCAutoMes.PlcReadObject;
      //读103
      PlcParameterObject plcstate=PLCAutoMes.plcStateObject;
      String OutRequest=plcread.getPlcParameter("OutRequest").getValue();//出片请求
      String OutActivate=plcmes.getPlcParameter("OutActivate").getValue();//出片启动
      
      String Plcadd1131=plcParameterObjects2.getPlcParameter("conveyorVelocity(AutoFAST)").getValue();
      

     
      S7control.getinstance().WriteWord( plcmes.getPlcParameter("1231").getAddress(plcmes.getPlcParameter("1231").getAddressIndex()), (short) 0);
      // 出片任务
      boolean Plcout = spianService.listbool("DB106.64"); 
      boolean Plcout2 = spianService.listbool("DB105.18"); 
      
      if (Plcout == false&&Plcout2==true) {
        S7control.getinstance().WriteWord("DB105.18", (short) 0);// 出片任务启动改为0
        System.out.println("关闭出片启动" + LocalDateTime.now());// 出片任务发送字改为0
      if (OutActivate.equals("1") == false&&OutRequest.equals("1")==true) {
        S7control.getinstance().WriteWord("DB105.18", (short) 0);// 出片任务启动改为0  
      }
      boolean Plcadd = spianService.listbool("DB106.24"); // 进片请求字
      boolean Plcadd2 = spianService.listbool("DB105.16"); // 进片启动
      if (Plcadd == false&&Plcadd2==true) {
      String FeedRequest=plcread.getPlcParameter("FeedRequest").getValue();// 进片请求字
      String AddActivate=plcmes.getPlcParameter("AddActivate").getValue();// 进片启动
      if (FeedRequest.equals("1") == false&&AddActivate.equals("1")==true) {
        S7control.getinstance().WriteWord("DB105.16", (short) 0);//进片任务启动改为0
        System.out.println("关闭进片启动" + LocalDateTime.now());// 进片任务发送字改为0
      }
      


      // StringBuilder writedstrIdOut = new StringBuilder();
      // 获取已下发的出片id
      byte[] writedglassidbytesOut = S7control.getinstance().ReadByte("DB105.30", 14);
      String writedstrIdOut = new String(writedglassidbytesOut);

      }     
   
      if (Plcout == true) {
      if (OutActivate.equals("1") == true) {
        // 判断当前是否有未执行的任务
        int outnum = spianMapper.SelectOutSliceshu();//是否有正在出片的任务
        int cageoutsum = spianMapper.Selectcageout(3);//笼子内是否还有在出片的玻璃
@@ -104,89 +86,81 @@
     
      }

      ///////////// 进片任务
      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);// 获取进片车任务是否启动
      
      ///////////// 进片任务      

      boolean B01backs = spianService.listbool("DB106.60");// b01汇报
      boolean B02backs = spianService.listbool("DB106.62");// b02汇报
      StringBuilder B01glassid = spianService.queGlassid("DB103.184", 14);// BO1的玻璃id
      StringBuilder B02glassid = spianService.queGlassid("DB103.212", 14);// B02的玻璃id
      String B01backs = plcread.getPlcParameter("B01CompleteTheReport").getValue();// b01汇报
      String B02backs = plcread.getPlcParameter("B02CompleteTheReport").getValue();// b02汇报
      
      String B01glassid = plcstate.getPlcParameter("B01ID1").getValue();// BO1的玻璃id
      String B02glassid = plcstate.getPlcParameter("B02ID1").getValue();// B02的玻璃id

      // 当进片小车完成任务时
      if (B01backs == true) {
      if (B01backs.equals("1") == true) {
        // 判断是否汇报正确的id
        int HB = spianMapper.SelectHB(B01glassid.toString());
        if (HB > 0) {
          // 当B01小车汇报完成时更改玻璃状态 为1
          S7control.getinstance().WriteWord("DB105.48", (short) 1);// 恢复B01小车应答改为1
          boolean yingda = spianService.listbool("DB105.48");// b01汇报
          if (yingda == true) {
          // 恢复B01小车应答改为1
          S7control.getinstance().WriteWord(plcmes.getPlcParameter("B01report").getAddress(plcmes.getPlcParameter("B01report").getAddressIndex()), (short) 1);
          String yingda =plcmes.getPlcParameter("B01report").getValue();// b01汇报
          if (yingda.equals("1")) {
            spianService.overtask(B01glassid.toString());// 完成任务
          }
          System.out.println("汇报时B01|第" + aaa + "次" + B01glassid + "应答" + yingda);
          aaa += 1;
          }       
        }

      }else{
        S7control.getinstance().WriteWord("DB105.48", (short) 0);// 恢复B01小车应答改为1
        // 恢复B01小车应答改为0
        S7control.getinstance().WriteWord(plcmes.getPlcParameter("B01report").getAddress(plcmes.getPlcParameter("B01report").getAddressIndex()), (short) 0);
      }

      // 当出片小车完成任务时
      if (B02backs == true) {
      if (B02backs.equals("1") == true) {
        // 判断是否汇报正确的id
        int HB = spianMapper.SelectHB(B02glassid.toString());
        System.out.println("汇报时B02|" + B02glassid);
        int HB = spianMapper.SelectHB(B02glassid);
        if (HB > 0) {
          // 当B02小车汇报完成时更改玻璃状态为0

          S7control.getinstance().WriteWord("DB105.50", (short) 1);// 恢复B02小车应答改为1
          System.out.println("汇报时B02ID|" + B02glassid);
          boolean yingda = spianService.listbool("DB105.50");// b02汇报
          if (yingda == true) {
            spianService.overtask(B02glassid.toString());// 完成任务
          }
          System.out.println("汇报时B02|第" + aaa + "次" + B02glassid + "应答" + yingda);
          // 恢复B02小车应答改为1
          S7control.getinstance().WriteWord(plcmes.getPlcParameter("B02report").getAddress(plcmes.getPlcParameter("B02report").getAddressIndex()), (short) 1);
          String yingda =plcmes.getPlcParameter("B01report").getValue();// b02应答
          if (yingda.equals("1") == true) {
            spianService.overtask(B02glassid);// 完成任务
          }    
        }
      }else{
         S7control.getinstance().WriteWord("DB105.50", (short) 0);// 恢复B02小车应答改为0
        S7control.getinstance().WriteWord(plcmes.getPlcParameter("B02report").getAddress(plcmes.getPlcParameter("B02report").getAddressIndex()), (short) 0);
      }


      // 获取DO1数据
      StringBuilder queueid1 = spianService.queGlassid("DB106.26", 14);// 获取请求的id跟DO1同时清
      String Do1ID=plcread.getPlcParameter("FeedID").getValue();// 获取请求的id跟DO1同时清
      // 获取DO2数据
      StringBuilder queueid2 = spianService.queGlassid("DB103.58", 14);
      String Do2ID=plcread.getPlcParameter("FeedID").getValue();// 获取请求的id跟DO1同时清

      int questate = spianMapper.Selectquecount(queueid1.toString());// 判断扫码位是否有玻璃已确认

      int questate = spianMapper.Selectquecount(Do1ID.toString());// 判断扫码位是否有玻璃已确认
      // queueid1.toString().isEmpty()
      north_glass_buffer1 glass1 = spianMapper.selectGlass(queueid1.toString());// D01的玻璃信息
      north_glass_buffer1 glass2 = spianMapper.selectGlass(queueid2.toString());// D02玻璃信息
      north_glass_buffer1 glass1 = spianMapper.selectGlass(Do1ID);// D01的玻璃信息
      north_glass_buffer1 glass2 = spianMapper.selectGlass(Do2ID);// D02玻璃信息
      // 当扫码位玻璃id为空时 宽度为0
      if (queueid1 != null && questate == 0) {
      if (Do1ID != null && questate == 0) {
        // 写入D01的数据到上片队列表
        if (glass1 == null) { // 当没有值时传空
          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(Do1ID.toString(), glass1.getordernumber(), glass1.getlistnumber(),
          glass1.getboxnumber(), 0, glass1.getglasslengthmm().toString(), glass1.getglassheightmm().toString(),
          glass1.getglasslength().toString(), glass1.getglassheight().toString(), 1);
        }

      }

      if (queueid2 != null) {
      if (Do2ID != null) {
        // 写入D02的数据到上片队列表
        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.overqueue2(queueid2.toString(), 0, 1);// 更改扫码位任务表的状态为0
          spianMapper.Updatequeue(Do2ID.toString(), glass2.getordernumber(), glass2.getlistnumber(),
          glass2.getboxnumber(), 0, glass2.getglasslengthmm().toString(), glass2.getglassheightmm().toString(),
          glass2.getglasslength().toString(), glass2.getglassheight().toString(), 2);
          spianMapper.overqueue2(Do2ID.toString(), 0, 1);// 更改扫码位任务表的状态为0
          S7control.getinstance().WriteWord("DB105.16", (short) 0);// 关闭任务启动
        }