From 68def795911b5a44fdc655655176acff89133882 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AE=89=E8=99=B9=E7=9D=BF?= <297504645@qq.com>
Date: Tue, 11 Jun 2024 10:38:08 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8B=86=E7=AE=B1bug=E5=A4=84=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 fe/PC/src/api/wms-core.js                                 | 3 ++-
 .../labelManage/PartiallyPreparedProducts/splitLabels.vue | 8 ++++++--
 fe/PC/src/views/padManage/isPadForKittingPack.vue         | 5 +++--
 3 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/fe/PC/src/api/wms-core.js b/fe/PC/src/api/wms-core.js
index 835091e63..adda4d0a7 100644
--- a/fe/PC/src/api/wms-core.js
+++ b/fe/PC/src/api/wms-core.js
@@ -40,7 +40,8 @@ export async function postInventoryLabelCode_count(params,data) {
 // 拆箱 | 标签管理-拆分箱标签
 export function postSplitPacking(data) {
   return request({
-    url: baseURL + 'wms/store/transfer-note/split-packing-inspect',
+    // url: baseURL + 'wms/store/transfer-note/split-packing-inspect',
+    url: baseURL + 'wms/store/transfer-note/split-packing',
     method: 'post',
     data
   })
diff --git a/fe/PC/src/views/labelManage/PartiallyPreparedProducts/splitLabels.vue b/fe/PC/src/views/labelManage/PartiallyPreparedProducts/splitLabels.vue
index a9ffcff2d..7a706dea7 100644
--- a/fe/PC/src/views/labelManage/PartiallyPreparedProducts/splitLabels.vue
+++ b/fe/PC/src/views/labelManage/PartiallyPreparedProducts/splitLabels.vue
@@ -334,6 +334,10 @@ export default {
     // },
     // 拆箱
     postSplitPackingHandle(newCode,resolve,reject){
+      if(!this.InventoryInfo || JSON.stringify(this.InventoryInfo) == '{}'){
+        this.pageLoading = false;
+        return this.$errorMsg("该箱码无库存，不可拆箱！")
+      }
       let _data = {
         useOnTheWayLocation: false,
         requestNumber: null,
@@ -346,13 +350,13 @@ export default {
         confirmTime: new Date(),
         details: [{
           fromLocationCode: this.InventoryInfo ? this.InventoryInfo.locationCode : null,
+          toLocationCode: this.InventoryInfo ? this.InventoryInfo.locationCode : null,
           fromLocationErpCode: this.selectItemInfo.locationErpCode || (this.InventoryInfo ? this.InventoryInfo.locationErpCode : null),
           fromLot: this.selectItemInfo.lot,
           fromPackingCode: this.selectItemInfo.code,
-          fromWarehouseCode: this.InventoryInfo ? this.InventoryInfo.warehouseCode : null,
+          fromWarehouseCode: this.InventoryInfo ? this.InventoryInfo.warehouseCode : localStorage.getItem('warehouseCode'),
           itemCode: this.selectItemInfo.itemCode,
           itemName: this.selectItemInfo.itemName,
-          toLocationCode: this.InventoryInfo ? this.InventoryInfo.locationCode : null,
           toLocationErpCode: this.selectItemInfo.locationErpCode || (this.InventoryInfo ? this.InventoryInfo.locationErpCode : null),
           toLot: this.selectItemInfo.lot,
           toPackingCode: newCode,
diff --git a/fe/PC/src/views/padManage/isPadForKittingPack.vue b/fe/PC/src/views/padManage/isPadForKittingPack.vue
index 49b70a8f2..5ba3cb928 100644
--- a/fe/PC/src/views/padManage/isPadForKittingPack.vue
+++ b/fe/PC/src/views/padManage/isPadForKittingPack.vue
@@ -22,7 +22,7 @@
         <div class="lockShadow" v-if="isLock">{{lockTip}}</div>
         <!-- 中间底盘号 -->
         <div class="centerChassisContain">
-          <div class="title" @click="LogoutUserHandle">底盘号</div>
+          <div class="title">底盘号</div>
           <ul class="chassisList" v-if="centerChassisList.length > 0">
             <li
               v-for="(item,index) of centerChassisList" 
@@ -167,6 +167,7 @@ export default {
     this.initData()
     clearInterval(this.intervalId)
     //刷新数据
+    window.LogoutPadUserHandle = this.LogoutUserHandle
     this.intervalId = setInterval(() => {
       this.initData()
     }, localStorage.getItem('padKittingPackUpdate') || 180000)
@@ -245,7 +246,7 @@ export default {
         })
         .catch(err=>{})
     },
-    // 退出锁定账号:批量将当前账号所有的绑定菜单删除
+    // 退出锁定账号:批量将当前账号所有的绑定菜单删除，框架调用
     async LogoutUserHandle(){
       let _filter = [{
         logic: "And",