shenzhouyu
/
CCL_QMS
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

送检数量的校验去掉了

master
shenzhouyu 1 day ago
parent
59e6fa80b6
commit
55cf5450b6
5 changed files with 62 additions and 56 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. 17
      cclqms-vue/src/views/modules/qc/FQCResultEntry.vue
  2. 17
      cclqms-vue/src/views/modules/qc/IPQCResultEntry.vue
  3. 35
      cclqms-vue/src/views/modules/qc/IQCBatchPurchaseAdd.vue
  4. 32
      cclqms-vue/src/views/modules/qc/IQCResultEntry.vue
  5. 17
      cclqms-vue/src/views/modules/qc/OQCResultEntry.vue

17
cclqms-vue/src/views/modules/qc/FQCResultEntry.vue
View File

@ -4047,14 +4047,15 @@
this.$message.warning(this.$t('qc.entry.fillSendQty')) this.$message.warning(this.$t('qc.entry.fillSendQty'))
return 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) { if (this.modalData.umId === '' || this.modalData.umId == null) {
this.$message.warning(this.$t('qc.entry.selectUnit')) this.$message.warning(this.$t('qc.entry.selectUnit'))
return return

17
cclqms-vue/src/views/modules/qc/IPQCResultEntry.vue
View File

@ -4695,14 +4695,15 @@
this.$message.warning(this.$t('qc.entry.fillSendQty')) this.$message.warning(this.$t('qc.entry.fillSendQty'))
return 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) { if (this.modalData.umId === '' || this.modalData.umId == null) {
this.$message.warning(this.$t('qc.entry.selectUnit')) this.$message.warning(this.$t('qc.entry.selectUnit'))
return return

35
cclqms-vue/src/views/modules/qc/IQCBatchPurchaseAdd.vue
View File

@ -470,23 +470,24 @@ export default {
) )
return false 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 return true
}, },

32
cclqms-vue/src/views/modules/qc/IQCResultEntry.vue
View File

@ -3769,15 +3769,16 @@ export default {
qcPrint(this.IQCSelections) qcPrint(this.IQCSelections)
}, },
rollCountChange() { 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.$nextTick(() => {
this.enforcePassQtyNotExceedRollCount() this.enforcePassQtyNotExceedRollCount()
this.enforceSamplingQtyNotExceedRollCount() this.enforceSamplingQtyNotExceedRollCount()
@ -4951,12 +4952,13 @@ export default {
this.$message.warning(this.$t('qc.entry.fillSendRollQty')) this.$message.warning(this.$t('qc.entry.fillSendRollQty'))
return 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) { if (this.modalData.umId === '' || this.modalData.umId == null) {
this.$message.warning(this.$t('qc.entry.selectUnit')) this.$message.warning(this.$t('qc.entry.selectUnit'))
return return

17
cclqms-vue/src/views/modules/qc/OQCResultEntry.vue
View File

@ -3748,14 +3748,15 @@
this.$message.warning(this.$t('qc.entry.fillSendQty')) this.$message.warning(this.$t('qc.entry.fillSendQty'))
return 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) { if (this.modalData.umId === '' || this.modalData.umId == null) {
this.$message.warning(this.$t('qc.entry.selectUnit')) this.$message.warning(this.$t('qc.entry.selectUnit'))
return return

Write Preview
Loading…
Cancel
Save