From f9696306872ef2567dc44ba9377a957f2f65008d Mon Sep 17 00:00:00 2001
From: bb_pan <max_163email@163.com>
Date: Sat, 6 Sep 2025 19:21:07 +0800
Subject: [PATCH] =?UTF-8?q?=E5=87=BA=E5=BA=93=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages/picking/outbound/code-outbound.vue | 19 ++++++++++++++++---
 src/pages/picking/outbound/codeOutScan.vue   |  1 +
 2 files changed, 17 insertions(+), 3 deletions(-)

diff --git a/src/pages/picking/outbound/code-outbound.vue b/src/pages/picking/outbound/code-outbound.vue
index 77bf1d9..0560aba 100644
--- a/src/pages/picking/outbound/code-outbound.vue
+++ b/src/pages/picking/outbound/code-outbound.vue
@@ -498,6 +498,9 @@ const onHandleOutbound = async () => {
 
 // 标准箱识别
 const boxScan = async () => {
+    // boxCode.value = 'BOX20250906-009'
+    // boxOut()
+    // return
     if (maxNum.value == 0) {
         uni.showToast({
             title: '待出库数量已为0！',
@@ -592,7 +595,7 @@ const boxOut = async () => {
                     })
                 }
             } else {
-                uni.showToast({ title: '标准箱未绑定设备！', icon: 'none' })
+                uni.showToast({ title: res.data.msg, icon: 'none' })
             }
         } else {
             uni.showToast({ title: '扫码识别失败', icon: 'none' })
@@ -608,6 +611,13 @@ const boxOutBound = async () => {
         })
         return
     }
+    if (!boxInfo.value || boxInfo.value.length == 0) {
+        uni.showToast({
+            title: '无符合出库条件的设备！',
+            icon: 'none',
+        })
+        return
+    }
     // 解构所需要的数据
     const { typeId, parentId, publishTask } = queryParams.value
     // 组装出库参数
@@ -624,7 +634,8 @@ const boxOutBound = async () => {
             parentId,
             typeId,
             publishTask,
-            code: queryParams.value.code
+            code: queryParams.value.code,
+            jiJuType: e.jiJuType
         })
     })
     console.log(paramsList)
@@ -660,8 +671,9 @@ const onCodeIdentify = () => {
 
 // 扫码识别按钮
 const scanStart = () => {
-    // qrCodeScan.value = '202401-00006'
+    // qrCodeScan.value = '202308-00657'
     // getMaInfoScan()
+    // return
     if (maxNum.value == 0) {
         uni.showToast({
             title: '待出库数量已为0！',
@@ -793,6 +805,7 @@ const confirmCodeOutBound = async () => {
         publishTask,
         code: queryParams.value.code,
         keyId: keyId.value,
+        jiJuType: codeData.value.jiJuType,
     })
     const res = await setOutboundNumAPI({ leaseOutDetailsList: paramsList })
     console.log('333333333333', res)
diff --git a/src/pages/picking/outbound/codeOutScan.vue b/src/pages/picking/outbound/codeOutScan.vue
index 40563f6..bec1e90 100644
--- a/src/pages/picking/outbound/codeOutScan.vue
+++ b/src/pages/picking/outbound/codeOutScan.vue
@@ -203,6 +203,7 @@ export default {
         materialName: this.codeData.maName,
         typeId: this.codeData.typeId,
         outType: 4,
+        jiJuType: this.codeData.jiJuType,
       }
       uni.$emit('paramsReceived', params)
       uni.navigateBack()