|
|
@ -271,14 +271,19 @@ public class MaterialServiceImpl implements MaterialService { |
|
|
page = ObjectFormatUtil.toInteger(map.get("page")); |
|
|
page = ObjectFormatUtil.toInteger(map.get("page")); |
|
|
map.put("begin", (page - 1) * size); |
|
|
map.put("begin", (page - 1) * size); |
|
|
} |
|
|
} |
|
|
|
|
|
Object state = 1; |
|
|
|
|
|
if (map.containsKey("state")) { |
|
|
|
|
|
state = map.get("state"); |
|
|
|
|
|
} |
|
|
|
|
|
map.put("state", state); |
|
|
List<Inventory> list = materialMapper.findInventory(map); |
|
|
List<Inventory> list = materialMapper.findInventory(map); |
|
|
for (int i = 0; i < list.size(); i++) { |
|
|
for (Inventory inventory : list) { |
|
|
list.get(i).setPrice(list.get(i).getPrice() / 100); |
|
|
inventory.setPrice(inventory.getPrice() / 100); |
|
|
list.get(i).setAmounts(list.get(i).getAmounts() / 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<PlaceP> placeByMidAndDid = placeService.findPlaceByMidAndDid(mid, depositoryId); |
|
|
List<PlaceP> placeByMidAndDid = placeService.findPlaceByMidAndDid(mid, depositoryId); |
|
|
StringBuilder placeCode = new StringBuilder(); |
|
|
StringBuilder placeCode = new StringBuilder(); |
|
|
for (PlaceP placeP : placeByMidAndDid) { |
|
|
for (PlaceP placeP : placeByMidAndDid) { |
|
|
@ -287,9 +292,9 @@ public class MaterialServiceImpl implements MaterialService { |
|
|
if (depositoryId != null) { |
|
|
if (depositoryId != null) { |
|
|
Depository depositoryRecordById = depositoryMapper.findDepositoryById(depositoryId); |
|
|
Depository depositoryRecordById = depositoryMapper.findDepositoryById(depositoryId); |
|
|
String code = depositoryRecordById.getCode(); |
|
|
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); |
|
|
return pack(list); |
|
|
} |
|
|
} |
|
|
|