From 498ef365baba3500316a4df5df80e7c410001f1e Mon Sep 17 00:00:00 2001 From: "juncheng.li" Date: Wed, 12 Apr 2023 14:48:08 +0800 Subject: [PATCH] =?UTF-8?q?=E5=8E=9F=E6=96=99=E7=9B=B4=E5=8F=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- fe/PDA/pages/store/deliverRaw.vue | 110 ++++++++++++++++++++++-------- 1 file changed, 80 insertions(+), 30 deletions(-) diff --git a/fe/PDA/pages/store/deliverRaw.vue b/fe/PDA/pages/store/deliverRaw.vue index cb6c937ff..2db5de61a 100644 --- a/fe/PDA/pages/store/deliverRaw.vue +++ b/fe/PDA/pages/store/deliverRaw.vue @@ -48,8 +48,8 @@ - + @@ -251,35 +251,80 @@ addLabel(item, balanceItem) { let label = this.currentLabel; - label.qty = balanceItem.qty; - label.uom = balanceItem.uom; - label.locationCode = balanceItem.locationCode; - label.locationGroup = balanceItem.locationGroup; - label.locationArea = balanceItem.locationArea; - label.locationErpCode = balanceItem.locationErpCode; - label.warehouseCode = balanceItem.warehouseCode; - label.status = balanceItem.status; - + // label.qty = balanceItem.qty; + // label.uom = balanceItem.uom; + // label.locationCode = balanceItem.locationCode; + // label.locationGroup = balanceItem.locationGroup; + // label.locationArea = balanceItem.locationArea; + // label.locationErpCode = balanceItem.locationErpCode; + // label.warehouseCode = balanceItem.warehouseCode; + // label.status = balanceItem.status; + + // label.fromPackingCode = balanceItem.packingCode; + // label.fromContainerCode = balanceItem.containerCode; + // label.fromLot = balanceItem.lot; + + // label.fromLocationCode = balanceItem.locationCode; + // label.fromLocationGroup = balanceItem.locationGroup; + // label.fromLocationArea = balanceItem.locationArea; + // label.fromLocationErpCode = balanceItem.locationErpCode; + // label.fromWarehouseCode = balanceItem.warehouseCode; + // label.fromStatus = balanceItem.status; + + // label.toContainerCode = this.currentLabel.containerCode; + // label.toPackingCode = this.currentLabel.packingCode; + // label.toLot = this.currentLabel.lot; + // label.toWarehouseCode = localStorage.warehouseCode; + // label.toStatus = balanceItem.status; + // item.supplierBatch = balanceItem.supplierBatch; + // item.arriveDate = balanceItem.arriveDate; + // item.produceDate = balanceItem.produceDate; + // item.expireDate = balanceItem.expireDate; + //================================================ + label.stdPackQty = balanceItem.stdPackQty; label.fromPackingCode = balanceItem.packingCode; + label.toPackingCode = this.currentLabel.packingCode; label.fromContainerCode = balanceItem.containerCode; + label.toContainerCode = this.currentLabel.containerCode; label.fromLot = balanceItem.lot; - + label.toLot = this.currentLabel.lot; + label.supplierBatch = balanceItem.supplierBatch; + label.arriveDate = balanceItem.arriveDate; + label.produceDate = balanceItem.produceDate; + label.expireDate = balanceItem.expireDate; label.fromLocationCode = balanceItem.locationCode; - label.fromLocationGroup = balanceItem.locationGroup; label.fromLocationArea = balanceItem.locationArea; + label.fromLocationGroup = balanceItem.locationGroup; label.fromLocationErpCode = balanceItem.locationErpCode; label.fromWarehouseCode = balanceItem.warehouseCode; label.fromStatus = balanceItem.status; - - label.toContainerCode = this.currentLabel.containerCode; - label.toPackingCode = this.currentLabel.packingCode; - label.toLot = this.currentLabel.lot; - label.toWarehouseCode = localStorage.warehouseCode; label.toStatus = balanceItem.status; - // item.supplierBatch = balanceItem.supplierBatch; - // item.arriveDate = balanceItem.arriveDate; - // item.produceDate = balanceItem.produceDate; - // item.expireDate = balanceItem.expireDate; + label.toWarehouseCode = localStorage.warehouseCode; + label.locationCode =balanceItem.locationCode; + + label.recommendContainerCode = balanceItem.containerCode; + label.recommendPackingCode = balanceItem.packingCode; + label.recommendSupplierBatch = balanceItem.supplierBatch; + label.recommendArriveDate = balanceItem.arriveDate; + label.recommendProduceDate = balanceItem.produceDate; + label.recommendExpireDate = balanceItem.expireDate; + label.recommendLot = balanceItem.lot; + label.recommendFromLocationCode = balanceItem.locationCode; + label.recommendFromLocationArea = balanceItem.locationArea; + label.recommendFromLocationGroup = balanceItem.locationGroup; + label.recommendFromLocationErpCode = balanceItem.locationErpCode; + label.recommendFromWarehouseCode = localStorage.warehouseCode; + label.uom = balanceItem.uom; + label.recommendQty = balanceItem.qty; + label.handledContainerCode = this.currentLabel.containerCode; + label.handledPackingCode = this.currentLabel.packingCode; + label.handledSupplierBatch = "string", + label.handledArriveDate = balanceItem.arriveDate; + label.handledProduceDate = balanceItem.produceDate; + label.handledExpireDate = balanceItem.expireDate; + label.handledLot = this.currentLabel.lot; + label.handledFromWarehouseCode = localStorage.warehouseCode, + label.handledQty = balanceItem.qty, item.labelList.unshift(label) }, @@ -365,16 +410,15 @@ customerAddressCode: that.customerAddress.customerAddressCode, deliverTime: getISODateTime(), deliverRequestType: 3, - toLocationCode: that.toLocation.code, - toLocationArea: that.toLocation.areaCode, - toLocationGroup: that.toLocation.locationGroupCode, - toLocationErpCode: that.toLocation.erpLocationCode, + // toLocationCode: that.toLocation.code, + // toLocationArea: that.toLocation.areaCode, + // toLocationGroup: that.toLocation.locationGroupCode, + // toLocationErpCode: that.toLocation.erpLocationCode, jobNumber: '', deliverPlanNumber: '', deliverRequestNumber: '', worker: localStorage.userName, warehouseCode: localStorage.warehouseCode, - company: localStorage.company, details: [] } @@ -384,6 +428,12 @@ r.toLocationGroup = that.toLocation.locationGroupCode; r.toLocationArea = that.toLocation.areaCode; r.toLocationErpCode = that.toLocation.erpLocationCode; + // ======================================= + r.handledFromLocationCode = that.toLocation.code; + r.handledFromLocationArea = that.toLocation.areaCode; + r.handledFromLocationGroup = that.toLocation.locationGroupCode; + r.handledFromLocationErpCode = that.toLocation.erpLocationCode; + r.worker = localStorage.userName item.details.push(r); }) @@ -418,15 +468,15 @@ this.customerCode = ''; that.clearCustomerAddress(); }, - + openScanPopup() { this.$refs.scanPopup.openScanPopup() }, - + scanPopupGetFocus() { this.$refs.scanPopup.getfocus(); }, - + showMessage(message) { this.$refs.comMessage.showMessage(message); },