diff --git a/src/api/wmsManagement/wmFgentryInspect.js b/src/api/wmsManagement/wmFgentryInspect.js index 0a46694..6d6c3c0 100644 --- a/src/api/wmsManagement/wmFgentryInspect.js +++ b/src/api/wmsManagement/wmFgentryInspect.js @@ -118,4 +118,17 @@ export function setTheBoxToBeUnQualified(data) { method: 'post', data: data, }) +} + +/** + * 把包装数据转换为检验数据 + * @param {*} query + * @returns + */ +export function convertToIncomingInspectionData(query) { + return request({ + url: '/mes/wm/WmFgentryInspect/transform', + 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 8478081..f6090d0 100644 --- a/src/views/qualityManagement/FQC/thirtyFQC.vue +++ b/src/views/qualityManagement/FQC/thirtyFQC.vue @@ -512,8 +512,10 @@ accumulator_query, calculate_packagingInvestment, update_workorder_status, - generateQualityStatisticsTable - } from '@/api/qualityManagement/thirtyFQC.js' + generateQualityStatisticsTable, + + } from '@/api/qualityManagement/thirtyFQC.js'; + import {convertToIncomingInspectionData} from '@/api/wmsManagement/wmFgentryInspect.js' export default { name: 'thirtyFQC', data() { @@ -751,6 +753,7 @@ if (res.code == 200) { this.$notify.success('质量统计表生成成功') } + }) }, //todo 获取下一个工单号 @@ -790,6 +793,13 @@ 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/qualityManagement/FQC/thirtyFQC2.vue b/src/views/qualityManagement/FQC/thirtyFQC2.vue deleted file mode 100644 index 4578e95..0000000 --- a/src/views/qualityManagement/FQC/thirtyFQC2.vue +++ /dev/null @@ -1,468 +0,0 @@ - - - - - -