1

winsea-haixin-plugin-yiliangyiyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/service/impl/WarehouseBaseInfoServiceImpl.java

@@ -1582,7 +1582,6 @@ public class WarehouseBaseInfoServiceImpl extends ServiceImpl<WarehouseBaseInfoM
         }
         if (!CollectionUtils.isEmpty(warehouseBaseInfoList)) {
             for (WarehouseBaseInfo warehouseBaseInfo : warehouseBaseInfoList) {
-                List<WarehousePositionStorageInfo> temp = new ArrayList();
                 // 以库位为维度查询
                 List<WarehousePositionInfo> warehousePositionInfos = warehousePositionInfoService.selectList(new EntityWrapper<WarehousePositionInfo>()
                         .eq("base_id", warehouseBaseInfo.getId()).orderBy("bin_number", false));
@@ -1592,12 +1591,9 @@ public class WarehouseBaseInfoServiceImpl extends ServiceImpl<WarehouseBaseInfoM
                         List<WarehousePositionStorageInfo> warehousePositionStorageInfos = warehousePositionStorageInfoService.selectList(new EntityWrapper<WarehousePositionStorageInfo>()
                                 .eq("position_id", warehousePositionInfo.getId()));
                         if (!CollectionUtils.isEmpty(warehousePositionStorageInfos)) {
-                            for (WarehousePositionStorageInfo warehousePositionStorageInfo : warehousePositionStorageInfos) {
-                                temp.add(warehousePositionStorageInfo);
-                            }
+                            warehouseBaseInfo.setGoodsNameInfos(warehousePositionStorageInfos);
                         }
                     }
-                    warehouseBaseInfo.setGoodsNameInfos(temp);
                     warehouseBaseInfo.setPositionInfos(warehousePositionInfos);
                 }
             }
@@ -1683,7 +1679,6 @@ public class WarehouseBaseInfoServiceImpl extends ServiceImpl<WarehouseBaseInfoM
 //        }
         if (!CollectionUtils.isEmpty(warehouseBaseInfoList)) {
             for (WarehouseBaseInfo warehouseBaseInfo : warehouseBaseInfoList) {
-                List<WarehousePositionStorageInfo> temp = new ArrayList();
                 // 以库位为维度查询
                 List<WarehousePositionInfo> warehousePositionInfos = warehousePositionInfoService.selectList(new EntityWrapper<WarehousePositionInfo>()
                         .eq("base_id", warehouseBaseInfo.getId()).orderBy("bin_number", false));
@@ -1708,11 +1703,10 @@ public class WarehouseBaseInfoServiceImpl extends ServiceImpl<WarehouseBaseInfoM
                                     }
                                 }
                                 warehousePositionStorageInfo.setUseStorage(warehousePositionStorageInfo.getStorage() - useWeight);
-                                temp.add(warehousePositionStorageInfo);
                             }
+                            warehouseBaseInfo.setGoodsNameInfos(warehousePositionStorageInfos);
                         }
                     }
-                    warehouseBaseInfo.setGoodsNameInfos(temp);
                     warehouseBaseInfo.setPositionInfos(warehousePositionInfos);
                 }
             }
@@ -1752,7 +1746,6 @@ public class WarehouseBaseInfoServiceImpl extends ServiceImpl<WarehouseBaseInfoM
                 pageView2.put("serviceManagementType", "2");
                 // 查询出库信息包括已删除的
                 Integer dataCount2 = baseMapper.getCountByCondition(pageView2);
-                List<WarehousePositionStorageInfo> temp = new ArrayList();
                 // 以库位为维度查询
                 List<WarehousePositionInfo> warehousePositionInfos = warehousePositionInfoService.selectList(new EntityWrapper<WarehousePositionInfo>()
                         .eq("base_id", warehouseBaseInfo.getId()).orderBy("bin_number", false));
@@ -1777,11 +1770,10 @@ public class WarehouseBaseInfoServiceImpl extends ServiceImpl<WarehouseBaseInfoM
                                     }
                                 }
                                 warehousePositionStorageInfo.setUseStorage(warehousePositionStorageInfo.getStorage() - useWeight);
-                                temp.add(warehousePositionStorageInfo);
                             }
+                            warehouseBaseInfo.setGoodsNameInfos(warehousePositionStorageInfos);
                         }
                     }
-                    warehouseBaseInfo.setGoodsNameInfos(temp);
                     warehouseBaseInfo.setPositionInfos(warehousePositionInfos);
                 }
                 warehouseBaseInfo.setOutCount(dataCount2);