Merge branch 'master' of http://bore.pub:10439/r/HangZhouMes

ZengTao

2024-09-20 34a5775085f5db40dfc80250e5185f5485eecfc2

 hangzhoumesParent/moduleService/GlassStorageModule/src/main/java/com/mes/job/push.java

@@ -40,8 +40,8 @@
        JSONObject jsonObject = new JSONObject();

        List<RawGlassStorageDetails> rack =  rawGlassStorageDetailsService.list();

        List<RawGlassStorageStation> state =  rawGlassStorageStationService.list();

        List<RawGlassStorageTask> tasks =  rawGlassStorageTaskService.list();



        //List<RawGlassStorageTask> tasks =  rawGlassStorageTaskService.list();

        List<RawGlassStorageTask> tasks =  rawGlassStorageTaskService.findAll();

        jsonObject.append("rack",rack);

        jsonObject.append("state",state);

        jsonObject.append("tasks",tasks);