任务日志和PLC取货异常逻辑

hwh

2024-08-28 34044b791a62914aec56576f40d9de958c4f2bd4

 Web/src/views/wcs/wcsTask/index.vue

@@ -55,7 +55,7 @@
            </el-row>
          </el-form>
          <el-table :data="tableData" style="width: 100%" v-loading="loading" tooltip-effect="light" row-key="id"
            @row-click="handleClick" @sort-change="sortChange" border="">
            @cell-click="handleClick" @sort-change="sortChange" border="">
            <el-table-column type="index" label="序号" width="55" align="center" />
            <el-table-column prop="taskNo" label="任务号" show-overflow-tooltip="" />
            <el-table-column prop="taskType" width="85" label="任务类型" show-overflow-tooltip="">
@@ -80,17 +80,15 @@
                <ModifyRecord :data="scope.row" />
              </template>
            </el-table-column>
            <el-table-column label="操作" width="130" align="center" fixed="right" show-overflow-tooltip=""
            <el-table-column prop="操作" label="操作" width="130" align="center" fixed="right" show-overflow-tooltip=""
              v-if="auth('wcsTask:complete') || auth('wcsTask:cancell')">
              <template #default="scope">
                <!-- <el-button icon="ele-Edit" size="small" text="" type="primary" @click="openEditWcsTask(scope.row)"
              v-auth="'wcsTask:update'"> 编辑 </el-button>
            <el-button icon="ele-Delete" size="small" text="" type="primary" @click="delWcsTask(scope.row)"
              v-auth="'wcsTask:delete'"> 删除 </el-button> -->
                <el-button icon="ele-Check" size="small" text="" type="primary" @click="completeTask(scope.row)"
                  v-auth="'wcsTask:complete'"> 完成 </el-button>
                <el-button icon="ele-Close" size="small" text="" type="primary" @click="cancellTask(scope.row)"
                  v-auth="'wcsTask:cancell'"> 取消 </el-button>
                <template v-if="scope.row.status <= 1">
                  <el-button icon="ele-Check" size="small" text="" type="primary" @click="completeTask(scope.row)"
                    v-auth="'wcsTask:complete'"> 完成 </el-button>
                  <el-button icon="ele-Close" size="small" text="" type="primary" @click="cancellTask(scope.row)"
                    v-auth="'wcsTask:cancell'"> 取消 </el-button>
                </template>
              </template>
            </el-table-column>
          </el-table>
@@ -158,7 +156,7 @@

import printDialog from '/@/views/system/print/component/hiprint/preview.vue'
import editDialog from '/@/views/wcs/wcsTask/component/editDialog.vue'
import { pageWcsTask, deleteWcsTask } from '/@/api/wcs/wcsTask';
import { pageWcsTask, finshWcsTask } from '/@/api/wcs/wcsTask';
import { pageWcsMonitorTask } from '/@/api/wcs/wcsTaskMonitor';
import { signalR } from './signalR';

@@ -187,8 +185,14 @@
  signalR.off('PublicTask');
  signalR.on('PublicTask', (data: any) => {
    console.log(data)
    if (tableData.value.filter(t => t.id == data.id).length == 0) {
    var listTask = tableData.value.filter(t => t.id == data.id);
    if (listTask.length == 0) {
      tableData.value.unshift(data)
    }
    else {
      //如果已经存在就更新数据
      const index = tableData.value.findIndex(t => t.id == data.id);
      tableData.value.splice(index, 1, data);
    }
  });
  signalR.off('PublicTaskMonitor');
@@ -247,33 +251,48 @@
  editDialogRef.value.openDialog(row);
};
//完成任务
const completeTask = (row: any) => {

}
//取消任务
const cancellTask = (row: any) => {

}
// 点击表格
const handleClick = (row: any, event: any, column: any) => {
  queryParams2.value.taskNo = row.taskNo;
  handleQuery2();
};
// 删除
const delWcsTask = (row: any) => {
  ElMessageBox.confirm(`确定要删除吗?`, "提示", {
const completeTask = async (row: any) => {
  ElMessageBox.confirm(`确定要完成任务吗?`, "提示", {
    confirmButtonText: "确定",
    cancelButtonText: "取消",
    type: "warning",
  })
    .then(async () => {
      await deleteWcsTask(row);
      var param = Object.assign(row);
      param.status = 2;
      await finshWcsTask(param);
      handleQuery();
      ElMessage.success("删除成功");
      handleQuery2();
      ElMessage.success("完成任务成功");
    })
    .catch(() => { });
};
}
//取消任务
const cancellTask = async (row: any) => {
  ElMessageBox.confirm(`确定要取消任务吗?`, "提示", {
    confirmButtonText: "确定",
    cancelButtonText: "取消",
    type: "warning",
  })
    .then(async () => {
      var param = Object.assign(row);
      param.status = 4;
      await finshWcsTask(param);
      handleQuery();
      handleQuery2();
      ElMessage.success("取消任务成功");
    })
    .catch(() => { });

}
// 点击表格
const handleClick = (row, column, cell, event) => {
  if (column.property === '操作') {
    return;
  }
  queryParams2.value.taskNo = row.taskNo;
  handleQuery2();
};
// 改变页面容量
const handleSizeChange = (val: number) => {
  tableParams.value.pageSize = val;