|
|
@ -40,6 +40,7 @@ |
|
|
</view> |
|
|
</view> |
|
|
<comCountDetailcards :ref="'countDetail_'+index" :dataContent="item" :index="index" |
|
|
<comCountDetailcards :ref="'countDetail_'+index" :dataContent="item" :index="index" |
|
|
@editItem="editItem" :settingParam="jobContent" @remove="updateData" |
|
|
@editItem="editItem" :settingParam="jobContent" @remove="updateData" |
|
|
|
|
|
:isShowRecommendQty ="false" |
|
|
@updateData="updateData"> |
|
|
@updateData="updateData"> |
|
|
</comCountDetailcards> |
|
|
</comCountDetailcards> |
|
|
</view> |
|
|
</view> |
|
|
@ -66,7 +67,9 @@ |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
<win-scan-button @goScan='openScanPopup'></win-scan-button> |
|
|
<win-scan-button @goScan='openScanPopup'></win-scan-button> |
|
|
<win-scan-pack-and-location ref="scanPopup" :noShowBalanceMessage="true" :queryBalance="false" @getResult='getScanResult'> |
|
|
<win-scan-pack-and-location |
|
|
|
|
|
:allowModifyLocation="false" |
|
|
|
|
|
ref="scanPopup" :noShowBalanceMessage="true" :queryBalance="true" @getResult='getScanResult'> |
|
|
</win-scan-pack-and-location> |
|
|
</win-scan-pack-and-location> |
|
|
<count-qty-edit ref="countQtyEdit" @confirm="editConfirm" @close="editClose" :isShowStatus="true" |
|
|
<count-qty-edit ref="countQtyEdit" @confirm="editConfirm" @close="editClose" :isShowStatus="true" |
|
|
:allowEditStatus="editInventoryStatus" :isShowBalance="jobContent.isOpenCount=='TRUE'"> |
|
|
:allowEditStatus="editInventoryStatus" :isShowBalance="jobContent.isOpenCount=='TRUE'"> |
|
|
@ -242,15 +245,15 @@ |
|
|
} else { |
|
|
} else { |
|
|
that.jobContent = res.data; |
|
|
that.jobContent = res.data; |
|
|
that.jobStatus = res.data.status; |
|
|
that.jobStatus = res.data.status; |
|
|
that.fromLocationCode = that.jobContent.locationCode; |
|
|
that.fromLocationCode = that.jobContent.countSplitCode; |
|
|
// res.data.subList.forEach(item => { |
|
|
res.data.subList.forEach(item => { |
|
|
// item.recommendQty = item.qty |
|
|
item.recommendQty = item.qty |
|
|
// item.handleQty = 0 |
|
|
item.handleQty = 0 |
|
|
// item.countTime = new Date() |
|
|
item.countTime = new Date() |
|
|
// item.fromLocationCode =that.fromLocationCode; |
|
|
item.fromLocationCode =that.fromLocationCode; |
|
|
// }) |
|
|
}) |
|
|
// that.allDetails = res.data.subList; |
|
|
that.allDetails = res.data.subList; |
|
|
// that.allCount = res.data.subList.length; |
|
|
that.allCount = res.data.subList.length; |
|
|
that.initList() |
|
|
that.initList() |
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
@ -335,9 +338,9 @@ |
|
|
var packingNumber = result.label.packingNumber |
|
|
var packingNumber = result.label.packingNumber |
|
|
var pack = result.package |
|
|
var pack = result.package |
|
|
var batch = result.label.batch |
|
|
var batch = result.label.batch |
|
|
var inventoryStatus = "OK" |
|
|
var inventoryStatus = result.balance ? result.balance.inventoryStatus : "OK" |
|
|
var qty = result.label.qty ? result.label.qty : 0; |
|
|
var qty = result.balance ? result.balance.qty : 0; |
|
|
|
|
|
|
|
|
//按物料、箱码、批次、状态匹配 |
|
|
//按物料、箱码、批次、状态匹配 |
|
|
let items = this.allDetails.filter(r => |
|
|
let items = this.allDetails.filter(r => |
|
|
r.itemCode === itemCode && |
|
|
r.itemCode === itemCode && |
|
|
@ -346,13 +349,21 @@ |
|
|
r.inventoryStatus === inventoryStatus) |
|
|
r.inventoryStatus === inventoryStatus) |
|
|
//不在任务列表中,是否添加库存 |
|
|
//不在任务列表中,是否添加库存 |
|
|
if (items.length == 0) { |
|
|
if (items.length == 0) { |
|
|
var detail = this.createAddDetailInfo(pack,qty) |
|
|
this.$refs.comMessage.showQuestionMessage("包装【" + result.label.packingNumber + |
|
|
detail.countTime = new Date(); |
|
|
"】不在任务列表中,是否要添加到列表中?", |
|
|
this.allDetails.push(detail) |
|
|
res => { |
|
|
this.updateList(); |
|
|
//创建盘点信息，标记为已经扫描 |
|
|
this.$refs.countQtyEdit.openEditPopupShowSeconds(detail, |
|
|
if (res) { |
|
|
null); |
|
|
var detail = this.createAddDetailInfo(pack,qty) |
|
|
|
|
|
detail.countTime = new Date(); |
|
|
|
|
|
this.allDetails.push(detail) |
|
|
|
|
|
this.updateList(); |
|
|
|
|
|
this.$refs.countQtyEdit.openEditPopupShowSeconds(detail, |
|
|
|
|
|
null); |
|
|
|
|
|
} else { |
|
|
|
|
|
this.scanPopupGetFocus(); |
|
|
|
|
|
} |
|
|
|
|
|
}) |
|
|
} else { |
|
|
} else { |
|
|
var selectItem = items[0] |
|
|
var selectItem = items[0] |
|
|
//已经扫描 |
|
|
//已经扫描 |
|
|
@ -368,15 +379,15 @@ |
|
|
this.scanPopupGetFocus(); |
|
|
this.scanPopupGetFocus(); |
|
|
} |
|
|
} |
|
|
}) |
|
|
}) |
|
|
|
|
|
|
|
|
} else { |
|
|
} else { |
|
|
//未扫描，赋值 |
|
|
//未扫描，赋值 |
|
|
selectItem.scaned = true; |
|
|
selectItem.scaned = true; |
|
|
selectItem.recommendQty =Number(qty); |
|
|
selectItem.balanceQty= Number(qty) |
|
|
selectItem.handleQty = Number(qty) |
|
|
selectItem.handleQty = Number(qty) |
|
|
selectItem.packQty = pack.packQty |
|
|
selectItem.packQty = pack.packQty |
|
|
selectItem.packUnit = pack.packUnit |
|
|
selectItem.packUnit = pack.packUnit |
|
|
|
|
|
|
|
|
this.$refs.countQtyEdit.openEditPopupShowSeconds(selectItem, |
|
|
this.$refs.countQtyEdit.openEditPopupShowSeconds(selectItem, |
|
|
null); |
|
|
null); |
|
|
selectItem.countTime = new Date(); |
|
|
selectItem.countTime = new Date(); |
|
|
@ -424,7 +435,7 @@ |
|
|
//创建盘盈的明细 |
|
|
//创建盘盈的明细 |
|
|
createAddDetailInfo(pack,qty) { |
|
|
createAddDetailInfo(pack,qty) { |
|
|
var detail = { |
|
|
var detail = { |
|
|
id: this.jobContent.masterId, //新增的明细 |
|
|
masterId: this.jobContent.id, //新增的明细 |
|
|
scaned: true, |
|
|
scaned: true, |
|
|
countDetailNumber: "", |
|
|
countDetailNumber: "", |
|
|
ownerCode: "", |
|
|
ownerCode: "", |
|
|
@ -448,6 +459,7 @@ |
|
|
countQty: 0, |
|
|
countQty: 0, |
|
|
balanceQty: 0, |
|
|
balanceQty: 0, |
|
|
fromLocationCode: this.fromLocationCode, |
|
|
fromLocationCode: this.fromLocationCode, |
|
|
|
|
|
locationCode:this.fromLocationCode, |
|
|
creator: this.$store.state.user.id, |
|
|
creator: this.$store.state.user.id, |
|
|
countTime: new Date() |
|
|
countTime: new Date() |
|
|
} |
|
|
} |
|
|
|
