From 3761fccb252d3d478859a242616b338f5868a03f Mon Sep 17 00:00:00 2001 From: liangzhou <594755172@qq.com> Date: Wed, 24 Jul 2024 22:14:25 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E6=9B=B4=E6=96=B0=EF=BC=9A?= =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=BA=93=E5=8C=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- package-lock.json | 4 ++-- package.json | 2 +- src/layout/goodsIn.vue | 6 ++++-- src/layout/goodsOut.vue | 8 ++++++-- src/layout/stock.vue | 20 +++++++++++++++++++- src/layout/taskMonitor.vue | 22 ++++++++++++++++++++-- src/router/index.js | 6 ++++-- 7 files changed, 56 insertions(+), 12 deletions(-) diff --git a/package-lock.json b/package-lock.json index e9607d8..21c4488 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,11 +1,11 @@ { - "name": "WMS", + "name": "wms", "version": "0.1.0", "lockfileVersion": 2, "requires": true, "packages": { "": { - "name": "WMS", + "name": "wms", "version": "0.1.0", "dependencies": { "axios": "^1.3.3", diff --git a/package.json b/package.json index 3ebefee..179220b 100644 --- a/package.json +++ b/package.json @@ -1,5 +1,5 @@ { - "name": "WMS", + "name": "wms", "version": "0.1.0", "private": true, "scripts": { diff --git a/src/layout/goodsIn.vue b/src/layout/goodsIn.vue index ede7458..9322eb9 100644 --- a/src/layout/goodsIn.vue +++ b/src/layout/goodsIn.vue @@ -128,12 +128,13 @@ export default { name: 'goodsIn', data() { return { + areaId: 2, labelPosition: "top", tempTasks: [], tempVehicleId: '', tempOriginPoint: '', totalWeight: 0, - isEmptyTask: false, + isEmptyTask: null, disabledEmpty: false, taskInRequestEntity: reactive({ vehicleId: '', @@ -276,6 +277,7 @@ export default { }, submitGoodsInTask(formEl) {// 下发入库任务 const inParams = { + areaId: this.areaId, vehicleId: this.tempVehicleId, originPoint: this.tempOriginPoint, totalWeight: this.totalWeight, @@ -292,7 +294,7 @@ export default { this.tempVehicleId = '' this.tempOriginPoint = '' this.totalWeight = 0 - this.isEmptyTask == false + this.isEmptyTask == null formEl.resetFields() this.disabledEmpty = false } else { diff --git a/src/layout/goodsOut.vue b/src/layout/goodsOut.vue index 2e82faa..b94708d 100644 --- a/src/layout/goodsOut.vue +++ b/src/layout/goodsOut.vue @@ -150,6 +150,7 @@ export default { name: 'goodsOut', data() { return { + areaId: 2, timer: '', tasks: [], pageInfo: {}, @@ -246,7 +247,7 @@ export default { }) return } - if (formData.vehicleId == '' || formData.goodsId == '' || formData.originPoint == '') { + if (formData.vehicleId == '' && formData.goodsId == '' && formData.originPoint == '') { ElMessage({ message: '载具号、物料号、起始库位号必须至少输入一个', type: 'error', @@ -275,6 +276,7 @@ export default { return } const outParams = { + areaId: this.areaId, goodsId: formData.goodsId, goodsNum: formData.goodsNum, vehicleId: formData.vehicleId, @@ -304,7 +306,8 @@ export default { const request = { taskType: 2, isPicking: 1, - taskStatus: 8 + taskStatus: 8, + areaId: this.areaId, } getTasks(request).then(res1 => { if (res1.data.code == 0) { @@ -349,6 +352,7 @@ export default { return } const confirmParams = { + areaId: this.areaId, taskId: formData.taskId, vehicleId: formData.vehicleId, goodsId: formData.goodsId, diff --git a/src/layout/stock.vue b/src/layout/stock.vue index 7954a7f..7dc3a38 100644 --- a/src/layout/stock.vue +++ b/src/layout/stock.vue @@ -2,6 +2,8 @@
+ 搜索 @@ -228,6 +230,21 @@ export default { label: '库存锁定' } ], + areaIdQuery: 1, + wmsAreaOptions: [ + { + value: 0, + label: '全部' + }, + { + value: 1, + label: '托盘库' + }, + { + value: 2, + label: '箱式库' + } + ], } }, mounted() { @@ -285,7 +302,8 @@ export default { const request = { pageNo: this.currentPage, pageSize: this.pageSize, - goodsId: this.goodsIdQuery.trim() + goodsId: this.goodsIdQuery.trim(), + areaId: this.areaIdQuery, } getAllStocks(request).then(res => { const tableResponse = res.data diff --git a/src/layout/taskMonitor.vue b/src/layout/taskMonitor.vue index 001736a..f6b48c3 100644 --- a/src/layout/taskMonitor.vue +++ b/src/layout/taskMonitor.vue @@ -3,6 +3,8 @@
+ 搜索 @@ -165,7 +167,22 @@ export default { label: '任务完成' } ], - availableLocationOptions: [] + availableLocationOptions: [], + areaIdQuery: 1, + wmsAreaOptions: [ + { + value: 0, + label: '全部' + }, + { + value: 1, + label: '托盘库' + }, + { + value: 2, + label: '箱式库' + } + ], } }, mounted() { @@ -199,7 +216,8 @@ export default { pageNo: this.currentPage, pageSize: this.pageSize, goodsId: this.goodsIdQuery.trim(), - vehicleId: this.vehicleIdQuery.trim() + vehicleId: this.vehicleIdQuery.trim(), + areaId: this.areaIdQuery, } getTasksByPage(tableRequest).then(res => { const tableResponse = res.data diff --git a/src/router/index.js b/src/router/index.js index 9c7d36f..79bbc95 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -12,8 +12,10 @@ const routes = [ redirect: '/stock', children: [ { path: '/stock', component: stock },// 库存 - { path: '/goodsIn', component: () => import('@/layout/goodsIn.vue') },// 入库 - { path: '/goodsOut', component: () => import('@/layout/goodsOut.vue') },// 出库 + { path: '/goodsIn', component: () => import('@/layout/goodsIn.vue') },// 箱式库入库 + { path: '/goodsOut', component: () => import('@/layout/goodsOut.vue') },// 箱式库出库 + { path: '/goodsInTP', component: () => import('@/layout/goodsInTP.vue') },// 托盘库入库 + { path: '/goodsOutTP', component: () => import('@/layout/goodsOutTP.vue') },// 托盘库出库 { path: '/inTaskRecord', component: () => import('@/layout/inTaskRecord.vue') },// 入库记录 { path: '/outTaskRecord', component: () => import('@/layout/outTaskRecord.vue') },// 出库记录 { path: '/location', component: () => import('@/layout/location.vue') },// 库位