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":