diff --git a/src/pages/deliver/coms/comScanDeliverPack.vue b/src/pages/deliver/coms/comScanDeliverPack.vue index 2b30bafa..c0e522eb 100644 --- a/src/pages/deliver/coms/comScanDeliverPack.vue +++ b/src/pages/deliver/coms/comScanDeliverPack.vue @@ -342,7 +342,7 @@ ) } } else { - if (this.jobContent.AllowModifyBatch == null) { + if (this.jobContent.allowModifyBatch == "TRUE") { this.showQuestionMessage('在【' + that.fromLocationCode + '】库位下,未查找到批次【' + lot + '】的发货明细,是否要继续发货?', res => { if (res) { diff --git a/src/pages/productionReturn/coms/comScanReturnPack.vue b/src/pages/productionReturn/coms/comScanReturnPack.vue index 2f11c595..3e3b0115 100644 --- a/src/pages/productionReturn/coms/comScanReturnPack.vue +++ b/src/pages/productionReturn/coms/comScanReturnPack.vue @@ -321,11 +321,11 @@ ) } } else { - if (this.jobContent.AllowModifyBatch == null) { + if (this.jobContent.allowModifyBatch == "TRUE") { this.showQuestionMessage('在【' + that.fromLocationCode + '】库位下,未查找到批次【' + lot + '】的发料明细,是否要继续发料?', res => { if (res) { - let batch = that.createBatchInfo(label, balance); + let batch = that.createBatchInfo(label, balance,packageInfo); fromLocation.Batchs.unshift(batch); } }) @@ -352,7 +352,7 @@ } }, - createBatchInfo(data, balance) { + createBatchInfo(data, balance,packageInfo) { let batch = { batch: data.lot, qty: 0, @@ -360,7 +360,7 @@ handleQty: Number(data.qty), Records: [] } - let record = this.creatRecord(data, balance); + let record = this.creatRecord(data, balance,packageInfo); batch.Records.push(record); this.issueRecord.unshift(record) return batch; diff --git a/src/pages/stockUp/coms/comScanStockUpPack.vue b/src/pages/stockUp/coms/comScanStockUpPack.vue index 6e2942e8..4f09dcbf 100644 --- a/src/pages/stockUp/coms/comScanStockUpPack.vue +++ b/src/pages/stockUp/coms/comScanStockUpPack.vue @@ -279,13 +279,13 @@ import { getDirectoryItemArray } from '../../../common/directory.js'; this.showBalanceSelect(balanceRes.data.list, packageInfo); } } else { - this.showErrorMessage(balanceRes.message.message); + this.showErrorMessage(balanceRes.message); } uni.hideLoading(); }); } - } catch (e) { - this.showErrorMessage(e.stack) + } catch (error) { + this.showErrorMessage(error) uni.hideLoading(); } }, @@ -340,11 +340,11 @@ import { getDirectoryItemArray } from '../../../common/directory.js'; ) } } else { - if (this.jobContent.AllowModifyBatch == null) { + if (this.jobContent.allowModifyBatch == "TRUE") { this.showQuestionMessage('在【' + that.fromLocationCode + '】库位下,未查找到批次【' + lot + '】的发货明细,是否要继续发货?', res => { if (res) { - let batch = that.createBatchInfo(label, balance); + let batch = that.createBatchInfo(label, balance,packageInfo); fromLocation.Batchs.unshift(batch); } }) @@ -371,15 +371,15 @@ import { getDirectoryItemArray } from '../../../common/directory.js'; } }, - createBatchInfo(data, balance) { + createBatchInfo(data, balance,packageInfo) { let batch = { - batch: data.lot, + batch: data.batch, qty: 0, uom: data.uom, handleQty: Number(data.qty), Records: [] } - let record = this.creatRecord(data, balance); + let record = this.creatRecord(data, balance,packageInfo); batch.Records.push(record); this.issueRecord.unshift(record) return batch;