From 59a863a9e682733f836fec0ca8289385f2b3932c Mon Sep 17 00:00:00 2001
From: zhang_li <2235006734@qqq.com>
Date: Wed, 28 Aug 2024 16:06:33 +0800
Subject: [PATCH] =?UTF-8?q?=E4=B8=8A=E6=9E=B6=E6=A8=A1=E5=9D=97fromInvento?=
 =?UTF-8?q?ryStatus2024/6/14=2019:01:24?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/mycomponents/package/packageCard.vue      | 194 +++++++++---------
 src/mycomponents/recommend/recommend.vue      |   2 +-
 .../scan/winScanPackAndLocation.vue           |   6 +-
 .../record/productPutawayRecord.vue           |   2 +
 .../job/fgProductReceiptDetail.vue            |   2 +
 src/pages/putaway/job/putawayDetail.vue       |   1 +
 src/pages/putaway/record/putawayRecord.vue    |   2 +
 7 files changed, 106 insertions(+), 103 deletions(-)

diff --git a/src/mycomponents/package/packageCard.vue b/src/mycomponents/package/packageCard.vue
index 3e0aee10..607e3f39 100644
--- a/src/mycomponents/package/packageCard.vue
+++ b/src/mycomponents/package/packageCard.vue
@@ -1,112 +1,104 @@
 <template>
-	<view :class="dataContent.scaned?'scan_view':''" style="background-color: #fff; ">
-		<!-- border-bottom: 1upx solid #EEEEEE; -->
-		<view class="uni-flex uni-row space-between" style="align-items: center">
-			<!-- uni-inline-item 暂时拿掉-->
-			<view style="word-break: break-all;">
-				<!-- 	<container v-if="isShowContainer&&dataContent.containerNumber!=null" :container="dataContent.containerNumber">
+  <view :class="dataContent.scaned ? 'scan_view' : ''" style="background-color: #fff">
+    <!-- border-bottom: 1upx solid #EEEEEE; -->
+    <view class="uni-flex uni-row space-between" style="align-items: center">
+      <!-- uni-inline-item 暂时拿掉-->
+      <view style="word-break: break-all">
+        <!-- 	<container v-if="isShowContainer&&dataContent.containerNumber!=null" :container="dataContent.containerNumber">
 				</container> -->
-				<pack v-if="isShowPack && dataContent.packingNumber!=null" :packingCode="dataContent.packingNumber">
-				</pack>
-				<batch v-if="isShowBatch && dataContent.batch!=null" :batch="dataContent.batch"></batch>
-				<location v-if="isShowFromLocation" title="来源库位" :locationCode="dataContent.fromLocationCode">
-				</location>
-				<!-- 	<to-location></to-location> -->
-				<to-location v-if="isShowToLocation" title="目标库位" :locationCode="dataContent.toLocationCode">
-				</to-location>
-			</view>
-			<view class="uni-flex uni-row " style="word-break: break-all;align-items:center">
-				<!-- ||dataContent.handleQty==0 可能会有扫描到0的情况-->
-				<recommend-qty v-if="dataContent.handleQty==null || dataContent.handleQty==undefined"
-					:dataContent="dataContent" :isShowStdPack="false" :isShowStatus="isShowStatus"></recommend-qty>
-				<compare-qty v-else :dataContent="dataContent" :recommendQty="Number(dataContent.qty)"
-					:handleQty="Number(dataContent.handleQty)" :isShowStdPack="false">
-				</compare-qty>
+        <pack v-if="isShowPack && dataContent.packingNumber != null" :packingCode="dataContent.packingNumber"> </pack>
+        <batch v-if="isShowBatch && dataContent.batch != null" :batch="dataContent.batch"></batch>
+        <location v-if="isShowFromLocation" title="来源库位" :locationCode="dataContent.fromLocationCode"> </location>
+        <!-- 	<to-location></to-location> -->
+        <to-location v-if="isShowToLocation" title="目标库位" :locationCode="dataContent.toLocationCode"> </to-location>
+      </view>
+      <view class="uni-flex uni-row" style="word-break: break-all; align-items: center">
+        <!-- ||dataContent.handleQty==0 可能会有扫描到0的情况-->
+        <recommend-qty v-if="dataContent.handleQty == null || dataContent.handleQty == undefined" :dataContent="dataContent" :isShowStdPack="false" :isShowStatus="isShowStatus"></recommend-qty>
+        <compare-qty v-else :dataContent="dataContent" :recommendQty="Number(dataContent.qty)" :handleQty="Number(dataContent.handleQty)" :isShowStdPack="isShowStatus"> </compare-qty>
 
-				<view v-if="isDevlement()">
-					<image style='width: 26rpx;height: 26rpx;margin-top: 44rpx;' src="/static/icons/icon_copy.svg" alt=""  @click="copy"/>
-				</view>
-			</view>
-		</view>
-	</view>
+        <view v-if="isDevlement()">
+          <image style="width: 26rpx; height: 26rpx; margin-top: 44rpx" src="/static/icons/icon_copy.svg" alt="" @click="copy" />
+        </view>
+      </view>
+    </view>
+  </view>
 </template>
 
 <script setup lang="ts">
