1、erp地址修改为义乌erp 2、fixbug:中空李赛克出片问题 3、大屏显示字段显示异常

zhoushihao

2025-03-17 29545639b4a4e9d21b8b2ff0ad4803d26f5afff0

1、erp地址修改为义乌erp
2、fixbug:中空李赛克出片问题
3、大屏显示字段显示异常

 UI-Project/src/lang/zh.js

@@ -580,18 +580,18 @@
          historicaltasks10:'中空大理片',
          historicaltasks11:'生产统计',
          date:'日期',
          countOutOne:'切割一线数量',
          totalAreaOutOne:'切割一线面积',
          countOutTwo:'切割二线数量',
          totalAreaOutTwo:'切割一线面积',
          countIn:'钢化前大理片数量',
          totalAreaIn:'钢化前大理片面积',
          countOut:'钢化数量',
          totalAreaOut:'钢化面积',
          hollowCountOutOne:'中空一线数量',
          hollowTotalAreaOutOne:'中空一线面积',
          countOut:'中空二线数量',
          hollowCountOutTwo:'中空一线面积',
          countOutOne: '切割一线数量',
          totalAreaOutOne: '切割一线面积',
          countOutTwo: '切割二线数量',
          totalAreaOutTwo: '切割一线面积',
          countIn: '钢化前大理片数量',
          totalAreaIn: '钢化前大理片面积',
          countOut: '钢化数量',
          totalAreaOut: '钢化面积',
          hollowCountOutOne: '中空一线数量',
          hollowTotalAreaOutOne: '中空一线面积',
          hollowCountOutTwo: '中空二线数量',
          hollowTotalAreaOutTwo: '中空二线面积',
      },
      reportmanage:{
          productiontime :'生产时间',

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

@@ -1,16 +1,17 @@
<script setup>
import { onBeforeUnmount, onMounted, onUnmounted, reactive, ref } from "vue";
import { useRouter } from "vue-router"
import { host, WebSocketHost } from '@/utils/constants'
import {onBeforeUnmount, onMounted, onUnmounted, ref} 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 {closeWebSocket, initializeWebSocket} from '@/utils/WebSocketService';
import dayjs from 'dayjs';
import { ElMessage, ElMessageBox } from 'element-plus'
import { useI18n } from 'vue-i18n'
import {ElMessage} from 'element-plus'
import {useI18n} from 'vue-i18n'

const router = useRouter()
const blinda = ref(false)
const blindb = ref(false)
const { t } = useI18n()
const {t} = useI18n()
let language = ref(localStorage.getItem('lang') || 'zh')
let socket = null;
const rawGlassStorageDetailList = ref([])
@@ -460,8 +461,9 @@
        <el-table-column prop="totalAreaOut" align="center" :label="$t('large.totalAreaOut')" min-width="40" />
        <el-table-column prop="hollowCountOutOne" align="center" :label="$t('large.hollowCountOutOne')" min-width="40" />
        <el-table-column prop="hollowTotalAreaOutOne" align="center" :label="$t('large.hollowTotalAreaOutOne')" min-width="40" />
        <el-table-column prop="countOut" align="center" :label="$t('large.countOut')" min-width="40" />
        <el-table-column prop="hollowCountOutTwo" align="center" :label="$t('large.hollowCountOutTwo')" min-width="40" />
        <el-table-column prop="hollowTotalAreaOutTwo" align="center" :label="$t('large.hollowTotalAreaOutTwo')"
                         min-width="40"/>
        <!-- <el-table-column align="center" :label="$t('large.operate')" min-width="50">
          <template #default="scope">
            <el-button type="primary" style="margin-left: 10px;margin-bottom: 10px;"

 hangzhoumesParent/common/servicebase/src/main/java/com/mes/damage/service/impl/DamageServiceImpl.java

@@ -55,8 +55,7 @@
    WorkAssignmentMapper workAssignmentMapper;


//        private final static String ERP_URL = "http://192.168.2.100:8086";
    private final static String ERP_URL = "http://10.153.19.26:8086";
    private final static String ERP_URL = "http://192.168.2.100:8086";


    /**

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

@@ -817,7 +817,7 @@
                    //大于总层数先取totalLyaer倍数数量的玻璃，保证大车上的玻璃成对传
                    int remainCount = templist.size() % totalLayer;
                    if (targetSlot == 930) {
                        baseInfoList = templist.subList(0, totalLayer - 1);
                        baseInfoList = templist.subList(0, totalLayer);
                    } else {
                        baseInfoList = templist.subList(0, templist.size() - remainCount);
                    }
@@ -831,13 +831,13 @@
        for (T t : baseInfoList) {
            bigStorageCageTaskList.add(new BigStorageCageTask(t.getGlassId(), t.getSlot(), targetSlot, 0));
        }
        while (baseInfoList.size() < 6) {
        while (bigStorageCageTaskList.size() < 6) {
            bigStorageCageTaskList.add(new BigStorageCageTask("", 0, 0, 0));
        }
        //清空任务表数据
        bigStorageCageTaskService.removeAll(tableName);
        bigStorageCageTaskService.saveTaskMessage(tableName, bigStorageCageTaskList);
        List<HollowBigStorageCageHistoryTask> historyList = baseInfoList.stream().filter(e -> StringUtils.isNotBlank(e.getGlassId())).map(e -> {
        List<HollowBigStorageCageHistoryTask> historyList = bigStorageCageTaskList.stream().filter(e -> StringUtils.isNotBlank(e.getGlassId())).map(e -> {
            HollowBigStorageCageHistoryTask history = new HollowBigStorageCageHistoryTask();
            BeanUtils.copyProperties(e, history);
            history.setGlassCount(glassCount);