From 50a7bbc6535b6c87f1b6b74fa14bac26f302220f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=B5=B5=E5=AE=8F=E6=96=8C?= <2164406372@qq.com>
Date: Fri, 19 Sep 2025 15:57:45 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=A0=A1=E9=AA=8C=20?=
 =?UTF-8?q?=E6=9C=AA=E5=85=A5=E5=BA=93=E7=9A=84=E6=A0=87=E7=AD=BE=20?=
 =?UTF-8?q?=E4=B8=8D=E8=83=BD=E7=A7=BB=E5=BA=93?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/resources/mapper/app/InventoryStock.xml    | 3 ++-
 src/main/resources/static/js/pda/changeLocation2.js | 8 +++++++-
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/src/main/resources/mapper/app/InventoryStock.xml b/src/main/resources/mapper/app/InventoryStock.xml
index d3b72b2..0e72067 100644
--- a/src/main/resources/mapper/app/InventoryStock.xml
+++ b/src/main/resources/mapper/app/InventoryStock.xml
@@ -118,7 +118,8 @@
                seq_no,
                batch_no,
                location_id,
-               warehouse_id
+               warehouse_id,
+               status
         from print_label_record
         <where>
             <if test="site!=null and site !=''">
diff --git a/src/main/resources/static/js/pda/changeLocation2.js b/src/main/resources/static/js/pda/changeLocation2.js
index 6e25c48..2ea26f3 100644
--- a/src/main/resources/static/js/pda/changeLocation2.js
+++ b/src/main/resources/static/js/pda/changeLocation2.js
@@ -142,7 +142,8 @@ async function queryPart(){
 		wareHouseId : '',
 		batchNo: '',
 		locationId : '',
-		printLabelId : ''
+		printLabelId : '',
+		status : '',
 	}
 	if(strList.length < 5){
 		layer.msg("袋贴标签格式错误！");
@@ -162,6 +163,10 @@ async function queryPart(){
 	}
 	//查询标签信息
 	await queryPrintLabelRecord()
+	if (partNoData.status == '未入库') {
+		layer.msg("该标签未入库，不能进行移库操作！");
+		return false
+	}
 	var flag = false;
 	for (let i = 0; i < tableList.length; i++) {
 		if(tableList[i].printLabelId == partNoData.printLabelId){
@@ -200,6 +205,7 @@ function queryPrintLabelRecord(){
 					partNoData.batchNo = data.row.batchNo;
 					partNoData.locationId = data.row.locationId;
 					partNoData.wareHouseId = data.row.warehouseId;
+					partNoData.status = data.row.status;
 					resolve(data);
 				} else {
 					layer.msg(data.msg);