diff --git a/src/api/inventory/label.js b/src/api/inventory/label.js index 57e6663..ce2c2c7 100644 --- a/src/api/inventory/label.js +++ b/src/api/inventory/label.js @@ -7,3 +7,11 @@ export const cancelReserve = data => createAPI(`/pda/label/cancelReserve`,'post' // 标签拆分 export const splitLabel = data => createAPI(`/pda/label/split`,'post',data) + +// ========== 标签校准 ========== - rqrq + +// 查询标签校准信息 - rqrq +export const queryLabelCalibration = data => createAPI(`/pda/labelCalibration/query`, 'post', data) + +// 执行标签校准纠正 - rqrq +export const calibrateLabel = data => createAPI(`/pda/labelCalibration/calibrate`, 'post', data) \ No newline at end of file diff --git a/src/router/index.js b/src/router/index.js index 560ccf7..589a128 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -124,6 +124,8 @@ const globalRoutes = [ // 标签查询 {path: "/labelQuery",name: "labelQuery", component: resolve => require(["@/views/modules/inventory/label-query.vue"], resolve), meta: { transition: 'instant' ,preload: true,keepAlive: true}}, {path: "/wmsCancelReserve",name: "wmsCancelReserve", component: resolve => require(["@/views/modules/inventory/wms-cancel-reserve.vue"], resolve), meta: { transition: 'instant' ,preload: true,keepAlive: true}}, + // 标签校准 - rqrq + {path: "/labelCalibration",name: "labelCalibration", component: resolve => require(["@/views/modules/inventory/label-calibration.vue"], resolve), meta: { transition: 'instant' ,preload: true,keepAlive: false}}, // 运输任务 {path: "/transportation",name: "transportation", component: resolve => require(["@/views/modules/transport-task/index.vue"], resolve), meta: { transition: 'instant' ,preload: true,keepAlive: true}}, diff --git a/src/views/main.vue b/src/views/main.vue index d123140..2b6999b 100644 --- a/src/views/main.vue +++ b/src/views/main.vue @@ -244,12 +244,20 @@
- diff --git a/src/views/modules/automatedWarehouse/palletSorting.vue b/src/views/modules/automatedWarehouse/palletSorting.vue index ba07818..351ebb5 100644 --- a/src/views/modules/automatedWarehouse/palletSorting.vue +++ b/src/views/modules/automatedWarehouse/palletSorting.vue @@ -1154,9 +1154,10 @@ export default { if (data && data.code === 0) { this.sortingList = data.rfidList || []; console.log('分拣明细获取成功 - rqrq,共' + this.sortingList.length + '条'); - - // 获取成功后,继续校验标签 - rqrq - this.validateAndScanIn(); + this.$nextTick(() => { + // 获取成功后,继续校验标签 - rqrq + this.validateAndScanIn(); + }) } else { // 获取失败 - rqrq this.$alert(data.msg || '获取分拣明细失败', '错误', {