getInventory料架为空时返回所有的库存

src/main/java/com/neotel/smfcore/hella/handler/HellaServiceHandler.java

@@ -159,7 +159,8 @@ public class HellaServiceHandler extends IoHandlerAdapter implements ITaskListen
         String msg = message.toString();
         String msg = message.toString();
         msg= msg.replace("\u0002","");
         msg= msg.replace("\u0002","");
         log.info("Received Tcp Server msg:" + msg);
         log.info("Received Tcp Server msg:" + msg);
-        String[] resposArr = msg.split(";");
+        //getInventory;21296;
+        String[] resposArr = msg.split(";",-1);
         String cmd = resposArr[0];
         String cmd = resposArr[0];
         String eventId = resposArr[1];
         String eventId = resposArr[1];
 
 
@@ -226,23 +227,29 @@ public class HellaServiceHandler extends IoHandlerAdapter implements ITaskListen
             //<STX>getInventory;eventId;shelfNumber<CR><LF>
             //<STX>getInventory;eventId;shelfNumber<CR><LF>
             String shelfNumber = resposArr[2];
             String shelfNumber = resposArr[2];
             Storage shelf = null;
             Storage shelf = null;
-            Collection<Storage> allStorages = dataCache.getAllStorage().values();
-            for (Storage storage : allStorages) {
-                if(storage.getName().equals(shelfNumber)){
-                    shelf = storage;
+            if(ObjectUtil.isNotEmpty(shelfNumber)) {
+                Collection<Storage> allStorages = dataCache.getAllStorage().values();
+                for (Storage storage : allStorages) {
+                    if (storage.getName().equals(shelfNumber)) {
+                        shelf = storage;
+                    }
                 }
                 }
             }
             }
 
 
             String resultCode = "0";
             String resultCode = "0";
             String resultMsg = "OK";
             String resultMsg = "OK";
             String dataStr = "";
             String dataStr = "";
-            if(shelf == null){
+            if(ObjectUtil.isNotEmpty(shelfNumber)&&shelf == null){
                 //<STX>getInventoryResp;eventId;returnCode;messageText;numberofResults;partNumber1;containerNumber;remainQuantity;MSL;lightClass;SelfPosition;reserved;…;partNumberN;containerNumberN;remainQuantityN;MSLN;lightClassN;SelfPositionN;reservedN;<CR><LF>
                 //<STX>getInventoryResp;eventId;returnCode;messageText;numberofResults;partNumber1;containerNumber;remainQuantity;MSL;lightClass;SelfPosition;reserved;…;partNumberN;containerNumberN;remainQuantityN;MSLN;lightClassN;SelfPositionN;reservedN;<CR><LF>
                 resultCode = "-1";
                 resultCode = "-1";
                 resultMsg = "Shelf is not found";
                 resultMsg = "Shelf is not found";
                 dataStr = "0";
                 dataStr = "0";
             }else{
             }else{
-                List<StoragePos> posList = storagePosManager.findNotEmptyByStorageId(shelf.getId());
+                String shelfId="";
+                if(!(shelf==null)){
+                    shelfId=shelf.getId();
+                }
+                List<StoragePos> posList = storagePosManager.findNotEmptyByStorageId(shelfId);
                 int numberOfResult = posList.size();
                 int numberOfResult = posList.size();
                 dataStr = "" + numberOfResult;
                 dataStr = "" + numberOfResult;
                 for (StoragePos storagePos : posList) {
                 for (StoragePos storagePos : posList) {