From cf7d600addb2fcb4e26ddc49ee2b5787debcc053 Mon Sep 17 00:00:00 2001
From: zhang_li <2235006734@qqq.com>
Date: Tue, 3 Sep 2024 16:21:37 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=A4=B4=E9=83=A8=E4=BF=A1?=
 =?UTF-8?q?=E6=81=AF=20=E5=90=8E=E7=AB=AF=E6=B7=BB=E5=8A=A0=E8=BF=87?=
 =?UTF-8?q?=E6=BB=A4=E6=89=BF=E6=8E=A5=E4=BA=BA=E6=9D=A1=E4=BB=B62024/6/25?=
 =?UTF-8?q?=2009:43:11?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/http.ts                               |   1 +
 src/mycomponents/balance/handleBalance.vue    |   2 +-
 src/mycomponents/common/comMessage.vue        |  17 ++-
 src/mycomponents/job/jobFilter.vue            |   4 +-
 src/pages/issue/request/issueScanRequest.vue  |   5 +
 .../package/job/overPackageJobDetail.vue      |   2 +-
 .../package/record/overPackageRecord.vue      |   2 +-
 src/pages/pointPutawayJob/index.vue           |   4 +-
 .../purchaseReceipt/job/receiptDetail.vue     |   2 +-
 src/pages/purchaseReceipt/job/receiptJob.vue  |   5 +
 .../repleinsh/coms/comScanReplishPack.vue     |  52 +++++--
 .../record/directRepleinshRecord.vue          | 130 +++++++++++++++++-
 .../transfer/coms/comReceiptDetailCard.vue    |   1 +
 13 files changed, 204 insertions(+), 23 deletions(-)

