diff --git a/win-module-eam/win-module-eam-biz/src/main/java/com/win/module/eam/service/item/ItemServiceImpl.java b/win-module-eam/win-module-eam-biz/src/main/java/com/win/module/eam/service/item/ItemServiceImpl.java index 482c3ef..5957902 100644 --- a/win-module-eam/win-module-eam-biz/src/main/java/com/win/module/eam/service/item/ItemServiceImpl.java +++ b/win-module-eam/win-module-eam-biz/src/main/java/com/win/module/eam/service/item/ItemServiceImpl.java @@ -348,24 +348,10 @@ public class ItemServiceImpl implements ItemService { public PageResult getWarningPage(ItemPageReqVO pageReqVO) { pageReqVO.setFlag("2"); PageResult pageResult = itemMapper.selectPage(pageReqVO); - List itemNewList=new ArrayList(); - for (ItemDO itemDO : pageResult.getList()) { - QueryWrapper queryWrapper = new QueryWrapper<>(); - queryWrapper.eq("item_number",itemDO.getNumber()); - queryWrapper.eq("available","TRUE"); - List itemAccountsDOList = itemAccountsMapper.selectList(queryWrapper); - BigDecimal allCount = BigDecimal.ZERO; - for (ItemAccountsDO itemAccountsDO : itemAccountsDOList) { - allCount=allCount.add(itemAccountsDO.getQty()); - } - //如果各种类型的备件库存数量总数低于最低库存数量 - if(allCount.compareTo(itemDO.getMinInventory())==-1){ - itemDO.setAllCount(allCount); - itemNewList.add(itemDO); - } + for(ItemDO en: pageResult.getList()){ + BigDecimal bigDecimal = itemAccountsMapper.selectInventorySum(en.getNumber()); + en.setAllCount(bigDecimal); } - pageResult.setList(itemNewList); - pageResult.setTotal(Long.valueOf(itemNewList.size()).longValue()); return pageResult; } diff --git a/win-module-eam/win-module-eam-biz/src/main/java/com/win/module/eam/service/itemoutlocation/ItemOutLocationServiceImpl.java b/win-module-eam/win-module-eam-biz/src/main/java/com/win/module/eam/service/itemoutlocation/ItemOutLocationServiceImpl.java index e7a689c..15757e6 100644 --- a/win-module-eam/win-module-eam-biz/src/main/java/com/win/module/eam/service/itemoutlocation/ItemOutLocationServiceImpl.java +++ b/win-module-eam/win-module-eam-biz/src/main/java/com/win/module/eam/service/itemoutlocation/ItemOutLocationServiceImpl.java @@ -153,6 +153,7 @@ public class ItemOutLocationServiceImpl implements ItemOutLocationService { } @Override + @Transactional public Long createPDA(ItemOutLocationCreateReqVO createReqVO) { long i = 0l; List> itemList = createReqVO.getItemNumbers();//备件号集合