ZengTao
2024-08-22 b676b41c726941872df7788a05f8ce291427cd94
hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/job/Downpush.java
@@ -39,6 +39,7 @@
    @Autowired
    private DownGlassTaskService downGlassTaskService;
    @Autowired
    private RedisUtil redisUtil;
@@ -147,14 +148,6 @@
            autoPrint = redisUtil.getCacheObject("autoPrint");
        }
        jsonObject4.append("autoPrint", autoPrint);
        //人工下片位置最后一片
//        DownGlassTask downGlassTask=downGlassTaskService.getOne(
//          new LambdaQueryWrapper<DownGlassTask>()
//                  .eq(DownGlassTask::getEndCell,Const.G13_WORK_STATION)
//                  .orderByDesc(DownGlassTask::getGlassId)
//                  .first("top 1")
//        );
//        jsonObject4.append("downGlassTask", downGlassTask);
        ArrayList<WebSocketServer> sendwServer4 = WebSocketServer.sessionMap.get("unloadglass");
        if (sendwServer4 != null) {
@@ -172,6 +165,8 @@
        //正在进行的任务
        List<DownWorkstation> downWorkstation = downWorkstationService.getoneDownWorkstations(1, 6);
        jsonObject.append("downWorkstation", downWorkstation);
        List<DownGlassTask> downGlassTask = downGlassTaskService.selectOutTaskCache();
        jsonObject.append("downGlassTask", downGlassTask);
        ArrayList<WebSocketServer> sendwServer = WebSocketServer.sessionMap.get("unLoadGlassIsRun");
        if (sendwServer != null) {
            for (WebSocketServer webserver : sendwServer) {