From dda24bca5a039b1c52015b3630887cad9d35d8f7 Mon Sep 17 00:00:00 2001
From: hehaibing-1996 <hehaibing1996@qq.com>
Date: Tue, 11 Mar 2025 19:15:32 +0800
Subject: [PATCH] =?UTF-8?q?=E7=89=A9=E6=96=99=E7=BB=91=E5=AE=9A=E7=95=8C?=
 =?UTF-8?q?=E9=9D=A2=E6=94=AF=E6=8C=81=E6=89=8B=E5=8A=A8=E8=BE=93=E5=85=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 PDA/PDA/pages/bind/bind.vue                   | 30 ++++++++++++++++++-
 PDA/PDA/pages/index/index.vue                 |  2 +-
 .../dist/dev/app-plus/app-service.js          | 30 ++++++++++++++++---
 3 files changed, 56 insertions(+), 6 deletions(-)

diff --git a/PDA/PDA/pages/bind/bind.vue b/PDA/PDA/pages/bind/bind.vue
index 280f629..3d2fdb4 100644
--- a/PDA/PDA/pages/bind/bind.vue
+++ b/PDA/PDA/pages/bind/bind.vue
@@ -51,7 +51,7 @@
 				<view style="flex: 3;"></view>
 
 				<view style="flex: 32;">
-					<button class="mini-btn" type="warn" size="mini" @click="callEmptyShelf">呼叫货架</button>
+					<button class="mini-btn" style="font-size: 25rpx;" type="warn" size="mini" @click="callEmptyShelf">呼叫货架</button>
 				</view>
 			</view>
 			
@@ -445,6 +445,34 @@
 			},
 
 			queryMatList: function() {
+				
+				//支持手动输入
+				const regex = /^\d{6}XY\d{6}$/;
+				if (regex.test(this.matCodeCondition)) {
+					this.locationCode = this.matCodeCondition;
+					this.matCodeCondition = '';
+					this.analysisScanCode(this.locationCode);
+					return;
+				}
+				
+				const regex1 = /^\d{6}xy\d{6}$/;
+				if (regex1.test(this.matCodeCondition)) {
+					this.locationCode = this.matCodeCondition.toUpperCase();
+					this.matCodeCondition = '';
+					this.analysisScanCode(this.locationCode);
+					return;
+				}
+				
+				const regex2 = /^[1-9]\d{5}$/;
+				//只有在未扫码的时候输入货架编码有用
+				if (regex2.test(this.matCodeCondition) && this.isNeedScanLocationCode) {
+					this.shelfCode = this.matCodeCondition;
+					this.matCodeCondition = '';
+					this.analysisScanCode(this.shelfCode);
+					return;
+				}
+				
+				
 				if (this.isNeedScanLocationCode) {
 					uni.showToast({
 						title: '请先扫描工位码！',
diff --git a/PDA/PDA/pages/index/index.vue b/PDA/PDA/pages/index/index.vue
index 10ed055..2c9fa06 100644
--- a/PDA/PDA/pages/index/index.vue
+++ b/PDA/PDA/pages/index/index.vue
@@ -38,7 +38,7 @@
 		
 		<view style="margin-top:70rpx;margin-bottom: 20rpx;text-align: center;">
 			<view >{{serverIPAndPort}}</view>
-			<view >V1.0</view>
+			<view >V1.1</view>
 		</view>
 		
 	</view>
diff --git a/PDA/PDA/unpackage/dist/dev/app-plus/app-service.js b/PDA/PDA/unpackage/dist/dev/app-plus/app-service.js
index 9991aae..e9c1a9f 100644
--- a/PDA/PDA/unpackage/dist/dev/app-plus/app-service.js
+++ b/PDA/PDA/unpackage/dist/dev/app-plus/app-service.js
@@ -320,7 +320,7 @@ if (uni.restoreGlobal) {
           1
           /* TEXT */
         ),
-        vue.createElementVNode("view", null, "V1.0")
+        vue.createElementVNode("view", null, "V1.1")
       ])
     ]);
   }
@@ -1013,6 +1013,27 @@ if (uni.restoreGlobal) {
         });
       },
       queryMatList: function() {
+        const regex = /^\d{6}XY\d{6}$/;
+        if (regex.test(this.matCodeCondition)) {
+          this.locationCode = this.matCodeCondition;
+          this.matCodeCondition = "";
+          this.analysisScanCode(this.locationCode);
+          return;
+        }
+        const regex1 = /^\d{6}xy\d{6}$/;
+        if (regex1.test(this.matCodeCondition)) {
+          this.locationCode = this.matCodeCondition.toUpperCase();
+          this.matCodeCondition = "";
+          this.analysisScanCode(this.locationCode);
+          return;
+        }
+        const regex2 = /^[1-9]\d{5}$/;
+        if (regex2.test(this.matCodeCondition) && this.isNeedScanLocationCode) {
+          this.shelfCode = this.matCodeCondition;
+          this.matCodeCondition = "";
+          this.analysisScanCode(this.shelfCode);
+          return;
+        }
         if (this.isNeedScanLocationCode) {
           uni.showToast({
             title: "请先扫描工位码！",
@@ -1113,7 +1134,7 @@ if (uni.restoreGlobal) {
             });
           },
           complete: (event) => {
-            formatAppLog("log", "at pages/bind/bind.vue:555", "请求完成", event);
+            formatAppLog("log", "at pages/bind/bind.vue:583", "请求完成", event);
           }
         });
       },
@@ -1204,7 +1225,7 @@ if (uni.restoreGlobal) {
             });
           },
           complete: (event) => {
-            formatAppLog("log", "at pages/bind/bind.vue:657", "请求完成", event);
+            formatAppLog("log", "at pages/bind/bind.vue:685", "请求完成", event);
           }
         });
       },
@@ -1232,7 +1253,7 @@ if (uni.restoreGlobal) {
         this.matQty = 0;
       },
       handlePopupClose() {
-        formatAppLog("log", "at pages/bind/bind.vue:689", "弹出层已关闭");
+        formatAppLog("log", "at pages/bind/bind.vue:717", "弹出层已关闭");
       }
     }
   };
@@ -1326,6 +1347,7 @@ if (uni.restoreGlobal) {
           vue.createElementVNode("view", { style: { "flex": "32" } }, [
             vue.createElementVNode("button", {
               class: "mini-btn",
+              style: { "font-size": "25rpx" },
               type: "warn",
               size: "mini",
               onClick: _cache[6] || (_cache[6] = (...args) => $options.callEmptyShelf && $options.callEmptyShelf(...args))