Merge remote-tracking branch 'origin/master'

zhoushihao

2025-09-05 438fca844f95d3bab3c7a457b8469d5d39a1b504

Merge remote-tracking branch 'origin/master'

# Conflicts:
#	hangzhoumesParent/moduleService/hollowGlassModule/src/main/java/com/mes/job/PushMessageToIndex.java

 UI-Project/src/views/Identify/identifwu.vue

@@ -2,7 +2,7 @@
  <div style="height: 600px;">
    <el-card style="flex: 1;margin-left: 10px;margin-top: 10px;margin-right: 10px;height: 850px;">
    <div style="display: flex;margin-left: 40%;margin-bottom: 5px;">
    <div style="text-align: center;"> {{ $t('processCard.temperinglayout') }}：{{ ava }}-{{ avanum }} </div>
    <div style="text-align: center;"> {{ $t('processCard.layoutID') }}：{{ ava }}-{{ avanum }} </div>
     <el-button @click="handleAllDamage" style="margin-left: 80%;margin-top: -5px;">{{$t('order.dilapidation')}}</el-button>
    </div>
      <el-scrollbar height="750px" width="1400px" style="background-color: #e9e9eb;">

 UI-Project/src/views/Identify/identifwutwo.vue

@@ -2,7 +2,7 @@
  <div style="height: 500px;">
    <el-card style="flex: 1;margin-left: 10px;margin-top: 10px;margin-right: 10px;height: 800px;">
     <div style="display: flex;margin-left: 40%;margin-bottom: 5px;">
    <div style="text-align: center;"> {{ $t('processCard.temperinglayout') }}：{{ ava }}-{{ avanum }} </div>
    <div style="text-align: center;"> {{ $t('processCard.layoutID') }}：{{ ava }}-{{ avanum }} </div>
     <el-button @click="handleAllDamage" style="margin-left: 80%;margin-top: -5px;">{{$t('order.dilapidation')}}</el-button>
    </div>
    <el-scrollbar height="750px" width="1400px" style="background-color: #e9e9eb;">

 hangzhoumesParent/moduleService/hollowGlassModule/src/main/java/com/mes/job/PushMessageToIndex.java

@@ -26,6 +26,7 @@
import com.mes.s7.entity.S7DataZKDLPOne;
import com.mes.s7.entity.S7DataZKDLPTwo;
import com.mes.s7.entity.S7DataZKExtra;
import com.mes.tools.WebSocketServer;
import com.mes.tools.WebSocketUtils;
import com.mes.utils.RedisUtil;
import lombok.extern.slf4j.Slf4j;
@@ -130,7 +131,7 @@
        } catch (Exception e) {
            log.error("opc存在异常", e);
        }
        webSocketUtils.sendToWeb(websocketName, jsonObject);
        webSocketUtils.sendToWeb(websocketName,jsonObject);
    }

    @Scheduled(fixedDelay = 1000)
@@ -139,7 +140,7 @@
        try {
            //查询使用数据源1查询数据
            queryDataSource1(jsonObject);
            webSocketUtils.sendToWeb("hollowGlassMessage", jsonObject);
            webSocketUtils.sendToWeb("hollowGlassMessage",jsonObject);
        } catch (Exception e) {
            e.printStackTrace();
        }
