diff --git a/pda/api/warehouse/inbound.js b/pda/api/warehouse/inbound.js index ac44a0d..107f063 100644 --- a/pda/api/warehouse/inbound.js +++ b/pda/api/warehouse/inbound.js @@ -9,6 +9,15 @@ export function getInboundTaskList(query) { }) } +// 获取入库待处理单据列表 +export function getInboundStockList(query) { + return request({ + url: '/pda/inboundStockList', + method: 'get', + params: query + }) +} + // 根据入库明细ID查询物料信息（入库绑盘用） export function getMaterialByDetailId(detailId) { return request({ @@ -18,6 +27,24 @@ export function getMaterialByDetailId(detailId) { }) } +// 根据辊号查询物料信息（入库绑盘用） +export function getMaterialByRollerNumber(rollerNumber) { + return request({ + url: '/pda/getStockinInfoByRollerNumber', + method: 'get', + params: { rollerNumber } + }) +} + +// 根据辊号查询物料信息（入库绑盘用） +export function getTrayMsgByRollerNumber(rollerNumber) { + return request({ + url: '/pda/getTrayMsgByRollerNumber', + method: 'get', + params: { rollerNumber } + }) +} + /** * 提交入库绑盘（支持一托多料） * @param {Object} data @@ -34,6 +61,22 @@ export function submitBindTray(data) { }) } +export function submitBindTrayMsg(data) { + return request({ + url: '/pda/bindTrayMsgs', + method: 'post', + data: data + }) +} + +export function submitCancelTrayMsg(data) { + return request({ + url: '/pda/cancelTrayMsgs', + method: 'post', + data: data + }) +} + // 提交补料入库 export function submitSupplyInbound(data) { return request({ @@ -43,6 +86,7 @@ export function submitSupplyInbound(data) { }) } + // 生成入库作业 export function submitAddInJob(data) { return request({ @@ -51,3 +95,13 @@ export function submitAddInJob(data) { data: data }) } + + +// 生成空托入库作业 +export function submitAddEmptyTrayJob(data) { + return request({ + url: '/pda/addEmptyTrayJob', + method: 'post', + data: data + }) +} diff --git a/pda/api/warehouse/outbound.js b/pda/api/warehouse/outbound.js index 24b1982..4a8d6d3 100644 --- a/pda/api/warehouse/outbound.js +++ b/pda/api/warehouse/outbound.js @@ -3,30 +3,67 @@ import request from '@/utils/request' // 获取出库待处理任务列表 export function getOutboundTaskList(query) { return request({ - url: '/wms/outbound/task/list', + url: '/pda/outboundTaskList', method: 'get', params: query }) } // 获取出库任务详情 -export function getOutboundDetail(query) { +export function getOutboundDetail(rollerNumber) { return request({ - url: '/wms/outbound/detail', + url: '/pda/getStockoutInfoByRollerNumber', method: 'get', - params: query + params: { rollerNumber } }) } -// 确认出库 +// 确认版辊出库数量 export function confirmOutbound(data) { return request({ - url: '/wms/outbound/confirm', + url: '/pda/stockoutDetailComplete', method: 'post', data: data }) } +// 确认托盘出库完成 +export function stockoutTrayCodeComplete(trayCode) { + return request({ + url: '/pda/stockoutTrayCodeComplete', + method: 'post', + // data: { trayCode: trayCode } + params: { trayCode } + }) +} + + +// 获取出库任务详情 +export function getTrayCodeDetail(trayCode) { + return request({ + url: '/pda/getStockoutInfoByTrayCode', + method: 'get', + params: { trayCode } + }) +} + + +/** + * 呼叫空托出库 + * @param {String} cargoAreaId 库区ID + * @param {Number} palletType 托盘类型 + */ +export function callStockOutForContainer(cargoAreaId, palletType) { + return request({ + url: '/pda/callStockOutForContainer', + method: 'post', + data: { + cargoAreaId: cargoAreaId, + palletType: palletType + }, + }) +} + // 提交出库异常确认 export function submitOutboundException(data) { return request({ diff --git a/pda/config.js b/pda/config.js index e85ae61..f507dd5 100644 --- a/pda/config.js +++ b/pda/config.js @@ -1,7 +1,7 @@ // 应用全局配置 module.exports = { //baseUrl: 'https://vue.ruoyi.vip/prod-api', - baseUrl: 'http://localhost:8080', + baseUrl: 'http://localhost:8084', // 应用信息 appInfo: { // 应用名称 diff --git a/pda/pages.json b/pda/pages.json index 4ff1d18..9aff3fe 100644 --- a/pda/pages.json +++ b/pda/pages.json @@ -70,6 +70,16 @@ "style": { "navigationBarTitleText": "入库绑盘" } + }, { + "path": "pages/warehouse/inbound/cancelBindTray", + "style": { + "navigationBarTitleText": "版辊绑定取消" + } + },{ + "path": "pages/warehouse/inbound/emptyTray", + "style": { + "navigationBarTitleText": "空托入库" + } }, { "path": "pages/warehouse/inbound/supply", "style": { @@ -86,6 +96,16 @@ "navigationBarTitleText": "出库确认" } }, { + "path": "pages/warehouse/outbound/trayConfirm", + "style": { + "navigationBarTitleText": "托盘出库确认" + } + }, { + "path": "pages/warehouse/outbound/container", + "style": { + "navigationBarTitleText": "容器出库" + } + },{ "path": "pages/warehouse/outbound/exception", "style": { "navigationBarTitleText": "出库异常确认" @@ -121,12 +141,7 @@ "iconPath": "static/images/tabbar/home.png", "selectedIconPath": "static/images/tabbar/home_.png", "text": "首页" - }, { - "pagePath": "pages/work/index", - "iconPath": "static/images/tabbar/work.png", - "selectedIconPath": "static/images/tabbar/work_.png", - "text": "工作台" - }, { + },{ "pagePath": "pages/mine/index", "iconPath": "static/images/tabbar/mine.png", "selectedIconPath": "static/images/tabbar/mine_.png", diff --git a/pda/pages/index.vue b/pda/pages/index.vue index 7c15acc..e157062 100644 --- a/pda/pages/index.vue +++ b/pda/pages/index.vue @@ -56,9 +56,13 @@ 入库绑盘 - + + + + 空托入库 diff --git a/pda/pages/login.vue b/pda/pages/login.vue index 8794386..dc1e05c 100644 --- a/pda/pages/login.vue +++ b/pda/pages/login.vue @@ -14,17 +14,17 @@ - + - + @@ -99,9 +99,11 @@ this.$modal.msgError("请输入账号") } else if (this.loginForm.password === "") { this.$modal.msgError("请输入密码") - } else if (this.loginForm.code === "" && this.captchaEnabled) { - this.$modal.msgError("请输入验证码") - } else { + } + // else if (this.loginForm.code === "" && this.captchaEnabled) { + // this.$modal.msgError("请输入验证码") + // } + else { this.$modal.loading("登录中，请耐心等待...") this.pwdLogin() } @@ -120,9 +122,9 @@ // 登录成功后，处理函数 loginSuccess(result) { // 设置用户信息 - this.$store.dispatch('GetInfo').then(res => { + // this.$store.dispatch('GetInfo').then(res => { this.$tab.reLaunch('/pages/index') - }) + // }) } } } diff --git a/pda/pages/warehouse/inbound/bindTray.vue b/pda/pages/warehouse/inbound/bindTray.vue index 315e1aa..bcae682 100644 --- a/pda/pages/warehouse/inbound/bindTray.vue +++ b/pda/pages/warehouse/inbound/bindTray.vue @@ -8,24 +8,35 @@ - 托盘信息 - + + - + --> - 扫描入库子单号 + 托盘信息 扫码 - + + + + + + + 版辊信息 + + + 扫码 + + + + @@ -33,13 +44,25 @@ 物料信息 - + + + 辊号 + {{ currentMaterial.rollerNumber }} + + + 颜色 + {{ currentMaterial.color }} + + + 色序 + {{ currentMaterial.colorSequence }} 子单号 @@ -47,7 +70,7 @@ 绑定数量 - + -