ak/zn-cloud-wcs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Compare commits

base: ak:e20ab5d933d193b31bf5033e2012e176408c8f98
Branches Tags
ak:master
ak:dev
ak:cbs
ak:aikai
..
compare: ak:06fd682e4870e1c7779e735301afc20ddf28877c
Branches Tags
ak:dev
ak:cbs
ak:aikai
ak:master

No commits in common. "e20ab5d933d193b31bf5033e2012e176408c8f98" and "06fd682e4870e1c7779e735301afc20ddf28877c" have entirely different histories.
e20ab5d933 ... 06fd682e48

10 changed files with 24 additions and 61 deletions
Show Stats Expand all files Collapse all files

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

@ -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) {
HouseAreaVO vo = houseAreaService.createOrEditOrDel(createReqVO);
return success(vo);
public CommonResult<Boolean> createOrEditOrDel(@Valid @RequestBody HouseAreaSaveReqVO createReqVO) {
houseAreaService.createOrEditOrDel(createReqVO);
return success(true);
}
@GetMapping("/get")

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

@ -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;
}

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

@ -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) {
HouseLaneVO vo = houseLaneService.createOrEditOrDel(createReqVO);
return success(vo);
public CommonResult<Boolean> createOrEditOrDel(@Valid @RequestBody WareHouseLaneSaveReqVO createReqVO) {
houseLaneService.createOrEditOrDel(createReqVO);
return success(true);
}
@GetMapping("/get")

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

@ -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;
}

2
yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/tenant/vo/tenant/TenantSaveReqVO.java
View File

@ -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;

2
yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/user/vo/user/UserSaveReqVO.java
View File

@ -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;

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

@ -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);
/**
* 获得全部库区

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

@ -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>()
@ -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

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

@ -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);
/**
* 删除线库

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

@ -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>()
@ -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