diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/housearea/HouseAreaController.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/housearea/HouseAreaController.java index a20fe15eb..510b5737f 100644 --- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/housearea/HouseAreaController.java +++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/housearea/HouseAreaController.java @@ -3,6 +3,7 @@ package cn.iocoder.yudao.module.system.controller.admin.housearea; import cn.iocoder.yudao.module.system.controller.admin.housearea.vo.HouseAreaPageReqVO; import cn.iocoder.yudao.module.system.controller.admin.housearea.vo.HouseAreaRespVO; import cn.iocoder.yudao.module.system.controller.admin.housearea.vo.HouseAreaSaveReqVO; +import cn.iocoder.yudao.module.system.controller.admin.housearea.vo.HouseAreaVO; import cn.iocoder.yudao.module.system.controller.admin.houselane.vo.WareHouseLanePageReqVO; import cn.iocoder.yudao.module.system.controller.admin.houselane.vo.WareHouseLaneRespVO; import cn.iocoder.yudao.module.system.controller.admin.houselane.vo.WareHouseLaneSaveReqVO; @@ -47,9 +48,9 @@ public class HouseAreaController { @PostMapping("/createOrEditOrDel") @Operation(summary = "创建修改删除库区") @PreAuthorize("@ss.hasPermission('ware:house-area:create')") - public CommonResult createOrEditOrDel(@Valid @RequestBody HouseAreaSaveReqVO createReqVO) { - houseAreaService.createOrEditOrDel(createReqVO); - return success(true); + public CommonResult createOrEditOrDel(@Valid @RequestBody HouseAreaSaveReqVO createReqVO) { + HouseAreaVO vo = houseAreaService.createOrEditOrDel(createReqVO); + return success(vo); } @GetMapping("/get") diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/housearea/vo/HouseAreaVO.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/housearea/vo/HouseAreaVO.java new file mode 100644 index 000000000..a58770c74 --- /dev/null +++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/housearea/vo/HouseAreaVO.java @@ -0,0 +1,15 @@ +package cn.iocoder.yudao.module.system.controller.admin.housearea.vo; + +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.Data; +import lombok.experimental.Accessors; + +@Data +@Accessors(chain = true) +public class HouseAreaVO { + @Schema(description = "主键ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "2922") + private Long id; + + @Schema(description = "库区名称", example = "李四") + private String areaName; +} diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/houselane/WareHouseLaneController.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/houselane/WareHouseLaneController.java index ebe541030..8dfc56d56 100644 --- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/houselane/WareHouseLaneController.java +++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/houselane/WareHouseLaneController.java @@ -4,12 +4,10 @@ import cn.iocoder.yudao.framework.common.pojo.CommonResult; import cn.iocoder.yudao.framework.common.pojo.PageResult; import cn.iocoder.yudao.framework.common.util.object.BeanUtils; import cn.iocoder.yudao.framework.mybatis.core.query.LambdaQueryWrapperX; -import cn.iocoder.yudao.module.system.controller.admin.housearea.vo.HouseAreaPageReqVO; -import cn.iocoder.yudao.module.system.controller.admin.housearea.vo.HouseAreaRespVO; +import cn.iocoder.yudao.module.system.controller.admin.houselane.vo.HouseLaneVO; import cn.iocoder.yudao.module.system.controller.admin.houselane.vo.WareHouseLanePageReqVO; import cn.iocoder.yudao.module.system.controller.admin.houselane.vo.WareHouseLaneRespVO; import cn.iocoder.yudao.module.system.controller.admin.houselane.vo.WareHouseLaneSaveReqVO; -import cn.iocoder.yudao.module.system.dal.dataobject.housearea.HouseAreaDO; import cn.iocoder.yudao.module.system.dal.dataobject.houselane.WareHouseLaneDO; import cn.iocoder.yudao.module.system.service.houselane.WareHouseLaneService; import io.swagger.v3.oas.annotations.Operation; @@ -38,9 +36,9 @@ public class WareHouseLaneController { @PostMapping("/createOrEditOrDel") @Operation(summary = "创建修改删除线库") @PreAuthorize("@ss.hasPermission('ware:house-lane:create')") - public CommonResult createOrEditOrDel(@Valid @RequestBody WareHouseLaneSaveReqVO createReqVO) { - houseLaneService.createOrEditOrDel(createReqVO); - return success(true); + public CommonResult createOrEditOrDel(@Valid @RequestBody WareHouseLaneSaveReqVO createReqVO) { + HouseLaneVO vo = houseLaneService.createOrEditOrDel(createReqVO); + return success(vo); } @GetMapping("/get") @@ -78,7 +76,7 @@ public class WareHouseLaneController { @DeleteMapping("/delete") @Operation(summary = "删除线库") - @Parameter(name = "id", description = "菜单编号", required= true, example = "1024") + @Parameter(name = "id", description = "菜单编号", required = true, example = "1024") public CommonResult delete(@RequestParam("id") Long id) { houseLaneService.delete(id); return success(true); diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/houselane/vo/HouseLaneVO.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/houselane/vo/HouseLaneVO.java new file mode 100644 index 000000000..da088d428 --- /dev/null +++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/houselane/vo/HouseLaneVO.java @@ -0,0 +1,17 @@ +package cn.iocoder.yudao.module.system.controller.admin.houselane.vo; + +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.Data; +import lombok.experimental.Accessors; + +@Data +@Accessors(chain = true) +public class HouseLaneVO { + + @Schema(description = "主键ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "4293") + private Long id; + + + @Schema(description = "线库名称", example = "芋艿") + private String laneName; +} diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/tenant/vo/tenant/TenantSaveReqVO.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/tenant/vo/tenant/TenantSaveReqVO.java index 117d365ff..9a0db0e29 100644 --- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/tenant/vo/tenant/TenantSaveReqVO.java +++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/tenant/vo/tenant/TenantSaveReqVO.java @@ -52,7 +52,7 @@ public class TenantSaveReqVO { // ========== 仅【创建】时,需要传递的字段 ========== @Schema(description = "用户账号", requiredMode = Schema.RequiredMode.REQUIRED, example = "yudao") - @Pattern(regexp = "^[a-zA-Z0-9]{4,30}$", message = "用户账号由 数字、字母 组成") + @Pattern(regexp = "^[a-zA-Z0-9]{4,30}$", message = "用户名称由 数字、字母 组成") @Size(min = 4, max = 30, message = "用户账号长度为 4-30 个字符") private String username; diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/user/vo/user/UserSaveReqVO.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/user/vo/user/UserSaveReqVO.java index 192e0539f..67ba642c8 100644 --- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/user/vo/user/UserSaveReqVO.java +++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/user/vo/user/UserSaveReqVO.java @@ -23,7 +23,7 @@ public class UserSaveReqVO { @Schema(description = "用户账号", requiredMode = Schema.RequiredMode.REQUIRED, example = "yudao") @NotBlank(message = "用户账号不能为空") - @Pattern(regexp = "^[a-zA-Z0-9]{4,30}$", message = "用户账号由 数字、字母 组成") + @Pattern(regexp = "^[a-zA-Z0-9]{4,30}$", message = "用户名称由 数字、字母 组成") @Size(min = 4, max = 30, message = "用户账号长度为 4-30 个字符") @DiffLogField(name = "用户账号") private String username; diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/housearea/HouseAreaService.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/housearea/HouseAreaService.java index 081191a26..2bfd7e4cd 100644 --- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/housearea/HouseAreaService.java +++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/housearea/HouseAreaService.java @@ -3,6 +3,7 @@ package cn.iocoder.yudao.module.system.service.housearea; import cn.iocoder.yudao.framework.common.pojo.PageResult; import cn.iocoder.yudao.module.system.controller.admin.housearea.vo.HouseAreaPageReqVO; import cn.iocoder.yudao.module.system.controller.admin.housearea.vo.HouseAreaSaveReqVO; +import cn.iocoder.yudao.module.system.controller.admin.housearea.vo.HouseAreaVO; import cn.iocoder.yudao.module.system.dal.dataobject.housearea.HouseAreaDO; import com.baomidou.mybatisplus.extension.service.IService; @@ -59,7 +60,7 @@ public interface HouseAreaService extends IService { * * @param createReqVO */ - void createOrEditOrDel(@Valid HouseAreaSaveReqVO createReqVO); + HouseAreaVO createOrEditOrDel(@Valid HouseAreaSaveReqVO createReqVO); /** * 获得全部库区 diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/housearea/HouseAreaServiceImpl.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/housearea/HouseAreaServiceImpl.java index 79f3cfdb9..45c4cd07e 100644 --- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/housearea/HouseAreaServiceImpl.java +++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/housearea/HouseAreaServiceImpl.java @@ -10,6 +10,7 @@ import cn.iocoder.yudao.framework.common.util.collection.CollectionUtils; import cn.iocoder.yudao.framework.common.util.object.BeanUtils; import cn.iocoder.yudao.module.system.controller.admin.housearea.vo.HouseAreaPageReqVO; import cn.iocoder.yudao.module.system.controller.admin.housearea.vo.HouseAreaSaveReqVO; +import cn.iocoder.yudao.module.system.controller.admin.housearea.vo.HouseAreaVO; import cn.iocoder.yudao.module.system.controller.admin.positionmap.dto.PositionMapConditionDTO; import cn.iocoder.yudao.module.system.dal.dataobject.housearea.HouseAreaDO; import cn.iocoder.yudao.module.system.dal.dataobject.houselocation.WareHouseLocationDO; @@ -93,7 +94,7 @@ public class HouseAreaServiceImpl extends ServiceImpl() @@ -115,10 +116,10 @@ public class HouseAreaServiceImpl extends ServiceImpl list = positionMapItemService.getByCondition(new PositionMapConditionDTO() - .setPositionMapId(createReqVO.getPositionMapId()) - .setType(NodeTypeEnum.WARE.getType()) - .setIds(createReqVO.getMapItemIds()) - .setAreaId(createReqVO.getId())); + .setPositionMapId(createReqVO.getPositionMapId()) + .setType(NodeTypeEnum.WARE.getType()) + .setIds(createReqVO.getMapItemIds()) + .setAreaId(createReqVO.getId())); //3.判定当前这些点位是否已经有包含线库了 - List containList = list.stream().filter(a -> a.getAreaId() != null && !a.getAreaId().equals(createReqVO.getId())).collect(Collectors.toList()); @@ -165,6 +166,7 @@ public class HouseAreaServiceImpl extends ServiceImpl { * * @param createReqVO */ - void createOrEditOrDel(@Valid WareHouseLaneSaveReqVO createReqVO); + HouseLaneVO createOrEditOrDel(@Valid WareHouseLaneSaveReqVO createReqVO); /** * 删除线库 diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/houselane/WareHouseLaneServiceImpl.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/houselane/WareHouseLaneServiceImpl.java index 52a3fdd6e..c277ed7ef 100644 --- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/houselane/WareHouseLaneServiceImpl.java +++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/houselane/WareHouseLaneServiceImpl.java @@ -7,6 +7,7 @@ import cn.hutool.json.JSONUtil; import cn.iocoder.yudao.framework.common.enums.NodeTypeEnum; import cn.iocoder.yudao.framework.common.pojo.PageResult; import cn.iocoder.yudao.framework.common.util.collection.CollectionUtils; +import cn.iocoder.yudao.module.system.controller.admin.houselane.vo.HouseLaneVO; import cn.iocoder.yudao.module.system.controller.admin.houselane.vo.WareHouseLanePageReqVO; import cn.iocoder.yudao.module.system.controller.admin.houselane.vo.WareHouseLaneSaveReqVO; import cn.iocoder.yudao.module.system.controller.admin.positionmap.dto.PositionMapConditionDTO; @@ -67,7 +68,7 @@ public class WareHouseLaneServiceImpl extends ServiceImpl() @@ -89,10 +90,10 @@ public class WareHouseLaneServiceImpl extends ServiceImpl list = positionMapItemService.getByCondition(new PositionMapConditionDTO() - .setPositionMapId(createReqVO.getPositionMapId()) - .setLaneId(createReqVO.getId()) - .setType(NodeTypeEnum.WARE.getType()) - .setIds(createReqVO.getMapItemIds())); + .setPositionMapId(createReqVO.getPositionMapId()) + .setLaneId(createReqVO.getId()) + .setType(NodeTypeEnum.WARE.getType()) + .setIds(createReqVO.getMapItemIds())); //3.判定当前这些点位是否已经有包含线库了 - List containList = list.stream().filter(a -> a.getLaneId() != null && !a.getLaneId().equals(createReqVO.getId())).collect(Collectors.toList()); @@ -150,6 +151,7 @@ public class WareHouseLaneServiceImpl extends ServiceImpl