From 55cf5450b6eed18e292bd9e6155df7d1f1aac2bc Mon Sep 17 00:00:00 2001 From: shenzhouyu Date: Mon, 21 Sep 2026 14:09:52 +0800 Subject: [PATCH] =?UTF-8?q?=E9=80=81=E6=A3=80=E6=95=B0=E9=87=8F=E7=9A=84?= =?UTF-8?q?=E6=A0=A1=E9=AA=8C=E5=8E=BB=E6=8E=89=E4=BA=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/views/modules/qc/FQCResultEntry.vue | 17 ++++----- .../src/views/modules/qc/IPQCResultEntry.vue | 17 ++++----- .../views/modules/qc/IQCBatchPurchaseAdd.vue | 35 ++++++++++--------- .../src/views/modules/qc/IQCResultEntry.vue | 32 +++++++++-------- .../src/views/modules/qc/OQCResultEntry.vue | 17 ++++----- 5 files changed, 62 insertions(+), 56 deletions(-) diff --git a/cclqms-vue/src/views/modules/qc/FQCResultEntry.vue b/cclqms-vue/src/views/modules/qc/FQCResultEntry.vue index 74e6973..d3a81d7 100644 --- a/cclqms-vue/src/views/modules/qc/FQCResultEntry.vue +++ b/cclqms-vue/src/views/modules/qc/FQCResultEntry.vue @@ -4047,14 +4047,15 @@ this.$message.warning(this.$t('qc.entry.fillSendQty')) return } - if (this.modalData.specialTaskFlag !== 'Y') { - const lotsize = Number(this.modalData.lotsize) - const rollQty = Number(this.modalData.rollQty) - if (!isNaN(lotsize) && this.modalData.lotsize !== '' && this.modalData.lotsize != null && !isNaN(rollQty) && rollQty > lotsize) { - this.$message.warning(this.$t('qc.entry.sendQtyGtWorkOrderReq')) - return - } - } + // 客户允许超检，暂不限制送检数量大于工单需求数量 + // if (this.modalData.specialTaskFlag !== 'Y') { + // const lotsize = Number(this.modalData.lotsize) + // const rollQty = Number(this.modalData.rollQty) + // if (!isNaN(lotsize) && this.modalData.lotsize !== '' && this.modalData.lotsize != null && !isNaN(rollQty) && rollQty > lotsize) { + // this.$message.warning(this.$t('qc.entry.sendQtyGtWorkOrderReq')) + // return + // } + // } if (this.modalData.umId === '' || this.modalData.umId == null) { this.$message.warning(this.$t('qc.entry.selectUnit')) return diff --git a/cclqms-vue/src/views/modules/qc/IPQCResultEntry.vue b/cclqms-vue/src/views/modules/qc/IPQCResultEntry.vue index d63ccf4..4d13904 100644 --- a/cclqms-vue/src/views/modules/qc/IPQCResultEntry.vue +++ b/cclqms-vue/src/views/modules/qc/IPQCResultEntry.vue @@ -4695,14 +4695,15 @@ this.$message.warning(this.$t('qc.entry.fillSendQty')) return } - if (this.modalData.specialTaskFlag !== 'Y') { - const lotsize = Number(this.modalData.lotsize) - const rollQty = Number(this.modalData.rollQty) - if (!isNaN(lotsize) && this.modalData.lotsize !== '' && this.modalData.lotsize != null && !isNaN(rollQty) && rollQty > lotsize) { - this.$message.warning(this.$t('qc.entry.sendQtyGtWorkOrderReq')) - return - } - } + // 客户允许超检，暂不限制送检数量大于工单需求数量 + // if (this.modalData.specialTaskFlag !== 'Y') { + // const lotsize = Number(this.modalData.lotsize) + // const rollQty = Number(this.modalData.rollQty) + // if (!isNaN(lotsize) && this.modalData.lotsize !== '' && this.modalData.lotsize != null && !isNaN(rollQty) && rollQty > lotsize) { + // this.$message.warning(this.$t('qc.entry.sendQtyGtWorkOrderReq')) + // return + // } + // } if (this.modalData.umId === '' || this.modalData.umId == null) { this.$message.warning(this.$t('qc.entry.selectUnit')) return diff --git a/cclqms-vue/src/views/modules/qc/IQCBatchPurchaseAdd.vue b/cclqms-vue/src/views/modules/qc/IQCBatchPurchaseAdd.vue index c4607d2..a0891e2 100644 --- a/cclqms-vue/src/views/modules/qc/IQCBatchPurchaseAdd.vue +++ b/cclqms-vue/src/views/modules/qc/IQCBatchPurchaseAdd.vue @@ -470,23 +470,24 @@ export default { ) return false } - const arrival = Number(row.currentArrivalQty) - const sendQty = Number(row.sendInspectQty) - if ( - row.currentArrivalQty !== '' && - row.currentArrivalQty != null && - !Number.isNaN(arrival) && - !Number.isNaN(sendQty) && - sendQty > arrival - ) { - this.$message.warning( - this.$t('qc.iqcPage.batchSendQtyGtArrival', { - po: row.poOrderNo, - item: row.poItemNo, - }) - ) - return false - } + // 客户允许超检，暂不限制此次送检数量大于本次到货数量 + // const arrival = Number(row.currentArrivalQty) + // const sendQty = Number(row.sendInspectQty) + // if ( + // row.currentArrivalQty !== '' && + // row.currentArrivalQty != null && + // !Number.isNaN(arrival) && + // !Number.isNaN(sendQty) && + // sendQty > arrival + // ) { + // this.$message.warning( + // this.$t('qc.iqcPage.batchSendQtyGtArrival', { + // po: row.poOrderNo, + // item: row.poItemNo, + // }) + // ) + // return false + // } } return true }, diff --git a/cclqms-vue/src/views/modules/qc/IQCResultEntry.vue b/cclqms-vue/src/views/modules/qc/IQCResultEntry.vue index fcfe508..6f7604f 100644 --- a/cclqms-vue/src/views/modules/qc/IQCResultEntry.vue +++ b/cclqms-vue/src/views/modules/qc/IQCResultEntry.vue @@ -3769,15 +3769,16 @@ export default { qcPrint(this.IQCSelections) }, rollCountChange() { - const rollQty = Number(this.detailData.rollQty) - const rollCount = this.detailData.rollCount - if (rollCount != null) { - const rc = Number(rollCount) - if (!isNaN(rollQty) && !isNaN(rc) && rc > rollQty) { - this.$set(this.detailData, 'rollCount', 0) - this.$message.warning(this.$t('qc.entry.qcGreaterThanIncoming')) - } - } + // 客户允许超检，暂不限制送检数量大于到货数量 + // const rollQty = Number(this.detailData.rollQty) + // const rollCount = this.detailData.rollCount + // if (rollCount != null) { + // const rc = Number(rollCount) + // if (!isNaN(rollQty) && !isNaN(rc) && rc > rollQty) { + // this.$set(this.detailData, 'rollCount', 0) + // this.$message.warning(this.$t('qc.entry.qcGreaterThanIncoming')) + // } + // } this.$nextTick(() => { this.enforcePassQtyNotExceedRollCount() this.enforceSamplingQtyNotExceedRollCount() @@ -4951,12 +4952,13 @@ export default { this.$message.warning(this.$t('qc.entry.fillSendRollQty')) return } - const arrivalQty = Number(this.modalData.rollQty) - const sendQty = Number(this.modalData.rollCount) - if (!isNaN(arrivalQty) && !isNaN(sendQty) && sendQty > arrivalQty) { - this.$message.warning(this.$t('qc.entry.qcGreaterThanIncoming')) - return - } + // 客户允许超检，暂不限制送检数量大于到货数量 + // const arrivalQty = Number(this.modalData.rollQty) + // const sendQty = Number(this.modalData.rollCount) + // if (!isNaN(arrivalQty) && !isNaN(sendQty) && sendQty > arrivalQty) { + // this.$message.warning(this.$t('qc.entry.qcGreaterThanIncoming')) + // return + // } if (this.modalData.umId === '' || this.modalData.umId == null) { this.$message.warning(this.$t('qc.entry.selectUnit')) return diff --git a/cclqms-vue/src/views/modules/qc/OQCResultEntry.vue b/cclqms-vue/src/views/modules/qc/OQCResultEntry.vue index d5b0bf3..c52b060 100644 --- a/cclqms-vue/src/views/modules/qc/OQCResultEntry.vue +++ b/cclqms-vue/src/views/modules/qc/OQCResultEntry.vue @@ -3748,14 +3748,15 @@ this.$message.warning(this.$t('qc.entry.fillSendQty')) return } - if (this.modalData.specialTaskFlag !== 'Y') { - const lotsize = Number(this.modalData.lotsize) - const rollQty = Number(this.modalData.rollQty) - if (!isNaN(lotsize) && this.modalData.lotsize !== '' && this.modalData.lotsize != null && !isNaN(rollQty) && rollQty > lotsize) { - this.$message.warning(this.$t('qc.entry.sendQtyGtWorkOrderReq')) - return - } - } + // 客户允许超检，暂不限制送检数量大于工单需求数量 + // if (this.modalData.specialTaskFlag !== 'Y') { + // const lotsize = Number(this.modalData.lotsize) + // const rollQty = Number(this.modalData.rollQty) + // if (!isNaN(lotsize) && this.modalData.lotsize !== '' && this.modalData.lotsize != null && !isNaN(rollQty) && rollQty > lotsize) { + // this.$message.warning(this.$t('qc.entry.sendQtyGtWorkOrderReq')) + // return + // } + // } if (this.modalData.umId === '' || this.modalData.umId == null) { this.$message.warning(this.$t('qc.entry.selectUnit')) return