@@ -217,7 +218,6 @@
            jsonObject.append("bigStorageCageDetailsFeedTask", inTaskList);
        } catch (Exception e) {
            //todo:不做任务处理
            log.info("中空进片任务推送数据异常：{}", e.getMessage());
        }
        try {
            //进片联机
@@ -243,69 +243,66 @@
            jsonObject.append("freeThreeRequestEntity", s7DataZKExtra.getIsFree());
        } catch (Exception e) {
            //todo:不做任务处理
            log.info("中空状态推送数据异常：{}", e.getMessage());
        }
        try {
            //出片任务数据
            List<BigStorageCageTask> outTaskList = new ArrayList<>();
            for (int i = 0; i < 6; i++) {

                BigStorageCageTask bigStorageCageTask = new BigStorageCageTask();
                String glassId = "";
                Integer startSlot = 0;
                Integer targetSlot = 0;
                Integer taskState = 0;
                switch (i) {
                    case 0:
                        glassId = s7DataZKDLPTwo.getId1();
                        startSlot = s7DataZKDLPTwo.getFrom1();
                        targetSlot = s7DataZKDLPTwo.getTo1();
                        taskState = s7DataZKDLPTwo.getState1();
                        ;
                        break;
                    case 1:
                        glassId = s7DataZKDLPTwo.getId2();
                        startSlot = s7DataZKDLPTwo.getFrom2();
                        targetSlot = s7DataZKDLPTwo.getTo2();
                        taskState = s7DataZKDLPTwo.getState2();
                        break;
                    case 2:
                        glassId = s7DataZKDLPTwo.getId3();
                        startSlot = s7DataZKDLPTwo.getFrom3();
                        targetSlot = s7DataZKDLPTwo.getTo3();
                        taskState = s7DataZKDLPTwo.getState3();
                        break;
                    case 3:
                        glassId = s7DataZKDLPTwo.getId4();
                        startSlot = s7DataZKDLPTwo.getFrom4();
                        targetSlot = s7DataZKDLPTwo.getTo4();
                        taskState = s7DataZKDLPTwo.getState4();
                        break;
                    case 4:
                        glassId = s7DataZKDLPTwo.getId5();
                        startSlot = s7DataZKDLPTwo.getFrom5();
                        targetSlot = s7DataZKDLPTwo.getTo5();
                        taskState = s7DataZKDLPTwo.getState5();
                        break;
                    case 5:
                        glassId = s7DataZKDLPTwo.getId6();
                        startSlot = s7DataZKDLPTwo.getFrom6();
                        targetSlot = s7DataZKDLPTwo.getTo6();
                        taskState = s7DataZKDLPTwo.getState6();
                        break;
                }
                if (StringUtils.isNotEmpty(glassId)) {
                    bigStorageCageTask.setGlassId(glassId);
                    bigStorageCageTask.setStartSlot(startSlot);
                    bigStorageCageTask.setTargetSlot(targetSlot);
                    bigStorageCageTask.setTaskState(taskState);
                    outTaskList.add(bigStorageCageTask);
                }
        //出片任务数据
        List<BigStorageCageTask> outTaskList = new ArrayList<>();
        for (int i = 0; i < 6; i++) {

            BigStorageCageTask bigStorageCageTask = new BigStorageCageTask();
            String glassId = "";
            Integer startSlot = 0;
            Integer targetSlot = 0;
            Integer taskState = 0;
            switch (i) {
                case 0:
                    glassId = s7DataZKDLPTwo.getId1();
                    startSlot = s7DataZKDLPTwo.getFrom1();
                    targetSlot = s7DataZKDLPTwo.getTo1();
                    taskState = s7DataZKDLPTwo.getState1();
                    ;
                    break;
                case 1:
                    glassId = s7DataZKDLPTwo.getId2();
                    startSlot = s7DataZKDLPTwo.getFrom2();
                    targetSlot = s7DataZKDLPTwo.getTo2();
                    taskState = s7DataZKDLPTwo.getState2();
                    break;
                case 2:
                    glassId = s7DataZKDLPTwo.getId3();
                    startSlot = s7DataZKDLPTwo.getFrom3();
                    targetSlot = s7DataZKDLPTwo.getTo3();
                    taskState = s7DataZKDLPTwo.getState3();
                    break;
                case 3:
                    glassId = s7DataZKDLPTwo.getId4();
                    startSlot = s7DataZKDLPTwo.getFrom4();
                    targetSlot = s7DataZKDLPTwo.getTo4();
                    taskState = s7DataZKDLPTwo.getState4();
                    break;
                case 4:
                    glassId = s7DataZKDLPTwo.getId5();
                    startSlot = s7DataZKDLPTwo.getFrom5();
                    targetSlot = s7DataZKDLPTwo.getTo5();
                    taskState = s7DataZKDLPTwo.getState5();
                    break;
                case 5:
                    glassId = s7DataZKDLPTwo.getId6();
                    startSlot = s7DataZKDLPTwo.getFrom6();
                    targetSlot = s7DataZKDLPTwo.getTo6();
                    taskState = s7DataZKDLPTwo.getState6();
                    break;
            }
            jsonObject.append("bigStorageCageDetailsOutTask", outTaskList);
        }catch (Exception e){
            log.info("中空出片任务推送数据异常：{}", e.getMessage());
            if (StringUtils.isNotEmpty(glassId)) {
                bigStorageCageTask.setGlassId(glassId);
                bigStorageCageTask.setStartSlot(startSlot);
                bigStorageCageTask.setTargetSlot(targetSlot);
                bigStorageCageTask.setTaskState(taskState);
                outTaskList.add(bigStorageCageTask);
            }
        }
        jsonObject.append("bigStorageCageDetailsOutTask", outTaskList);

        //调度开关
        boolean dispatchHollowSwitch = false;
        if (redisUtil.getCacheObject("dispatchHollowSwitch") == null) {
@@ -344,6 +341,6 @@
        jsonObject.append("pieChartVOS", pieChartVOS);
        List<RunTime> hollowRunTimes = hollowBigStorageCageHistoryTaskService.queryRunTimes(LocalDate.now().format(DateTimeFormatter.ofPattern("yyyy-MM-dd")));
        jsonObject.append("hollowRunTimes", hollowRunTimes);
        webSocketUtils.sendToWeb("largenScreen", jsonObject);
        webSocketUtils.sendToWeb("largenScreen",jsonObject);
    }
}

 hangzhoumesParent/moduleService/hollowGlassModule/src/main/resources/mapper/HollowGlassRelationInfoMapper.xml

@@ -141,7 +141,7 @@
                        order_number      as order_sort,
                        count(1)          as damage_count
                 from damage
                 where process_id = #{flowCardId} and type in (8,9) and status < 3
                 where process_id = #{flowCardId} and type in (8,9) and status &lt; 3
                 group by process_id, technology_number, order_number
             ),
             result_count as (