diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/positionmap/PositionMapController.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/positionmap/PositionMapController.java index 1ba4f2dee..82f1d6276 100644 --- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/positionmap/PositionMapController.java +++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/positionmap/PositionMapController.java @@ -88,7 +88,6 @@ public class PositionMapController { positionMapService.downloadPng(floor, area, response); } - @GetMapping("/download") @Operation(summary = "下载文件") @PermitAll diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/positionmap/vo/PositionMapItemPageReqVO.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/positionmap/vo/PositionMapItemPageReqVO.java index 3f97fb39e..de83084e2 100644 --- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/positionmap/vo/PositionMapItemPageReqVO.java +++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/positionmap/vo/PositionMapItemPageReqVO.java @@ -1,5 +1,6 @@ package cn.iocoder.yudao.module.system.controller.admin.positionmap.vo; +import com.alibaba.excel.annotation.ExcelProperty; import lombok.*; import java.util.*; import io.swagger.v3.oas.annotations.media.Schema; @@ -18,6 +19,12 @@ public class PositionMapItemPageReqVO extends PageParam { @Schema(description = "仓库点位地图表id", example = "30963") private Long positionMapId; + @Schema(description = "库区id(自定义)", example = "30963") + private Long areaId; + + @Schema(description = "巷道id(自定义)", example = "30963") + private Long laneId; + @Schema(description = "坐标x轴") private String locationX; diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/positionmap/vo/PositionMapItemRespVO.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/positionmap/vo/PositionMapItemRespVO.java index e54a3c537..6649e8ea0 100644 --- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/positionmap/vo/PositionMapItemRespVO.java +++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/positionmap/vo/PositionMapItemRespVO.java @@ -20,6 +20,14 @@ public class PositionMapItemRespVO { @ExcelProperty("仓库点位地图表id") private Long positionMapId; + @Schema(description = "库区id(自定义)", example = "30963") + @ExcelProperty("库区id(自定义)") + private Long areaId; + + @Schema(description = "巷道id(自定义)", example = "30963") + @ExcelProperty("巷道id(自定义)") + private Long laneId; + @Schema(description = "坐标x轴") @ExcelProperty("坐标x轴") private String locationX; diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/positionmap/vo/PositionMapItemSaveReqVO.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/positionmap/vo/PositionMapItemSaveReqVO.java index 9fbfcb635..3eab98048 100644 --- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/positionmap/vo/PositionMapItemSaveReqVO.java +++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/positionmap/vo/PositionMapItemSaveReqVO.java @@ -15,6 +15,12 @@ public class PositionMapItemSaveReqVO { @Schema(description = "仓库点位地图表id", example = "30963") private Long positionMapId; + @Schema(description = "库区id(自定义)", example = "30963") + private Long areaId; + + @Schema(description = "巷道id(自定义)", example = "30963") + private Long laneId; + @Schema(description = "坐标x轴") private String locationX; diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/dataobject/positionmap/PositionMapItemDO.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/dataobject/positionmap/PositionMapItemDO.java index ab5ff673a..970fd3060 100644 --- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/dataobject/positionmap/PositionMapItemDO.java +++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/dataobject/positionmap/PositionMapItemDO.java @@ -31,6 +31,14 @@ public class PositionMapItemDO extends BaseDO { * 仓库点位地图表id */ private Long positionMapId; + /** + * 库区id(自定义) + */ + private Long areaId; + /** + * 巷道id(自定义) + */ + private Long laneId; /** * 坐标x轴 */