From 91f7de6cc770471a728bca945572822b14bba9f2 Mon Sep 17 00:00:00 2001
From: qiezi <15576055375@163.com>
Date: Mon, 7 Apr 2025 16:36:01 +0800
Subject: [PATCH] =?UTF-8?q?=E8=A2=8B=E8=A3=85=E6=8B=86=E8=A2=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../resources/static/js/pda/transferWarehousing2.js    |  2 +-
 .../static/js/pda/transferWarehousingScanLabel.js      | 10 ++++++++--
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/src/main/resources/static/js/pda/transferWarehousing2.js b/src/main/resources/static/js/pda/transferWarehousing2.js
index 926cf55..d8898f6 100644
--- a/src/main/resources/static/js/pda/transferWarehousing2.js
+++ b/src/main/resources/static/js/pda/transferWarehousing2.js
@@ -336,7 +336,7 @@ function cleanInput(){
 function pdaBaseJump(){
     var menuId = $("#menuId").val();
     var titleName = "回退";
-    window.location.href = "/pda/transferWarehousing?menuId=" +menuId +"&titleName=" +titleName;
+    window.location.href = "/pda/transferWarehousingScanLabel?menuId=" +menuId +"&titleName=" +titleName;
 }
 //下级界面页面跳转
 function pdaBaseJump2(){
diff --git a/src/main/resources/static/js/pda/transferWarehousingScanLabel.js b/src/main/resources/static/js/pda/transferWarehousingScanLabel.js
index 32469d4..6d6b5d0 100644
--- a/src/main/resources/static/js/pda/transferWarehousingScanLabel.js
+++ b/src/main/resources/static/js/pda/transferWarehousingScanLabel.js
@@ -12,7 +12,7 @@ var wareHouseData = null;
 
 var batchType = "";
 
-const labelList = [];
+let labelList = [];
 
 //页面初始化
 $(function(){
@@ -24,8 +24,14 @@ $(function(){
     var workData = $.cookie("transFer");
     if(workData != null && workData !==""){
         currentData = JSON.parse(workData);
+        // 处理下一步返回的操作
         if (currentData.preLotSize){
             currentData.lotSize = currentData.preLotSize
+            currentData.preLotSize = undefined
+        }
+        if (currentData.scanList && currentData.scanList.length > 0){
+            labelList = [...currentData.scanList]
+            currentData.scanList = [];
         }
         $("#warehouseQty").val(currentData.lotSize);
         if(currentData.weightFactor!='0'&&currentData.weightFactor!=''&&currentData.weightFactor!=null){
@@ -39,6 +45,7 @@ $(function(){
     // 初始化
     initPageProp(currentData);
 
+    onloadTable();
 });
 
 $("#scanInput").bind("keydown",function(event){
@@ -57,7 +64,6 @@ function initPageProp(preDate){
     $("#partDesc").val(preDate.partDescription)
     $("#scanQty").val(0)
     $("#scanWeight").val(0)
-    console.log(preDate)
 }