|
|
|
@ -69,7 +69,7 @@ |
|
|
|
<uni-swipe-action-item @click="swipeClick($event,record,index)" |
|
|
|
:right-options="scanOptions"> |
|
|
|
<view style="padding: 0px 10px"> |
|
|
|
<balance :dataContent="record" :isShowFromLocation="false" |
|
|
|
<balance :dataContent="record" :isShowFromLocation="false" :isShowStatus='true' |
|
|
|
:isShowStdPack="false"></balance> |
|
|
|
</view> |
|
|
|
</uni-swipe-action-item> |
|
|
|
@ -106,8 +106,8 @@ |
|
|
|
} from '@/api/request2.js'; |
|
|
|
|
|
|
|
import { |
|
|
|
calc |
|
|
|
} from '@/common/calc.js'; |
|
|
|
calc |
|
|
|
} from '@/common/calc.js'; |
|
|
|
|
|
|
|
import { |
|
|
|
getBalanceByManagementPrecision |
|
|
|
@ -242,30 +242,33 @@ |
|
|
|
) |
|
|
|
return; |
|
|
|
} else { |
|
|
|
//查找库存信息 |
|
|
|
uni.showLoading({ |
|
|
|
title: '加载中', |
|
|
|
mask: true |
|
|
|
}) |
|
|
|
getBalanceByManagementPrecision(result.label, that.fromLocationCode, that.fromInventoryStatuses, |
|
|
|
balanceRes => { |
|
|
|
if (balanceRes.success) { |
|
|
|
if (balanceRes.data.list.length == 0) { |
|
|
|
this.showErrorMessage('在来源库位[' + this.fromLocationCode + '],未查找到该包装的库存记录', |
|
|
|
res => { |
|
|
|
this.packGetFocus(); |
|
|
|
}) |
|
|
|
} else if (balanceRes.data.list.length == 1) { |
|
|
|
let balance = balanceRes.data.list[0]; |
|
|
|
this.afterGetBalance(result.label, balance, packageInfo); |
|
|
|
} else { |
|
|
|
this.showBalanceSelect(balanceRes.data.list); |
|
|
|
} |
|
|
|
} else { |
|
|
|
this.showErrorMessage(balanceRes.message.message); |
|
|
|
} |
|
|
|
uni.hideLoading(); |
|
|
|
}); |
|
|
|
|
|
|
|
this.afterGetBalance(result.label, result.label, packageInfo); |
|
|
|
|
|
|
|
// //查找库存信息 |
|
|
|
// uni.showLoading({ |
|
|
|
// title: '加载中', |
|
|
|
// mask: true |
|
|
|
// }) |
|
|
|
// getBalanceByManagementPrecision(result.label, that.fromLocationCode, that.fromInventoryStatuses, |
|
|
|
// balanceRes => { |
|
|
|
// if (balanceRes.success) { |
|
|
|
// if (balanceRes.data.list.length == 0) { |
|
|
|
// this.showErrorMessage('在来源库位[' + this.fromLocationCode + '],未查找到该包装的库存记录', |
|
|
|
// res => { |
|
|
|
// this.packGetFocus(); |
|
|
|
// }) |
|
|
|
// } else if (balanceRes.data.list.length == 1) { |
|
|
|
// let balance = balanceRes.data.list[0]; |
|
|
|
// this.afterGetBalance(result.label, balance, packageInfo); |
|
|
|
// } else { |
|
|
|
// this.showBalanceSelect(balanceRes.data.list); |
|
|
|
// } |
|
|
|
// } else { |
|
|
|
// this.showErrorMessage(balanceRes.message.message); |
|
|
|
// } |
|
|
|
// uni.hideLoading(); |
|
|
|
// }); |
|
|
|
} |
|
|
|
} catch (e) { |
|
|
|
this.showErrorMessage(e.stack) |
|
|
|
@ -297,11 +300,11 @@ |
|
|
|
if (batch.Recommends.length > 0) { |
|
|
|
let recommend = batch.Recommends.find(r => r.packingNumber == packingCode); |
|
|
|
if (recommend != undefined) { |
|
|
|
that.addRecord(batch, label, balance, packageInfo) |
|
|
|
that.addRecord(batch, label, packageInfo) |
|
|
|
} else { |
|
|
|
//允许修改箱码 |
|
|
|
if (this.jobContent.allowModifyPackingNumber == 'TRUE') { |
|
|
|
that.addRecord(batch, label, balance, packageInfo); |
|
|
|
that.addRecord(batch, label, packageInfo); |
|
|
|
} else { |
|
|
|
that.showErrorMessage('未查找到该箱码【' + packingCode + '】的明细', |
|
|
|
res => { |
|
|
|
@ -311,7 +314,7 @@ |
|
|
|
} |
|
|
|
} |
|
|
|
} else { |
|
|
|
that.addRecord(batch, label, balance, packageInfo) |
|
|
|
that.addRecord(batch, label, packageInfo) |
|
|
|
} |
|
|
|
} else { |
|
|
|
that.showErrorMessage('箱码【' + packingCode + '】已经扫描,请继续扫描下一箱', |
|
|
|
@ -325,8 +328,8 @@ |
|
|
|
this.showQuestionMessage('在【' + that.fromLocationCode + '】库位下,未查找到批次【' + lot + |
|
|
|
'】的发料明细,是否要继续发料?', res => { |
|
|
|
if (res) { |
|
|
|
let batch = that.createBatchInfo(label, balance,packageInfo); |
|
|
|
if(fromLocation.Batchs.length>0){ |
|
|
|
let batch = that.createBatchInfo(label, balance, packageInfo); |
|
|
|
if (fromLocation.Batchs.length > 0) { |
|
|
|
batch.detail = fromLocation.Batchs[0].detail; |
|
|
|
} |
|
|
|
fromLocation.Batchs.unshift(batch); |
|
|
|
@ -355,7 +358,7 @@ |
|
|
|
} |
|
|
|
}, |
|
|
|
|
|
|
|
createBatchInfo(data, balance,packageInfo) { |
|
|
|
createBatchInfo(data, balance, packageInfo) { |
|
|
|
let batch = { |
|
|
|
batch: data.batch, |
|
|
|
qty: 0, |
|
|
|
@ -363,54 +366,75 @@ |
|
|
|
handleQty: Number(data.qty), |
|
|
|
Records: [] |
|
|
|
} |
|
|
|
let record = this.creatRecord(data, balance,packageInfo); |
|
|
|
let record = this.creatRecord(data, packageInfo); |
|
|
|
batch.Records.push(record); |
|
|
|
this.issueRecord.unshift(record) |
|
|
|
return batch; |
|
|
|
}, |
|
|
|
|
|
|
|
creatRecord(label, balance, packageInfo) { |
|
|
|
balance.packQty = packageInfo.packQty |
|
|
|
balance.packUnit = packageInfo.packUnit |
|
|
|
creatRecord(label, packageInfo) { |
|
|
|
let record = { |
|
|
|
scaned: true, |
|
|
|
itemCode: label.itemCode, |
|
|
|
packingNumber: label.packingNumber, |
|
|
|
parentPackingNumber: packageInfo.parentNumber, |
|
|
|
batch: label.batch, |
|
|
|
qty: Number(balance.qty), |
|
|
|
qty: Number(label.qty), |
|
|
|
// qty: Number(label.qty)>Number(balance.qty)?Number(balance.qty):Number(label.qty), |
|
|
|
uom: balance.uom, |
|
|
|
inventoryStatus: balance.inventoryStatus, |
|
|
|
balance: balance, |
|
|
|
uom: label.uom, |
|
|
|
inventoryStatus: "OK", |
|
|
|
balance: null, |
|
|
|
toLocationCode: this.toLocationCode, |
|
|
|
supplierCode: label.supplierCode |
|
|
|
} |
|
|
|
return record; |
|
|
|
}, |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
// creatRecord(label, balance, packageInfo) { |
|
|
|
// balance.packQty = packageInfo.packQty |
|
|
|
// balance.packUnit = packageInfo.packUnit |
|
|
|
// let record = { |
|
|
|
// scaned: true, |
|
|
|
// itemCode: label.itemCode, |
|
|
|
// packingNumber: label.packingNumber, |
|
|
|
// batch: label.batch, |
|
|
|
// qty: Number(balance.qty), |
|
|
|
// // qty: Number(label.qty)>Number(balance.qty)?Number(balance.qty):Number(label.qty), |
|
|
|
// uom: balance.uom, |
|
|
|
// inventoryStatus: balance.inventoryStatus, |
|
|
|
// balance: balance, |
|
|
|
// toLocationCode: this.toLocationCode, |
|
|
|
// supplierCode: label.supplierCode |
|
|
|
// } |
|
|
|
// return record; |
|
|
|
// }, |
|
|
|
|
|
|
|
calcBatchHandleQty(batch) { |
|
|
|
let handleQty = 0; |
|
|
|
batch.Records.forEach(res => { |
|
|
|
handleQty = calc.add(handleQty,res.qty) |
|
|
|
handleQty = calc.add(handleQty, res.qty) |
|
|
|
}) |
|
|
|
batch.handleQty = handleQty; |
|
|
|
|
|
|
|
this.dataContent.forEach(toLocationCode=>{ |
|
|
|
toLocationCode.Items.forEach(item=>{ |
|
|
|
var itemCodeHandleQty =0; |
|
|
|
item.Locations.forEach(batch=>{ |
|
|
|
batch.Batchs.forEach(batchHandleQty=>{ |
|
|
|
itemCodeHandleQty=calc.add(itemCodeHandleQty,batchHandleQty.handleQty) |
|
|
|
this.dataContent.forEach(toLocationCode => { |
|
|
|
toLocationCode.Items.forEach(item => { |
|
|
|
var itemCodeHandleQty = 0; |
|
|
|
item.Locations.forEach(batch => { |
|
|
|
batch.Batchs.forEach(batchHandleQty => { |
|
|
|
itemCodeHandleQty = calc.add(itemCodeHandleQty, |
|
|
|
batchHandleQty.handleQty) |
|
|
|
}) |
|
|
|
}) |
|
|
|
item.handleQty=itemCodeHandleQty; |
|
|
|
item.handleQty = itemCodeHandleQty; |
|
|
|
}) |
|
|
|
|
|
|
|
}) |
|
|
|
}, |
|
|
|
|
|
|
|
addRecord(batch, label, balance, packageInfo) { |
|
|
|
let record = this.creatRecord(label, balance, packageInfo); |
|
|
|
addRecord(batch, label, packageInfo) { |
|
|
|
let record = this.creatRecord(label, packageInfo); |
|
|
|
batch.Records.push(record); |
|
|
|
this.issueRecord.unshift(record) |
|
|
|
this.calcBatchHandleQty(batch); |
|
|
|
|
