From b1584d94242d65c9436e4c8ce4da0b9921eefff7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=B5=B5=E6=AD=A3=E6=98=93?= Date: Thu, 22 Aug 2024 10:44:39 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BB=93=E5=BA=93=E7=9C=8B=E6=9D=BF=E6=A0=B7?= =?UTF-8?q?=E5=BC=8F=E4=BC=98=E5=8C=96=EF=BC=8C=E6=AF=9B=E5=9D=AF=EF=BC=8C?= =?UTF-8?q?=E6=8A=9B=E5=85=89=EF=BC=8C=E4=B8=80=E6=AC=A1=E5=90=88=E6=A0=BC?= =?UTF-8?q?=E4=BB=93=E5=BA=93=E6=B7=BB=E5=8A=A0=E9=9B=B6=E4=BB=B6=E6=95=B0?= =?UTF-8?q?=E7=BB=9F=E8=AE=A1=EF=BC=8C=E5=B7=A5=E5=8D=95=E6=8E=92=E7=A8=8B?= =?UTF-8?q?=E4=B8=AD=E7=BC=96=E7=A0=81=E5=8F=B7=E5=8F=98=E4=B8=BA=E5=AD=97?= =?UTF-8?q?=E7=AC=A6=E4=B8=B2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/wmsManagement/wmBlankInventory.js | 102 +-- src/api/wmsManagement/wmOneTimeInventory.js | 10 + src/api/wmsManagement/wmPolishInventory.js | 10 + .../FqcWarehouseBoard/index.vue | 501 ++++++++------ src/views/productManagement/workorder2.vue | 4 +- src/views/wmsManagement/WmBlankInventory.vue | 652 ++++++++++-------- .../WmOneTimeQualifiedProduct/index.vue | 16 +- .../wmsManagement/WmPolishInventory/index.vue | 70 +- 8 files changed, 788 insertions(+), 577 deletions(-) diff --git a/src/api/wmsManagement/wmBlankInventory.js b/src/api/wmsManagement/wmBlankInventory.js index afa0311..9732adb 100644 --- a/src/api/wmsManagement/wmBlankInventory.js +++ b/src/api/wmsManagement/wmBlankInventory.js @@ -1,70 +1,80 @@ import request from '@/utils/request' /** -* 毛坯库存表分页查询 -* @param {查询条件} data -*/ + * 毛坯库存表分页查询 + * @param {查询条件} data + */ export function listWmBlankInventory(query) { - return request({ - url: '/mes/wm/WmBlankInventory/list', - method: 'get', - params: query, - }) + return request({ + url: '/mes/wm/WmBlankInventory/list', + method: 'get', + params: query, + }) } /** -* 新增毛坯库存表 -* @param data -*/ + * 新增毛坯库存表 + * @param data + */ export function addWmBlankInventory(data) { - return request({ - url: '/mes/wm/WmBlankInventory', - method: 'post', - data: data, - }) + return request({ + url: '/mes/wm/WmBlankInventory', + method: 'post', + data: data, + }) } /** -* 修改毛坯库存表 -* @param data -*/ + * 修改毛坯库存表 + * @param data + */ export function updateWmBlankInventory(data) { - return request({ - url: '/mes/wm/WmBlankInventory', - method: 'PUT', - data: data, - }) + return request({ + url: '/mes/wm/WmBlankInventory', + method: 'PUT', + data: data, + }) } /** -* 获取毛坯库存表详情 -* @param {Id} -*/ + * 获取毛坯库存表详情 + * @param {Id} + */ export function getWmBlankInventory(id) { - return request({ - url: '/mes/wm/WmBlankInventory/' + id, - method: 'get' - }) + return request({ + url: '/mes/wm/WmBlankInventory/' + id, + method: 'get' + }) } /** -* 删除毛坯库存表 -* @param {主键} pid -*/ + * 删除毛坯库存表 + * @param {主键} pid + */ export function delWmBlankInventory(pid) { - return request({ - url: '/mes/wm/WmBlankInventory/' + pid, - method: 'delete' - }) + return request({ + url: '/mes/wm/WmBlankInventory/' + pid, + method: 'delete' + }) } /** -* 毛坯库存表同步清单数据 -* @param data -*/ + * 毛坯库存表同步清单数据 + * @param data + */ export function synchronousMaterial(data) { - return request({ - url: '/mes/wm/WmBlankInventory/synchronousMaterial', - method: 'post', - data: data, - }) + return request({ + url: '/mes/wm/WmBlankInventory/synchronousMaterial', + method: 'post', + data: data, + }) +} + +/** + * 查询零件数 + */ +export function getPartNumber() { + return request({ + url: '/mes/wm/WmBlankInventory/getPartNumber', + method: 'get' + }) } \ No newline at end of file diff --git a/src/api/wmsManagement/wmOneTimeInventory.js b/src/api/wmsManagement/wmOneTimeInventory.js index 405c495..7894320 100644 --- a/src/api/wmsManagement/wmOneTimeInventory.js +++ b/src/api/wmsManagement/wmOneTimeInventory.js @@ -102,4 +102,14 @@ export function getWmOneTimeRecordList(query) { method: 'get', params: query, }) +} + +/** + * 查询零件数 + */ +export function getPartNumber() { + return request({ + url: '/mes/wm/WmOneTimeInventory/getPartNumber', + method: 'get' + }) } \ No newline at end of file diff --git a/src/api/wmsManagement/wmPolishInventory.js b/src/api/wmsManagement/wmPolishInventory.js index 322d5df..5b589e6 100644 --- a/src/api/wmsManagement/wmPolishInventory.js +++ b/src/api/wmsManagement/wmPolishInventory.js @@ -112,4 +112,14 @@ export function getWmPolishRecordList(query) { method: 'get', params: query, }) +} + +/** + * 查询零件数 + */ +export function getPartNumber() { + return request({ + url: '/mes/wm/WmPolishInventory/getPartNumber', + method: 'get' + }) } \ No newline at end of file diff --git a/src/views/kanbanManagement/FqcWarehouseBoard/index.vue b/src/views/kanbanManagement/FqcWarehouseBoard/index.vue index d7ac352..26fd937 100644 --- a/src/views/kanbanManagement/FqcWarehouseBoard/index.vue +++ b/src/views/kanbanManagement/FqcWarehouseBoard/index.vue @@ -1,207 +1,284 @@ @@ -223,7 +300,7 @@ export default { sandingTotal: 0, discardTotal: 0, productRequireTotal: 0, - productQualifiedNotDoorknobTotal:0, + productQualifiedNotDoorknobTotal: 0, productQualifiedTotal: 0, productPolishTotal: 0, productSandingTotal: 0, @@ -234,7 +311,7 @@ export default { polishSandingTotal: 0, polishDiscardTotal: 0, afterPolishRequireTotal: 0, - afterPolishQualifiedNotDoorknobTotal:0, + afterPolishQualifiedNotDoorknobTotal: 0, afterPolishQualifiedTotal: 0, afterPolishPolishTotal: 0, afterPolishSandingTotal: 0, @@ -299,9 +376,9 @@ export default { } .main-box { width: 100%; - height: 100vh - 60px; + height: 100vh; display: flex; - flex-direction: row; + flex-direction: column; background-color: #e6e8eb; } .box-left { @@ -337,31 +414,24 @@ export default { justify-content: center; } .card-type-2 { - height: 100%; - margin: 2px; + height: 100vh; display: flex; flex-direction: column; } .card-type-3 { height: 120px; - margin: 2px; + margin-top: 5px; display: flex; flex-direction: column; } -.card-type-4 { - width: 100%; - margin: 2px; - /* height: 70px; */ - display: flex; -} .span-text-1 { font-size: 16px; - color: #909399; + color: #606266; } .span-text-2 { margin-left: 90px; font-size: 12px; - color: #909399; + color: #606266; } .span-num-1 { font-size: 24px; @@ -395,14 +465,33 @@ export default { } .header-label-1 { margin-left: 40px; + font-size: 18px; + font-weight: 500; + color: red; display: flex; flex-direction: row; align-items: center; justify-content: space-between; } -.header-2{ +.header-2 { width: 100px; } +.search-card { + width: 100%; + margin-bottom: 5px; + display: flex; +} +.color-warning { + color: #E6A23C !important; +} +.color-danger { + color: #f56c6c !important; +} +.tip-text{ + color: #909399; + font-size: 14px; + margin-left: 10px; +} .border { border: 1px solid #000000; } diff --git a/src/views/productManagement/workorder2.vue b/src/views/productManagement/workorder2.vue index 46582da..f7c0d0c 100644 --- a/src/views/productManagement/workorder2.vue +++ b/src/views/productManagement/workorder2.vue @@ -479,7 +479,7 @@ //todo 新增或者修改 提交按钮 submitForm() { const query = { ...this.workorderItem }; - (query.codeNumber = Number(query.codeNumber)), + // (query.codeNumber = Number(query.codeNumber)), (query.qualificationRate = Number(query.qualificationRate)), (query.vehicleNumber = Number(query.vehicleNumber)), (query.hangNumber = Number(query.hangNumber)), @@ -488,7 +488,7 @@ (query.week = Number(query.week)), (query.date = Number(query.date)), (query.sort = Number(query.sort)) - + console.log('query',query); if (this.flag == 'insert') { this.$refs['workorder'].validate((valid) => { if (valid) { diff --git a/src/views/wmsManagement/WmBlankInventory.vue b/src/views/wmsManagement/WmBlankInventory.vue index 5828185..08963c0 100644 --- a/src/views/wmsManagement/WmBlankInventory.vue +++ b/src/views/wmsManagement/WmBlankInventory.vue @@ -9,19 +9,35 @@ \ No newline at end of file + // 毛坯数据详情-库存记录 + handleDetail(row) { + console.log(row) + this.detailData = row + this.TheWmBlankRecordShow = true + }, + // 毛坯数据同步 + handleBlankInventoryRenew() { + this.TheWmBlankInventoryRenewShow = true + }, + // 类别字典翻译 + typeFormat(row, column) { + return this.selectDictLabel(this.typeOptions, row.type) + }, + // 状态字典翻译 + statusFormat(row, column) { + return this.selectDictLabel(this.statusOptions, row.status) + }, + /** 提交按钮 */ + submitForm: function () { + this.$refs['form'].validate((valid) => { + if (valid) { + console.log(JSON.stringify(this.form)) + + if (this.form.id != undefined && this.opertype === 2) { + updateWmBlankInventory(this.form) + .then((res) => { + this.msgSuccess('修改成功') + this.open = false + this.getList() + }) + .catch((err) => { + //TODO 错误逻辑 + }) + } else { + addWmBlankInventory(this.form) + .then((res) => { + this.msgSuccess('新增成功') + this.open = false + this.getList() + }) + .catch((err) => { + //TODO 错误逻辑 + }) + } + } + }) + }, + }, +} + diff --git a/src/views/wmsManagement/WmOneTimeQualifiedProduct/index.vue b/src/views/wmsManagement/WmOneTimeQualifiedProduct/index.vue index 885c7fc..089aa83 100644 --- a/src/views/wmsManagement/WmOneTimeQualifiedProduct/index.vue +++ b/src/views/wmsManagement/WmOneTimeQualifiedProduct/index.vue @@ -51,7 +51,10 @@ - + +
+ 一次合格品仓库零件数:{{ partTotal }} +
{ + if (res.code === 200) { + this.partTotal = res.data + } + }) }, // 取消按钮 cancel() { @@ -508,7 +520,7 @@ export default { }, // 弹窗打开 dialogOpened() { - if(this.opertype != 3){ + if (this.opertype != 3) { this.$refs.ThePartNumberSelectRef.init() } }, diff --git a/src/views/wmsManagement/WmPolishInventory/index.vue b/src/views/wmsManagement/WmPolishInventory/index.vue index 16cb77b..fe550dc 100644 --- a/src/views/wmsManagement/WmPolishInventory/index.vue +++ b/src/views/wmsManagement/WmPolishInventory/index.vue @@ -42,28 +42,18 @@ - + - 抛光零件入库 + 抛光零件入库 - 抛光零件出库 + 抛光零件出库 - +
+ 抛光仓库零件数:{{ partTotal }} +
@@ -243,10 +219,21 @@ > - + - + @@ -305,6 +292,7 @@ import { doWmPolishRetrieval, doWmPolishStocktaking, getWmPolishRecordList, + getPartNumber, } from '@/api/wmsManagement/wmPolishInventory.js' import ThePartNumberSelect from './ThePartNumberSelect.vue' export default { @@ -388,6 +376,9 @@ export default { }, ThePartNumberSelectRef: null, + //抛光仓库零件数 + partTotal: 0, + // 详情 RecordLoading: false, RecordTitle: '', @@ -428,6 +419,11 @@ export default { this.loading = false } }) + getPartNumber().then((res) => { + if (res.code === 200) { + this.partTotal = res.data + } + }) }, // 取消按钮 cancel() { @@ -517,7 +513,7 @@ export default { }, // 弹窗打开 dialogOpened() { - if(this.opertype != 3){ + if (this.opertype != 3) { this.$refs.ThePartNumberSelectRef.init() } }, @@ -635,4 +631,4 @@ export default { }, }, } - \ No newline at end of file +