parent: f2939d78 | 补丁 | 提交 | ignore whitespace
wangfei
2025-03-17 d3e0a24b6cf1b22ada479791c15739885293c602 
Merge branch 'master' of http://10.153.19.25:10105/r/YiWuProject
7个文件已修改
62 ■■■■■ 已修改文件
UI-Project/src/lang/zh.js 2 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
UI-Project/src/views/largescreendisplay/screendisplay.vue 12 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
UI-Project/src/views/largescreendisplay/statistics.vue 26 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/job/PushMessageToIndex.java 16 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/bigstorage/service/impl/BigStorageCageServiceImpl.java 2 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
hangzhoumesParent/moduleService/hollowGlassModule/src/main/java/com/mes/hollow/service/impl/HollowBigStorageCageServiceImpl.java 2 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
hangzhoumesParent/moduleService/hollowGlassModule/src/main/java/com/mes/job/OpcPlcStorageCageHollowTask.java 2 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 
 UI-Project/src/lang/zh.js


@@ -583,7 +583,7 @@


          countOutOne: '切割一线数量',


          totalAreaOutOne: '切割一线面积',


          countOutTwo: '切割二线数量',


          totalAreaOutTwo: '切割一线面积',


          totalAreaOutTwo: '切割二线面积',


          countIn: '钢化前大理片数量',


          totalAreaIn: '钢化前大理片面积',


          countOut: '钢化数量',




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


@@ -225,7 +225,7 @@


      style: {


        width: '15px',


        height: '15px',


        backgroundColor: i % 2 === 0 ? '#911005' : 'blue',


        backgroundColor: i % 2 === 0 ? '#911005' : '#911005',


        position: 'absolute',


        transform: `translate(0px, 0px)`


      }


@@ -243,7 +243,7 @@


      style: {


        width: '15px',


        height: '15px',


        backgroundColor: i % 2 === 0 ? '#911005' : 'blue',


        backgroundColor: i % 2 === 0 ? '#911005' : '#911005',


        position: 'absolute',


        transform: `translate(0px, 0px)`


      }


@@ -261,7 +261,7 @@


      style: {


        width: '15px',


        height: '15px',


        backgroundColor: i % 2 === 0 ? '#911005' : 'blue',


        backgroundColor: i % 2 === 0 ? '#911005' : '#911005',


        position: 'absolute',


        transform: `translate(0px, 0px)`


      }


@@ -448,7 +448,7 @@


    </el-dialog>


    <!-- 生产统计 -->


    <div style="height: 190px;width: 88%;float: right;position: absolute;" @click="handlehistorical9">


      <el-table height="700" ref="table" :data="productionVO"


      <el-table height="100" ref="table" :data="productionVO"


        :header-cell-style="{ background: '#F2F3F5 ', color: '#1D2129' }">


        <el-table-column prop="date" align="center" :label="$t('large.date')" min-width="70" />


        <el-table-column prop="countOutOne" align="center" :label="$t('large.countOutOne')" min-width="40" />


@@ -622,8 +622,8 @@


  <el-dialog v-model="blinda" top="5vh" width="85%">


    <el-table height="650" ref="table" :data="tableData"


      :header-cell-style="{ background: '#F2F3F5 ', color: '#1D2129' }">


      <el-table-column prop="processId" fixed align="center" :label="$t('large.processId')" min-width="110" />


      <el-table-column prop="glassChild" align="center" :label="$t('large.productname')" min-width="110" />


      <el-table-column prop="processId" fixed align="center" :label="$t('large.processId')" min-width="150" />


      <el-table-column prop="glassChild" align="center" :label="$t('large.productname')" min-width="150" />


      <el-table-column prop="orderNumber" align="center" :label="$t('large.serialnumber')" min-width="110" />


      <el-table-column prop="technologyNumber" align="center" :label="$t('large.slicemarker')" min-width="110" />


      <el-table-column prop="width" align="center" :label="$t('large.width')" min-width="110" />




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


@@ -11,19 +11,19 @@


    <el-table ref="table" style="margin-top: 20px;height: 580px;width: 1770px;" :data="tableDatax"


      :header-cell-style="{ background: '#F2F3F5 ', color: '#1D2129' }">


      <el-table-column prop="date" align="center" :label="$t('large.date')" min-width="70" />


      <el-table-column prop="countOutOne" align="center" :label="$t('large.countOutOne')" min-width="40" />


      <el-table-column prop="totalAreaOutOne" align="center" :label="$t('large.totalAreaOutOne')" min-width="40" />


      <el-table-column prop="countOutTwo" align="center" :label="$t('large.countOutTwo')" min-width="50" />


      <el-table-column prop="totalAreaOutTwo" align="center" :label="$t('large.totalAreaOutTwo')" min-width="40" />


      <el-table-column prop="countIn" align="center" :label="$t('large.countIn')" min-width="40" />


      <el-table-column prop="totalAreaIn" align="center" :label="$t('large.totalAreaIn')" min-width="40" />


      <el-table-column prop="countOut" align="center" :label="$t('large.countOut')" min-width="40" />


      <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="countOutOne" align="center" :label="$t('large.countOutOne')" min-width="40" />


        <el-table-column prop="totalAreaOutOne" align="center" :label="$t('large.totalAreaOutOne')" min-width="40" />


        <el-table-column prop="countOutTwo" align="center" :label="$t('large.countOutTwo')" min-width="50" />


        <el-table-column prop="totalAreaOutTwo" align="center" :label="$t('large.totalAreaOutTwo')" min-width="50" />


        <el-table-column prop="countIn" align="center" :label="$t('large.countIn')" min-width="50" />


        <el-table-column prop="totalAreaIn" align="center" :label="$t('large.totalAreaIn')" min-width="50" />


        <el-table-column prop="countOut" align="center" :label="$t('large.countOut')" min-width="40" />


        <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="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>


    <div style="margin-top: 20px;margin-left: 40%;">


      <el-pagination v-model:current-page="currentPage2" :page-size="pageSize" :size="large" :disabled="disabled"




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


