Merge remote-tracking branch 'origin/master'

zhoushihao

2024-09-20 d1f7ca24bfba95331f81f0b7a0d48739e6850262

 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);