From f38057c904e52842d2e73c7215b9833cb1068eb2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=B5=B5=E6=AD=A3=E6=98=93?= Date: Thu, 11 Jul 2024 10:42:10 +0800 Subject: [PATCH] =?UTF-8?q?=E6=AF=9B=E5=9D=AF=E5=BA=93=E5=AD=98=E7=9B=98?= =?UTF-8?q?=E7=82=B9=EF=BC=8C=E5=8C=85=E8=A3=85=E6=AF=9B=E5=9D=AF=E8=87=AA?= =?UTF-8?q?=E5=8A=A8=E6=89=A3=E9=99=A4=EF=BC=8C=E7=89=A9=E6=96=99=E6=B8=85?= =?UTF-8?q?=E5=8D=95=E6=9F=A5=E7=9C=8B=E7=AD=89=E5=8A=9F=E8=83=BD=E5=AE=8C?= =?UTF-8?q?=E5=96=84=EF=BC=8C=E9=9C=80=E8=A6=81=E4=B8=80=E5=AE=9A=E6=97=B6?= =?UTF-8?q?=E9=97=B4=E6=B5=8B=E8=AF=95=EF=BC=8C=E4=B8=8D=E7=A8=B3=E5=AE=9A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/wmsManagement/wmBlankRecord.js | 25 +++++++++++++++ src/views/qualityManagement/FQC/thirtyFQC.vue | 18 +++++++++-- src/views/wmsManagement/WmBlankInventory.vue | 4 +-- src/views/wmsManagement/WmMaterial.vue | 9 ++++++ .../TheWmBlankRecord/TheWmBlankRecord.vue | 32 +++++++++++++++---- 5 files changed, 77 insertions(+), 11 deletions(-) diff --git a/src/api/wmsManagement/wmBlankRecord.js b/src/api/wmsManagement/wmBlankRecord.js index 7b0509a..3860a82 100644 --- a/src/api/wmsManagement/wmBlankRecord.js +++ b/src/api/wmsManagement/wmBlankRecord.js @@ -79,4 +79,29 @@ export function reduceInventoryNum(query) { method: 'get', params: query, }) +} + +/** +* 毛坯库存盘点 +* @param {查询条件} data +*/ +export function doStocktakingBlankInventory(query) { + return request({ + url: '/mes/wm/WmBlankRecord/doStocktakingBlankInventory', + method: 'get', + params: query, + }) +} + + +/** +* 根据工单号出库毛坯 +* @param {查询条件} data +*/ +export function doOutboundByWorkOrderId(query) { + return request({ + url: '/mes/wm/WmBlankRecord/doOutboundByWorkOrderId', + method: 'get', + params: query, + }) } \ No newline at end of file diff --git a/src/views/qualityManagement/FQC/thirtyFQC.vue b/src/views/qualityManagement/FQC/thirtyFQC.vue index c1c08b8..fad4b81 100644 --- a/src/views/qualityManagement/FQC/thirtyFQC.vue +++ b/src/views/qualityManagement/FQC/thirtyFQC.vue @@ -503,7 +503,7 @@ 标签参考图片 - + @@ -631,6 +631,9 @@ import { GetQcQualityStatisticsFirstStartTime, } from '@/api/qualityManagement/firstFQC.js' + import { + doOutboundByWorkOrderId, + } from '@/api/wmsManagement/wmBlankRecord.js'; import { convertToIncomingInspectionData } from '@/api/wmsManagement/wmFgentryInspect.js' import ElImageViewer from 'element-ui/packages/image/src/image-viewer' export default { @@ -871,8 +874,19 @@ this.$modal .confirm('是否确认完成本工单？') .then(() => { - this.$notify.success(`已完成工单${saveWorkorderInfo.clientWorkorder}，即将跳转下一个工单`); + // 毛坯库存出库 + this.$notify.success(`工单${saveWorkorderInfo.clientWorkorder},开始同步毛坯库存！`) + const queryData = { + workOrderId: saveWorkorderInfo.clientWorkorder + } + doOutboundByWorkOrderId(queryData).then(res => { + if (res.code === 200) { + this.$notify.success(`工单${saveWorkorderInfo.clientWorkorder},毛坯库存已扣除！`) + } + }).catch((err) => { + + }) //todo 更改这个工单状态为2 this.getNext_current_workorder().then(() => { setTimeout(() => { diff --git a/src/views/wmsManagement/WmBlankInventory.vue b/src/views/wmsManagement/WmBlankInventory.vue index b4b87ca..cf10e82 100644 --- a/src/views/wmsManagement/WmBlankInventory.vue +++ b/src/views/wmsManagement/WmBlankInventory.vue @@ -55,8 +55,8 @@ - - + + diff --git a/src/views/wmsManagement/WmMaterial.vue b/src/views/wmsManagement/WmMaterial.vue index 0af828a..351a218 100644 --- a/src/views/wmsManagement/WmMaterial.vue +++ b/src/views/wmsManagement/WmMaterial.vue @@ -16,6 +16,9 @@ + + + @@ -76,6 +79,12 @@ + + + @@ -90,7 +93,7 @@ - + @@ -136,7 +139,8 @@ updateWmBlankRecord, getWmBlankRecord, addInventoryNum, - reduceInventoryNum + reduceInventoryNum, + doStocktakingBlankInventory } from '@/api/wmsManagement/wmBlankRecord.js'; import { getWmBlankInventory, @@ -231,7 +235,7 @@ this.loading = false; }) }, - updateQuantity(){ + updateQuantity() { // 库存值更新 getWmBlankInventory(this.ItemData.id).then((res) => { const { code, data } = res; @@ -296,7 +300,7 @@ this.addDialogOpen = false; } }) - } else { + } else if (this.formAdd.actionType === 2) { // 出库 reduceInventoryNum(data).then(res => { if (res.code === 200) { @@ -311,9 +315,23 @@ this.addDialogOpen = false; } }) + } else if (this.formAdd.actionType === 4) { + // 盘点 + doStocktakingBlankInventory(data).then(res => { + if (res.code === 200) { + if (res.data < 1) { + this.$message.error("添加记录失败！"); + return; + } + this.$message.success("添加记录成功！"); + this.getList(); + this.emitRefresh(); + this.initData(); + this.addDialogOpen = false; + } + }) } - } } }