-	import container from '@/mycomponents/container/container.vue'
-	import pack from '@/mycomponents/balance/pack.vue'
-	import location from '@/mycomponents/balance/location.vue'
-	import toLocation from '@/mycomponents/balance/toLocation.vue'
-	import batch from '@/mycomponents/balance/batch.vue'
-	import recommendQty from '@/mycomponents/qty/recommendQty.vue'
-	import compareQty from '@/mycomponents/qty/compareQty.vue'
-	import config from '@/static/config.js'
-	const props = defineProps({
-		dataContent: {
-			type: Object,
-			default: null
-		},
-		isShowContainer: {
-			type: Boolean,
-			default: true
-		},
-		isShowPack: {
-			type: Boolean,
-			default: true
-		},
-		isShowBatch: {
-			type: Boolean,
-			default: true
-		},
-		isShowFromLocation: {
-			type: Boolean,
-			default: true
-		},
-		isShowToLocation: {
-			type: Boolean,
-			default: false
-		},
-		isShowStatus: {
-			type: Boolean,
-			default: true
-		},
+import container from '@/mycomponents/container/container.vue'
+import pack from '@/mycomponents/balance/pack.vue'
+import location from '@/mycomponents/balance/location.vue'
+import toLocation from '@/mycomponents/balance/toLocation.vue'
+import batch from '@/mycomponents/balance/batch.vue'
+import recommendQty from '@/mycomponents/qty/recommendQty.vue'
+import compareQty from '@/mycomponents/qty/compareQty.vue'
+import config from '@/static/config.js'
 
-		locationTitle: {
-			type: String,
-			default: '库位'
-		}
-	})
-	const copy = () => {
-		// HPQ;V1.0;ICE115F11161AG;PP20230427000026;B20230427002;Q100
-		var content = "HPQ;V1.0;I" + props.dataContent.itemCode + ";P" + props.dataContent.packingNumber + ";B" + props.dataContent
-			.batch + ";Q" + props.dataContent.qty
+const props = defineProps({
+  dataContent: {
+    type: Object,
+    default: null
+  },
+  isShowContainer: {
+    type: Boolean,
+    default: true
+  },
+  isShowPack: {
+    type: Boolean,
+    default: true
+  },
+  isShowBatch: {
+    type: Boolean,
+    default: true
+  },
+  isShowFromLocation: {
+    type: Boolean,
+    default: true
+  },
+  isShowToLocation: {
+    type: Boolean,
+    default: false
+  },
+  isShowStatus: {
+    type: Boolean,
+    default: true
+  },
 
-		uni.setClipboardData({
-			data: content,
-			success: () => {
-				uni.showToast({
-					title: '复制采购标签成功'
-				})
-			}
-		})
-	}
-	const copyPro = () => {
-		// HPQ;V1.0;ICE115F11161AG;PP20230427000026;B20230427002;Q100
-		var content = "HMQ;V1.0;I" + props.dataContent.itemCode + ";P" + props.dataContent.packingNumber + ";B" + props.dataContent
-			.batch + ";Q" + props.dataContent.qty
+  locationTitle: {
+    type: String,
+    default: '库位'
+  }
+})
+const copy = () => {
+  // HPQ;V1.0;ICE115F11161AG;PP20230427000026;B20230427002;Q100
+  const content = `HPQ;V1.0;I${props.dataContent.itemCode};P${props.dataContent.packingNumber};B${props.dataContent.batch};Q${props.dataContent.qty}`
 
-		uni.setClipboardData({
-			data: content,
-			success: () => {
-				uni.showToast({
-					title: '复制制品标签成功'
-				})
-			}
-		})
-	}
-	const isDevlement = () => {
-		return config.isDevelopment;
-	}
+  uni.setClipboardData({
+    data: content,
+    success: () => {
+      uni.showToast({
+        title: '复制采购标签成功'
+      })
+    }
+  })
+}
+const copyPro = () => {
+  // HPQ;V1.0;ICE115F11161AG;PP20230427000026;B20230427002;Q100
+  const content = `HMQ;V1.0;I${props.dataContent.itemCode};P${props.dataContent.packingNumber};B${props.dataContent.batch};Q${props.dataContent.qty}`
+
+  uni.setClipboardData({
+    data: content,
+    success: () => {
+      uni.showToast({
+        title: '复制制品标签成功'
+      })
+    }
+  })
+}
+const isDevlement = () => {
+  return config.isDevelopment
+}
 </script>
 
-<style>
-</style>
\ No newline at end of file
+<style></style>
diff --git a/src/mycomponents/recommend/recommend.vue b/src/mycomponents/recommend/recommend.vue
index ca861123..29654fd7 100644
--- a/src/mycomponents/recommend/recommend.vue
+++ b/src/mycomponents/recommend/recommend.vue
@@ -14,7 +14,7 @@
       <view style="word-break: break-all" class="uni-flex uni-row center">
         <!-- ||detail.handleQty==0 可能会有扫描到0的情况-->
         <recommend-qty v-if="detail.handleQty == null || detail.handleQty == undefined" :dataContent="detail" :isShowStdPack="false" :isShowStatus="isShowStatus"></recommend-qty>
