库位合并

src/views/robot/merge/index.vue

@@ -404,15 +404,15 @@ const onBarcodeEnter = async () => {
       currentInventoryData.value = inventoryData
       // 填充商品信息
       productInfo.targetLocation = sourceLocation.value
-      productInfo.stockQty = inventoryData.quantityAvailable || inventoryData.quantity || ''
-      productInfo.productName = inventoryData.productName || inventoryData.skuName || ''
-      productInfo.barcode = inventoryData.barcode || scanBarcode.value
-      productInfo.qualityStatus = inventoryData.lotAtt08 || inventoryData.qualityStatus || ''
-      productInfo.warehouseType = inventoryData.lotAtt05 || inventoryData.warehouseType || ''
-      productInfo.batchNo = inventoryData.lotNumber || inventoryData.lotNum || ''
-      productInfo.productionDate = inventoryData.lotAtt01 || inventoryData.productionDate || ''
-      productInfo.expiryDate = inventoryData.lotAtt02 || inventoryData.expiryDate || ''
-      productInfo.moveQty = inventoryData.quantityAvailable || inventoryData.quantity || ''
+      productInfo.stockQty = inventoryData.quantity
+      productInfo.productName = inventoryData.productName
+      productInfo.barcode = inventoryData.barcode || inventoryData.barcode2
+      productInfo.qualityStatus = inventoryData.lotAtt08
+      productInfo.warehouseType = inventoryData.lotAtt05
+      productInfo.batchNo = inventoryData.lotNumber
+      productInfo.productionDate = inventoryData.lotAtt01
+      productInfo.expiryDate = inventoryData.lotAtt02
+      productInfo.moveQty = inventoryData.quantityAvailable + inventoryData.quantityAvailable
 
       scanSuccess()
       showToast('商品信息获取成功')