diff --git a/acs/nladmin-system/src/main/java/org/nl/acs/ext/wms/service/impl/WmsToAcsServiceImpl.java b/acs/nladmin-system/src/main/java/org/nl/acs/ext/wms/service/impl/WmsToAcsServiceImpl.java
index a09fc5544..3ee15e51e 100644
--- a/acs/nladmin-system/src/main/java/org/nl/acs/ext/wms/service/impl/WmsToAcsServiceImpl.java
+++ b/acs/nladmin-system/src/main/java/org/nl/acs/ext/wms/service/impl/WmsToAcsServiceImpl.java
@@ -246,8 +246,13 @@ public class WmsToAcsServiceImpl implements WmsToAcsService {
                 JSONObject jo = new JSONObject();
                 JSONObject data = datas.getJSONObject(i);
                 String parent_device_code = data.getString("device_code");
+                String device_code = "";
                 JSONObject device_json = WQLObject.getWQLObject("acs_storage_cell").query("parent_storage_code ='" + parent_device_code + "'").uniqueResult(0);
-                String device_code = device_json.get("parent_storage_code") == null ? parent_device_code : (String) device_json.get("storage_code");
+                if (!ObjectUtil.isEmpty(device_json)) {
+                    device_code = device_json.get("parent_storage_code") == null ? parent_device_code : (String) device_json.get("storage_code");
+                } else {
+                    device_code = parent_device_code;
+                }
                 Device device = deviceAppService.findDeviceByCode(device_code);
                 if (ObjectUtil.isEmpty(device)) {
                     throw new Exception("未找到对应设备:" + parent_device_code);