From 5fd11eaabeb2724b31b366d6b45397f0c10e1ee1 Mon Sep 17 00:00:00 2001
From: fengyuan_yang <1976974459@qq.com>
Date: Tue, 24 Mar 2026 11:01:59 +0800
Subject: [PATCH] =?UTF-8?q?2026-03-24=201=E3=80=81=E8=BF=87=E7=AB=99?=
=?UTF-8?q?=E9=87=87=E9=9B=86-=E3=80=8B=E6=9D=90=E6=96=99=E6=B8=85?=
=?UTF-8?q?=E5=8D=95=E4=BC=98=E5=8C=96=202=E3=80=81=E5=B7=A5=E5=8D=95?=
=?UTF-8?q?=E6=9D=90=E6=96=99=E4=B8=8A=E6=9C=BA=E8=AE=B0=E5=BD=95=E4=BC=98?=
=?UTF-8?q?=E5=8C=96=203=E3=80=81IPQC=E6=A3=80=E9=AA=8C=E5=8D=95=E5=B1=95?=
=?UTF-8?q?=E7=A4=BA=E5=B7=A5=E5=8D=95=E5=92=8C=E6=B4=BE=E5=B7=A5=E5=8D=95?=
=?UTF-8?q?=E5=8F=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/views/modules/qc/IPQCResultEntry.vue | 36 +++++++++----
.../searchMaterialOnMachineRecord.vue | 5 +-
.../yieldReport/com_produce_report_normal.vue | 27 ++++++++--
.../modules/yieldReport/com_separate_roll.vue | 51 ++++++++++---------
.../yieldReport/com_split_order_report.vue | 33 +++++++++---
5 files changed, 106 insertions(+), 46 deletions(-)
diff --git a/src/views/modules/qc/IPQCResultEntry.vue b/src/views/modules/qc/IPQCResultEntry.vue
index 5bbeb7b..dfb4c72 100644
--- a/src/views/modules/qc/IPQCResultEntry.vue
+++ b/src/views/modules/qc/IPQCResultEntry.vue
@@ -508,7 +508,7 @@
-
+
@@ -529,7 +529,7 @@
-
+
-
+
@@ -2187,7 +2199,9 @@
passQty: '',
notPassQty: '',
batchQualifiedQty: '',
- spec: ''
+ spec: '',
+ orderNo: '',
+ seqNo: ''
},
detailInformationFlag: false,
detailList: [],
@@ -4278,6 +4292,8 @@
this.detailData.responsiblePersonName = row.responsiblePersonName
this.detailData.state = row.state
this.detailData.spec = row.spec
+ this.detailData.orderNo = row.orderNo
+ this.detailData.seqNo = row.seqNo
if (row.state === '待检验') {
this.detailData.passQty = row.samplingQty
} else {
diff --git a/src/views/modules/schedule/searchMaterialOnMachineRecord.vue b/src/views/modules/schedule/searchMaterialOnMachineRecord.vue
index cd006f8..b406df1 100644
--- a/src/views/modules/schedule/searchMaterialOnMachineRecord.vue
+++ b/src/views/modules/schedule/searchMaterialOnMachineRecord.vue
@@ -397,8 +397,9 @@ export default {
{ columnProp: 'partDesc', columnLabel: '材料名称', columnWidth: '150', headerAlign: 'center', align: 'left' },
{ columnProp: 'spec', columnLabel: '规格型号', columnWidth: '120', headerAlign: 'center', align: 'left' },
{ 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: 'finishedFlagDesc', columnLabel: '是否结束', columnWidth: '80', headerAlign: 'center', align: 'center' },
{ columnProp: 'finishedDate', columnLabel: '结束时间', columnWidth: '150', headerAlign: 'center', align: 'center' },
diff --git a/src/views/modules/yieldReport/com_produce_report_normal.vue b/src/views/modules/yieldReport/com_produce_report_normal.vue
index 3c6125c..034ef30 100644
--- a/src/views/modules/yieldReport/com_produce_report_normal.vue
+++ b/src/views/modules/yieldReport/com_produce_report_normal.vue
@@ -1952,13 +1952,31 @@ export default {
status: true,
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,
functionId: 5303,
- serialNumber: '5303MaterialTransQty',
+ serialNumber: '5303MaterialCalcQty',
tableId: "5303Material",
tableName: "派工单材料",
- columnProp: "transQty",
+ columnProp: "calcQty",
headerAlign: "center",
align: "right",
columnLabel: "可用数量",
@@ -4226,7 +4244,10 @@ export default {
//刷新派工单的材料表的记录
getSfdcMaterialList() {
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;
+ });
});
},
// 打开材料卷（重新激活已完成的材料）
diff --git a/src/views/modules/yieldReport/com_separate_roll.vue b/src/views/modules/yieldReport/com_separate_roll.vue
index af0c538..ab51067 100644
--- a/src/views/modules/yieldReport/com_separate_roll.vue
+++ b/src/views/modules/yieldReport/com_separate_roll.vue
@@ -1349,31 +1349,32 @@ export default {
// }
// 开启loading
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();
},
/*执行创建分卷的操作*/
diff --git a/src/views/modules/yieldReport/com_split_order_report.vue b/src/views/modules/yieldReport/com_split_order_report.vue
index 24e9def..8439ce3 100644
--- a/src/views/modules/yieldReport/com_split_order_report.vue
+++ b/src/views/modules/yieldReport/com_split_order_report.vue
@@ -1781,16 +1781,34 @@ export default {
status: true,
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,
functionId: 5303,
- serialNumber: '5303MaterialTransQty',
+ serialNumber: '5303MaterialCalcQty',
tableId: "5303Material",
tableName: "派工单材料",
- columnProp: "transQty",
+ columnProp: "calcQty",
headerAlign: "center",
align: "center",
- columnLabel: "数量",
+ columnLabel: "可用数量",
columnWidth: 80,
columnHidden: false,
columnImage: false,
@@ -3494,7 +3512,10 @@ export default {
//重置查询的工序
this.searchData.itemNo = this.scheduleData.itemNo;
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;
+ });
});
},
//刷新派工单的下机卷的记录
@@ -3720,7 +3741,7 @@ export default {
this.$message.error(this.labels.pleaseSelectSeqNo);
return false;
}
-
+
// 如果操作员信息还未设置，先设置为当前登录人
if (!this.operatorData.operatorId || !this.operatorData.operatorName) {
this.operatorData.operatorId = this.$store.state.user.name;
@@ -3731,7 +3752,7 @@ export default {
this.titleCon = this.labels.titleCon + ' - ' + this.scheduleData.workCenterDesc + ' '
+ this.scheduleData.resourceDesc + ' （' + this.operatorData.operatorName + '）';
}
-
+
//打开操作员切换功能，用于管理上下岗人员，机台操作人保持为当前登录人
this.showOperatorFlag = true;
this.$nextTick(() => {