Merge remote-tracking branch 'origin/testing' into testing

src/views/robot/merge/index.vue

@@ -58,7 +58,7 @@
         <div class="cell label label-small">属性仓</div>
         <div class="cell value value-large">{{ productInfo.warehouseType }}</div>
         <div class="cell label label-small">批号</div>
-        <div class="cell value value-small"></div>
+        <div class="cell value value-small">{{ productInfo.lotNumber }}</div>
       </div>
       <div class="table-row">
         <div class="cell label">生产日期</div>
@@ -408,11 +408,11 @@ const onBarcodeEnter = async () => {
       productInfo.barcode = inventoryData.barcode || inventoryData.barcode2
       productInfo.qualityStatus = inventoryData.lotAtt08
       productInfo.warehouseType = inventoryData.lotAtt05
-      productInfo.batchNo = inventoryData.lotNumber
+      productInfo.lotNumber = inventoryData.lotAtt04 || ''
       productInfo.productionDate = inventoryData.lotAtt01
       productInfo.expiryDate = inventoryData.lotAtt02
       // 可移库数量
-      const availableQty = inventoryData.quantityAvailable || 0
+      const availableQty = inventoryData.quantityAvailable + inventoryData.quantityVirtual
       productInfo.moveQty = availableQty
       // 计算推荐移库数量：取可移库数量和任务推荐数量的最小值
       const taskRecommendQty = getTaskRecommendQty(sourceLocation.value)
@@ -472,7 +472,7 @@ const resetProductInfo = () => {
   productInfo.barcode = ''
   productInfo.qualityStatus = ''
   productInfo.warehouseType = ''
-  productInfo.batchNo = ''
+  productInfo.lotNumber = ''
   productInfo.productionDate = ''
   productInfo.expiryDate = ''
   productInfo.moveQty = ''
@@ -617,7 +617,7 @@ const productInfo = reactive({
   barcode: '',
   qualityStatus: '',
   warehouseType: '',
-  batchNo: '',
+  lotNumber: '', // 批号，取lotAtt04
   productionDate: '',
   expiryDate: '',
   moveQty: '', // 可移库数量（库存可用数量）
@@ -1035,11 +1035,11 @@ const queryInventoryBySku = async (sku: string, location: string) => {
       productInfo.barcode = inventoryData.barcode || inventoryData.barcode2
       productInfo.qualityStatus = inventoryData.lotAtt08
       productInfo.warehouseType = inventoryData.lotAtt05
-      productInfo.batchNo = inventoryData.lotNumber
+      productInfo.lotNumber = inventoryData.lotAtt04 || ''
       productInfo.productionDate = inventoryData.lotAtt01
       productInfo.expiryDate = inventoryData.lotAtt02
       // 可移库数量
-      const availableQty = inventoryData.quantityAvailable || 0
+      const availableQty = inventoryData.quantityAvailable + inventoryData.quantityVirtual
       productInfo.moveQty = availableQty
       // 计算推荐移库数量：取可移库数量和任务推荐数量的最小值
       const taskRecommendQty = getTaskRecommendQty(location)
@@ -1143,13 +1143,13 @@ const submitMove = () => {
     message: `${productInfo.barcode}从"${sourceLocation.value}"移动至"${productInfo.targetLocationNew}"共：${productInfo.actualMoveQty}件`
   })
     .then(() => {
-      const { traceId, lotNum, lotNumber, ownerCode, owner, sku } = currentInventoryData.value || {}
+      const { traceId, lotNum, ownerCode, owner, sku } = currentInventoryData.value || {}
       const data = {
         fmLocation: sourceLocation.value,
         fmContainer: traceId || boxCode.value,
         owner: ownerCode || owner || '',
         sku: sku || productInfo.barcode,
-        lotNum: lotNum || lotNumber || productInfo.batchNo || '',
+        lotNum: lotNum,
         warehouse,
         quantity: Number(productInfo.actualMoveQty),
         toLocation: productInfo.targetLocationNew