@@ -174,15 +174,15 @@


    public void largenScreen() {


        JSONObject jsonObject = new JSONObject();


        //磨边信息


        List<EdgStorageDeviceTaskHistory> edgOneTasks = edgStorageDeviceTaskHistoryService.list(


                new LambdaQueryWrapper<EdgStorageDeviceTaskHistory>()


                        .eq(EdgStorageDeviceTaskHistory::getDeviceId, 1)


                        .eq(EdgStorageDeviceTaskHistory::getTaskState, Const.EDG_GLASS_BEFORE)


        List<EdgGlassTaskInfo> edgOneTasks = edgGlassTaskInfoService.list(


                new LambdaQueryWrapper<EdgGlassTaskInfo>()


                        .lt(EdgGlassTaskInfo::getState, 2)


                        .eq(EdgGlassTaskInfo::getLine, 1)


        );


        List<EdgStorageDeviceTaskHistory> edgTwoTasks = edgStorageDeviceTaskHistoryService.list(


                new LambdaQueryWrapper<EdgStorageDeviceTaskHistory>()


                        .eq(EdgStorageDeviceTaskHistory::getDeviceId, 2)


                        .eq(EdgStorageDeviceTaskHistory::getTaskState, Const.EDG_GLASS_BEFORE)


        List<EdgGlassTaskInfo> edgTwoTasks = edgGlassTaskInfoService.list(


                new LambdaQueryWrapper<EdgGlassTaskInfo>()


                        .lt(EdgGlassTaskInfo::getState, 2)


                        .eq(EdgGlassTaskInfo::getLine, 2)


        );


        jsonObject.append("edgOneTasks", edgOneTasks);


        jsonObject.append("edgTwoTasks", edgTwoTasks);




 hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/bigstorage/service/impl/BigStorageCageServiceImpl.java


@@ -226,7 +226,7 @@


                        .like(StringUtils.isNotBlank(query.getFilmsId()), BigStorageCageDetails::getFilmsId, query.getFilmsId())


                        .like(StringUtils.isNotBlank(query.getFlowCardId()), BigStorageCageDetails::getFlowCardId, query.getFlowCardId())


                        .in(BigStorageCageDetails::getState, Const.GLASS_STATE_IN, Const.GLASS_STATE_ARTIFICIAL, Const.GLASS_STATE_OUT_ING))


                .eq(BigStorageCage::getDeviceId, query.getDeviceId())


//                .eq(BigStorageCage::getDeviceId, query.getDeviceId())


                .orderByAsc(BigStorageCage::getDeviceId)


                .orderByAsc(BigStorageCage::getSlot);


        return bigStorageCageMapper.selectJoinList(BigStorageAndDetailsDTO.class, wrapper);




 hangzhoumesParent/moduleService/hollowGlassModule/src/main/java/com/mes/hollow/service/impl/HollowBigStorageCageServiceImpl.java


@@ -49,7 +49,7 @@


                        .like(StringUtils.isNotBlank(query.getFilmsId()), HollowBigStorageCageDetails::getFilmsId, query.getFilmsId())


                        .like(StringUtils.isNotBlank(query.getFlowCardId()), HollowBigStorageCageDetails::getFlowCardId, query.getFlowCardId())


                        .in(HollowBigStorageCageDetails::getState, Const.GLASS_STATE_IN, Const.GLASS_STATE_ARTIFICIAL, Const.GLASS_STATE_OUT_ING))


                .eq(HollowBigStorageCage::getDeviceId, query.getDeviceId())


//                .eq(HollowBigStorageCage::getDeviceId, query.getDeviceId())


                .orderByAsc(HollowBigStorageCage::getDeviceId)


                .orderByAsc(HollowBigStorageCage::getSlot);


        return baseMapper.selectJoinList(HollowBigStorageAndDetailsDTO.class, wrapper);




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


@@ -798,7 +798,7 @@


        }


        Assert.isFalse(CollectionUtil.isEmpty(templist), "未获取出片数据，结束出片任务");


        log.info("获取出片任务数据{}条，执行保存", templist.size());


        List<T> baseInfoList = new ArrayList<>();


        List<T> baseInfoList = templist;


        if (1 != isForce) {


            if (taskType == Const.BIG_STORAGE_AFTER_OUT) {


                //校验防止小于等于总层数玻璃片序不匹配的问题，该问题多出现在大片玻璃，3层