From 394d3813736be74796d4881678a3350d5a2c7770 Mon Sep 17 00:00:00 2001
From: zhang_li <2235006734@qqq.com>
Date: Fri, 30 Aug 2024 16:16:20 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BB=BB=E5=8A=A1=E5=88=97=E8=A1=A8=E7=9B=B4?=
 =?UTF-8?q?=E6=8E=A5=E6=89=AB=E6=8F=8F2024/6/18=2019:52:55?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/mycomponents/scan/winComScan.vue          |  3 +-
 src/mycomponents/scan/winScanPack.vue         |  8 ++-
 .../scan/winScanPackAndLocation.vue           | 10 ++-
 src/pages/issue/job/issueDetail.vue           |  4 +-
 src/pages/pointPutawayJob/index.vue           |  2 +-
 .../job/productPutawayDetail.vue              | 65 ++++++++++---------
 .../job/productReceiptDetail.vue              | 10 ++-
 .../purchaseReceipt/job/receiptDetail.vue     | 15 +++--
 src/pages/putaway/job/putawayDetail.vue       |  5 +-
 9 files changed, 76 insertions(+), 46 deletions(-)

diff --git a/src/mycomponents/scan/winComScan.vue b/src/mycomponents/scan/winComScan.vue
index 3e2ced0e..c483bfe5 100644
--- a/src/mycomponents/scan/winComScan.vue
+++ b/src/mycomponents/scan/winComScan.vue
@@ -228,7 +228,8 @@ defineExpose({
   clearScanValue,
   clear,
   clickScanMsg,
-  losefocus
+  losefocus,
+  setItemCodeSimulate
 })
 </script>
 <script module="textarea" lang="renderjs">
diff --git a/src/mycomponents/scan/winScanPack.vue b/src/mycomponents/scan/winScanPack.vue
index 28d88f89..1dcc1357 100644
--- a/src/mycomponents/scan/winScanPack.vue
+++ b/src/mycomponents/scan/winScanPack.vue
@@ -61,10 +61,14 @@ const closeScanPopup = () => {
 }
 
 const scanClick = () => {
-  comscan.value.clickScanMsg()
+  if (comscan.value) {
+    comscan.value.clickScanMsg()
+  }
 }
 const cancelClick = () => {
-  comscan.value.clearScanValue()
+  if (comscan.value) {
+    comscan.value.clearScanValue()
+  }
 }
 
 const getScanResult = (result) => {
diff --git a/src/mycomponents/scan/winScanPackAndLocation.vue b/src/mycomponents/scan/winScanPackAndLocation.vue
index 38129740..39886bcd 100644
--- a/src/mycomponents/scan/winScanPackAndLocation.vue
+++ b/src/mycomponents/scan/winScanPackAndLocation.vue
@@ -165,6 +165,8 @@ const openScanPopupForJobSimulate = (fromLocationCodeParams, fromLocationListPar
     if (timer) {
       clearTimeout(timer)
     }
+    comscansimulate.value.setItemCodeSimulate(item.copyContent)
+    comscansimulate.value.clickScanMsg()
   }, 500)
 }
 const closeScanPopup = (content) => {
@@ -331,7 +333,9 @@ const selectBalanceItem = (balance) => {
 // 盘点回调
 
 const countCallBack = (datas) => {
-  comscan.value.clear()
+  if (comscan.value) {
+    comscan.value.clear()
+  }
   // 返回标签信息、库存信息和管理模式
   const data = {
     label: scanResult.value.label,
@@ -345,7 +349,9 @@ const countCallBack = (datas) => {
 }
 
 const packCallBack = (item) => {
-  comscan.value.clear()
+  if (comscan.value) {
+    comscan.value.clear()
+  }
   // 返回标签信息、库存信息和管理模式
   const data = {
     label: scanResult.value.label,
diff --git a/src/pages/issue/job/issueDetail.vue b/src/pages/issue/job/issueDetail.vue
index 901a3038..8c04b90a 100644
--- a/src/pages/issue/job/issueDetail.vue
+++ b/src/pages/issue/job/issueDetail.vue
@@ -39,7 +39,7 @@ import { ref, getCurrentInstance, nextTick } from 'vue'
 import { onLoad, onShow, onNavigationBarButtonTap, onReady, onBackPress, onReachBottom, onPullDownRefresh } from '@dcloudio/uni-app'
 import { takeIssueJob, cancleTakeIssueJob, getIssueJobDetail, issueJobSubmit } from '@/api/request2.js'
 
-import { goHome, navigateBack, getRemoveOption, getCurrDateTime, getDirectoryItemArray, getPackingNumberAndBatch } from '@/common/basic.js'
+import { goHome, navigateBack, getRemoveOption, getCurrDateTime, getDirectoryItemArray, getPackingNumberAndBatch, deepCopyData } from '@/common/basic.js'
 
 import { getDataSource } from '@/pages/issue/js/issue.js'
 
@@ -254,7 +254,7 @@ const setParams = () => {
                 }
                 subItem.recordList.push(record)
               })
-              subList.push(subItem)
+              subList.push(deepCopyData(subItem))
             }
           }
         })
