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

2026-03-24 

1、过站采集-》材料清单优化
2、工单材料上机记录优化
3、IPQC检验单展示工单和派工单号
master
fengyuan_yang 4 weeks ago
parent
aac514cbfb
commit
5fd11eaabe
5 changed files with 106 additions and 46 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 36
      src/views/modules/qc/IPQCResultEntry.vue
  2. 5
      src/views/modules/schedule/searchMaterialOnMachineRecord.vue
  3. 27
      src/views/modules/yieldReport/com_produce_report_normal.vue
  4. 51
      src/views/modules/yieldReport/com_separate_roll.vue
  5. 29
      src/views/modules/yieldReport/com_split_order_report.vue

36
src/views/modules/qc/IPQCResultEntry.vue
View File

@ -508,7 +508,7 @@
<el-col :span="3"> <el-col :span="3">
<div class="info-item"> <div class="info-item">
<label>物料类别</label> <label>物料类别</label>
<el-input v-model="detailData.invdefinetype" readonly size="small"></el-input>
<el-input v-model="detailData.invdefinetype" disabled size="small"></el-input>
</div> </div>
</el-col> </el-col>
<el-col :span="6"> <el-col :span="6">
@ -529,7 +529,7 @@
<el-input v-model="detailData.umName" disabled size="small"></el-input> <el-input v-model="detailData.umName" disabled size="small"></el-input>
</div> </div>
</el-col> </el-col>
<el-col :span="3">
<el-col :span="4">
<div class="info-item"> <div class="info-item">
<label> <label>
<span v-if="detailData.submitFlag === 'Y'">协同人员</span> <span v-if="detailData.submitFlag === 'Y'">协同人员</span>
@ -538,7 +538,7 @@
<el-input v-model="detailData.operatorName" readonly size="small"></el-input> <el-input v-model="detailData.operatorName" readonly size="small"></el-input>
</div> </div>
</el-col> </el-col>
<el-col :span="4">
<el-col :span="3">
<div class="info-item"> <div class="info-item">
<label> <label>
<span v-if="detailData.submitFlag === 'Y'">责任人</span> <span v-if="detailData.submitFlag === 'Y'">责任人</span>
@ -550,44 +550,56 @@
</el-row> </el-row>
<!-- 第二行：数量信息 --> <!-- 第二行：数量信息 -->
<el-row :gutter="12" class="info-row" style="margin-top: 12px"> <el-row :gutter="12" class="info-row" style="margin-top: 12px">
<el-col :span="4">
<el-col :span="3">
<div class="info-item"> <div class="info-item">
<label>送检数量</label> <label>送检数量</label>
<el-input-number :controls="false" :step="0" v-model="detailData.rollQty" size="small" style="width: 100%"></el-input-number> <el-input-number :controls="false" :step="0" v-model="detailData.rollQty" size="small" style="width: 100%"></el-input-number>
</div> </div>
</el-col> </el-col>
<el-col :span="4">
<el-col :span="3">
<div class="info-item"> <div class="info-item">
<label>抽样数量</label> <label>抽样数量</label>
<el-input-number :controls="false" :step="0" v-model="detailData.samplingQty" size="small" style="width: 100%"></el-input-number> <el-input-number :controls="false" :step="0" v-model="detailData.samplingQty" size="small" style="width: 100%"></el-input-number>
</div> </div>
</el-col> </el-col>
<el-col :span="4">
<el-col :span="3">
<div class="info-item"> <div class="info-item">
<label>合格数量</label> <label>合格数量</label>
<el-input-number :controls="false" :step="0" min="0" v-if="detailData.submitFlag === 'Y'" v-model="detailData.passQty" disabled size="small" style="width: 100%"></el-input-number> <el-input-number :controls="false" :step="0" min="0" v-if="detailData.submitFlag === 'Y'" v-model="detailData.passQty" disabled size="small" style="width: 100%"></el-input-number>
<el-input-number :controls="false" :step="0" min="0" v-else v-model="detailData.passQty" size="small" style="width: 100%"></el-input-number> <el-input-number :controls="false" :step="0" min="0" v-else v-model="detailData.passQty" size="small" style="width: 100%"></el-input-number>
</div> </div>
</el-col> </el-col>
<el-col :span="4">
<el-col :span="3">
<div class="info-item"> <div class="info-item">
<label>不合格数量</label> <label>不合格数量</label>
<el-input-number :controls="false" :step="0" min="0" v-model="detailData.notPassQty" disabled size="small" style="width: 100%"></el-input-number> <el-input-number :controls="false" :step="0" min="0" v-model="detailData.notPassQty" disabled size="small" style="width: 100%"></el-input-number>
</div> </div>
</el-col> </el-col>
<el-col :span="4">
<el-col :span="3">
<div class="info-item"> <div class="info-item">
<label>不合格项目数量</label> <label>不合格项目数量</label>
<el-input-number :controls="false" :step="0" v-if="detailData.submitFlag === 'Y'" v-model="detailData.unqualifiedQty" disabled size="small" style="width: 100%"></el-input-number> <el-input-number :controls="false" :step="0" v-if="detailData.submitFlag === 'Y'" v-model="detailData.unqualifiedQty" disabled size="small" style="width: 100%"></el-input-number>
<el-input-number :controls="false" :step="0" v-else v-model="detailData.unqualifiedQty" size="small" style="width: 100%"></el-input-number> <el-input-number :controls="false" :step="0" v-else v-model="detailData.unqualifiedQty" size="small" style="width: 100%"></el-input-number>
</div> </div>
</el-col> </el-col>
<el-col :span="4">
<el-col :span="2">
<div class="info-item"> <div class="info-item">
<label>批次合格数</label> <label>批次合格数</label>
<el-input-number :controls="false" :step="0" min="0" v-model="detailData.batchQualifiedQty" disabled size="small" style="width: 100%"></el-input-number> <el-input-number :controls="false" :step="0" min="0" v-model="detailData.batchQualifiedQty" disabled size="small" style="width: 100%"></el-input-number>
</div> </div>
</el-col> </el-col>
<el-col :span="4">
<div class="info-item">
<label>工单号</label>
<el-input v-model="detailData.orderNo" disabled size="small"></el-input>
</div>
</el-col>
<el-col :span="3">
<div class="info-item">
<label>派工单号</label>
<el-input v-model="detailData.seqNo" disabled size="small"></el-input>
</div>
</el-col>
</el-row> </el-row>
</div> </div>
@ -2187,7 +2199,9 @@
passQty: '', passQty: '',
notPassQty: '', notPassQty: '',
batchQualifiedQty: '', batchQualifiedQty: '',
spec: ''
spec: '',
orderNo: '',
seqNo: ''
}, },
detailInformationFlag: false, detailInformationFlag: false,
detailList: [], detailList: [],
@ -4278,6 +4292,8 @@
this.detailData.responsiblePersonName = row.responsiblePersonName this.detailData.responsiblePersonName = row.responsiblePersonName
this.detailData.state = row.state this.detailData.state = row.state
this.detailData.spec = row.spec this.detailData.spec = row.spec
this.detailData.orderNo = row.orderNo
this.detailData.seqNo = row.seqNo
if (row.state === '待检验') { if (row.state === '待检验') {
this.detailData.passQty = row.samplingQty this.detailData.passQty = row.samplingQty
} else { } else {

5
src/views/modules/schedule/searchMaterialOnMachineRecord.vue
View File

@ -397,8 +397,9 @@ export default {
{ columnProp: 'partDesc', columnLabel: '材料名称', columnWidth: '150', headerAlign: 'center', align: 'left' }, { columnProp: 'partDesc', columnLabel: '材料名称', columnWidth: '150', headerAlign: 'center', align: 'left' },
{ columnProp: 'spec', columnLabel: '规格型号', columnWidth: '120', headerAlign: 'center', align: 'left' }, { columnProp: 'spec', columnLabel: '规格型号', columnWidth: '120', headerAlign: 'center', align: 'left' },
{ columnProp: 'histType', columnLabel: '操作类型', columnWidth: '80', headerAlign: 'center', align: 'center' }, { columnProp: 'histType', columnLabel: '操作类型', columnWidth: '80', headerAlign: 'center', align: 'center' },
{ columnProp: 'transQty', columnLabel: '上机数量', columnWidth: '100', headerAlign: 'center', align: 'right' },
{ columnProp: 'netIssueQty', columnLabel: '净发料数量', columnWidth: '100', headerAlign: 'center', align: 'right' },
{ columnProp: 'originalHistQty', columnLabel: '上机数量', columnWidth: '100', headerAlign: 'center', align: 'right' },
{ columnProp: 'transQty', columnLabel: '可用数量', columnWidth: '100', headerAlign: 'center', align: 'right' },
{ columnProp: 'netIssueQty', columnLabel: '实际消耗数量', columnWidth: '100', headerAlign: 'center', align: 'right' },
{ columnProp: 'startDate', columnLabel: '上机时间', columnWidth: '150', headerAlign: 'center', align: 'center' }, { columnProp: 'startDate', columnLabel: '上机时间', columnWidth: '150', headerAlign: 'center', align: 'center' },
{ columnProp: 'finishedFlagDesc', columnLabel: '是否结束', columnWidth: '80', headerAlign: 'center', align: 'center' }, { columnProp: 'finishedFlagDesc', columnLabel: '是否结束', columnWidth: '80', headerAlign: 'center', align: 'center' },
{ columnProp: 'finishedDate', columnLabel: '结束时间', columnWidth: '150', headerAlign: 'center', align: 'center' }, { columnProp: 'finishedDate', columnLabel: '结束时间', columnWidth: '150', headerAlign: 'center', align: 'center' },

27
src/views/modules/yieldReport/com_produce_report_normal.vue
View File

@ -1952,13 +1952,31 @@ export default {
status: true, status: true,
fixed: false fixed: false
}, },
// {
// userId: this.$store.state.user.name,
// functionId: 5303,
// serialNumber: '5303MaterialTransQty',
// tableId: "5303Material",
// tableName: "派工单材料",
// columnProp: "transQty",
// headerAlign: "center",
// align: "right",
// columnLabel: "可用数量",
// columnWidth: 80,
// columnHidden: false,
// columnImage: false,
// columnSortable: true,
// sortLv: 0,
// status: true,
// fixed: false
// },
{ {
userId: this.$store.state.user.name, userId: this.$store.state.user.name,
functionId: 5303, functionId: 5303,
serialNumber: '5303MaterialTransQty',
serialNumber: '5303MaterialCalcQty',
tableId: "5303Material", tableId: "5303Material",
tableName: "派工单材料", tableName: "派工单材料",
columnProp: "transQty",
columnProp: "calcQty",
headerAlign: "center", headerAlign: "center",
align: "right", align: "right",
columnLabel: "可用数量", columnLabel: "可用数量",
@ -4226,7 +4244,10 @@ export default {
//刷新派工单的材料表的记录 //刷新派工单的材料表的记录
getSfdcMaterialList() { getSfdcMaterialList() {
getSfdcMaterialByCon(this.searchData).then(({data}) => { getSfdcMaterialByCon(this.searchData).then(({data}) => {
this.sfdcMaterialList = data.rows;
this.sfdcMaterialList = data.rows.map(item => {
item.calcQty = parseFloat(((item.transQty || 0) - (item.netIssueQty || 0)).toFixed(6));
return item;
});
}); });
}, },
// 打开材料卷（重新激活已完成的材料） // 打开材料卷（重新激活已完成的材料）

51
src/views/modules/yieldReport/com_separate_roll.vue
View File

@ -1349,31 +1349,32 @@ export default {
// } // }
// 开启loading // 开启loading
this.yieldReportLoading = true; this.yieldReportLoading = true;
//校验是否继续
checkCreateSplitSfdcRoll(this.pageData)
.then(({data}) => {
//判断是否成功
if (data.code == 500) {
this.$message.error(data.msg);
this.yieldReportLoading = false;
} else if (data.resultMap.resultCode == '201') {
//打开异常原因录入的界面
this.$confirm(data.resultMap.resultMsg, '提示', {
confirmButtonText: this.labels.confirmLabel,
celButtonText: this.labels.cancelLabel,
type: 'warning'
}).then(() => {
//执行切换卷的操作
this.createSeparateRolllOperation();
}).catch(() => {
this.yieldReportLoading = false;
});
} else { //执行切换卷的操作
this.createSeparateRolllOperation();
}
}).catch(() => {
this.yieldReportLoading = false;
});
// //校验是否继续
// checkCreateSplitSfdcRoll(this.pageData)
// .then(({data}) => {
// //判断是否成功
// if (data.code == 500) {
// this.$message.error(data.msg);
// this.yieldReportLoading = false;
// } else if (data.resultMap.resultCode == '201') {
// //打开异常原因录入的界面
// this.$confirm(data.resultMap.resultMsg, '提示', {
// confirmButtonText: this.labels.confirmLabel,
// celButtonText: this.labels.cancelLabel,
// type: 'warning'
// }).then(() => {
// //执行切换卷的操作
// this.createSeparateRolllOperation();
// }).catch(() => {
// this.yieldReportLoading = false;
// });
// } else { //执行切换卷的操作
// this.createSeparateRolllOperation();
// }
// }).catch(() => {
// this.yieldReportLoading = false;
// });
this.createSeparateRolllOperation();
}, },
/*执行创建分卷的操作*/ /*执行创建分卷的操作*/

29
src/views/modules/yieldReport/com_split_order_report.vue
View File

@ -1781,16 +1781,34 @@ export default {
status: true, status: true,
fixed: false fixed: false
}, },
// {
// userId: this.$store.state.user.name,
// functionId: 5303,
// serialNumber: '5303MaterialTransQty',
// tableId: "5303Material",
// tableName: "派工单材料",
// columnProp: "transQty",
// 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, userId: this.$store.state.user.name,
functionId: 5303, functionId: 5303,
serialNumber: '5303MaterialTransQty',
serialNumber: '5303MaterialCalcQty',
tableId: "5303Material", tableId: "5303Material",
tableName: "派工单材料", tableName: "派工单材料",
columnProp: "transQty",
columnProp: "calcQty",
headerAlign: "center", headerAlign: "center",
align: "center", align: "center",
columnLabel: "数量",
columnLabel: "可用数量",
columnWidth: 80, columnWidth: 80,
columnHidden: false, columnHidden: false,
columnImage: false, columnImage: false,
@ -3494,7 +3512,10 @@ export default {
//重置查询的工序 //重置查询的工序
this.searchData.itemNo = this.scheduleData.itemNo; this.searchData.itemNo = this.scheduleData.itemNo;
getSfdcMaterialByCon(this.searchData).then(({data}) => { getSfdcMaterialByCon(this.searchData).then(({data}) => {
this.sfdcMaterialList = data.rows;
this.sfdcMaterialList = data.rows.map(item => {
item.calcQty = parseFloat(((item.transQty || 0) - (item.netIssueQty || 0)).toFixed(6));
return item;
});
}); });
}, },
//刷新派工单的下机卷的记录 //刷新派工单的下机卷的记录

Write Preview
Loading…
Cancel
Save