Browse Source

开始调机代码

master
rui_li 4 years ago
parent
commit
ed2d65fb73
  1. 10
      src/api/yieldReport/com_produce_down.js
  2. 4
      src/api/yieldReport/com_start_tuning.js
  3. 2
      src/views/modules/sys/language/common.vue
  4. 226
      src/views/modules/yieldReport/com_produce_down.vue
  5. 7
      src/views/modules/yieldReport/com_produce_report_normal.vue
  6. 87
      src/views/modules/yieldReport/com_start_tuning.vue

10
src/api/yieldReport/com_produce_down.js

@ -0,0 +1,10 @@
import { createAPI } from '@/utils/httpRequest.js'
// 获取当前停机代码
export const checkDownTimeCode = data => createAPI('schedule/checkDownTimeCode', 'POST', data)
// 获取上机卷的时间信息汇总
export const countSfdcTimeQty = data => createAPI('schedule/countSfdcTimeQty', 'POST', data)
// 获取派工单的班次信息
export const getScheduleShiftData = data => createAPI('schedule/getScheduleShiftData', 'POST', data)

4
src/api/yieldReport/com_start_tuning.js

@ -0,0 +1,4 @@
import { createAPI } from '@/utils/httpRequest.js'
// 获取当前停机代码
export const startTuning = data => createAPI('schedule/startTuning', 'POST', data)

2
src/views/modules/sys/language/common.vue

@ -82,7 +82,7 @@
<!-- 动态列 -->
<column v-if="visible" ref="column" @refreshData="getTableUserColumn"></column>
<!-- <list ref="baseList" @getBaseData="getBaseData"></list>-->
<list ref="baseList" @getBaseData="getBaseData"></list>
<el-dialog :close-on-click-modal="false" :close-on-press-escape="false" v-drag
:title="'设置语言一'+querySysLanguagePack.languageCode" :visible.sync="addLanguage" width="1000px">

226
src/views/modules/yieldReport/com_produce_down.vue

