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

wuyouming666

2024-05-14 137ab94168623d78bbc369f41ddaaa6135e114a3

 hangzhoumesParent/moduleService/LoadGlassModule/src/main/java/com/mes/job/PlcLoadGlassTask.java

@@ -59,26 +59,9 @@
                    upPattenUsageService.updateUpPattenUsageState(upPattenUsage, workId);

                }
            }
            //获取是否有汇报
            String loadStatus = plcParameterObject.getPlcParameter("PlcStatus").getValue();
            if (loadStatus != null) {
                log.info(loadStatus);
                if ("1".equals(loadStatus)) {
                    log.info("收到汇报任务完成");
                    S7object.getinstance().plccontrol.writetime(plcParameterObject.getPlcParameter("MesToPlcStatus").getAddress(), 1);
                } else if ("2".equals(loadStatus)) {
                    log.info("收到汇报未完成任务");
                    //减少工位数量,恢复任务状态
                    overTask(loadStatus,0);
                } else if ("3".equals(loadStatus)) {
                    log.info("收到汇报玻璃破损");
                    overTask(loadStatus,0);
                } else if("0".equals(loadStatus)){
                        log.info("收到汇报清0状态");
                        //减少工位数量,完成任务状态
                        overTask(loadStatus,1);
                }
            }else {
                //请求字为零时，任务字清零
                S7object.getinstance().plccontrol.writetime(plcParameterObject.getPlcParameter("MesToPlc").getAddress(), 0);
            }
            //执行后休眠300毫秒
            //Thread.sleep(300);
@@ -86,16 +69,41 @@
            e.printStackTrace();
        }
    }
  public  void overTask(String loadStatus,int state) throws InterruptedException {
      UpPattenUsage upPattenUsage = upPattenUsageService.selectOverTask();
      if (upPattenUsage != null) {
          log.info("收到汇报清{}状态",loadStatus);
          //减少工位数量
          upWorkstationService.reduceWorkstationNumber(upPattenUsage.getState());
          //完成上片表状态
          upPattenUsageService.updateUpPattenUsageState(upPattenUsage, 100);
          S7object.getinstance().plccontrol.writetime(plcParameterObject.getPlcParameter("MesToPlcStatus").getAddress(), 0);
      }
  }

    @Scheduled(fixedDelay = 300)
    public void plcLoadGlassReport(){
        //获取是否有汇报
        String loadStatus = plcParameterObject.getPlcParameter("PlcStatus").getValue();
        if (loadStatus != null) {
            log.info(loadStatus);
            if ("1".equals(loadStatus)) {
                log.info("收到汇报任务完成");
                S7object.getinstance().plccontrol.writetime(plcParameterObject.getPlcParameter("MesToPlcStatus").getAddress(), 1);
            } else if ("2".equals(loadStatus)) {
                log.info("收到汇报未完成任务");
                //减少工位数量,恢复任务状态
                overTask(loadStatus,0);
            } else if ("3".equals(loadStatus)) {
                log.info("收到汇报玻璃破损");
                overTask(loadStatus,0);
            } else if("0".equals(loadStatus)){
                log.info("收到汇报清0状态");
                //减少工位数量,完成任务状态
                overTask(loadStatus,100);
            }
        }
    }

    public void overTask(String loadStatus, int state)  {
        UpPattenUsage upPattenUsage = upPattenUsageService.selectOverTask();
        if (upPattenUsage != null) {
            log.info("收到汇报清{}状态", loadStatus);
            //减少工位数量
            upWorkstationService.reduceWorkstationNumber(upPattenUsage.getState());
            //完成上片表状态
            upPattenUsageService.updateUpPattenUsageState(upPattenUsage, state);
            S7object.getinstance().plccontrol.writetime(plcParameterObject.getPlcParameter("MesToPlcStatus").getAddress(), 0);
        }
    }

}