diff --git a/common/record.js b/common/record.js index 6b310f39..8980df6c 100644 --- a/common/record.js +++ b/common/record.js @@ -30,6 +30,7 @@ export function createDetailInfo(data, pack) { detail.balanceQty = Number(detail.qty) detail.stdPackQty = Number(pack.stdPackQty) detail.stdPackUnit = pack.stdPackUnit + detail.handleQty =0; detail.package = pack; return detail; diff --git a/pages/container/record/containerBindRecord.vue b/pages/container/record/containerBindRecord.vue index 9429a8b9..2b132196 100644 --- a/pages/container/record/containerBindRecord.vue +++ b/pages/container/record/containerBindRecord.vue @@ -260,6 +260,7 @@ data.scaned = false; data.packingNumber = data.contentNumber data.qty = Number(data.qty) + data.handleQty = 0; let detail = data; return detail; }, diff --git a/pages/container/record/containerUnBindRecord.vue b/pages/container/record/containerUnBindRecord.vue index 8a337130..cd1e1ffa 100644 --- a/pages/container/record/containerUnBindRecord.vue +++ b/pages/container/record/containerUnBindRecord.vue @@ -205,6 +205,7 @@ data.scaned = false; data.packingNumber = data.contentNumber data.qty = Number(data.qty) + data.handleQty =0; let detail = data; return detail; }, diff --git a/pages/customerReturn/record/returnRecord.vue b/pages/customerReturn/record/returnRecord.vue index 3dc6a45e..9a9e3d4a 100644 --- a/pages/customerReturn/record/returnRecord.vue +++ b/pages/customerReturn/record/returnRecord.vue @@ -346,7 +346,7 @@ submitItem.fromLocationCode = detail.locationCode; submitItem.toLocationCode = detail.toLocationCode; - submitItem.qty = detail.handleQty!=undefined?detail.handleQty:detail.qty; + submitItem.qty = detail.handleQty!=0?detail.handleQty:detail.qty; submitItem.package =""; subList.push(submitItem) diff --git a/pages/deliver/record/deliverRecord.vue b/pages/deliver/record/deliverRecord.vue index b3dc640b..fa16f8c0 100644 --- a/pages/deliver/record/deliverRecord.vue +++ b/pages/deliver/record/deliverRecord.vue @@ -380,7 +380,7 @@ submitItem.fromLocationCode = detail.locationCode; submitItem.toLocationCode = detail.toLocationCode; - submitItem.qty = detail.handleQty!=undefined?detail.handleQty:detail.qty; + submitItem.qty = detail.handleQty!=0?detail.handleQty:detail.qty; submitItem.package =""; subList.push(submitItem) diff --git a/pages/productPutaway/record/productPutawayRecord.vue b/pages/productPutaway/record/productPutawayRecord.vue index ea503e70..644abbca 100644 --- a/pages/productPutaway/record/productPutawayRecord.vue +++ b/pages/productPutaway/record/productPutawayRecord.vue @@ -335,7 +335,7 @@ submitItem.fromLocationCode = detail.locationCode; submitItem.toLocationCode = detail.toLocationCode; - submitItem.qty = detail.handleQty!=undefined?detail.handleQty:detail.qty; + submitItem.qty = detail.handleQty!=0?detail.handleQty:detail.qty; submitItem.package =""; subList.push(submitItem) } diff --git a/pages/productReceipt/record/productReceiptRecord.vue b/pages/productReceipt/record/productReceiptRecord.vue index 9cf94eda..dd183d9e 100644 --- a/pages/productReceipt/record/productReceiptRecord.vue +++ b/pages/productReceipt/record/productReceiptRecord.vue @@ -195,6 +195,7 @@ Object.assign(detail, label) detail.scaned = true; detail.qty = Number(label.qty); + detail.handleQty = 0; detail.inventoryStatus = "OK" detail.stdPackQty = pack.stdPackQty; detail.stdPackUnit = pack.stdPackUnit; @@ -326,7 +327,7 @@ submitItem.productionlineCode = this.productionLineCode; submitItem.workStationCode = this.workStationCode; - submitItem.qty = detail.handleQty!=undefined?detail.handleQty:detail.qty; + submitItem.qty = detail.handleQty!=0?detail.handleQty:detail.qty; submitItem.package =""; subList.push(submitItem) diff --git a/pages/productionReturn/coms/comReturn.vue b/pages/productionReturn/coms/comReturn.vue index 911f9571..c8efa490 100644 --- a/pages/productionReturn/coms/comReturn.vue +++ b/pages/productionReturn/coms/comReturn.vue @@ -226,7 +226,7 @@ detail.inventoryStatus = this.businessTypeCode == 'ReturnToStore' ? "OK" : "HOLD" detail.stdPackQty = pack.stdPackQty; detail.stdPackUnit = pack.stdPackUnit; - + detail.handleQty = 0; detail.package = pack; detail.label = label; return detail; diff --git a/pages/productionReturn/record/returnToHold.vue b/pages/productionReturn/record/returnToHold.vue index 788bd62a..8833f5d5 100644 --- a/pages/productionReturn/record/returnToHold.vue +++ b/pages/productionReturn/record/returnToHold.vue @@ -230,6 +230,7 @@ Object.assign(detail, label) detail.scaned = true; detail.qty = Number(label.qty); + detail.handleQty = 0; detail.inventoryStatus = "OK" detail.stdPackQty = pack.stdPackQty; detail.stdPackUnit = pack.stdPackUnit; @@ -417,7 +418,7 @@ submitItem.productionlineCode = this.productionLineCode; submitItem.workStationCode = this.workStationCode; - submitItem.qty = detail.handleQty!=undefined?detail.handleQty:detail.qty; + submitItem.qty = detail.handleQty!=0?detail.handleQty:detail.qty; subList.push(submitItem) } diff --git a/pages/productionReturn/record/returnToStore.vue b/pages/productionReturn/record/returnToStore.vue index 253bfd64..c4214847 100644 --- a/pages/productionReturn/record/returnToStore.vue +++ b/pages/productionReturn/record/returnToStore.vue @@ -231,6 +231,7 @@ Object.assign(detail, label) detail.scaned = true; detail.qty = Number(label.qty); + detail.handleQty =0; detail.inventoryStatus = "OK" detail.stdPackQty = pack.stdPackQty; detail.stdPackUnit = pack.stdPackUnit; @@ -446,7 +447,7 @@ submitItem.productionlineCode = this.productionLineCode; submitItem.workStationCode = this.workStationCode; - submitItem.qty = detail.handleQty!=undefined?detail.handleQty:detail.qty; + submitItem.qty = detail.handleQty!=0?detail.handleQty:detail.qty; subList.push(submitItem) } }) diff --git a/pages/purchaseReturn/record/returnRecord.vue b/pages/purchaseReturn/record/returnRecord.vue index 18178c36..5d5a76af 100644 --- a/pages/purchaseReturn/record/returnRecord.vue +++ b/pages/purchaseReturn/record/returnRecord.vue @@ -290,7 +290,7 @@ submitItem.fromLocationCode = this.fromLocationCode; submitItem.toLocationCode = ''; //采购退货直接出库，目标库位为空 - submitItem.qty = detail.handleQty!=undefined?detail.handleQty:detail.qty; + submitItem.qty = detail.handleQty!=0?detail.handleQty:detail.qty; submitItem.package = ""; subList.push(submitItem) } diff --git a/pages/putaway/record/putawayRecord.vue b/pages/putaway/record/putawayRecord.vue index b7497340..fc381f0e 100644 --- a/pages/putaway/record/putawayRecord.vue +++ b/pages/putaway/record/putawayRecord.vue @@ -381,7 +381,7 @@ // detail.toInventoryStatus = detail.inventoryStatus // detail.toLocationCode = detail.toLocationCode - submitItem.qty = detail.handleQty!=undefined?detail.handleQty:detail.qty; + submitItem.qty = detail.handleQty!=0?detail.handleQty:detail.qty; submitItem.package = ""; subList.push(submitItem) } diff --git a/pages/scrap/record/scrapRecord.vue b/pages/scrap/record/scrapRecord.vue index 421d14b1..827a5728 100644 --- a/pages/scrap/record/scrapRecord.vue +++ b/pages/scrap/record/scrapRecord.vue @@ -297,7 +297,7 @@ submitItem.toLocationCode = ""; submitItem.reason = this.reasonCode; - submitItem.qty = detail.handleQty!=undefined?detail.handleQty:detail.qty; + submitItem.qty = detail.handleQty!=0?detail.handleQty:detail.qty; submitItem.package =""; subList.push(submitItem) } diff --git a/pages/transfer/coms/comTransferRecord.vue b/pages/transfer/coms/comTransferRecord.vue index a4002787..e3dbd8ba 100644 --- a/pages/transfer/coms/comTransferRecord.vue +++ b/pages/transfer/coms/comTransferRecord.vue @@ -361,7 +361,7 @@ submitItem.fromLocationCode = detail.locationCode; submitItem.toLocationCode = detail.toLocationCode; - submitItem.qty = detail.handleQty!=undefined?detail.handleQty:detail.qty; + submitItem.qty = detail.handleQty!=0?detail.handleQty:detail.qty; submitItem.package =""; subList.push(submitItem) diff --git a/pages/transfer/job/transferDetail.vue b/pages/transfer/job/transferDetail.vue index a1eee5e7..33d6ed75 100644 --- a/pages/transfer/job/transferDetail.vue +++ b/pages/transfer/job/transferDetail.vue @@ -221,7 +221,9 @@ createDetailInfo(data) { data.scaned = false; // data.record = {}; + let detail = data; + detail.handleQty = 0, return detail; }, diff --git a/pages/unPlanned/record/issueRecord.vue b/pages/unPlanned/record/issueRecord.vue index 0cdbc6e7..052033f6 100644 --- a/pages/unPlanned/record/issueRecord.vue +++ b/pages/unPlanned/record/issueRecord.vue @@ -255,7 +255,7 @@ submitItem.toLocationCode = ""; submitItem.reason = this.reasonCode; - submitItem.qty = detail.handleQty!=undefined?detail.handleQty:detail.qty; + submitItem.qty = detail.handleQty!=0?detail.handleQty:detail.qty; submitItem.package =""; subList.push(submitItem) diff --git a/pages/unPlanned/record/receiptRecord.vue b/pages/unPlanned/record/receiptRecord.vue index 2d2e3353..f61f657c 100644 --- a/pages/unPlanned/record/receiptRecord.vue +++ b/pages/unPlanned/record/receiptRecord.vue @@ -183,6 +183,7 @@ detail.scaned = true; // Object.assign(detail, label) detail.qty = Number(label.qty) + detail.handleQty = 0, detail.inventoryStatus = "OK" detail.stdPackQty = pack.stdPackQty; detail.stdPackUnit = pack.stdPackUnit; @@ -334,7 +335,7 @@ submitItem.reason = this.reasonCode; - submitItem.qty = detail.handleQty!=undefined?detail.handleQty:detail.qty; + submitItem.qty = detail.handleQty!=0?detail.handleQty:detail.qty; submitItem.package =""; subList.push(submitItem)