wilson
/
rongxing-vue
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

结束派工单页面查询

master
Rui_Li 4 years ago
parent
7511db5bec
commit
0ce5bb8a76
2 changed files with 125 additions and 53 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 44
      src/api/yieldReport/com_finish_schedule.js
  2. 132
      src/views/modules/yieldReport/com_finish_schedule.vue

44
src/api/yieldReport/com_finish_schedule.js
View File

@ -0,0 +1,44 @@
import { createAPI } from '@/utils/httpRequest.js'
// 获取当前的卷的报工汇总数据
export const getFinishSchedulePageData = data => createAPI('schedule/getFinishSchedulePageData', 'POST', data)
// 获取派工单的时间记录
export const getSfdcTimeHistBySeqNo = data => createAPI('schedule/getSfdcTimeHistBySeqNo', 'POST', data)
// 获取派工单的工具记录
export const getSfdcToolHistBySeqNo = data => createAPI('schedule/getSfdcToolHistBySeqNo', 'POST', data)
// 获取派工单的材料记录
export const getSfdcMaterialHistBySeqNo = data => createAPI('schedule/getSfdcMaterialHistBySeqNo', '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)
// 结束卷的验证
export const checkFinishRollWithNoFqc = data => createAPI('schedule/checkFinishRollWithNoFqc', 'POST', data)
// 结束卷的操作
export const finishRollWithNoFqc = data => createAPI('schedule/finishRollWithNoFqc', 'POST', data)

132
src/views/modules/yieldReport/com_finish_schedule.vue
View File

@ -95,7 +95,7 @@
<el-row style="margin-top: 18px; height: 55px;">
<el-col style="text-align: center">
<el-form-item>
<el-button type="primary" @click="createNewRollFun"
<el-button type="primary" @click="finishScheduleBun"
style="margin-left: 10px; margin-bottom: 5px;">
接单关闭
</el-button>
@ -105,7 +105,7 @@
<el-row style="height: 55px;">
<el-col style="text-align: center">
<el-form-item>
<el-button type="primary" @click="switchRollModal" style="margin-left: 10px; margin-bottom: 5px;">
<el-button type="primary" @click="closeDialog" style="margin-left: 10px; margin-bottom: 5px;">
关闭
</el-button>
</el-form-item>
@ -114,7 +114,7 @@
<el-row style="height: 55px;">
<el-col style="text-align: center">
<el-form-item>
<el-button type="primary" @click="separateRollModal" style="margin-left: 10px; margin-bottom: 5px;">
<el-button type="primary" @click="refreshPageData" style="margin-left: 10px; margin-bottom: 5px;">
刷新数据
</el-button>
</el-form-item>
@ -179,7 +179,7 @@
<el-col :span="6">
<el-form-item :label="''" style="margin-left: 65px;">
<el-checkbox style="margin-top: 28px;" true-label="Y" false-label="N"
v-model="pageData.showNoFinishedTollFlag">仅显示未结束使用刀模记录
v-model="pageData.showNoFinishedToolFlag">仅显示未结束使用刀模记录
</el-checkbox>
</el-form-item>
</el-col>
@ -270,16 +270,11 @@
/*添加组件*/
import comExceptionReason from "./com_exception_reason";//异常远远
import {
getCurrentRollReportedQty,
countSfdcTimeQty,
getScheduleShiftData,
getSfdcTimeMaxAndMinTime,
getSfdcTimeData,
getSfdcReportedData,
getSfdcMaterialByRollNo,
checkFinishRollWithNoFqc,
finishRollWithNoFqc
} from '@/api/yieldReport/com_finish_roll.js';
getFinishSchedulePageData,
getSfdcTimeHistBySeqNo,
getSfdcToolHistBySeqNo,
getSfdcMaterialHistBySeqNo,
} from '@/api/yieldReport/com_finish_schedule.js';
export default {
name: "com_finish_roll",
data() {
@ -310,7 +305,7 @@ export default {
timeFinishedFlag: 'Y',//时间结束的标记
showNoFinishedTimeFlag: 'Y',//显示未结束的时间记录标记
toolFinishedFlag: 'Y',//时间结束的标记
showNoFinishedTollFlag: 'Y',//显示未结束的时间记录标记
showNoFinishedToolFlag: 'Y',//显示未结束的时间记录标记
materialFinishedFlag: 'Y',//时间结束的标记
showNoFinishedMaterialFlag: 'Y',//显示未结束的时间记录标记
remark: '',
@ -908,6 +903,61 @@ export default {
this.$emit('update:visible', false);
},
/*刷新当前的页面参数*/
refreshPageData(){
getFinishSchedulePageData(this.pageData).then(({data}) => {
this.pageData.totalApprovedQty = data.resultMap.reportedQty;//总良品数量
this.pageData.totalDefectedQty = data.resultMap.defectedQty;//总不良品数量
//调机的数据
this.pageData.totalSetupTime = data.resultMap.totalSetupTime;//总调机时间
this.pageData.totalDowntimeTimeSetup = data.resultMap.totalDowntimeTimeSetup;//总调机过程停机时间
this.pageData.totalPureSetupTime = data.resultMap.pureSetupTime;//净调机时间
//生产时间的数据
this.pageData.totalProdTime = data.resultMap.totalProdTime; //总生产时间
this.pageData.totalDowntimeTimeProd = data.resultMap.totalDowntimeTimeProd; //总生产过程停机时间
this.pageData.totalPureProdTime = data.resultMap.pureProdTime; //净生产时间
//制造时间的数据
this.pageData.totalManufactureTime = data.resultMap.totalManfTime; //总制造时间
this.pageData.totalManufactureDowntimeTime = data.resultMap.totalDowntimeTimeManf; //总制造过程停机时间
this.pageData.totalPureManufactureTime = data.resultMap.pureManfTime; //净制造时间
//班次和时间的数据
this.pageData.scheduledDate = data.resultMap.scheduledDate; //排产日期
this.pageData.shiftDesc = data.resultMap.shiftDesc; //班次
//设置是否结束的标记
this.pageData.timeFinishedFlag = data.resultMap.scheduledDate; //时间记录是否结束
this.pageData.toolFinishedFlag = data.resultMap.shiftDesc; //工具记录是否结束
this.pageData.materialFinishedFlag = data.resultMap.scheduledDate; //材料记录是否结束
//刷新时间的记录
this.refreshSfdcTimeHist();
//刷新工具的记录
this.refreshSfdcToolHist();
//刷新材料的记录
this.refreshSfdcMaterialHist();
});
},
//刷新当前页面时间的列表
refreshSfdcTimeHist(){
getSfdcTimeHistBySeqNo(this.pageData).then(({data}) => {
this.sfdcTimeList = data.rows;
})
},
//刷新当前页面工具的列表
refreshSfdcToolHist(){
getSfdcToolHistBySeqNo(this.pageData).then(({data}) => {
this.sfdcToolList = data.rows;
})
},
//刷新当前页面材料的列表
refreshSfdcMaterialHist(){
getSfdcMaterialHistBySeqNo(this.pageData).then(({data}) => {
this.sfdcMaterialList = data.rows;
})
},
/*生产过程的停机组件*/
exceptionReasonModal() {
//1.首先调用菜单判断方式 打开生产过程的停机的页面
@ -919,34 +969,7 @@ export default {
});
},
/*刷新当前的页面参数*/
refreshPageData(){
//1.刷新当前卷的报工数据
},
/*检查数据是否有效*/
checkValidQty(row){
//判断当前是否为空
if(row.netIssueQty == ''){
this.$message.error('材料上本卷耗用数量不能为空!');
row.netIssueQty = 0;//重新赋值
return false;
}
//判断当前是否有效
if(row.netIssueQty <= 0){
this.$message.error('材料耗用数量必须大于0!');
return false;
}
//判断是否超限
if(row.netIssueQty > row.transQty){
this.$message.error('材料耗用数量大于发料数量!');
row.netIssueQty = 0;//重新赋值
return false;
}
},
/*添加定制的css类*/
customerCellClassName({row, column, rowIndex, columnIndex}) {
@ -964,22 +987,27 @@ export default {
/*检验良品的总数量*/
checkValidApprovedQty(){
//调用刷新的方法
this.refreshSfdcData();
//首先判断数值是否通过判断
let approvedQty = this.pageData.totalApprovedQty;
if(approvedQty == null || approvedQty == ''){
this.$message.error('请输入总良品数量!');
this.pageData.approvedQty = 0;//重新赋值
return false;
}
},
/*结束当前的操作*/
finishRollBun(){
finishScheduleBun(){
//首先判断数值是否通过判断
let approvedQty = this.pageData.approvedQty;
if(approvedQty == null || approvedQty == ''){
this.$message.error('请输入良品总数量!');
this.pageData.approvedQty = 0;//重新赋值
let totalApprovedQty = this.pageData.totalApprovedQty;
if(totalApprovedQty == null || totalApprovedQty == ''){
this.$message.error('请输入总良品数量!');
this.pageData.totalApprovedQty = 0;//重新赋值
return false;
}
if(approvedQty <= 0){
this.$message.error('良品总数量必须大于0!');
this.pageData.approvedQty = 0;//重新赋值
if(totalApprovedQty <= 0){
this.$message.error('总良品数量必须大于0!');
this.pageData.totalApprovedQty = 0;//重新赋值
return false;
}
//班次判断

Write Preview
Loading…
Cancel
Save