1、因4号笼子划伤临时修改不进笼 2、大屏运行时间段最后一段缺失修改

ZengTao

2025-11-29 fc46ed525a74e09292c87ca2daa395f5ae6b22ff

1、因4号笼子划伤临时修改不进笼
2、大屏运行时间段最后一段缺失修改

 UI-Project/src/views/largescreendisplay/screendisplay.vue

@@ -1,7 +1,6 @@
<script setup>
import { onBeforeUnmount, onMounted, onUnmounted, ref, computed, nextTick, watch } from "vue";
import { useRouter } from "vue-router"
import { host, WebSocketHost } from '@/utils/constants'
import request from "@/utils/request"
import { closeWebSocket, initializeWebSocket } from '@/utils/WebSocketService';
import dayjs from 'dayjs';
@@ -1048,10 +1047,10 @@
      </div>
      <div style="width: 50%;">
        <div class="img-screen" alt="Screen">
          <div>
          <!-- <div>
            <el-button type="primary" style="top:40px;left:670px;position: absolute;" @click="exportToExcel()">{{
              $t('large.statistics') }}</el-button>
          </div>
          </div> -->
          <!-- 钢化半透明色块 -->
          <div
            style="width: 80px;height: 40px;top: 315px;left: 130px;position: absolute;background-color: rgba(0, 0, 0, 0.5);color: white;font-size: 12px;z-index: 999;">

 UI-Project/src/views/largescreendisplay/timeaxis.vue

@@ -115,8 +115,20 @@
          state: 2
        });
      }
      if(index == tableDatax.value.length - 1){
        tableData.push({
          firstTimestamp: item.secondTimestamp,
          secondTimestamp: item.endTimestamp,
          diffMinutes: item.diffMinutes,
          startTimestamp: item.startTimestamp,
          endTimestamp: item.endTimestamp,
          state: 1
        });
      }
    });
  }
  console.log(tableData);
  
  return tableData;
};


 hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/job/OpcPlcStorageCageNewTask.java

@@ -256,13 +256,13 @@
                    .in(BigStorageCageDetails::getState, Const.GLASS_STATE_IN_ALL));
            if (count > 0) {
                log.info("直通片台存在玻璃，结束本次进片");
                ProductAlarmInfo alarmInfo = new ProductAlarmInfo();
                alarmInfo.setState(Const.LOAD_RAW_GLASS_NEW);
                alarmInfo.setAlarmModule(ALARM_MODULE);
                alarmInfo.setAlarmType(ALARM_TYPE);
                alarmInfo.setAlarmCode(ALARM_CODE_OVER);
                alarmInfo.setAlarmMessage("");
                productAlarmInfoService.save(alarmInfo);
//                ProductAlarmInfo alarmInfo = new ProductAlarmInfo();
//                alarmInfo.setState(Const.LOAD_RAW_GLASS_NEW);
//                alarmInfo.setAlarmModule(ALARM_MODULE);
//                alarmInfo.setAlarmType(ALARM_TYPE);
//                alarmInfo.setAlarmCode(ALARM_CODE_OVER);
//                alarmInfo.setAlarmMessage("");
//                productAlarmInfoService.save(alarmInfo);
                //向plc发送报警:直通片台存在玻璃，无法继续直通
//                miloService.writeToOpcWord(generateReadWriteEntity("DLP1A.DLP1A.alarmSignal", 64));
                s7DataDLPOne = new S7DataDLPOne();
@@ -1011,7 +1011,7 @@
//        if (!THROUGH_SLOT.equals(list.get(0).getSlot())) {
//            临时解决方案:出片时考虑玻璃碰撞，改为一片一出
        // 界面关闭调度开关 !Const.BIG_STORAGE_BEFORE_DISPATCH.equals(taskType)
        if (list.get(0).getSlot() >= 500 && list.get(0).getThickness() > 8) {
        if (list.get(0).getSlot() >= 500 && list.get(0).getThickness() > 7) {
            outGlassList = list.subList(0, 1);
        } else {
            List<String> glassIdList = bigStorageGlassRelationInfoService.queryNeedOutGlassId(

 hangzhoumesParent/moduleService/LoadGlassModule/src/main/java/com/mes/engineering/controller/EngineeringController.java

@@ -105,10 +105,10 @@
                log.info("从PP表查询engineering的数据并保存到表里");
                List<Engineering> listEngineering = engineeringService.selectEngineering(engineering.getEngineerId());
                engineeringService.saveEngineering(listEngineering);
                log.info("更改pp表状态为已领取");
                //将engineering表状态为正在上片
                boolean work = engineeringService.changeTasks(engineering);
                optimizeProjectService.changeTask(engineering.getEngineerId(), 200);
                log.info("更改pp表状态为已领取");
                if (work) {
                    return Result.build(200, "保存成功" + engineering.getEngineerId(), true);
                } else {

 hangzhoumesParent/moduleService/hollowGlassModule/src/main/resources/application-dev.yml

@@ -19,6 +19,11 @@
          username: root
          password: beibo.123/
          driver-class-name: com.mysql.cj.jdbc.Driver
        sd:
          url: jdbc:mysql://127.0.0.1:3306/sd?serverTimezone=GMT%2b8
          username: root
          password: beibo.123/
          driver-class-name: com.mysql.cj.jdbc.Driver
  cloud:
    nacos:
      discovery: