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; @@ -217,7 +218,6 @@ jsonObject.append("bigStorageCageDetailsFeedTask", inTaskList); } catch (Exception e) { //todo:不做任务处理 log.info("中空进片任务推送数据异常：{}", e.getMessage()); } try { //进片联机 @@ -243,9 +243,8 @@ 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++) { @@ -303,9 +302,7 @@ } } jsonObject.append("bigStorageCageDetailsOutTask", outTaskList); }catch (Exception e){ log.info("中空出片任务推送数据异常：{}", e.getMessage()); } //调度开关 boolean dispatchHollowSwitch = false; if (redisUtil.getCacheObject("dispatchHollowSwitch") == null) { 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 < 3 group by process_id, technology_number, order_number ), result_count as (
