Merge remote-tracking branch 'origin/master'

wangfei

2024-12-19 268a9d6e7b1596abc9ac49ca9cf4b32e89998a9a

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

@@ -123,6 +123,13 @@
        if(upPattenUsages!=null){
            jsonObject.append("prioritylist", upPattenUsages);
        }
        //查询1、2号线的任务
        List<UpPattenUsage> upPattenUsages1 = upPattenUsageService.selectLoadTask(5);
        jsonObject.append("loadTask1", upPattenUsages1);
        //查询1、2号线的任务
        List<UpPattenUsage> upPattenUsages2 = upPattenUsageService.selectLoadTask(6);
        jsonObject.append("loadTask2", upPattenUsages2);


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