diff --git a/src/views/agvTask/AgvTask.api.ts b/src/views/agvTask/AgvTask.api.ts index 08233d7..6e2684c 100644 --- a/src/views/agvTask/AgvTask.api.ts +++ b/src/views/agvTask/AgvTask.api.ts @@ -13,7 +13,7 @@ enum Api { exportXls = '/agvTask/exportXls', taskReporter = '/api/robot/reporter/task', callBackTask = '/tes/apiv2/callBackTask', - cancelTes = '/tes/apiv2/cancelTes', + cancelTes = '/tes/cancelTes', cancelAgv = '/api/robot/cancelAgv', resendTes = '/tes/apiv2/resendTes', resendAgv = '/api/robot/resendAgv', @@ -113,11 +113,11 @@ export const callBackTask = (params) => { /** * TES任务取消 - * @param params + * @param tesId */ -export const cancelTes = (params) => { - return defHttp.post( - { url: Api.cancelTes, params }, +export const cancelTes = (id) => { + return defHttp.get( + { url: Api.cancelTes, params: { id } }, { isTransformResponse: false, } diff --git a/src/views/agvTask/TesAgv.data.ts b/src/views/agvTask/TesAgv.data.ts index 46393b7..f24ccec 100644 --- a/src/views/agvTask/TesAgv.data.ts +++ b/src/views/agvTask/TesAgv.data.ts @@ -2,6 +2,12 @@ import {BasicColumn} from '/@/components/Table'; import { render } from '@/utils/common/renderUtils'; //列表数据 export const columns: BasicColumn[] = [ + { + title: 'TES任务ID', + align: "center", + width: '100px', + dataIndex: 'tesId' + }, { title: '任务ID', align: "center", @@ -41,13 +47,13 @@ export const columns: BasicColumn[] = [ { title: '起点', align: "center", - width: '120px', + width: '130px', dataIndex: 'startCode' }, { title: '终点', align: "center", - width: '120px', + width: '130px', dataIndex: 'endCode' }, { diff --git a/src/views/conveyorLine/ConveyorLine.api.ts b/src/views/conveyorLine/ConveyorLine.api.ts index 36ed294..eb30e44 100644 --- a/src/views/conveyorLine/ConveyorLine.api.ts +++ b/src/views/conveyorLine/ConveyorLine.api.ts @@ -1,8 +1,8 @@ import { defHttp } from '/@/utils/http/axios'; enum Api { - showConveyorLine = '/api/conveyorLine/showConveyorLine', - scanTray='/api/conveyorLine/scanTray', + showConveyorLine = '/conveyorLine/showConveyorLine', + scanTray='/conveyorLine/scanTray', } export const showConveyorLine = (conveyorLine) => { diff --git a/src/views/receive/asn/components/scanTray/ScanTrayForm.vue b/src/views/receive/asn/components/scanTray/ScanTrayForm.vue index d86c945..ce19374 100644 --- a/src/views/receive/asn/components/scanTray/ScanTrayForm.vue +++ b/src/views/receive/asn/components/scanTray/ScanTrayForm.vue @@ -106,7 +106,18 @@ } confirmLoading.value = true; try { - const res = await scanTray(formData); + //messageID 时间戳 + const params = { + messageID: new Date().getTime(), + messageType: 50, + content: { + stationCode: formData.station, + signal: { + barCode: formData.stockCode, + }, + }, + }; + const res = await scanTray(params); if (res && res.code === 200) { createMessage.success('操作成功'); emit('ok');