From e300bc6b5e2ac90ecd47c4e3ed751234902b7516 Mon Sep 17 00:00:00 2001 From: "qianhao.xu" Date: Mon, 22 Apr 2024 10:00:33 +0800 Subject: [PATCH] =?UTF-8?q?=E4=B8=89=E6=A3=80=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/wmsManagement/wmFgentryInspect.js | 68 +++++++++---------- src/views/qualityManagement/FQC/thirtyFQC.vue | 15 ++-- src/views/wmsManagement/WmFgentryInspect.vue | 41 ++++++++--- 3 files changed, 75 insertions(+), 49 deletions(-) diff --git a/src/api/wmsManagement/wmFgentryInspect.js b/src/api/wmsManagement/wmFgentryInspect.js index 1aa9681..45dc99b 100644 --- a/src/api/wmsManagement/wmFgentryInspect.js +++ b/src/api/wmsManagement/wmFgentryInspect.js @@ -1,9 +1,9 @@ import request from '@/utils/request' /** -* 成品入库检验分页查询 -* @param {查询条件} data -*/ + * 成品入库检验分页查询 + * @param {查询条件} data + */ export function listWmFgentryInspect(query) { return request({ url: '/mes/wm/WmFgentryInspect/list', @@ -12,13 +12,15 @@ export function listWmFgentryInspect(query) { }) } - - /** -* 成品入库检验分页查询 一级 -* @param {查询条件} data -*/ + * 成品入库检验分页查询 一级 + * @param {查询条件} data + */ export function listWmFgentryInspect_firstLevel(query) { + const moment = require('moment') + if (query.starttime != undefined || query.starttime != '') query.starttime = moment(query.starttime).format('YYYY-MM-DD HH:mm:ss') + if (query.endtime != undefined || query.endtime != '') query.endtime = moment(query.endtime).format('YYYY-MM-DD HH:mm:ss') + return request({ url: '/mes/wm/WmFgentryInspect/first_level_list', method: 'get', @@ -26,11 +28,10 @@ export function listWmFgentryInspect_firstLevel(query) { }) } - /** -* 成品入库检验分页查询 二级级 -* @param {查询条件} data -*/ + * 成品入库检验分页查询 二级级 + * @param {查询条件} data + */ export function listWmFgentryInspect_secondLevel(query) { return request({ url: '/mes/wm/WmFgentryInspect/second_level_list', @@ -40,9 +41,9 @@ export function listWmFgentryInspect_secondLevel(query) { } /** -* 新增成品入库检验 -* @param data -*/ + * 新增成品入库检验 + * @param data + */ export function addWmFgentryInspect(data) { return request({ url: '/mes/wm/WmFgentryInspect', @@ -51,9 +52,9 @@ export function addWmFgentryInspect(data) { }) } /** -* 修改成品入库检验 -* @param data -*/ + * 修改成品入库检验 + * @param data + */ export function updateWmFgentryInspect(data) { return request({ url: '/mes/wm/WmFgentryInspect', @@ -62,28 +63,27 @@ export function updateWmFgentryInspect(data) { }) } /** -* 获取成品入库检验详情 -* @param {Id} -*/ + * 获取成品入库检验详情 + * @param {Id} + */ export function getWmFgentryInspect(id) { return request({ url: '/mes/wm/WmFgentryInspect/' + id, - method: 'get' + method: 'get', }) } /** -* 删除成品入库检验 -* @param {主键} pid -*/ + * 删除成品入库检验 + * @param {主键} pid + */ export function delWmFgentryInspect(pid) { return request({ url: '/mes/wm/WmFgentryInspect/' + pid, - method: 'delete' + method: 'delete', }) } - /* 批量修改合格 @@ -98,8 +98,8 @@ export function setTheBoxToBeQualified(data) { /** * 设置全部合格 - * @param {*} query - * @returns + * @param {*} query + * @returns */ export function setAllQualified(query) { return request({ @@ -110,8 +110,8 @@ export function setAllQualified(query) { } /** * 设置全部合格 - * @param {*} query - * @returns + * @param {*} query + * @returns */ export function setAllUnQualified(query) { return request({ @@ -134,8 +134,8 @@ export function setTheBoxToBeUnQualified(data) { /** * 把包装数据转换为检验数据 - * @param {*} query - * @returns + * @param {*} query + * @returns */ export function convertToIncomingInspectionData(query) { return request({ @@ -143,4 +143,4 @@ export function convertToIncomingInspectionData(query) { 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 f6090d0..e615e84 100644 --- a/src/views/qualityManagement/FQC/thirtyFQC.vue +++ b/src/views/qualityManagement/FQC/thirtyFQC.vue @@ -753,7 +753,14 @@ if (res.code == 200) { this.$notify.success('质量统计表生成成功') } + // 入库检验数据转换 + const quest={ workorder: saveWorkorderInfo.clientWorkorder } + return convertToIncomingInspectionData(quest) + }).then((res)=>{ + if(res.code==200){ + this.$notify.success("生成入库检验数量为"+res.data); + } }) }, //todo 获取下一个工单号 @@ -793,13 +800,7 @@ this.team = result.data.team this.$loading().close() } - // 入库检验数据转换 - const quest={ workorder: this.CurrentWorkorder.clientWorkorder } - return convertToIncomingInspectionData(quest) - }).then((res)=>{ - if(res.code==200){ - this.$notify.success("生成入库检验数量为"+res.data); - } + }) }, //todo 获取上一个工单号 diff --git a/src/views/wmsManagement/WmFgentryInspect.vue b/src/views/wmsManagement/WmFgentryInspect.vue index da2bd7a..45fa374 100644 --- a/src/views/wmsManagement/WmFgentryInspect.vue +++ b/src/views/wmsManagement/WmFgentryInspect.vue @@ -18,6 +18,7 @@ placeholder="选择日期时间" align="right" :picker-options="pickerOptions" + value-format="yyyy-MM-dd hh:mm:ss" > @@ -29,23 +30,28 @@ placeholder="选择日期时间" align="right" :picker-options="pickerOptions" + value-format="yyyy-MM-dd hh:mm:ss" > 搜索 重置 + 强制生成 + - - + + + + + + -