-        <compare-qty v-else :dataContent="detail" :recommendQty="Number(detail.qty)" :handleQty="Number(detail.handleQty)" :isShowStdPack="false"> </compare-qty>
+        <compare-qty v-else :dataContent="detail" :recommendQty="Number(detail.qty)" :handleQty="Number(detail.handleQty)" :isShowStdPack="isShowStatus"> </compare-qty>
 
         <view v-if="isDevlement()">
           <image style="width: 26rpx; height: 26rpx; margin-top: 40rpx" src="/static/icons/icon_copy.svg" alt="" @click="copy" />
diff --git a/src/mycomponents/scan/winScanPackAndLocation.vue b/src/mycomponents/scan/winScanPackAndLocation.vue
index 935649ba..fa8e25ea 100644
--- a/src/mycomponents/scan/winScanPackAndLocation.vue
+++ b/src/mycomponents/scan/winScanPackAndLocation.vue
@@ -241,7 +241,11 @@ const afterQueryBalance = (datas) => {
   if (props.allowNullBalance) {
     allowNoneBalance(datas)
   } else if (props.noShowBalanceMessage) {
-    countCallBack(datas)
+    if (Array.isArray(datas)) {
+      countCallBack(datas[0])
+    } else {
+      countCallBack(datas)
+    }
   } else {
     mustHavaBalance(datas)
   }
diff --git a/src/pages/productPutaway/record/productPutawayRecord.vue b/src/pages/productPutaway/record/productPutawayRecord.vue
index 7debdb69..9f49fcf0 100644
--- a/src/pages/productPutaway/record/productPutawayRecord.vue
+++ b/src/pages/productPutaway/record/productPutawayRecord.vue
@@ -114,6 +114,7 @@ const getScanResult = (result) => {
   if (item == undefined) {
     const itemp = createItemInfo(balance, pack)
     const newDetail = createDetailInfo(balance, pack) //
+    newDetail.fromInventoryStatus = balance.inventoryStatus
     itemp.subList.push(newDetail)
     detailSource.value.push(itemp)
   } else {
@@ -124,6 +125,7 @@ const getScanResult = (result) => {
     })
     if (detail == undefined) {
       const newDetail = createDetailInfo(balance, pack)
+      newDetail.fromInventoryStatus = balance.inventoryStatus
       item.subList.push(newDetail)
     } else if (detail.scaned == true) {
       showErrorMessage(`箱码[${balance.packingNumber}批次[${balance.batch}]已经在列表中`)
diff --git a/src/pages/productReceipt/job/fgProductReceiptDetail.vue b/src/pages/productReceipt/job/fgProductReceiptDetail.vue
index 05cab35f..9d0e35e2 100644
--- a/src/pages/productReceipt/job/fgProductReceiptDetail.vue
+++ b/src/pages/productReceipt/job/fgProductReceiptDetail.vue
@@ -316,6 +316,8 @@ const print = () => {
           barcodeString: item.barcodeString, // 标签
           itemCode: item.itemCode || '', // 物品代码
           itemName: item.itemName || '', // 物品名称
+          packName: item.packName || '', // 包装名称
+          itemType: item.itemType || '', // 物料类型
           itemDesc1: item.itemDesc1 || '', // 物品描述
           relateNumber: item.relateNumber || '', // relateNumber包装号
           batch: item.batch || '', // 批次
diff --git a/src/pages/putaway/job/putawayDetail.vue b/src/pages/putaway/job/putawayDetail.vue
index 9ee26f36..05491938 100644
--- a/src/pages/putaway/job/putawayDetail.vue
+++ b/src/pages/putaway/job/putawayDetail.vue
@@ -293,6 +293,7 @@ const getScanResult = (result) => {
             scanedLength++
           }
         })
+        itemDetail.fromInventoryStatus = result.balance.inventoryStatus
         if (itemDetail.scaned && scanedLength == itemDetail.packList.length) {
           showMessage(`箱码【${packingNumber}】已经扫描`)
         } else {
diff --git a/src/pages/putaway/record/putawayRecord.vue b/src/pages/putaway/record/putawayRecord.vue
index 41270871..10fa7887 100644
--- a/src/pages/putaway/record/putawayRecord.vue
+++ b/src/pages/putaway/record/putawayRecord.vue
@@ -128,6 +128,7 @@ const getScanResult = (result) => {
       newDetail.poLine = poLine
       newDetail.poNumber = poNumber
       newDetail.supplierCode = supplierCode
+      newDetail.fromInventoryStatus = balance.inventoryStatus
       itemp.subList.push(newDetail)
       detailSource.value.push(itemp)
       calcHandleQty(detailSource.value)
@@ -145,6 +146,7 @@ const getScanResult = (result) => {
         newDetail.toWarehouseCode = toLocation.toWarehouseCode
         newDetail.poLine = poLine
         newDetail.poNumber = poNumber
+        newDetail.fromInventoryStatus = balance.inventoryStatus
         newDetail.supplierCode = supplierCode
         item.subList.push(newDetail)
         calcHandleQty(detailSource.value)