更新

winsea-haixin-plugin-yiliangyiyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/entity/view/WarehouseView.java

@@ -72,5 +72,9 @@ public class WarehouseView {
      */
     private int outNumber;
 
+    /**
+     * 是否允许手动编辑
+     */
+    private String allowEdit;
     private Date updateDate;
 }

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

@@ -120,6 +120,7 @@ public class WarehouseBaseInfoServiceImpl extends ServiceImpl<WarehouseBaseInfoM
                     if (!CollectionUtils.isEmpty(warehousePositionInfos)) {
                         for (WarehousePositionInfo warehousePositionInfo : warehousePositionInfos) {
                             WarehouseView warehouseView = new WarehouseView();
+                            warehouseView.setAllowEdit(warehouseBaseInfo.getAllowEdit());
                             warehouseView.setWarehouseId(warehouseBaseInfo.getId());
                             warehouseView.setWarehouseName(warehouseBaseInfo.getWarehouseName());
                             warehouseView.setBinNumberId(warehousePositionInfo.getId());
@@ -1064,29 +1065,29 @@ 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()));
-//                if (!CollectionUtils.isEmpty(warehousePositionInfos)) {
-//                    for (WarehousePositionInfo warehousePositionInfo:warehousePositionInfos) {
-//                        //查询仓库内的货名
-//                        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(temp);
-//                    warehouseBaseInfo.setPositionInfos(warehousePositionInfos);
-//                }
-//            }
-//
-//        }
+        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()));
+                if (!CollectionUtils.isEmpty(warehousePositionInfos)) {
+                    for (WarehousePositionInfo warehousePositionInfo:warehousePositionInfos) {
+                        //查询仓库内的货名
+                        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(temp);
+                    warehouseBaseInfo.setPositionInfos(warehousePositionInfos);
+                }
+            }
+
+        }
         return warehouseBaseInfoList;
     }