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

wuyouming666

2024-04-15 a2068f3779b8172dd66f55d13a2da2ec62c9796a

 hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downworkstation/service/DownGlassLogic.java

@@ -23,7 +23,7 @@
    @Autowired

    private DownGlassInfo downGlassInfo;

    private DownWorkstation downWorkstation;

  //  private DownGlassInfoMapper downGlassInfoMapper;

    private DownGlassInfoMapper downGlassInfoMapper;

    private DownGlassInfoService downGlassInfoService;

    private DownGlassTaskService downGlassTaskService;

    private DownWorkstationMapper downWorkstationMapper;

@@ -68,9 +68,9 @@
        downWorkstationService = WebSocketServer.applicationContext.getBean(DownWorkstationService.class);

        downWorkstationTaskService = WebSocketServer.applicationContext.getBean(DownWorkstationTaskService.class);

        downGlassInfoService = WebSocketServer.applicationContext.getBean(DownGlassInfoService.class);

       // downGlassInfoMapper = WebSocketServer.applicationContext.getBean(DownGlassInfoMapper.class);

      downGlassInfoMapper = WebSocketServer.applicationContext.getBean(DownGlassInfoMapper.class);

        downGlassTaskService = WebSocketServer.applicationContext.getBean(DownGlassTaskService.class);

        List<DownGlassTask> taskdownGlassInf = downGlassTaskService.getUnloadingTaskState();

        List<DownGlassTask> taskdownGlassInf = downWorkstationMapper.selectunloadingtaskstate();

//





@@ -159,4 +159,4 @@
//    }





}

}