diff --git a/src/api/yieldReport/com_material_settlement.js b/src/api/yieldReport/com_material_settlement.js new file mode 100644 index 0000000..646ed9f --- /dev/null +++ b/src/api/yieldReport/com_material_settlement.js @@ -0,0 +1,42 @@ +import { createAPI } from '@/utils/httpRequest.js' + +// 获取当前的卷的报工汇总数据 +export const getCurrentRollReportedQty = data => createAPI('schedule/getCurrentRollReportedQty', 'POST', data) + +// 获取上机卷的时间信息汇总 +export const countSfdcTimeQty = data => createAPI('schedule/countSfdcTimeQty', 'POST', data) + +// 获取派工单的班次信息 +export const getScheduleShiftData = data => createAPI('schedule/getScheduleShiftData', 'POST', data) + +// 获取sfdc表的时间信息汇总 +export const getSfdcTimeData = data => createAPI('schedule/getSfdcTimeData', 'POST', data) + +// 获取当前时间记录信息 +export const getSfdcTimeMaxAndMinTime = data => createAPI('schedule/getSfdcTimeMaxAndMinTime', 'POST', data) + +// 获取当前卷sfdc表的报工数据 +export const getSfdcReportedData = data => createAPI('schedule/getSfdcReportedData', 'POST', data) + +// 获取当前卷的材料记录--在线的 +export const getSfdcMaterialByRollNo = data => createAPI('schedule/getSfdcMaterialByRollNo', 'POST', data) + +// 获取当前派工单的材料记录 +export const getSfdcMaterialByCon = data => createAPI('schedule/getSfdcMaterialByCon', 'POST', data) + +// 获取当前派工单的上机卷记录 +export const getSfdcRollOpsByCon = data => createAPI('schedule/getSfdcRollOpsByCon', 'POST', data) + +// 获取当前派工单的不良卷记录 +export const getSfdcDefectByCon = data => createAPI('schedule/getSfdcDefectByCon', 'POST', data) + +// 获取当前上机卷信息 +export const getSfdcRollByCon = data => createAPI('schedule/getSfdcRollByCon', 'POST', data) + + + + + + + + diff --git a/src/api/yieldReport/produce_report_normal.js b/src/api/yieldReport/produce_report_normal.js index 547e087..4c16996 100644 --- a/src/api/yieldReport/produce_report_normal.js +++ b/src/api/yieldReport/produce_report_normal.js @@ -35,8 +35,10 @@ export const refreshWorkPlatformButtons = data => createAPI('schedule/refreshWor // 获取当前页面的按钮 -export const checkProduceButton = data => createAPI('schedule/checkProduceButton', 'POST', data) +export const checkScheduleButton = data => createAPI('schedule/checkScheduleButton', 'POST', data) +//创建新卷号 +export const createNewRoll = data => createAPI('schedule/createNewRoll', 'POST', data) diff --git a/src/views/modules/yieldReport/com_material_settlement.vue b/src/views/modules/yieldReport/com_material_settlement.vue new file mode 100644 index 0000000..fb3d963 --- /dev/null +++ b/src/views/modules/yieldReport/com_material_settlement.vue @@ -0,0 +1,365 @@ + + + + + diff --git a/src/views/modules/yieldReport/com_produce_report_normal.vue b/src/views/modules/yieldReport/com_produce_report_normal.vue index b24b9ac..c6f1737 100644 --- a/src/views/modules/yieldReport/com_produce_report_normal.vue +++ b/src/views/modules/yieldReport/com_produce_report_normal.vue @@ -59,7 +59,8 @@ {{this.currentRollOps.rollNo}} - + 创建新卷 @@ -432,7 +433,8 @@ import { getSfdcDefectByCon, getSfdcRollByCon, refreshWorkPlatformButtons, - checkProduceButton, + checkScheduleButton, + createNewRoll, } from "@/api/yieldReport/produce_report_normal.js"; /*引入组件*/ import comSwitchOperator from "./com_switch_operator";/*切换操作员*/ @@ -2618,6 +2620,7 @@ export default { orderNo: '', itemNo: 0, partNo: '', + workCenterNo: '', workCenterDesc: '', resourceDesc: '', rollNo: '', @@ -2630,6 +2633,8 @@ export default { preItemDesc: '', nextItemDesc: '', nextItemNo: 0, + operatorId: '', + functionName: '', currentRollFlag: false }, currentRollOps: { @@ -2647,7 +2652,7 @@ export default { showFlag: false }, buttonTags:{ - createNewRollFlag: true, + createNewRollFlag: false, switchRollFlag: false, separateRollFlag: false, finishRollFlag: false, @@ -2691,6 +2696,7 @@ export default { this.scheduleData.shiftNo = data.row.shiftNo; this.scheduleData.preItemDesc = data.row.preItemDesc; this.scheduleData.nextItemDesc = data.row.nextItemDesc; + this.scheduleData.workCenterNo = data.row.workCenterNo; this.scheduleData.workCenterDesc = data.row.workCenterDesc; this.scheduleData.resourceDesc = data.row.resourceDesc; }); @@ -2816,6 +2822,7 @@ export default { this.scheduleData.shiftNo= data.row.shiftNo; this.scheduleData.preItemDesc= data.row.preItemDesc; this.scheduleData.nextItemDesc= data.row.nextItemDesc; + this.scheduleData.workCenterNo = data.row.workCenterNo; this.scheduleData.workCenterDesc = data.row.workCenterDesc; this.scheduleData.resourceDesc = data.row.resourceDesc; //设置弹窗的标题 @@ -2839,58 +2846,75 @@ export default { //刷新当前页面的菜单 refreshPageButtons(){ - /*refreshWorkPlatformButtons(this.scheduleData).then(({data}) => { - if(data.resultMap.createNewRollFlag == 'Y'){ - this.buttonTags.createNewRollFlag = false; - }else{ - this.buttonTags.createNewRollFlag = true; - } - if(data.resultMap.switchRollFlag == 'Y'){ - this.buttonTags.switchRollFlag = false; - }else{ - this.buttonTags.switchRollFlag = true; - } - if(data.resultMap.separateRollFlag == 'Y'){ - this.buttonTags.separateRollFlag = false; - }else{ - this.buttonTags.separateRollFlag = true; - } - if(data.resultMap.finishRollFlag == 'Y'){ - this.buttonTags.finishRollFlag = false; - }else{ - this.buttonTags.finishRollFlag = true; - } - if(data.resultMap.tuningFlag == 'Y'){ - this.buttonTags.tuningFlag = false; - }else{ - this.buttonTags.tuningFlag = true; - } - if(data.resultMap.produceFlag == 'Y'){ - this.buttonTags.produceFlag = false; - }else{ - this.buttonTags.produceFlag = true; - } - if(data.resultMap.defectFlag == 'Y'){ - this.buttonTags.defectFlag = false; - }else{ - this.buttonTags.defectFlag = true; - } - if(data.resultMap.toolFlag == 'Y'){ - this.buttonTags.toolFlag = false; - }else{ - this.buttonTags.toolFlag = true; - } - if(data.resultMap.materialFlag == 'Y'){ - this.buttonTags.materialFlag = false; - }else{ - this.buttonTags.materialFlag = true; - } - if(data.resultMap.downTimeFlag == 'Y'){ - this.buttonTags.downTimeFlag = false; - }else{ - this.buttonTags.downTimeFlag = true; - } - });*/ + //判断是否存在人员 + if(this.operatorData.operatorId == null || this.operatorData.operatorId == ''){ + this.buttonTags.createNewRollFlag = true; + this.buttonTags.switchRollFlag = true; + this.buttonTags.separateRollFlag = true; + this.buttonTags.finishRollFlag = true; + this.buttonTags.tuningFlag = true; + this.buttonTags.produceFlag = true; + this.buttonTags.defectFlag = true; + this.buttonTags.toolFlag = true; + this.buttonTags.materialFlag = true; + this.buttonTags.downTimeFlag = true; + }else{ + //存在人员既可以合并卷 + this.buttonTags.mergeRollFlag = false; + //刷新其他的菜单 + refreshWorkPlatformButtons(this.scheduleData).then(({data}) => { + if(data.resultMap.createNewRollFlag == 'Y'){ + this.buttonTags.createNewRollFlag = false; + }else{ + this.buttonTags.createNewRollFlag = true; + } + if(data.resultMap.switchRollFlag == 'Y'){ + this.buttonTags.switchRollFlag = false; + }else{ + this.buttonTags.switchRollFlag = true; + } + if(data.resultMap.separateRollFlag == 'Y'){ + this.buttonTags.separateRollFlag = false; + }else{ + this.buttonTags.separateRollFlag = true; + } + if(data.resultMap.finishRollFlag == 'Y'){ + this.buttonTags.finishRollFlag = false; + }else{ + this.buttonTags.finishRollFlag = true; + } + if(data.resultMap.tuningFlag == 'Y'){ + this.buttonTags.tuningFlag = false; + }else{ + this.buttonTags.tuningFlag = true; + } + if(data.resultMap.produceFlag == 'Y'){ + this.buttonTags.produceFlag = false; + }else{ + this.buttonTags.produceFlag = true; + } + if(data.resultMap.defectFlag == 'Y'){ + this.buttonTags.defectFlag = false; + }else{ + this.buttonTags.defectFlag = true; + } + if(data.resultMap.toolFlag == 'Y'){ + this.buttonTags.toolFlag = false; + }else{ + this.buttonTags.toolFlag = true; + } + if(data.resultMap.materialFlag == 'Y'){ + this.buttonTags.materialFlag = false; + }else{ + this.buttonTags.materialFlag = true; + } + if(data.resultMap.downTimeFlag == 'Y'){ + this.buttonTags.downTimeFlag = false; + }else{ + this.buttonTags.downTimeFlag = true; + } + }); + } }, //设置参数 @@ -2925,8 +2949,21 @@ export default { }, //创建新卷的功能 - createNewRollFunction(){ - checkProduceButton('createNewRollFlag'); + createNewRollFun(){ + //校验当前的功能是否可用 + this.scheduleData.functionName = 'createNewRollFlag'; + this.scheduleData.operatorId = this.operatorData.operatorId; + checkScheduleButton(this.scheduleData).then(({data}) => { + //判断校验是否通过 + let resultMap = data.resultMap; + //判断是否通过验证 + if(resultMap.code == 200){ + //调用创建卷的方法 + this.createNewRollDo(); + }else{ + this.$message.error(resultMap.msg) + } + }); }, /*切换卷操作*/ @@ -2993,7 +3030,7 @@ export default { //打开开始生产的页面 this.$nextTick(() => { this.showProduceFlag = true; - this.$refs.comStartProduce.init(this.scheduleData.seqNo, this.operatorData) + this.$refs.comStartProduce.init(this.scheduleData, this.operatorData) // this.$refs.com_finish_roll.init(this.scheduleData.seqNo, this.currentRollOps.rollNo); }); }, @@ -3043,6 +3080,20 @@ export default { }); }, + //创建新卷的方法 + createNewRollDo(){ + createNewRoll(this.scheduleData).then(({data}) => { + //判断是否成功 + if(data.success){ + this.$message.success(data.msg); + //刷新当的按钮 + this.refreshPageData(); + }else{ + this.$message.error(data.msg); + } + }); + } + }, created() { diff --git a/src/views/modules/yieldReport/com_start_produce.vue b/src/views/modules/yieldReport/com_start_produce.vue index f54c546..53414d1 100644 --- a/src/views/modules/yieldReport/com_start_produce.vue +++ b/src/views/modules/yieldReport/com_start_produce.vue @@ -9,7 +9,7 @@ @@ -20,7 +20,7 @@ @@ -31,31 +31,40 @@ - 确 定 + 保存 关闭 + + + +