|
@ -279,13 +279,13 @@ import { getDirectoryItemArray } from '../../../common/directory.js'; |
|
|
this.showBalanceSelect(balanceRes.data.list, packageInfo); |
|
|
this.showBalanceSelect(balanceRes.data.list, packageInfo); |
|
|
} |
|
|
} |
|
|
} else { |
|
|
} else { |
|
|
this.showErrorMessage(balanceRes.message.message); |
|
|
this.showErrorMessage(balanceRes.message); |
|
|
} |
|
|
} |
|
|
uni.hideLoading(); |
|
|
uni.hideLoading(); |
|
|
}); |
|
|
}); |
|
|
} |
|
|
} |
|
|
} catch (e) { |
|
|
} catch (error) { |
|
|
this.showErrorMessage(e.stack) |
|
|
this.showErrorMessage(error) |
|
|
uni.hideLoading(); |
|
|
uni.hideLoading(); |
|
|
} |
|
|
} |
|
|
}, |
|
|
}, |
|
@ -340,11 +340,11 @@ import { getDirectoryItemArray } from '../../../common/directory.js'; |
|
|
) |
|
|
) |
|
|
} |
|
|
} |
|
|
} else { |
|
|
} else { |
|
|
if (this.jobContent.AllowModifyBatch == null) { |
|
|
if (this.jobContent.allowModifyBatch == "TRUE") { |
|
|
this.showQuestionMessage('在【' + that.fromLocationCode + '】库位下,未查找到批次【' + lot + |
|
|
this.showQuestionMessage('在【' + that.fromLocationCode + '】库位下,未查找到批次【' + lot + |
|
|
'】的发货明细,是否要继续发货?', res => { |
|
|
'】的发货明细,是否要继续发货?', res => { |
|
|
if (res) { |
|
|
if (res) { |
|
|
let batch = that.createBatchInfo(label, balance); |
|
|
let batch = that.createBatchInfo(label, balance,packageInfo); |
|
|
fromLocation.Batchs.unshift(batch); |
|
|
fromLocation.Batchs.unshift(batch); |
|
|
} |
|
|
} |
|
|
}) |
|
|
}) |
|
@ -371,15 +371,15 @@ import { getDirectoryItemArray } from '../../../common/directory.js'; |
|
|
} |
|
|
} |
|
|
}, |
|
|
}, |
|
|
|
|
|
|
|
|
createBatchInfo(data, balance) { |
|
|
createBatchInfo(data, balance,packageInfo) { |
|
|
let batch = { |
|
|
let batch = { |
|
|
batch: data.lot, |
|
|
batch: data.batch, |
|
|
qty: 0, |
|
|
qty: 0, |
|
|
uom: data.uom, |
|
|
uom: data.uom, |
|
|
handleQty: Number(data.qty), |
|
|
handleQty: Number(data.qty), |
|
|
Records: [] |
|
|
Records: [] |
|
|
} |
|
|
} |
|
|
let record = this.creatRecord(data, balance); |
|
|
let record = this.creatRecord(data, balance,packageInfo); |
|
|
batch.Records.push(record); |
|
|
batch.Records.push(record); |
|
|
this.issueRecord.unshift(record) |
|
|
this.issueRecord.unshift(record) |
|
|
return batch; |
|
|
return batch; |
|
|