neotel获取实时库存接口修改

src/main/java/com/neotel/smfcore/core/storage/service/manager/IStoragePosManager.java

@@ -67,5 +67,5 @@ public interface IStoragePosManager extends IBaseManager<StoragePos> {
 
     List<StoragePos> getSameSizeContinuityEmptyPosList(Storage storage, Barcode barcode) throws ValidateException;
 
-    List<StoragePos> getInventoryPosList(List<String> storageId);
+    List<StoragePos> getNotEmptyByStorageIdList(List<String> storageId);
 }

src/main/java/com/neotel/smfcore/core/storage/service/manager/impl/StoragePosManagerImpl.java

@@ -558,7 +558,7 @@ public class StoragePosManagerImpl implements IStoragePosManager {
     }
 
     @Override
-    public List<StoragePos> getInventoryPosList(List<String> storageIds) {
+    public List<StoragePos> getNotEmptyByStorageIdList(List<String> storageIds) {
         //构造查询条件
         Query query = new Query();
         Criteria criteria = Criteria.where("barcode").exists(true).and("enabled").is(true);

src/main/java/com/neotel/smfcore/custom/neotelApi/rest/NeotelController.java

@@ -125,19 +125,31 @@ public class NeotelController {
     @AnonymousPostMapping("/inventory")
     public ResultBean inventory(@RequestBody Map<String, List<String>> paramMap) {
         List<String> towerIds = paramMap.get("towerIds");
-        List<StoragePos> storagePosList = storagePosManager.getInventoryPosList(towerIds);
+        List<StoragePos> storagePosList = storagePosManager.getNotEmptyByStorageIdList(towerIds);
         if (storagePosList != null && storagePosList.size() > 0) {
             List<Map<String, Object>> resultMapList = new ArrayList<>();
             for (StoragePos storagePos : storagePosList) {
-                Map<String, Object> resultMap = new HashMap<>();
                 Barcode barcode = storagePos.getBarcode();
-                resultMap.put("reelId", barcode.getBarcode());
-                resultMap.put("qty", barcode.getAmount());
-                resultMap.put("towerId", storagePos.getStorageId());
-                resultMap.put("location", barcode.getPosName());
-                resultMapList.add(resultMap);
+                if (barcode != null) {
+                    if (barcode.getSubCodeList() != null && !barcode.getSubCodeList().isEmpty()) {
+                        for (Barcode subBarcode : barcode.getSubCodeList()) {
+                            Map<String, Object> resultMap = new HashMap<>();
+                            resultMap.put("reelId", subBarcode.getBarcode());
+                            resultMap.put("qty", subBarcode.getAmount());
+                            resultMap.put("towerId", storagePos.getStorageId());
+                            resultMap.put("location", storagePos.getPosName());
+                            resultMapList.add(resultMap);
+                        }
+                    } else {
+                        Map<String, Object> resultMap = new HashMap<>();
+                        resultMap.put("reelId", barcode.getBarcode());
+                        resultMap.put("qty", barcode.getAmount());
+                        resultMap.put("towerId", storagePos.getStorageId());
+                        resultMap.put("location", storagePos.getPosName());
+                        resultMapList.add(resultMap);
+                    }
+                }
             }
-
             return ResultBean.newOkResult(resultMapList);
         }
         return ResultBean.newErrorResult(1, "", "查询失败");