yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/housearea/HouseAreaController.java

@@ -3,7 +3,6 @@ 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;
@@ -48,9 +47,9 @@ public class HouseAreaController {
     @PostMapping("/createOrEditOrDel")
     @Operation(summary = "创建修改删除库区")
     @PreAuthorize("@ss.hasPermission('ware:house-area:create')")
-    public CommonResult<HouseAreaVO> createOrEditOrDel(@Valid @RequestBody HouseAreaSaveReqVO createReqVO) {
+    public CommonResult<Boolean> createOrEditOrDel(@Valid @RequestBody HouseAreaSaveReqVO createReqVO) {
-        HouseAreaVO vo = houseAreaService.createOrEditOrDel(createReqVO);
+        houseAreaService.createOrEditOrDel(createReqVO);
-        return success(vo);
+        return success(true);
     }
 
     @GetMapping("/get")

yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/housearea/vo/HouseAreaVO.java

@@ -1,15 +0,0 @@
-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;
-}

yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/houselane/WareHouseLaneController.java

@@ -4,10 +4,12 @@ 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.houselane.vo.HouseLaneVO;
+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.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;
@@ -36,9 +38,9 @@ public class WareHouseLaneController {
     @PostMapping("/createOrEditOrDel")
     @Operation(summary = "创建修改删除线库")
     @PreAuthorize("@ss.hasPermission('ware:house-lane:create')")
-    public CommonResult<HouseLaneVO> createOrEditOrDel(@Valid @RequestBody WareHouseLaneSaveReqVO createReqVO) {
+    public CommonResult<Boolean> createOrEditOrDel(@Valid @RequestBody WareHouseLaneSaveReqVO createReqVO) {
-        HouseLaneVO vo = houseLaneService.createOrEditOrDel(createReqVO);
+        houseLaneService.createOrEditOrDel(createReqVO);
-        return success(vo);
+        return success(true);
     }
 
     @GetMapping("/get")
@@ -76,7 +78,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<Boolean> delete(@RequestParam("id") Long id) {
         houseLaneService.delete(id);
         return success(true);

yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/houselane/vo/HouseLaneVO.java

@@ -1,17 +0,0 @@
-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;
-}

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;
 

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;

yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/housearea/HouseAreaService.java

@@ -3,7 +3,6 @@ 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;
 
@@ -60,7 +59,7 @@ public interface HouseAreaService extends IService<HouseAreaDO> {
      *
      * @param createReqVO
      */
-    HouseAreaVO createOrEditOrDel(@Valid HouseAreaSaveReqVO createReqVO);
+    void createOrEditOrDel(@Valid HouseAreaSaveReqVO createReqVO);
 
     /**
      * 获得全部库区

yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/housearea/HouseAreaServiceImpl.java

@@ -10,7 +10,6 @@ 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;
@@ -94,7 +93,7 @@ public class HouseAreaServiceImpl extends ServiceImpl<HouseAreaMapper, HouseArea
 
     @Override
     @Transactional(rollbackFor = Exception.class)
-    public HouseAreaVO createOrEditOrDel(HouseAreaSaveReqVO createReqVO) {
+    public void createOrEditOrDel(HouseAreaSaveReqVO createReqVO) {
         // 判断名称唯一
         Long count = houseAreaMapper.selectCount(
                 new LambdaQueryWrapper<HouseAreaDO>()
@@ -116,10 +115,10 @@ public class HouseAreaServiceImpl extends ServiceImpl<HouseAreaMapper, HouseArea
 
         //2.查询目前的地图所有的库位点位列表 - 如果没有的话 - 就设为空列表先 -
         List<PositionMapItemDO> list = positionMapItemService.getByCondition(new PositionMapConditionDTO()
-                .setPositionMapId(createReqVO.getPositionMapId())
+                        .setPositionMapId(createReqVO.getPositionMapId())
-                .setType(NodeTypeEnum.WARE.getType())
+                        .setType(NodeTypeEnum.WARE.getType())
-                .setIds(createReqVO.getMapItemIds())
+                        .setIds(createReqVO.getMapItemIds())
-                .setAreaId(createReqVO.getId()));
+                        .setAreaId(createReqVO.getId()));
 
         //3.判定当前这些点位是否已经有包含线库了 -
         List<PositionMapItemDO> containList = list.stream().filter(a -> a.getAreaId() != null && !a.getAreaId().equals(createReqVO.getId())).collect(Collectors.toList());
@@ -166,7 +165,6 @@ public class HouseAreaServiceImpl extends ServiceImpl<HouseAreaMapper, HouseArea
         if (CollUtil.isNotEmpty(wareHouseLocationList)) {
             houseLocationService.updateBatchById(wareHouseLocationList);
         }
-        return new HouseAreaVO().setId(houseArea.getId()).setAreaName(houseArea.getAreaName());
     }
 
     @Override

yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/houselane/WareHouseLaneService.java

@@ -1,7 +1,6 @@
 package cn.iocoder.yudao.module.system.service.houselane;
 
 import cn.iocoder.yudao.framework.common.pojo.PageResult;
-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.dal.dataobject.houselane.WareHouseLaneDO;
@@ -38,7 +37,7 @@ public interface WareHouseLaneService extends IService<WareHouseLaneDO> {
      *
      * @param createReqVO
      */
-    HouseLaneVO createOrEditOrDel(@Valid WareHouseLaneSaveReqVO createReqVO);
+    void createOrEditOrDel(@Valid WareHouseLaneSaveReqVO createReqVO);
 
     /**
      * 删除线库

yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/houselane/WareHouseLaneServiceImpl.java

@@ -7,7 +7,6 @@ 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;
@@ -68,7 +67,7 @@ public class WareHouseLaneServiceImpl extends ServiceImpl<WareHouseLaneMapper, W
 
     @Override
     @Transactional(rollbackFor = Exception.class)
-    public HouseLaneVO createOrEditOrDel(WareHouseLaneSaveReqVO createReqVO) {
+    public void createOrEditOrDel(WareHouseLaneSaveReqVO createReqVO) {
         // 判断名称唯一
         Long num = houseLaneMapper.selectCount(
                 new LambdaQueryWrapper<WareHouseLaneDO>()
@@ -90,10 +89,10 @@ public class WareHouseLaneServiceImpl extends ServiceImpl<WareHouseLaneMapper, W
 
         //2.查询目前的点位列表 - 如果没有的话 - 就设为空列表先 -
         List<PositionMapItemDO> list = positionMapItemService.getByCondition(new PositionMapConditionDTO()
-                .setPositionMapId(createReqVO.getPositionMapId())
+                        .setPositionMapId(createReqVO.getPositionMapId())
-                .setLaneId(createReqVO.getId())
+                        .setLaneId(createReqVO.getId())
-                .setType(NodeTypeEnum.WARE.getType())
+                        .setType(NodeTypeEnum.WARE.getType())
-                .setIds(createReqVO.getMapItemIds()));
+                        .setIds(createReqVO.getMapItemIds()));
 
         //3.判定当前这些点位是否已经有包含线库了 -
         List<PositionMapItemDO> containList = list.stream().filter(a -> a.getLaneId() != null && !a.getLaneId().equals(createReqVO.getId())).collect(Collectors.toList());
@@ -151,7 +150,6 @@ public class WareHouseLaneServiceImpl extends ServiceImpl<WareHouseLaneMapper, W
         if (CollUtil.isNotEmpty(wareHouseLocationList)) {
             houseLocationService.updateBatchById(wareHouseLocationList);
         }
-        return new HouseLaneVO().setId(houseLane.getId()).setLaneName(houseLane.getLaneName());
     }
 
     @Override