diff --git a/src/main/java/com/nov/KgLowDurable/pojo/vo/LdTwoInventoryVO.java b/src/main/java/com/nov/KgLowDurable/pojo/vo/LdTwoInventoryVO.java index 2f13dc4..9034e62 100644 --- a/src/main/java/com/nov/KgLowDurable/pojo/vo/LdTwoInventoryVO.java +++ b/src/main/java/com/nov/KgLowDurable/pojo/vo/LdTwoInventoryVO.java @@ -79,4 +79,10 @@ public class LdTwoInventoryVO implements Serializable { */ private String department; + + /** + * 库存 + */ + private BigDecimal inventory; + } diff --git a/src/main/java/com/nov/KgLowDurable/service/Impl/LdTwoOutStorageServiceImpl.java b/src/main/java/com/nov/KgLowDurable/service/Impl/LdTwoOutStorageServiceImpl.java index e7e1cf1..7a3778f 100644 --- a/src/main/java/com/nov/KgLowDurable/service/Impl/LdTwoOutStorageServiceImpl.java +++ b/src/main/java/com/nov/KgLowDurable/service/Impl/LdTwoOutStorageServiceImpl.java @@ -246,6 +246,7 @@ public class LdTwoOutStorageServiceImpl extends ServiceImpl { LdTwoInventoryVO vo = new LdTwoInventoryVO(); BeanUtils.copyProperties(form, vo); + vo.setInventory(form.getNum()); return vo; }) .collect(Collectors.toList()); - list.add(ldTwoInventoryVO); - list.addAll(collect); + + if(null != ldTwoInventoryVO){ + list.add(ldTwoInventoryVO); + } + if(!CollectionUtils.isEmpty(collect)){ + list.addAll(collect); + } groupMaterialVO.setTwoInventoryVOList(list); } }