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

wangfei

2024-07-25 6671a156075e3fafe63b7768f2e81df4634f04f8

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

@@ -120,7 +120,10 @@
        JSONObject jsonObject = new JSONObject();
        //正在进行的任务
        List<UpPattenUsage> upPattenUsages = upPattenUsageService.prioritylist();
        if(upPattenUsages!=null){
        jsonObject.append("prioritylist", upPattenUsages);
        }

        //工位信息
        List<UpWorkstation> upWorkstations = upWorkstationService.list();
        jsonObject.append("list", upWorkstations);