diff --git a/src/pages/pointPutawayJob/index.vue b/src/pages/pointPutawayJob/index.vue
index d3b4cbbd..72a62889 100644
--- a/src/pages/pointPutawayJob/index.vue
+++ b/src/pages/pointPutawayJob/index.vue
@@ -217,7 +217,7 @@ export default {
 									<td>${cur.batch}</td>
 									<td>${cur.packingNumber}</td>
 									<td>${cur.packUnit}</td>
-									<td>${cur.packQty}</td>
+									<td>${cur.qty}</td>
 									<td>${cur.uom}</td>
 								</tr>
 							`
diff --git a/src/pages/productPutaway/job/productPutawayDetail.vue b/src/pages/productPutaway/job/productPutawayDetail.vue
index cec9d175..2100e42d 100644
--- a/src/pages/productPutaway/job/productPutawayDetail.vue
+++ b/src/pages/productPutaway/job/productPutawayDetail.vue
@@ -78,6 +78,7 @@ const type = ref('')
 const isCheckLocation = ref(false)
 const switchCode = ref('')
 const scanedPackingNumber = ref('')
+const status = ref('')
 const scanPopup = ref()
 const comScanLocation = ref()
 const detailInfoPopupRef = ref()
@@ -86,6 +87,7 @@ onLoad((option) => {
   id.value = option.id
   type.value = option.type
   scanedPackingNumber.value = option.scaned || ''
+  status.value = option.status || ''
   if (type.value == 'predict') {
     switchCode.value = 'SemiPutawayLocationCodeValidate'
     updateTitle('预生产上架任务')
@@ -93,9 +95,11 @@ onLoad((option) => {
     switchCode.value = 'FgPutawayLocationCodeValidate'
     updateTitle('装配上架任务')
   }
+})
+onShow(() => {
   if (id.value != undefined) {
     // 新建的任务自动接收
-    if (option.status == '1') {
+    if (status.value == '1') {
       receive((callback) => {
         getDetail()
       })
@@ -155,22 +159,21 @@ const getDetail = () => {
         fromLocationCode.value = subList.value[0].fromLocationCode
         jobToLocationCode.value = subList.value[0].toLocationCode
         detailSource.value = getDataSource(subList.value)
+        isCheckLocation.value = getSwitchInfoByCode(that.switchCode)
+        if (isCheckLocation.value) {
+          toLocationCode.value = ''
+        } else {
+          toLocationCode.value = jobToLocationCode.value
+        }
         detailSource.value.forEach((r) => {
           r.subList.forEach((s) => {
             if (scanedPackingNumber.value && scanedPackingNumber.value == s.packingNumber) {
               s.scaned = true
-              s.handleQty = s.qty
+              s.cancleScanedHiht = true
+              openScanPopupSimulate(s)
             }
           })
         })
-        toLocationAreaTypeList.value = getLocationTypeArray(jobContent.value.toAreaTypes)
-        isCheckLocation.value = getSwitchInfoByCode(switchCode.value)
-        if (isCheckLocation.value) {
-          toLocationCode.value = ''
-        } else {
-          toLocationCode.value = jobToLocationCode.value
-        }
-        uni.hideLoading()
       } else {
         showMessage('列表数据为0')
       }
@@ -198,6 +201,25 @@ const updateData = () => {
 const openDetail = (item) => {
   detailInfoPopupRef.value.openPopup(item)
 }
+const openScanPopupSimulate = (item) => {
+  let fromlocationCode = ''
+  const fromlocationList = []
+  for (let i = 0; i < detailSource.value.length; i++) {
+    const item = detailSource.value[i]
+    item.subList.forEach((l) => {
+      // 重复的库位不往里面插入
+      const location = fromlocationList.find((res) => res == l.fromLocationCode)
+      if (location == undefined) {
+        fromlocationList.push(l.fromLocationCode)
+      }
+      // 来源库位赋默认值
+      if (fromlocationCode == '') {
+        fromlocationCode = l.fromLocationCode
+      }
+    })
+  }
+  scanPopup.value.openScanPopupForJobSimulate(fromlocationCode, fromlocationList, jobContent.value, item)
+}
 const openScanPopup = () => {
   let fromlocationCode = ''
   const fromlocationList = []
@@ -241,28 +263,11 @@ const getScanResult = (result) => {
       })
       if (itemDetail == undefined) {
         showErrorMessage(`箱码【${packingNumber}】,批次【${batch}】库位【${result.fromLocationCode}】不在列表中`)
-      } else if (itemDetail.scaned) {
+      } else if (!itemDetail.cancleScanedHiht && itemDetail.scaned) {
         showErrorMessage(`箱码【${packingNumber}】,批次【${batch}】库位【${result.fromLocationCode}】已经扫描`)
       } else {
-        // addDetail(itemDetail, result)
-        // return
-        // 暂时先不判断状态
-        const itemStatus = getInventoryStatusName(itemDetail.inventoryStatus)
-        const balanceStatus = getInventoryStatusName(result.balance.inventoryStatus)
-        if (itemDetail.inventoryStatus != result.balance.inventoryStatus) {
-          // if (jobContent.value.allowModifyInventoryStatus == 'TRUE') {
-          showQuestionMessage(`实际库存状态[${balanceStatus}]与推荐库存状态[${itemStatus}]不一致,是否继续上架?`, (res) => {
-            if (res) {
-              addDetail(itemDetail, result)
-            } else {
-              scanPopupGetFocus()
-            }
-          })
-          // }
-        }
-        // else {
-        //       addDetail(itemDetail, result)
-        //     }
+        addDetail(itemDetail, result)
+        return
       }
     }
   } catch (e) {
diff --git a/src/pages/productReceipt/job/productReceiptDetail.vue b/src/pages/productReceipt/job/productReceiptDetail.vue
index ea954f26..0753a3b5 100644
--- a/src/pages/productReceipt/job/productReceiptDetail.vue
+++ b/src/pages/productReceipt/job/productReceiptDetail.vue
@@ -101,15 +101,19 @@ const managementList = ref([])
 const jobStatus = ref('')
 const jobToLocationCode = ref('')
 const scanedPackingNumber = ref('')
+const status = ref('')
 const scanPopup = ref()
 const comScanLocation = ref()
 const comMessageRef = ref()
 onLoad((option) => {
   id.value = option.id
   scanedPackingNumber.value = option.scaned || ''
+  status.value = option.status || ''
+})
+onShow(() => {
   if (id.value != undefined) {
     // 新建的任务自动接收
-    if (option.status == '1') {
+    if (status.value == '1') {
       receive((callback) => {
         getDetail()
       })
@@ -180,6 +184,8 @@ const getDetail = () => {
           r.subList.forEach((s) => {
             if (scanedPackingNumber.value && scanedPackingNumber.value == s.packingNumber) {
               s.scaned = true
+              s.cancleScanedHiht = true
+              s.copyContent = `HMQ;V1.0;I${s.itemCode};P${s.packingNumber};B${s.batch};Q${s.qty}`
               scanPopup.value.simulateScan(s)
               // s.handleQty = s.qty
             }
@@ -208,7 +214,7 @@ const getScanResult = (result) => {
     const itemDetail = detail.subList.find((r) => r.packingNumber == packingNumber && r.batch == batch)
     if (itemDetail == undefined) {
       showErrorMessage(`箱码[${packingNumber}]` + `批次[${batch}]不在任务列表中`)
-    } else if (itemDetail.scaned) {
+    } else if (!itemDetail.cancleScanedHiht && itemDetail.scaned) {
       showErrorMessage(`箱码[${packingNumber}]` + `批次[${batch}]已经扫描`)
     } else {
       itemDetail.scaned = true
diff --git a/src/pages/purchaseReceipt/job/receiptDetail.vue b/src/pages/purchaseReceipt/job/receiptDetail.vue
index 2559021d..bc731397 100644
--- a/src/pages/purchaseReceipt/job/receiptDetail.vue
+++ b/src/pages/purchaseReceipt/job/receiptDetail.vue
@@ -90,6 +90,7 @@ const jobStatus = ref('')
 const isAllReceived = ref(false)
 const operation = ref('')
 const scanedPackingNumber = ref('')
+const status = ref('')
 const comMessageRef = ref()
 const locationCompareRef = ref()
 const scanPopup = ref()
@@ -98,10 +99,14 @@ const count = ref(0)
 onLoad((option) => {
   id.value = option.id
   scanedPackingNumber.value = option.scaned || ''
+  status.value = option.status || ''
   operation.value = option.operation
+})
+
+onShow(() => {
   if (id.value != undefined) {
     // 新建的任务自动接收
-    if (option.status == '1') {
+    if (status.value == '1') {
       receive((callback) => {
         getDetail()
       })
@@ -174,6 +179,8 @@ const getDetail = () => {
             r.subList.forEach((s) => {
               if (scanedPackingNumber.value && scanedPackingNumber.value == s.packingNumber) {
                 s.scaned = true
+                s.cancleScanedHiht = true
+                s.copyContent = `HPQ;V1.0;I${s.itemCode};P${s.packingNumber};B${s.batch};Q${s.qty}`
                 scanPopup.value.simulateScan(s)
               }
             })
@@ -203,7 +210,7 @@ const getScanResult = (result) => {
       var itemDetail = detail.subList.filter((r) => r.containerNumber == containerNumber)
       if (itemDetail.length == 0) {
         showErrorMessage(`物料【${itemCode}】、托码【${containerNumber}】不在列表中`)
-      } else if (itemDetail[0].scaned) {
+      } else if (!itemDetail[0].cancleScanedHiht && itemDetail[0].scaned) {
         showErrorMessage(`物料【${itemCode}】、托码【${containerNumber}】已经扫描`)
       } else {
         itemDetail.forEach((item) => {
@@ -245,7 +252,7 @@ const getScanResult = (result) => {
 
           if (isExit == undefined) {
             showMessage(`箱码【${packingNumber}】、批次【${batch}】不在列表中`)
-          } else if (isExit.scaned) {
+          } else if (!isExit.cancleScanedHiht && isExit.scaned) {
             showMessage(`箱码【${packingNumber}】已经扫描`)
           } else {
             isExit.scaned = true
@@ -261,7 +268,7 @@ const getScanResult = (result) => {
               scanedLength++
             }
           })
-          if (itemDetail.scaned && scanedLength == itemDetail.packList.length) {
+          if (!itemDetail.cancleScanedHiht && itemDetail.scaned && scanedLength == itemDetail.packList.length) {
             showMessage(`箱码【${packingNumber}】已经扫描`)
           } else {
             itemDetail.scaned = true
diff --git a/src/pages/putaway/job/putawayDetail.vue b/src/pages/putaway/job/putawayDetail.vue
index 84caba2b..188567f8 100644
--- a/src/pages/putaway/job/putawayDetail.vue
+++ b/src/pages/putaway/job/putawayDetail.vue
@@ -159,6 +159,7 @@ const getDetail = () => {
           r.subList.forEach((s) => {
             if (scanedPackingNumber.value && scanedPackingNumber.value == s.packingNumber) {
               s.scaned = true
+              s.cancleScanedHiht = true
               s.packList.forEach((item) => (item.scaned = true))
               s.inventoryStatus = s.inspectResult // 更新检验结果状态
               openScanPopupSimulate(s)
@@ -295,7 +296,7 @@ const getScanResult = (result) => {
         }
         if (isExit == undefined) {
           showErrorMessage(`箱码【${packingNumber}】,批次【${batch}】库位【${result.fromLocationCode}】不在列表中`)
-        } else if (isExit.scaned) {
+        } else if (!isExit.cancleScanedHiht && isExit.scaned) {
           showMessage(`箱码【${packingNumber}】已经扫描`)
         } else {
           isExit.scaned = true
@@ -317,7 +318,7 @@ const getScanResult = (result) => {
           }
         })
         itemDetail.fromInventoryStatus = result.balance.inventoryStatus
-        if (itemDetail.scaned && scanedLength == itemDetail.packList.length) {
+        if (!itemDetail.cancleScanedHiht && itemDetail.scaned && scanedLength == itemDetail.packList.length) {
           showMessage(`箱码【${packingNumber}】已经扫描`)
         } else {
           itemDetail.scaned = true