提交

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;
+
 }

src/main/java/com/nov/KgLowDurable/service/Impl/LdTwoOutStorageServiceImpl.java

@@ -246,6 +246,7 @@ public class LdTwoOutStorageServiceImpl extends ServiceImpl<LdTwoOutStorageMappe
                 LdConsumerForm consumerForm = consumerFormService.getByMaterialId(groupMaterialVO.getMaterialId(), departmentId);
                 if(null != consumerForm){
                     BeanUtils.copyProperties(consumerForm, ldTwoInventoryVO);
+                    ldTwoInventoryVO.setInventory(consumerForm.getNum());
                 }
 
                 //耐用
@@ -254,12 +255,18 @@ public class LdTwoOutStorageServiceImpl extends ServiceImpl<LdTwoOutStorageMappe
                         .map(form -> {
                             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);
             }
         }