1、中空任务队列显示bug修复，缺片详情破损后再查询条件添加

ZengTao

2025-10-12 ea2fdc85d876c680e042034d1cbb7c1ca030b5b7

1、中空任务队列显示bug修复，缺片详情破损后再查询条件添加

 UI-Project/src/utils/request.js

@@ -13,8 +13,8 @@
request.interceptors.request.use(config => {
   config.headers['Content-Type'] = 'application/json;charset=utf-8';
   if(userStore.user){
      config.headers['Authorization'] = `Bearer ${userStore.user.token}`;
      // config.headers['token'] = userStore.user.token;
      // config.headers['Authorization'] = `Bearer ${userStore.user.token}`;
      config.headers['token'] = userStore.user.token;
   }
   // 设置请求头
   return config

 UI-Project/src/views/hollow/hollowequipment.vue

@@ -1427,7 +1427,7 @@
    if (response.code == 200) {
      ElMessage.success(response.message);
      const { flowCardId } = row;
      fetchFlowBind();
      fetchFlowBind(currentRow.flowCardId);
      fetchFlowCardId()
    } else {
      ElMessage.error(response.msg);

 UI-Project/src/views/hollow/hollowequipmenthree.vue

@@ -982,7 +982,7 @@
    if (response.code == 200) {
      ElMessage.success(response.message);
      const { flowCardId } = row;
      fetchFlowBind();
      fetchFlowBind(currentRow.flowCardId);
      fetchFlowCardId()
    } else {
      ElMessage.error(response.msg);

 UI-Project/src/views/hollow/hollowequipmenttwo.vue

@@ -1116,7 +1116,7 @@
    if (response.code == 200) {
      ElMessage.success(response.message);
      const { flowCardId } = row;
      fetchFlowBind();
      fetchFlowBind(currentRow.flowCardId);
      fetchFlowCardId()
    } else {
      ElMessage.error(response.msg);

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

@@ -712,6 +712,7 @@

    @Scheduled(fixedDelay = 1000)
    public void finishOutBigStorageTask() throws Exception {
        try {
        S7DataZKDLPTwo s7DataZKDLPTwo = s7SerializerZKDLPTwo.read(S7DataZKDLPTwo.class);
        Boolean inkageEntity = s7DataZKDLPTwo.getMesControl();
        if (true != inkageEntity) {
@@ -724,6 +725,8 @@
            log.info("当前大车无出片玻璃，结束完成出片任务");
            return;
        }
            log.info("中空理片笼出片完成任务:{}", outTaskList);
            log.info("中空理片笼出片汇报情况:{}", s7DataZKDLPTwo);
        List<BigStorageCageTask> unFinishTaskList = outTaskList.stream().filter(e -> e.getTaskState() <= 1 || e.getStartSlot() == 0).collect(Collectors.toList());
        if (CollectionUtil.isNotEmpty(unFinishTaskList)) {
            log.info("存在未完成的玻璃信息,玻璃：{}", unFinishTaskList);
@@ -843,6 +846,10 @@
        s7DataZKDLPTwo = new S7DataZKDLPTwo();
        s7DataZKDLPTwo.setMesReply(0);
        s7SerializerZKDLPTwo.write(s7DataZKDLPTwo);
        } catch (Exception e) {
            log.info("中空理片笼出片汇报任务异常：{}", e);
        }

    }

    private void dealDamageInTask(List<BigStorageCageTask> damageTaskList) {