From 6b1bc8c7f6f1845a04f04e2fcbc890510d6676f4 Mon Sep 17 00:00:00 2001
From: 18110972313 <780768673@qq.com>
Date: Thu, 8 May 2025 15:46:19 +0800
Subject: [PATCH] =?UTF-8?q?update=20=E4=BF=AE=E6=94=B9=E9=80=9A=E8=BF=87?=
 =?UTF-8?q?=E4=BB=93=E5=BA=93=E8=8E=B7=E5=8F=96=E8=B4=A7=E4=BD=8D=E4=BF=A1?=
 =?UTF-8?q?=E6=81=AF=E6=9F=A5=E8=AF=A2SQL=EF=BC=8C=E5=A2=9E=E5=8A=A0?=
 =?UTF-8?q?=E5=88=86=E9=A1=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../cim/idm/controller/StorageController.java    | 16 ++++++++++++++--
 1 file changed, 14 insertions(+), 2 deletions(-)

diff --git a/zi-wms-pda/src/main/java/com/cim/idm/controller/StorageController.java b/zi-wms-pda/src/main/java/com/cim/idm/controller/StorageController.java
index 2c933e4..6c942d7 100644
--- a/zi-wms-pda/src/main/java/com/cim/idm/controller/StorageController.java
+++ b/zi-wms-pda/src/main/java/com/cim/idm/controller/StorageController.java
@@ -100,7 +100,7 @@ public class StorageController {
 //		String commitDate = storageSpec.getCommitDate();
 		//判断条码是否存在且状态是在库
 		//String sql = "SELECT m.STORAGENAME ,m.DESCRIPTION || m.STORAGENAME DESCRIPTION  FROM STORAGESPEC m WHERE m.ERPLOCATION = :ERPLOCATION ORDER BY STORAGENAME ";
-		String sql = " SELECT\n" +
+		/*String sql = " SELECT\n" +
 				"\tm.STORAGENAME,\n" +
 				"\tm.STORAGENAME || ' ' || m.DESCRIPTION DESCRIPTION \n" +
 				"FROM\n" +
@@ -109,7 +109,19 @@ public class StorageController {
 				"\tm.SITENAME =:SITENAME\n" +
 				"\tAND m.AREANAME =:AREANAME\n" +
 				"ORDER BY\n" +
-				"\tSTORAGENAME ";
+				"\tSTORAGENAME ";*/
+		String sql = " SELECT * FROM ( " +
+				" SELECT\n" +
+				"\tm.STORAGENAME,\n" +
+				"\tm.STORAGENAME || ' ' || m.DESCRIPTION DESCRIPTION \n" +
+				"FROM\n" +
+				"\tSTORAGESPEC m \n" +
+				"WHERE\n" +
+				"\tm.SITENAME =:SITENAME\n" +
+				"\tAND m.AREANAME =:AREANAME\n" +
+				"ORDER BY\n" +
+				"\tSTORAGENAME" +
+				" ) WHERE ROWNUM <= 50 ";
 		switch (erpLocation) {
 			case "1010":
 			case "1020":