From a3624bc45b923dc0c532e1ebf96af16516039df5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=A5=A5=E5=BE=B7=E5=BD=AA=E6=9C=AC=E5=BD=AA=5C92525?= Date: Wed, 25 Sep 2024 22:24:00 +0800 Subject: [PATCH] =?UTF-8?q?=E4=B8=8A=E6=9E=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/agvTask.js | 11 +++++- src/api/inventory.js | 11 +----- src/api/task.js | 18 +++++++++- src/views/business-agvTask/agvTask/index.vue | 8 ++--- src/views/business-asn/asn/index.vue | 37 ++++++++++++-------- src/views/business-asn/asn/viewAsnDetail.vue | 33 +++++++++++++---- src/views/business-inv/inventory/index.vue | 11 +++--- 7 files changed, 85 insertions(+), 44 deletions(-) diff --git a/src/api/agvTask.js b/src/api/agvTask.js index b1161f6..0e8a6e7 100644 --- a/src/api/agvTask.js +++ b/src/api/agvTask.js @@ -24,4 +24,13 @@ export function edit(data) { }) } -export default { add, edit, del } +export function missionStateCallback(data) { + return request({ + url: 'interfaces/api/amr/missionStateCallback', + method: 'post', + data + }) +} + + +export default { add, edit, del ,missionStateCallback} diff --git a/src/api/inventory.js b/src/api/inventory.js index 204c48f..11d1a35 100644 --- a/src/api/inventory.js +++ b/src/api/inventory.js @@ -39,13 +39,4 @@ export function downloadXb(data) { data }) } - -export function queryStockShangJia(status) { - return request({ - url: 'api/inventory/queryStockShangJia', - method: 'get', - params: {status} - }) -} - -export default {add, edit, del, knywInventory, downloadXb,queryStockShangJia} +export default {add, edit, del, knywInventory, downloadXb} diff --git a/src/api/task.js b/src/api/task.js index e4fd257..3ece7f1 100644 --- a/src/api/task.js +++ b/src/api/task.js @@ -43,6 +43,22 @@ export function queryTaskData(params) { }) } +export function queryByPutAwayTask(status) { + return request({ + url: 'api/task/queryByPutAwayTask', + method: 'get', + params: {status} + }) +} + +export function stockShangJia(data) { + return request({ + url: 'api/task/stockShangJia', + method: 'post', + data + }) +} -export default { add, edit, del ,getTaskInfo,queryPickTask,queryTaskData} + +export default { add, edit, del ,getTaskInfo,queryPickTask,queryTaskData,queryByPutAwayTask,stockShangJia} diff --git a/src/views/business-agvTask/agvTask/index.vue b/src/views/business-agvTask/agvTask/index.vue index 2a99586..32571c3 100644 --- a/src/views/business-agvTask/agvTask/index.vue +++ b/src/views/business-agvTask/agvTask/index.vue @@ -312,11 +312,7 @@ export default { } this.MissionStateCallback.missionCode = data.id this.MissionStateCallback.containerCode = data.stockCode - if (data.type == 'ASN' || data.type == 'FB_RETURN') { - this.MissionStateCallback.missionStatus = 'FORK_DOWN' - } else { - this.MissionStateCallback.missionStatus = 'COMPLETED' - } + this.MissionStateCallback.missionStatus = 'COMPLETED' crudAgvTask.missionStateCallback(this.MissionStateCallback).then(res => { if (res.status == 200) { this.crud.notify("任务完成!", CRUD.NOTIFICATION_TYPE.SUCCESS); @@ -348,7 +344,7 @@ export default { type: 'warning' }).then(() => { if (data.type == 'ASN') { - return this.crud.notify('原材料入库任务不允许重新发送!', CRUD.NOTIFICATION_TYPE.ERROR); + return this.crud.notify('入库任务不允许重新发送!', CRUD.NOTIFICATION_TYPE.ERROR); } this.MissionStateCallback.missionCode = data.id this.MissionStateCallback.missionStatus = 'RESEND' diff --git a/src/views/business-asn/asn/index.vue b/src/views/business-asn/asn/index.vue index a9d0e18..d188625 100644 --- a/src/views/business-asn/asn/index.vue +++ b/src/views/business-asn/asn/index.vue @@ -315,7 +315,7 @@ import {queryItemAll} from '@/api/item' import {formatDate} from '@/utils/commonUtils' import {xbjsOut} from "@/api/pickOut"; import viewAsnDetail from "@/views/business-asn/asn/viewAsnDetail.vue" -import crudInv from "@/api/inventory" +import crudTask from "@/api/task" const defaultForm = { id: null, @@ -467,7 +467,7 @@ export default { stockShangJiaDialogVisible: false, stockOptionsMap: new Map(), stockShangjiaForm: { - id: null, + taskId: null, stock: {} } @@ -564,7 +564,6 @@ export default { }, asnDetailRouter(datas) { this.$refs.viewAsnDetail.asnFrom = datas - console.log(this.asnFrom.status) this.$refs.viewAsnDetail.queryAsnDetail(datas.id) this.$refs.viewAsnDetail.dialogInsertAsn = true //this.$router.push({path:'/business-asn/viewAsnDetail',query: {ids:datas.id}}) @@ -688,21 +687,23 @@ export default { }) }, queryStockShangjia() { - crudInv.queryStockShangJia('待入库').then(res => { - this.stockOptions = res.map(item => item.stock); - // 清空 Map - this.stockOptionsMap.clear(); - // 处理数据并存入 Map - res.forEach(item => { - this.stockOptionsMap.set(item.id, item.stock); - }); + //待上架任务 + crudTask.queryByPutAwayTask('OPEN').then(res => { + // 使用一个对象来存储中间结果，减少重复计算 + const stockOptions = res.map(task => task.srcStock); + + // 直接使用map方法创建Map + this.stockOptionsMap = new Map(res.map(task => [task.id, task.srcStock])); + + // 更新stockOptions + this.stockOptions = stockOptions; }) }, getStock(stockOption) { - const invId = this.getKeyByValue(stockOption); - this.stockShangjiaForm.id = invId + const taskId = this.getKeyByValue(stockOption); + this.stockShangjiaForm.taskId = taskId }, getKeyByValue(value) { for (const [key, val] of this.stockOptionsMap.entries()) { @@ -713,7 +714,15 @@ export default { return null; }, stockShangJiaCof(){ - + crudTask.stockShangJia(this.stockShangjiaForm.taskId).then(res => { + if (res.status == 200) { + this.crud.notify(res.message, CRUD.NOTIFICATION_TYPE.SUCCESS); + this.crud.toQuery(); + this.stockShangJiaDialogVisible = false; + } else { + this.crud.notify(res.message, CRUD.NOTIFICATION_TYPE.ERROR); + } + }) }, stockShangJiaClose(done) { this.stockShangjiaForm = {}; diff --git a/src/views/business-asn/asn/viewAsnDetail.vue b/src/views/business-asn/asn/viewAsnDetail.vue index fa7f09e..8d20cc6 100644 --- a/src/views/business-asn/asn/viewAsnDetail.vue +++ b/src/views/business-asn/asn/viewAsnDetail.vue @@ -150,12 +150,12 @@ @selection-change="crud.selectionChangeHandler" height="35vh" > - + - + @@ -200,11 +200,19 @@ :disabled="scope.row.receivedQty>0" style="float: left" size="mini" type="primary" icon="el-icon-edit" @click="toEditAsnDetail(scope.row)"/> - + + + @@ -259,6 +267,7 @@ { + if(res.status==200){ + this.crud.notify(res.message, CRUD.NOTIFICATION_TYPE.SUCCESS) + this.crud.toQuery() + }else { + this.crud.notify(res.message, CRUD.NOTIFICATION_TYPE.ERROR) + } + }) + }, asnDetailZl(datas) { this.zlForm = datas[0]; this.zlDialogVisible = true; diff --git a/src/views/business-inv/inventory/index.vue b/src/views/business-inv/inventory/index.vue index c9b1bc9..7639e41 100644 --- a/src/views/business-inv/inventory/index.vue +++ b/src/views/business-inv/inventory/index.vue @@ -82,19 +82,19 @@ - + - + - + @@ -133,10 +133,10 @@ :title="'库存修改'" width="520px" > - + - + @@ -171,6 +171,7 @@ +