diff --git a/src/main/java/com/dreamchaser/depository_manage/service/impl/MaterialServiceImpl.java b/src/main/java/com/dreamchaser/depository_manage/service/impl/MaterialServiceImpl.java index 1c598008..c00df820 100644 --- a/src/main/java/com/dreamchaser/depository_manage/service/impl/MaterialServiceImpl.java +++ b/src/main/java/com/dreamchaser/depository_manage/service/impl/MaterialServiceImpl.java @@ -271,14 +271,19 @@ public class MaterialServiceImpl implements MaterialService { page = ObjectFormatUtil.toInteger(map.get("page")); map.put("begin", (page - 1) * size); } + Object state = 1; + if (map.containsKey("state")) { + state = map.get("state"); + } + map.put("state", state); List list = materialMapper.findInventory(map); - for (int i = 0; i < list.size(); i++) { - list.get(i).setPrice(list.get(i).getPrice() / 100); - list.get(i).setAmounts(list.get(i).getAmounts() / 100); + for (Inventory inventory : list) { + inventory.setPrice(inventory.getPrice() / 100); + inventory.setAmounts(inventory.getAmounts() / 100); // 获取当前物料所处仓库 - Integer depositoryId = list.get(i).getDepositoryId(); + Integer depositoryId = inventory.getDepositoryId(); // 获取当前物料所处库位 - Integer mid = list.get(i).getId(); + Integer mid = inventory.getId(); List placeByMidAndDid = placeService.findPlaceByMidAndDid(mid, depositoryId); StringBuilder placeCode = new StringBuilder(); for (PlaceP placeP : placeByMidAndDid) { @@ -287,9 +292,9 @@ public class MaterialServiceImpl implements MaterialService { if (depositoryId != null) { Depository depositoryRecordById = depositoryMapper.findDepositoryById(depositoryId); String code = depositoryRecordById.getCode(); - list.get(i).setDepositoryCode(code); + inventory.setDepositoryCode(code); } - list.get(i).setPlaceCode(placeCode.toString()); + inventory.setPlaceCode(placeCode.toString()); } return pack(list); }