@ -10,7 +10,7 @@
<el-col :span="8" >
<el-form-item :label="'开始时间:'">
<el-date-picker style="width: 100px;"
v-model="scheduleData.reportDate"
v-model="pageData.reportDate"
format="yyyy-MM-dd"
value-format="yyyy-MM-dd"
placeholder="">
@ -21,7 +21,7 @@
<el-form-item :label="''">
<el-form-item :label="''">
<el-time-picker style="width: 80px;"
v-model="scheduleData.reportTime"
v-model="pageData.reportTime"
format="HH:mm:ss"
value-format="HH:mm:ss"
placeholder="">
@ -31,19 +31,19 @@
</el-col>
<el-col :span="8" >
<el-form-item :label="'时长:'">
<el-input v-model="scheduleData.seqNo" style="width: 120px"></el-input>
<el-input ref="totalTime" type="number" v-model="pageData.totalTime" style="width: 120px"></el-input>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="8">
<el-form-item :label="'停机代码:'">
<el-input v-model="scheduleData.seqNo" style="width: 100px"></el-input>
<el-input @keyup.enter.native="getDownTimeDesc" v-model="pageData.downTimeCode" style="width: 100px"></el-input>
</el-form-item>
</el-col>
<el-col :span="16">
<el-form-item :label="'停机描述:'">
<el-input v-model="scheduleData.seqNo" style="width: 180px"></el-input>
<el-input v-model="pageData.downTimeDesc" style="width: 180px"></el-input>
</el-form-item>
</el-col>
</el-row>
@ -89,6 +89,10 @@
</template>
<script>
import {
checkDownTimeCode,
}
from '@/api/yieldReport/com_produce_down.js';
export default {
name: "com_defect_roll",
data() {
@ -100,25 +104,37 @@ export default {
userName: this.$store.state.user.name,
seqNo: '',
orderNo: '',
itemNo: 0,
partNo: '',
workCenterNo: '',
workCenterDesc: '',
resourceDesc: '',
rollNo: '',
partDesc: '',
reportDate: this.dayjs(new Date()).format('YYYY-MM-DD'),
reportTime: this.dayjs(new Date()).format('HH:mm:ss'),
reportedFlag: 'N',
planStartTime: '',
planFinishTime: '',
qtyRequiredOriginal: 0,
scheduledDate: '',
shiftNo: '',
preItemDesc: '',
nextItemDesc: '',
nextItemNo: 0,
operatorId: '',
functionName: '',
currentRollFlag: false
},
currentRollOps: {
pageData: {
site: this.$store.state.user.site,
userName: this.$store.state.user.name,
orderNo: '',
itemNo: '',
seqNo: '',
rollNo: '',
finishedFlag: '',
reportDate: this.dayjs(new Date()).format('YYYY-MM-DD'),
reportTime: this.dayjs(new Date()).format('HH:mm:ss'),
totalTime: 0,
downTimeCode: '',
downTimeDesc: '',
},
operatorData: {
site: this.$store.state.user.site,
@ -129,158 +145,58 @@ export default {
seqNo: '',
showFlag: false
},
sfdcDefectList: [],
columnDefectArray: [
{
userId: this.$store.state.user.name,
functionId: 5303,
serialNumber: '5305DefectHistSeqNo',
tableId: "5305Material",
tableName: "不良卷",
columnProp: "histSeqNo",
headerAlign: "center",
align: "center",
columnLabel: "序号",
columnWidth: 60,
columnHidden: false,
columnImage: false,
columnSortable: false,
sortLv: 0,
status: true,
fixed: false
},
{
userId: this.$store.state.user.name,
functionId: 5303,
serialNumber: '5305DefectDefectCode',
tableId: "5305Defect",
tableName: "不良卷",
columnProp: "defectCode",
headerAlign: "center",
align: "center",
columnLabel: "不良代码",
columnWidth: 80,
columnHidden: false,
columnImage: false,
columnSortable: false,
sortLv: 0,
status: true,
fixed: false
},
{
userId: this.$store.state.user.name,
functionId: 5303,
serialNumber: '5305DefectDefectCode',
tableId: "5305Defect",
tableName: "不良卷",
columnProp: "defectDesc",
headerAlign: "center",
align: "center",
columnLabel: "不良描述",
columnWidth: 160,
columnHidden: false,
columnImage: false,
columnSortable: false,
sortLv: 0,
status: true,
fixed: false
},
{
userId: this.$store.state.user.name,
functionId: 5303,
serialNumber: '5305DefectDefectQty',
tableId: "5305Defect",
tableName: "不良卷",
columnProp: "defectQty",
headerAlign: "center",
align: "center",
columnLabel: "不良数量",
columnWidth: 80,
columnHidden: false,
columnImage: false,
columnSortable: false,
sortLv: 0,
status: true,
fixed: false
},
{
userId: this.$store.state.user.name,
functionId: 5303,
serialNumber: '5305DefectReportedDate',
tableId: "5305Defect",
tableName: "不良卷",
columnProp: "reportedDate",
headerAlign: "center",
align: "center",
columnLabel: "报告日期",
columnWidth: 125,
columnHidden: false,
columnImage: false,
columnSortable: false,
sortLv: 0,
status: true,
fixed: false
},
{
userId: this.$store.state.user.name,
functionId: 5303,
serialNumber: '5305DefectReportedBy',
tableId: "5305Defect",
tableName: "不良卷",
columnProp: "reportedBy",
headerAlign: "center",
align: "center",
columnLabel: "报告人",
columnWidth: 75,
columnHidden: false,
columnImage: false,
columnSortable: false,
sortLv: 0,
status: true,
fixed: false
},
{
userId: this.$store.state.user.name,
functionId: 5303,
serialNumber: '5305DefectRemark',
tableId: "5305Defect",
tableName: "不良卷",
columnProp: "remark",
headerAlign: "center",
align: "center",
columnLabel: "备注",
columnWidth: 160,
columnHidden: false,
columnImage: false,
columnSortable: false,
sortLv: 0,
status: true,
fixed: false
}
],
buttonTags:{
createRollFlag: true,
switchRollFlag: true,
separatorRollFlag: true,
finishRollFlag: true,
mergeRollFlag: true,
tuningFlag: true,
produceFlag: true,
defectFlag: true,
toolFlag: true,
materialFlag: true,
downTimeFlag: true
createRollFlag: true
},
dataListLoading: false,
}
},
methods: {
//
init(scheduleData, operatorData) {
//
this.scheduleData = scheduleData;
//
this.operatorData = JSON.parse(JSON.stringify(operatorData));
//
this.pageData.orderNo = scheduleData.orderNo;
this.pageData.itemNo = scheduleData.itemNo;
this.pageData.seqNo = scheduleData.seqNo;
this.pageData.rollNo = scheduleData.rollNo;
//
this.pageData.totalTime = 0;
this.pageData.downTimeCode = '';
this.pageData.downTimeDesc = '';
//
this.$nextTick(() => {
this.$refs.totalTime.focus();
});
},
/*关闭modal*/
closeDialog(){
this.$emit('update:visible', false);
},
/*检查停机代码*/
getDownTimeDesc(){
if(this.pageData.downTimeCode == null || this.pageData.downTimeCode == ''){
this.$message.error('请扫描不凉代码!');
return false;
}
checkDownTimeCode(this.pageData).then(({data}) => {
//
if(data.code == 500){
this.$message.error(data.msg);
}else{
let resultMap = data.resultMap;
this.pageData.downTimeDesc = resultMap.downTimeDesc;
}
})
},
@ -291,16 +207,6 @@ export default {
init(seqNo, operatorData) {
//
this.scheduleData.seqNo = seqNo;
//
this.operatorData = JSON.parse(JSON.stringify(operatorData));
// this.currentRollOps.seqNo = seqNo;
// this.currentRollOps.rollNo = rollNo;
//
//this.refreshPageData();
},
},
created() {

7
src/views/modules/yieldReport/com_produce_report_normal.vue

@ -404,7 +404,8 @@
<!-- 开始调机组件 -->
<comStartTuning ref="comStartTuning" :close-on-click-modal="false"
:visible.sync="showTuningFlag">
:visible.sync="showTuningFlag"
@refreshPageData="refreshPageData">
</comStartTuning>
@ -3040,7 +3041,7 @@ export default {
//
this.$nextTick(() => {
this.showTuningFlag = true;
this.$refs.comStartTuning.init(this.scheduleData.seqNo, this.operatorData)
this.$refs.comStartTuning.init(this.scheduleData, this.operatorData)
// this.$refs.com_finish_roll.init(this.scheduleData.seqNo, this.currentRollOps.rollNo);
});
},
@ -3098,7 +3099,7 @@ export default {
//
this.$nextTick(() => {
this.showDownFlag = true;
this.$refs.comProduceDown.init(this.scheduleData.seqNo, this.operatorData)
this.$refs.comProduceDown.init(this.scheduleData, this.operatorData)
});
},

87
src/views/modules/yieldReport/com_start_tuning.vue

@ -9,7 +9,7 @@
<el-col :span="10" >
<el-form-item :label="'当前时间:'">
<el-date-picker style="width: 100px;"
v-model="scheduleData.reportDate"
v-model="pageData.reportDate"
format="yyyy-MM-dd"
value-format="yyyy-MM-dd"
placeholder="">
@ -20,7 +20,7 @@
<el-form-item :label="''">
<el-form-item :label="''">
<el-time-picker style="width: 80px;"
v-model="scheduleData.reportTime"
v-model="pageData.reportTime"
format="HH:mm:ss"
value-format="HH:mm:ss"
placeholder="">
@ -31,7 +31,7 @@
</el-row>
</el-form>
<span slot="footer" class="dialog-footer">
<el-button type="primary" @click=""> </el-button>
<el-button type="primary" @click="startTuningFun"> </el-button>
<el-button type="primary" @click="closeDialog">关闭</el-button>
</span>
</el-dialog>
@ -39,36 +39,48 @@
</template>
<script>
import {
startTuning,
}
from '@/api/yieldReport/com_start_tuning.js';
export default {
name: "com_merge_roll",
data() {
return {
titleCon: '开始调机',
sfdcTimeList: [],
scheduleData: {
site: this.$store.state.user.site,
userName: this.$store.state.user.name,
seqNo: '',
orderNo: '',
itemNo: 0,
partNo: '',
workCenterNo: '',
workCenterDesc: '',
resourceDesc: '',
rollNo: '',
partDesc: '',
reportDate: this.dayjs(new Date()).format('YYYY-MM-DD'),
reportTime: this.dayjs(new Date()).format('HH:mm:ss'),
reportedFlag: 'N',
planStartTime: '',
planFinishTime: '',
qtyRequiredOriginal: 0,
scheduledDate: '',
shiftNo: '',
preItemDesc: '',
nextItemDesc: '',
nextItemNo: 0,
operatorId: '',
functionName: '',
currentRollFlag: false
},
currentRollOps: {
pageData: {
site: this.$store.state.user.site,
userName: this.$store.state.user.name,
orderNo: '',
itemNo: 0,
seqNo: '',
rollNo: '',
finishedFlag: '',
reportDate: this.dayjs(new Date()).format('YYYY-MM-DD'),
reportTime: this.dayjs(new Date()).format('HH:mm:ss'),
operatorId: ''
},
operatorData: {
site: this.$store.state.user.site,
@ -79,40 +91,47 @@ export default {
seqNo: '',
showFlag: false
},
dataListLoading: false,
}
},
methods: {
/*关闭modal*/
closeDialog(){
this.$emit('update:visible', false);
},
init(seqNo, operatorData) {
/*初始化页面的参数*/
init(scheduleData, operatorData) {
//
this.scheduleData.seqNo = seqNo;
this.scheduleData = scheduleData;
//
this.operatorData = JSON.parse(JSON.stringify(operatorData));
//
this.titleCon = '开始调机操作 \
派工单号:'+seqNo;
// this.currentRollOps.seqNo = seqNo;
// this.currentRollOps.rollNo = rollNo;
//
//this.refreshPageData();
this.titleCon = '开始调机 \
派工单号:'+scheduleData.seqNo;
//
this.pageData.orderNo = scheduleData.orderNo;
this.pageData.itemNo = scheduleData.itemNo;
this.pageData.seqNo = scheduleData.seqNo;
this.pageData.rollNo = scheduleData.rollNo;
this.pageData.operatorId = operatorData.operatorId;
},
/*关闭modal*/
closeDialog(){
this.$emit('update:visible', false);
},
/*开始调机*/
startTuningFun(){
startTuning(this.pageData).then(({data}) => {
//
if(data.code == 500){
this.$message.error(data.msg);
}else{
this.$message.success(data.msg);
//
this.closeDialog();
//
this.$emit('refreshPageData')
}
});
},
},
created() {
// this.factoryList()

Loading…
Cancel
Save