diff --git a/src/pages/purchaseReceipt/job/receiptDetail.vue b/src/pages/purchaseReceipt/job/receiptDetail.vue index d2c5510f..70d58910 100644 --- a/src/pages/purchaseReceipt/job/receiptDetail.vue +++ b/src/pages/purchaseReceipt/job/receiptDetail.vue @@ -303,10 +303,10 @@ } }) // 获取收货记录列表,用于判断扫描包装是否已被收货 - // getPurchaseReceiptJobDetailListByNmber(that.jobContent.requestNumber).then((res)=>{ - // console.log(res) - // this.receiptRecordList = res.data - // }) + getPurchaseReceiptJobDetailListByNmber(that.jobContent.requestNumber).then((res)=>{ + console.log(res) + this.receiptRecordList = res.data + }) // if (uni.getStorageSync('purchaseReceiptDetailPointParams')) { // const purchaseReceiptDetailPointParams = uni.getStorageSync( // 'purchaseReceiptDetailPointParams') @@ -496,11 +496,11 @@ this.showMessage("批次【" + batch + "】不在列表中") } else { // 箱码是否已经扫描 - // var isHavePackingNumber1 =this.receiptRecordList.find(r => r.packingNumber == packingNumber); - // if(isHavePackingNumber1){ - // this.showMessage("箱码【" + packingNumber + "】已经生成任务"); - // return - // } + var isHavePackingNumber1 =this.receiptRecordList.find(r => r.packingNumber == packingNumber); + if(isHavePackingNumber1){ + this.showMessage("箱码【" + packingNumber + "】已经生成任务"); + return + } var isHavePackingNumber =this.packingNumberList.find(r => r.packingNumber == packingNumber); if(isHavePackingNumber){ this.showMessage("箱码【" + packingNumber + "】已经扫描"); diff --git a/src/pages/unPlanned/job/receiptJobDetail.vue b/src/pages/unPlanned/job/receiptJobDetail.vue index 8b210636..5b5fe2d3 100644 --- a/src/pages/unPlanned/job/receiptJobDetail.vue +++ b/src/pages/unPlanned/job/receiptJobDetail.vue @@ -290,7 +290,7 @@ batch:batch, handleQty:Number(result.label.qty), qty:detail.qty, - toLocationCode:locationCode, + toLocationCode:this.toLocationCode ? this.toLocationCode : this.jobToLocationCode, // inventoryStatus:inventoryStatus, // toInventoryStatus:inventoryStatus, packQty:Number(result.package.packQty), @@ -311,8 +311,8 @@ } else { itemDetail.scaned = true; itemDetail.handleQty = Number(result.label.qty); - // itemDetail.toLocationCode = this.toLocationCode ? this.toLocationCode : itemDetail - // .toLocationCode; + itemDetail.toLocationCode = this.toLocationCode ? this.toLocationCode : itemDetail + .toLocationCode; itemDetail.packQty = Number(result.package.packQty) itemDetail.packUnit = result.package.packUnit itemDetail.labelQty = Number(result.label.qty);