diff --git a/src/api/http.ts b/src/api/http.ts
index 73507521..8491c2fc 100644
--- a/src/api/http.ts
+++ b/src/api/http.ts
@@ -49,6 +49,7 @@ instance.interceptors.request.use((config) => {
 	const headers : any = {
 		token: getAccessToken(),
 		"tenant-id": tenantId,
+		"dataSource":"PDA",
 		'Authorization': 'Bearer ' + getAccessToken()
 	}
 	if (uni.getStorageSync('openId')) {
diff --git a/src/mycomponents/balance/handleBalance.vue b/src/mycomponents/balance/handleBalance.vue
index 0f9b067c..e71dd28b 100644
--- a/src/mycomponents/balance/handleBalance.vue
+++ b/src/mycomponents/balance/handleBalance.vue
@@ -2,7 +2,7 @@
   <view :class="detail.scaned ? 'scan_view' : ''" style="background-color: #ffffff">
     <view class="space_between center">
       <view style="word-break: break-all; width: 60%">
-        <pack title="外包装" v-if="detail.parentPackingNumber != undefined && detail.parentPackingNumber != ''" :packingCode="detail.parentPackingNumber"></pack>
+        <pack title="外包装" v-if="detail.parentPackingNumber" :packingCode="detail.parentPackingNumber"></pack>
         <pack v-if="isShowPack" :packingCode="detail.packingNumber"></pack>
         <batch v-if="isShowBatch" :batch="detail.batch"></batch>
         <location v-if="isShowLocation" :locationCode="detail.fromLocationCode"></location>
diff --git a/src/mycomponents/common/comMessage.vue b/src/mycomponents/common/comMessage.vue
index c68ebe85..84781b2c 100644
--- a/src/mycomponents/common/comMessage.vue
+++ b/src/mycomponents/common/comMessage.vue
@@ -1,6 +1,9 @@
 <template name="show-modal">
   <view>
     <u-modal v-model="show" :title-style="{ color: 'red' }" :title="title" :showTitle="false" :showConfirmButton="false" ref="modal">
+      <view class="" style="width: 100%; display: flex; align-items: center; justify-content: center; margin-top: 10rpx">
+        <view class="" style=""> 版本号 : {{ version }} </view>
+      </view>
       <view class="slot-content">
         <slot name="icon">
           <image class="icon" :src="icon" />
@@ -31,7 +34,7 @@
  * modal 模态框
  * @description 弹出模态框，常用于消息提示、消息确认、在当前页面内完成特定的交互操作
  * */
-import { ref, getCurrentInstance } from 'vue'
+import { ref, getCurrentInstance, onMounted } from 'vue'
 
 const timer = ref(null)
 const show = ref(false) // 是否显示
@@ -53,6 +56,18 @@ const cancel = ref(false) // 为 true 时，表示用户点击了取消
 const isDisabled = ref(true) // 为 true 时，表示用户可以点击，反之则不可以
 const seconds = ref(0)
 const success = ref(() => {})
+const version = ref('')
+onMounted(() => {
+  const systemInfo = uni.getSystemInfoSync()
+  // #ifdef H5
+  version.value = systemInfo.appVersion
+  console.log(systemInfo.appVersion, '版本号')
+  // #endif
+
+  // #ifdef APP
+  version.value = systemInfo.appWgtVersion
+  // #endif
+})
 const open = () => {
   show.value = true
   isDisabled.value = true
diff --git a/src/mycomponents/job/jobFilter.vue b/src/mycomponents/job/jobFilter.vue
index 06c530cb..2e2a5078 100644
--- a/src/mycomponents/job/jobFilter.vue
+++ b/src/mycomponents/job/jobFilter.vue
@@ -14,11 +14,11 @@
       <view v-if="isShowProductionLineCode" class="uni-flex space-between u-col-center" style="width: 100%; margin-top: 30rpx">
         <view class="" style="font-size: 32rpx"> 生产线 </view>
         <!-- <u-input style="margin-left: 20rpx" v-model="productionLineCode" :border="true" placeholder="请输入生产线" @confirm="productionLineCodeConfirm" /> -->
-        <uni-data-select class="uni-data-select" style="margin-left: 20rpx" placeholder="请输入生产线" v-model="productionLineCode" :clear="false" :localdata="productionline" @change="productionLineCodeConfirm"></uni-data-select>
+        <uni-data-select class="uni-data-select" style="margin-left: 50rpx" placeholder="请输入生产线" v-model="productionLineCode" :clear="false" :localdata="productionline" @change="productionLineCodeConfirm"></uni-data-select>
       </view>
       <view v-if="isShowFromLocationCode" class="uni-flex space-between u-col-center" style="width: 100%; margin-top: 30rpx">
         <view class="" style="font-size: 32rpx"> 来源库位 </view>
-        <u-input type="textarea" style="margin-left: 20rpx" v-model="fromLocationCode" :border="true" placeholder="请输入来源库位" @confirm="fromLocationCodeConfirm" />
+        <u-input style="margin-left: 20rpx" confirmType="search" v-model="fromLocationCode" :border="true" placeholder="请输入来源库位" @confirm="fromLocationCodeConfirm" />
       </view>
       <view class="">
         <view class="uni-flex u-row-center" style="margin-top: 30rpx" v-if="isShowAsn">
diff --git a/src/pages/issue/request/issueScanRequest.vue b/src/pages/issue/request/issueScanRequest.vue
index f27e916e..72cef50b 100644
--- a/src/pages/issue/request/issueScanRequest.vue
+++ b/src/pages/issue/request/issueScanRequest.vue
@@ -61,6 +61,11 @@ onLoad((option) => {
 })
 const goScan = () => {
   scanPopup.value.openScanPopup()
+  setTimeout((res) => {
+    if (scanPopup.value != undefined) {
+      scanPopup.value.getfocus()
+    }
+  }, 400)
 }
 const getScanResult = (data) => {
   detailSource.value = {
diff --git a/src/pages/package/job/overPackageJobDetail.vue b/src/pages/package/job/overPackageJobDetail.vue
index 053a014e..4764736b 100644
--- a/src/pages/package/job/overPackageJobDetail.vue
+++ b/src/pages/package/job/overPackageJobDetail.vue
@@ -388,7 +388,7 @@ const showCommitSuccess = () => {
 const showCommitSuccessMessage = (hint, pointData) => {
   comMessageRef.value.showSuccessMessage(hint, (res) => {
     if (pointData.length > 0) {
-      uni.navigateTo({
+      uni.redirectTo({
         url: `/pages/point/index?points=${JSON.stringify(pointData)}`
       })
     } else {
diff --git a/src/pages/package/record/overPackageRecord.vue b/src/pages/package/record/overPackageRecord.vue
index f167dba1..ed1f0064 100644
--- a/src/pages/package/record/overPackageRecord.vue
+++ b/src/pages/package/record/overPackageRecord.vue
@@ -397,7 +397,7 @@ const showCommitSuccessMessage = (hint, pointData) => {
       fromLocationCode.value = ''
       dataContent.value = {}
       if (pointData.length > 0) {
-        uni.navigateTo({
+        uni.redirectTo({
           url: `/pages/point/index?points=${JSON.stringify(pointData)}`
         })
       }
diff --git a/src/pages/pointPutawayJob/index.vue b/src/pages/pointPutawayJob/index.vue
index 0dd724bb..6f4c00be 100644
--- a/src/pages/pointPutawayJob/index.vue
+++ b/src/pages/pointPutawayJob/index.vue
@@ -18,7 +18,7 @@
           </view>
           <view class="mb-right">
             <view class="mb-text">
-              数量：<view>{{ item.packQty }}个</view>
+              数量：<view>{{ item.qty }}个</view>
             </view>
           </view>
         </view>
@@ -201,7 +201,7 @@ export default {
         								</div>
         								<div class="mb-right">
         									<div class="mb-text">
-        										数量：<div>${item.packQty}个</div>
+        										数量：<div>${item.qty}个</div>
         									</div>
         								</div>
         								</div>
diff --git a/src/pages/purchaseReceipt/job/receiptDetail.vue b/src/pages/purchaseReceipt/job/receiptDetail.vue
index 0396ddc1..80c9420f 100644
--- a/src/pages/purchaseReceipt/job/receiptDetail.vue
+++ b/src/pages/purchaseReceipt/job/receiptDetail.vue
@@ -438,7 +438,7 @@ const submitJob = () => {
                       ids: res1.data.list.map((item) => item.masterId).join(',')
                     }
                     console.log(dataParams)
-                    uni.navigateTo({
+                    uni.redirectTo({
                       url: `/pages/pointPutawayJob/index?data=${encodeURIComponent(JSON.stringify(dataParams))}`
                     })
                   }
diff --git a/src/pages/purchaseReceipt/job/receiptJob.vue b/src/pages/purchaseReceipt/job/receiptJob.vue
index 7610ce64..eaed5b8c 100644
--- a/src/pages/purchaseReceipt/job/receiptJob.vue
+++ b/src/pages/purchaseReceipt/job/receiptJob.vue
@@ -288,6 +288,11 @@ const getScanResult = (result) => {
           column: 'asn_number',
           action: '==',
           value: result.label.code
+        },
+        {
+          column: 'status',
+          action: 'in',
+          value: '1,2'
         }
       ]
     } else {
diff --git a/src/pages/repleinsh/coms/comScanReplishPack.vue b/src/pages/repleinsh/coms/comScanReplishPack.vue
index 65eb6f30..3e9b0c64 100644
--- a/src/pages/repleinsh/coms/comScanReplishPack.vue
+++ b/src/pages/repleinsh/coms/comScanReplishPack.vue
@@ -207,30 +207,57 @@ const onScan = (result) => {
     getBalance(result.label, packageInfo, (balances) => {
       // 扫描的是外包装
       const s = ''
-      if (result.package.parentNumber == null || result.package.parentNumber == '') {
+      if (!result.package.parentNumber) {
         if (balances.list.length == 0) {
           showErrorMessage('未查找到该包装的库存信息,请重新扫描')
         } else {
-          const newBalances = balances.list.filter((b) => b.locationCode == fromLocationCode.value)
-          console.log(22222222)
+          const newBalances = balances.list.filter((b) => b.locationCode == that.fromLocationCode)
           if (newBalances.length == 0) {
-            console.log(333333)
             showErrorMessage('未查找到该包装的库存信息,请重新扫描')
           } else if (newBalances.length == 1) {
-            console.log(44444444)
             const balance1 = newBalances[0]
             afterGetBalance(result.label, balance1, packageInfo)
           } else {
-            console.log(5555555)
             showBalanceSelect(newBalances)
           }
         }
       } else {
         // 扫描的是小包装
         if (balances.list.length == 0) {
-          afterGetBalance(result.label, null, packageInfo)
+          showErrorMessage('未查找到该包装的库存信息,请重新扫描')
         } else {
-          showErrorMessage(`该包装在库位【${balances.list[0].locationCode}】已经有库存余额,请重新扫描`)
+          // 小包装库存
+          const subPackitems = balances.list.filter((r) => r.packingNumber == packageInfo.number)
+          // 外包装库存
+          const subParentPackitems = balances.list.filter((r) => r.packingNumber == packageInfo.parentNumber && r.locationCode == fromLocationCode.value)
+
+          // 小包装没有库存，
+          if (subPackitems.length == 0) {
+            // 外包装有库存，出库后剩余库存未转换为出库包装规格
+
+            if (subParentPackitems.length > 0) {
+              if (subParentPackitems.length == 1) {
+                const balance = subParentPackitems[0]
+                balance.qty = packageInfo.qty
+                afterGetBalance(result.label, balance, packageInfo)
+              } else {
+                showBalanceSelect(subParentPackitems)
+              }
+            } else {
+              showErrorMessage(`按外包装【${packageInfo.parentNumber}】和子包装【${packageInfo.number}】都未查找到库存余额`)
+            }
+          } else {
+            let locationCode = fromLocationCode.value
+            if (balances.list == 1) {
+              locationCode = balances.list[0].locationCode
+            } else {
+              const manyBlances = balances.list.filter((r) => r.locationCode != fromLocationCode.value)
+              if (manyBlances.length > 0) {
+                locationCode = manyBlances[0].locationCode
+              }
+            }
+            showErrorMessage(`该包装【${packageInfo.number}】在库位【${locationCode}】已经有库存余额,请重新扫描`)
+          }
         }
       }
       uni.hideLoading()
@@ -243,7 +270,7 @@ const onScan = (result) => {
 const getBalance = (labelParams, packageInfo, callback) => {
   const filters = []
   if (packageInfo.parentNumber) {
-    const packingNumber = `${packageInfo.parentNumber},${packageInfo.packingNumber}`
+    const packingNumber = `${packageInfo.parentNumber},${labelParams.packingNumber}`
     filters.push({
       column: 'packingNumber',
       action: 'in',
@@ -253,7 +280,7 @@ const getBalance = (labelParams, packageInfo, callback) => {
     filters.push({
       column: 'packingNumber',
       action: '==',
-      value: packageInfo.packingNumber
+      value: labelParams.packingNumber
     })
   }
   filters.push({
@@ -410,8 +437,9 @@ const creatRecordByBalance = (balanceParams, packageInfo) => {
   const record = {
     scaned: true,
     itemCode: balanceParams.itemCode,
-    packingNumber: balanceParams.packingNumber,
-    batch: balanceParams.batch,
+    packingNumber: packageInfo.number,
+    parentPackingNumber: packageInfo.parentNumber,
+    batch: packageInfo.batch,
     qty: Number(balanceParams.qty),
     // qty: Number(label.qty)>Number(balance.qty)?Number(balance.qty):Number(label.qty),
     uom: balanceParams.uom,
diff --git a/src/pages/repleinsh/record/directRepleinshRecord.vue b/src/pages/repleinsh/record/directRepleinshRecord.vue
index 5810d8ba..1ad312d3 100644
--- a/src/pages/repleinsh/record/directRepleinshRecord.vue
+++ b/src/pages/repleinsh/record/directRepleinshRecord.vue
@@ -30,16 +30,17 @@
       </view>
       <win-scan-button @goScan="openScanPopup"></win-scan-button>
     </view>
-    <win-scan-pack-and-location ref="scanPopup" @getResult="getScanResult" :allowModifyLocation="false"> </win-scan-pack-and-location>
+    <win-scan-pack-and-location ref="scanPopup" @getResult="getScanResult" :allowModifyLocation="false" :queryBalance="false"> </win-scan-pack-and-location>
     <com-message ref="comMessageRef" />
     <win-scan-location ref="scanLocationCode" title="来源库位" @getLocation="getLocation" :locationAreaTypeList="fromLocationAreaTypeList"></win-scan-location>
+    <balance-select ref="balanceSelectRef" @onSelectItem="selectBalanceItem"></balance-select>
   </view>
 </template>
 
 <script setup lang="ts">
 import { ref, getCurrentInstance, nextTick } from 'vue'
 import { onLoad, onNavigationBarButtonTap, onReady, onReachBottom, onPullDownRefresh } from '@dcloudio/uni-app'
-import { repleinshRecordSubmit, validateItemAndLocation, getPutawayRecommendLocation } from '@/api/request2.js'
+import { repleinshRecordSubmit, validateItemAndLocation, getPutawayRecommendLocation, getBalanceByFilter } from '@/api/request2.js'
 
 import { goHome, updateTitle, getCurrDateTime, getPackingNumberAndBatchByList, deepCopyData } from '@/common/basic.js'
 
@@ -59,6 +60,7 @@ import winScanLocation from '@/mycomponents/scan/winScanLocation.vue'
 import winScanPackAndLocation from '@/mycomponents/scan/winScanPackAndLocation.vue'
 import recordComDetailCard from '@/mycomponents/record/recordComDetailCard.vue'
 import recordDetailCard from '@/mycomponents/record/recordDetailCard.vue'
+import balanceSelect from '@/mycomponents/balance/balanceSelect.vue'
 import { useCountStore } from '@/store'
 // 获取自定义的store
 const store = useCountStore()
@@ -78,6 +80,9 @@ const recommendLocationList = ref([]) // 推荐库位列表
 const fromWarehouseCode = ref('') // 来源仓库
 const businessTypeCode = ref('Repleinment')
 const toLocationCode = ref('')
+const resultData = ref({})
+const balanceSelectRef = ref({})
+
 const managementList = ref([])
 // const positionList = ref([])
 // const show = ref(false)
@@ -105,8 +110,129 @@ onNavigationBarButtonTap((e) => {
     goHome()
   }
 })
+const getBalance = (label, packageInfo, callback) => {
+  const filters = []
+
+  if (packageInfo.parentNumber) {
+    const packingNumber = `${packageInfo.parentNumber},${label.packingNumber}`
+    filters.push({
+      column: 'packingNumber',
+      action: 'in',
+      value: packingNumber
+    })
+  } else {
+    filters.push({
+      column: 'packingNumber',
+      action: '==',
+      value: label.packingNumber
+    })
+  }
+
+  filters.push({
+    column: 'itemCode',
+    action: '==',
+    value: label.itemCode
+  })
+  filters.push({
+    column: 'batch',
+    action: '==',
+    value: label.batch
+  })
 
+  if (fromInventoryStatuses.value != null && fromInventoryStatuses.value != '') {
+    filters.push({
+      column: 'inventoryStatus',
+      action: 'in',
+      value: fromInventoryStatuses.value
+    })
+  }
+
+  const params = {
+    filters,
+    pageNo: 1,
+    pageSize: 100
+  }
+  getBalanceByFilter(params)
+    .then((res) => {
+      callback(res.data)
+    })
+    .catch((err) => {
+      showErrorMessage(err.message)
+    })
+}
 const getScanResult = (result) => {
+  resultData.value = result
+  const packageInfo = result.package
+  getBalance(result.label, packageInfo, (balances) => {
+    // 扫描的是外包装
+    const s = ''
+    if (!result.package.parentNumber) {
+      if (balances.list.length == 0) {
+        showErrorMessage('未查找到该包装的库存信息,请重新扫描')
+      } else {
+        const newBalances = balances.list.filter((b) => b.locationCode == fromLocationCode.value)
+        if (newBalances.length == 0) {
+          showErrorMessage('未查找到该包装的库存信息,请重新扫描')
+        } else if (newBalances.length == 1) {
+          const balance = newBalances[0]
+          result.balance = balance
+          afterGetBalance(result)
+        } else {
+          showBalanceSelect(newBalances)
+        }
+      }
+    } else {
+      // 扫描的是小包装
+      if (balances.list.length == 0) {
+        showErrorMessage('未查找到该包装的库存信息,请重新扫描')
+      } else {
+        // 小包装库存
+        const subPackitems = balances.list.filter((r) => r.packingNumber == packageInfo.number)
+        // 外包装库存
+        const subParentPackitems = balances.list.filter((r) => r.packingNumber == packageInfo.parentNumber && r.locationCode == fromLocationCode.value)
+
+        // 小包装没有库存，
+        if (subPackitems.length == 0) {
+          // 外包装有库存，出库后剩余库存未转换为出库包装规格
+
+          if (subParentPackitems.length > 0) {
+            if (subParentPackitems.length == 1) {
+              const balance = subParentPackitems[0]
+              balance.qty = packageInfo.qty
+              result.balance = balance
+              afterGetBalance(result)
+            } else {
+              showBalanceSelect(subParentPackitems)
+            }
+          } else {
+            showErrorMessage(`按外包装【${packageInfo.parentNumber}】和子包装【${packageInfo.number}】都未查找到库存余额`)
+          }
+        } else {
+          let locationCode = fromLocationCode.value
+          if (balances.list == 1) {
+            locationCode = balances.list[0].locationCode
+          } else {
+            const manyBlances = balances.list.filter((r) => r.locationCode != fromLocationCode.value)
+            if (manyBlances.length > 0) {
+              locationCode = manyBlances[0].locationCode
+            }
+          }
+          showErrorMessage(`该包装【${packageInfo.number}】在库位【${locationCode}】已经有库存余额,请重新扫描`)
+        }
+      }
+    }
+  })
+}
+
+const showBalanceSelect = (items) => {
+  balanceSelectRef.value.openPopup(items)
+}
+
+const selectBalanceItem = (balance) => {
+  afterGetBalance(resultData.value, balance)
+}
+
+const afterGetBalance = (result) => {
   const { balance } = result
   const { label } = result
   const pack = result.package
diff --git a/src/pages/transfer/coms/comReceiptDetailCard.vue b/src/pages/transfer/coms/comReceiptDetailCard.vue
index 5ee85a47..645e4bf6 100644
--- a/src/pages/transfer/coms/comReceiptDetailCard.vue
+++ b/src/pages/transfer/coms/comReceiptDetailCard.vue
@@ -37,6 +37,7 @@ import jobDetailPopup from '@/mycomponents/job/jobDetailPopup.vue'
 import detailInfoPopup from '@/pages/unPlanned/coms/detailInfoPopup.vue'
 
 import { getDetailOption, getPurchaseReceiptOption } from '@/common/array.js'
+import winScanLocation from '@/mycomponents/scan/winScanLocation.vue'
 
 const props = defineProps({
   dataContent: {