diff --git a/src/api/production/generateReport.js b/src/api/production/generateReport.js index 44f6448..2767561 100644 --- a/src/api/production/generateReport.js +++ b/src/api/production/generateReport.js @@ -9,6 +9,7 @@ export const saveGenerateReport = data => createAPI(`dailyPlan/saveGenerateRepor // 获取生产报告信息 export const getSOScheduleRoutingData = data => createAPI(`dailyPlan/getSOScheduleRoutingData`, 'post', data); +export const getSOScheduleRoutingDataPrint = data => createAPI(`dailyPlan/getSOScheduleRoutingDataPrint`, 'post', data); // 获取生产报告信息 diff --git a/src/views/modules/production/bagLabels.vue b/src/views/modules/production/bagLabels.vue index 9b5ee5f..f159072 100644 --- a/src/views/modules/production/bagLabels.vue +++ b/src/views/modules/production/bagLabels.vue @@ -2,7 +2,7 @@ import { checkIsPacking, getPackagePrintDataList, - getSOScheduleRoutingData + getSOScheduleRoutingDataPrint } from "../../../api/production/generateReport"; import {printPackageLabel} from "../print/print_package_label"; export default { @@ -43,10 +43,9 @@ export default { } let params = { seqNo:this.searchData.seqNo, - reportFlag:'a.QtyRequired>a.QtyApprove', userId:this.$store.state.user.name }; - getSOScheduleRoutingData(params).then(({data})=>{ + getSOScheduleRoutingDataPrint(params).then(({data})=>{ if (data && data.code === 0){ if (data.total === 0){ this.$message.warning("派工单不存在") @@ -70,6 +69,7 @@ export default { workCenterNo:this.soScheduleRouting.sWorkCenterNo, } checkIsPacking(params).then(({data})=>{ + this.soScheduleRouting={}; if (data && data.code === 0){ }else { @@ -78,7 +78,6 @@ export default { seqNo: undefined, flag: '', } - this.soScheduleRouting={}; } }).catch((error)=>{ this.$message.error(error) @@ -144,7 +143,7 @@ export default { - + diff --git a/src/views/modules/production/scanForm.vue b/src/views/modules/production/scanForm.vue index 4609eb1..4ef4b85 100644 --- a/src/views/modules/production/scanForm.vue +++ b/src/views/modules/production/scanForm.vue @@ -159,7 +159,7 @@ export default { - +