feat:新增库区和库位页面
HuangHuiKang
2 weeks ago
parent
ec455718f1
commit
fcc3cf46c0
@ -0,0 +1,114 @@
|
|||||||
|
package cn.iocoder.yudao.module.erp.controller.admin.warehousearea;
|
||||||
|
|
||||||
|
import cn.iocoder.yudao.framework.common.enums.CommonStatusEnum;
|
||||||
|
import cn.iocoder.yudao.module.erp.controller.admin.stock.vo.warehouse.ErpWarehouseRespVO;
|
||||||
|
import cn.iocoder.yudao.module.erp.dal.dataobject.stock.ErpWarehouseDO;
|
||||||
|
import org.springframework.web.bind.annotation.*;
|
||||||
|
import org.springframework.validation.annotation.Validated;
|
||||||
|
import org.springframework.security.access.prepost.PreAuthorize;
|
||||||
|
import io.swagger.v3.oas.annotations.tags.Tag;
|
||||||
|
import io.swagger.v3.oas.annotations.Parameter;
|
||||||
|
import io.swagger.v3.oas.annotations.Operation;
|
||||||
|
|
||||||
|
|
||||||
|
import java.util.*;
|
||||||
|
import java.io.IOException;
|
||||||
|
|
||||||
|
import cn.iocoder.yudao.framework.common.pojo.PageParam;
|
||||||
|
import cn.iocoder.yudao.framework.common.pojo.PageResult;
|
||||||
|
import cn.iocoder.yudao.framework.common.pojo.CommonResult;
|
||||||
|
import cn.iocoder.yudao.framework.common.util.object.BeanUtils;
|
||||||
|
import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success;
|
||||||
|
|
||||||
|
import cn.iocoder.yudao.framework.excel.core.util.ExcelUtils;
|
||||||
|
|
||||||
|
import cn.iocoder.yudao.framework.apilog.core.annotation.ApiAccessLog;
|
||||||
|
import static cn.iocoder.yudao.framework.apilog.core.enums.OperateTypeEnum.*;
|
||||||
|
import static cn.iocoder.yudao.framework.common.util.collection.CollectionUtils.convertList;
|
||||||
|
|
||||||
|
import cn.iocoder.yudao.module.erp.controller.admin.warehousearea.vo.*;
|
||||||
|
import cn.iocoder.yudao.module.erp.dal.dataobject.warehousearea.WarehouseAreaDO;
|
||||||
|
import cn.iocoder.yudao.module.erp.service.warehousearea.WarehouseAreaService;
|
||||||
|
|
||||||
|
import javax.annotation.Resource;
|
||||||
|
import javax.servlet.http.HttpServletResponse;
|
||||||
|
import javax.validation.Valid;
|
||||||
|
|
||||||
|
@Tag(name = "管理后台 - ERP 库区信息")
|
||||||
|
@RestController
|
||||||
|
@RequestMapping("/erp/warehouse-area")
|
||||||
|
@Validated
|
||||||
|
public class WarehouseAreaController {
|
||||||
|
|
||||||
|
@Resource
|
||||||
|
private WarehouseAreaService warehouseAreaService;
|
||||||
|
|
||||||
|
@PostMapping("/create")
|
||||||
|
@Operation(summary = "创建ERP 库区信息")
|
||||||
|
@PreAuthorize("@ss.hasPermission('erp:warehouse-area:create')")
|
||||||
|
public CommonResult<Long> createWarehouseArea(@Valid @RequestBody WarehouseAreaSaveReqVO createReqVO) {
|
||||||
|
return success(warehouseAreaService.createWarehouseArea(createReqVO));
|
||||||
|
}
|
||||||
|
|
||||||
|
@PutMapping("/update")
|
||||||
|
@Operation(summary = "更新ERP 库区信息")
|
||||||
|
@PreAuthorize("@ss.hasPermission('erp:warehouse-area:update')")
|
||||||
|
public CommonResult<Boolean> updateWarehouseArea(@Valid @RequestBody WarehouseAreaSaveReqVO updateReqVO) {
|
||||||
|
warehouseAreaService.updateWarehouseArea(updateReqVO);
|
||||||
|
return success(true);
|
||||||
|
}
|
||||||
|
|
||||||
|
@DeleteMapping("/delete")
|
||||||
|
@Operation(summary = "删除ERP 库区信息")
|
||||||
|
@Parameter(name = "id", description = "编号", required = true)
|
||||||
|
@PreAuthorize("@ss.hasPermission('erp:warehouse-area:delete')")
|
||||||
|
public CommonResult<Boolean> deleteWarehouseArea(@RequestParam("id") Long id) {
|
||||||
|
warehouseAreaService.deleteWarehouseArea(id);
|
||||||
|
return success(true);
|
||||||
|
}
|
||||||
|
|
||||||
|
@GetMapping("/get")
|
||||||
|
@Operation(summary = "获得ERP 库区信息")
|
||||||
|
@Parameter(name = "id", description = "编号", required = true, example = "1024")
|
||||||
|
@PreAuthorize("@ss.hasPermission('erp:warehouse-area:query')")
|
||||||
|
public CommonResult<WarehouseAreaRespVO> getWarehouseArea(@RequestParam("id") Long id) {
|
||||||
|
WarehouseAreaDO warehouseArea = warehouseAreaService.getWarehouseArea(id);
|
||||||
|
return success(BeanUtils.toBean(warehouseArea, WarehouseAreaRespVO.class));
|
||||||
|
}
|
||||||
|
|
||||||
|
@GetMapping("/page")
|
||||||
|
@Operation(summary = "获得ERP 库区信息分页")
|
||||||
|
@PreAuthorize("@ss.hasPermission('erp:warehouse-area:query')")
|
||||||
|
public CommonResult<PageResult<WarehouseAreaRespVO>> getWarehouseAreaPage(@Valid WarehouseAreaPageReqVO pageReqVO) {
|
||||||
|
PageResult<WarehouseAreaDO> pageResult = warehouseAreaService.getWarehouseAreaPage(pageReqVO);
|
||||||
|
return success(BeanUtils.toBean(pageResult, WarehouseAreaRespVO.class));
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
@GetMapping("/simple-list")
|
||||||
|
@Operation(summary = "获得库区精简列表", description = "只包含被开启的仓库库区，主要用于前端的下拉选项")
|
||||||
|
public CommonResult<List<WarehouseAreaRespVO>> getWarehouseSimpleList(@RequestParam(value = "warehouseId", required = false) Long warehouseId) {
|
||||||
|
List<WarehouseAreaDO> list = warehouseAreaService.getWarehouseListByStatusAndWarehouseId(CommonStatusEnum.ENABLE.getStatus(), warehouseId);
|
||||||
|
return success(convertList(list, area -> new WarehouseAreaRespVO()
|
||||||
|
.setId(area.getId())
|
||||||
|
.setWarehouseId(area.getWarehouseId())
|
||||||
|
.setAreaCode(area.getAreaCode())
|
||||||
|
.setAreaName(area.getAreaName())
|
||||||
|
.setStatus(area.getStatus())));
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
@GetMapping("/export-excel")
|
||||||
|
@Operation(summary = "导出ERP 库区信息 Excel")
|
||||||
|
@PreAuthorize("@ss.hasPermission('erp:warehouse-area:export')")
|
||||||
|
@ApiAccessLog(operateType = EXPORT)
|
||||||
|
public void exportWarehouseAreaExcel(@Valid WarehouseAreaPageReqVO pageReqVO,
|
||||||
|
HttpServletResponse response) throws IOException {
|
||||||
|
pageReqVO.setPageSize(PageParam.PAGE_SIZE_NONE);
|
||||||
|
List<WarehouseAreaDO> list = warehouseAreaService.getWarehouseAreaPage(pageReqVO).getList();
|
||||||
|
// 导出 Excel
|
||||||
|
ExcelUtils.write(response, "ERP 库区信息.xls", "数据", WarehouseAreaRespVO.class,
|
||||||
|
BeanUtils.toBean(list, WarehouseAreaRespVO.class));
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
||||||
@ -0,0 +1,41 @@
|
|||||||
|
package cn.iocoder.yudao.module.erp.controller.admin.warehousearea.vo;
|
||||||
|
|
||||||
|
import lombok.*;
|
||||||
|
import java.util.*;
|
||||||
|
import io.swagger.v3.oas.annotations.media.Schema;
|
||||||
|
import cn.iocoder.yudao.framework.common.pojo.PageParam;
|
||||||
|
import java.math.BigDecimal;
|
||||||
|
import org.springframework.format.annotation.DateTimeFormat;
|
||||||
|
import java.time.LocalDateTime;
|
||||||
|
|
||||||
|
import static cn.iocoder.yudao.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND;
|
||||||
|
|
||||||
|
@Schema(description = "管理后台 - ERP 库区信息分页 Request VO")
|
||||||
|
@Data
|
||||||
|
@EqualsAndHashCode(callSuper = true)
|
||||||
|
@ToString(callSuper = true)
|
||||||
|
public class WarehouseAreaPageReqVO extends PageParam {
|
||||||
|
|
||||||
|
@Schema(description = "所属仓库id", example = "19404")
|
||||||
|
private Long warehouseId;
|
||||||
|
|
||||||
|
@Schema(description = "库区编码")
|
||||||
|
private String areaCode;
|
||||||
|
|
||||||
|
@Schema(description = "库区名称", example = "赵六")
|
||||||
|
private String areaName;
|
||||||
|
|
||||||
|
@Schema(description = "面积(平方米)")
|
||||||
|
private BigDecimal areaSize;
|
||||||
|
|
||||||
|
@Schema(description = "库区描述", example = "你说的对")
|
||||||
|
private String description;
|
||||||
|
|
||||||
|
@Schema(description = "开启状态", example = "2")
|
||||||
|
private Integer status;
|
||||||
|
|
||||||
|
@Schema(description = "创建时间")
|
||||||
|
@DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
|
||||||
|
private LocalDateTime[] createTime;
|
||||||
|
|
||||||
|
}
|
||||||
@ -0,0 +1,48 @@
|
|||||||
|
package cn.iocoder.yudao.module.erp.controller.admin.warehousearea.vo;
|
||||||
|
|
||||||
|
import io.swagger.v3.oas.annotations.media.Schema;
|
||||||
|
import lombok.*;
|
||||||
|
import java.util.*;
|
||||||
|
import java.math.BigDecimal;
|
||||||
|
import org.springframework.format.annotation.DateTimeFormat;
|
||||||
|
import java.time.LocalDateTime;
|
||||||
|
import com.alibaba.excel.annotation.*;
|
||||||
|
|
||||||
|
@Schema(description = "管理后台 - ERP 库区信息 Response VO")
|
||||||
|
@Data
|
||||||
|
@ExcelIgnoreUnannotated
|
||||||
|
public class WarehouseAreaRespVO {
|
||||||
|
|
||||||
|
@Schema(description = "id", requiredMode = Schema.RequiredMode.REQUIRED, example = "1157")
|
||||||
|
@ExcelProperty("id")
|
||||||
|
private Long id;
|
||||||
|
|
||||||
|
@Schema(description = "所属仓库id", requiredMode = Schema.RequiredMode.REQUIRED, example = "19404")
|
||||||
|
@ExcelProperty("所属仓库id")
|
||||||
|
private Long warehouseId;
|
||||||
|
|
||||||
|
@Schema(description = "库区编码", requiredMode = Schema.RequiredMode.REQUIRED)
|
||||||
|
@ExcelProperty("库区编码")
|
||||||
|
private String areaCode;
|
||||||
|
|
||||||
|
@Schema(description = "库区名称", requiredMode = Schema.RequiredMode.REQUIRED, example = "赵六")
|
||||||
|
@ExcelProperty("库区名称")
|
||||||
|
private String areaName;
|
||||||
|
|
||||||
|
@Schema(description = "面积(平方米)")
|
||||||
|
@ExcelProperty("面积(平方米)")
|
||||||
|
private BigDecimal areaSize;
|
||||||
|
|
||||||
|
@Schema(description = "库区描述", example = "你说的对")
|
||||||
|
@ExcelProperty("库区描述")
|
||||||
|
private String description;
|
||||||
|
|
||||||
|
@Schema(description = "开启状态", requiredMode = Schema.RequiredMode.REQUIRED, example = "2")
|
||||||
|
@ExcelProperty("开启状态")
|
||||||
|
private Integer status;
|
||||||
|
|
||||||
|
@Schema(description = "创建时间", requiredMode = Schema.RequiredMode.REQUIRED)
|
||||||
|
@ExcelProperty("创建时间")
|
||||||
|
private LocalDateTime createTime;
|
||||||
|
|
||||||
|
}
|
||||||
@ -0,0 +1,38 @@
|
|||||||
|
package cn.iocoder.yudao.module.erp.controller.admin.warehousearea.vo;
|
||||||
|
|
||||||
|
import io.swagger.v3.oas.annotations.media.Schema;
|
||||||
|
import lombok.Data;
|
||||||
|
|
||||||
|
import javax.validation.constraints.NotEmpty;
|
||||||
|
import javax.validation.constraints.NotNull;
|
||||||
|
import java.math.BigDecimal;
|
||||||
|
|
||||||
|
@Schema(description = "管理后台 - ERP 库区信息新增/修改 Request VO")
|
||||||
|
@Data
|
||||||
|
public class WarehouseAreaSaveReqVO {
|
||||||
|
|
||||||
|
@Schema(description = "id", requiredMode = Schema.RequiredMode.REQUIRED, example = "1157")
|
||||||
|
private Long id;
|
||||||
|
|
||||||
|
@Schema(description = "所属仓库id", example = "19404")
|
||||||
|
private Long warehouseId;
|
||||||
|
|
||||||
|
@Schema(description = "库区编码", requiredMode = Schema.RequiredMode.REQUIRED)
|
||||||
|
// @NotEmpty(message = "库区编码不能为空")
|
||||||
|
private String areaCode;
|
||||||
|
|
||||||
|
@Schema(description = "库区名称", requiredMode = Schema.RequiredMode.REQUIRED, example = "A区")
|
||||||
|
@NotEmpty(message = "库区名称不能为空")
|
||||||
|
private String areaName;
|
||||||
|
|
||||||
|
@Schema(description = "面积(平方米)")
|
||||||
|
private BigDecimal areaSize;
|
||||||
|
|
||||||
|
@Schema(description = "库区描述", example = "常温区")
|
||||||
|
private String description;
|
||||||
|
|
||||||
|
@Schema(description = "开启状态", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
|
||||||
|
@NotNull(message = "开启状态不能为空")
|
||||||
|
private Integer status;
|
||||||
|
|
||||||
|
}
|
||||||
@ -0,0 +1,110 @@
|
|||||||
|
package cn.iocoder.yudao.module.erp.controller.admin.warehouselocation;
|
||||||
|
|
||||||
|
import cn.iocoder.yudao.framework.common.enums.CommonStatusEnum;
|
||||||
|
import org.springframework.web.bind.annotation.*;
|
||||||
|
import org.springframework.validation.annotation.Validated;
|
||||||
|
import org.springframework.security.access.prepost.PreAuthorize;
|
||||||
|
import io.swagger.v3.oas.annotations.tags.Tag;
|
||||||
|
import io.swagger.v3.oas.annotations.Parameter;
|
||||||
|
import io.swagger.v3.oas.annotations.Operation;
|
||||||
|
|
||||||
|
import java.util.*;
|
||||||
|
import java.io.IOException;
|
||||||
|
|
||||||
|
import cn.iocoder.yudao.framework.common.pojo.PageParam;
|
||||||
|
import cn.iocoder.yudao.framework.common.pojo.PageResult;
|
||||||
|
import cn.iocoder.yudao.framework.common.pojo.CommonResult;
|
||||||
|
import cn.iocoder.yudao.framework.common.util.object.BeanUtils;
|
||||||
|
import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success;
|
||||||
|
import static cn.iocoder.yudao.framework.common.util.collection.CollectionUtils.convertList;
|
||||||
|
|
||||||
|
import cn.iocoder.yudao.framework.excel.core.util.ExcelUtils;
|
||||||
|
|
||||||
|
import cn.iocoder.yudao.framework.apilog.core.annotation.ApiAccessLog;
|
||||||
|
import static cn.iocoder.yudao.framework.apilog.core.enums.OperateTypeEnum.*;
|
||||||
|
|
||||||
|
import cn.iocoder.yudao.module.erp.controller.admin.warehouselocation.vo.*;
|
||||||
|
import cn.iocoder.yudao.module.erp.dal.dataobject.warehouselocation.WarehouseLocationDO;
|
||||||
|
import cn.iocoder.yudao.module.erp.service.warehouselocation.WarehouseLocationService;
|
||||||
|
|
||||||
|
import javax.annotation.Resource;
|
||||||
|
import javax.servlet.http.HttpServletResponse;
|
||||||
|
import javax.validation.Valid;
|
||||||
|
|
||||||
|
@Tag(name = "管理后台 - ERP 库位信息")
|
||||||
|
@RestController
|
||||||
|
@RequestMapping("/erp/warehouse-location")
|
||||||
|
@Validated
|
||||||
|
public class WarehouseLocationController {
|
||||||
|
|
||||||
|
@Resource
|
||||||
|
private WarehouseLocationService warehouseLocationService;
|
||||||
|
|
||||||
|
@PostMapping("/create")
|
||||||
|
@Operation(summary = "创建ERP 库位信息")
|
||||||
|
@PreAuthorize("@ss.hasPermission('erp:warehouse-location:create')")
|
||||||
|
public CommonResult<Long> createWarehouseLocation(@Valid @RequestBody WarehouseLocationSaveReqVO createReqVO) {
|
||||||
|
return success(warehouseLocationService.createWarehouseLocation(createReqVO));
|
||||||
|
}
|
||||||
|
|
||||||
|
@PutMapping("/update")
|
||||||
|
@Operation(summary = "更新ERP 库位信息")
|
||||||
|
@PreAuthorize("@ss.hasPermission('erp:warehouse-location:update')")
|
||||||
|
public CommonResult<Boolean> updateWarehouseLocation(@Valid @RequestBody WarehouseLocationSaveReqVO updateReqVO) {
|
||||||
|
warehouseLocationService.updateWarehouseLocation(updateReqVO);
|
||||||
|
return success(true);
|
||||||
|
}
|
||||||
|
|
||||||
|
@DeleteMapping("/delete")
|
||||||
|
@Operation(summary = "删除ERP 库位信息")
|
||||||
|
@Parameter(name = "id", description = "编号", required = true)
|
||||||
|
@PreAuthorize("@ss.hasPermission('erp:warehouse-location:delete')")
|
||||||
|
public CommonResult<Boolean> deleteWarehouseLocation(@RequestParam("id") Long id) {
|
||||||
|
warehouseLocationService.deleteWarehouseLocation(id);
|
||||||
|
return success(true);
|
||||||
|
}
|
||||||
|
|
||||||
|
@GetMapping("/get")
|
||||||
|
@Operation(summary = "获得ERP 库位信息")
|
||||||
|
@Parameter(name = "id", description = "编号", required = true, example = "1024")
|
||||||
|
@PreAuthorize("@ss.hasPermission('erp:warehouse-location:query')")
|
||||||
|
public CommonResult<WarehouseLocationRespVO> getWarehouseLocation(@RequestParam("id") Long id) {
|
||||||
|
WarehouseLocationDO warehouseLocation = warehouseLocationService.getWarehouseLocation(id);
|
||||||
|
return success(BeanUtils.toBean(warehouseLocation, WarehouseLocationRespVO.class));
|
||||||
|
}
|
||||||
|
|
||||||
|
@GetMapping("/page")
|
||||||
|
@Operation(summary = "获得ERP 库位信息分页")
|
||||||
|
@PreAuthorize("@ss.hasPermission('erp:warehouse-location:query')")
|
||||||
|
public CommonResult<PageResult<WarehouseLocationRespVO>> getWarehouseLocationPage(@Valid WarehouseLocationPageReqVO pageReqVO) {
|
||||||
|
PageResult<WarehouseLocationDO> pageResult = warehouseLocationService.getWarehouseLocationPage(pageReqVO);
|
||||||
|
return success(BeanUtils.toBean(pageResult, WarehouseLocationRespVO.class));
|
||||||
|
}
|
||||||
|
|
||||||
|
@GetMapping("/simple-list")
|
||||||
|
@Operation(summary = "获得ERP 库位信息精简列表", description = "只包含已启用的库位，主要用于前端下拉选项")
|
||||||
|
public CommonResult<List<WarehouseLocationRespVO>> getWarehouseLocationSimpleList() {
|
||||||
|
List<WarehouseLocationDO> list = warehouseLocationService.getWarehouseLocationListByStatus(CommonStatusEnum.ENABLE.getStatus());
|
||||||
|
return success(convertList(list, item -> new WarehouseLocationRespVO()
|
||||||
|
.setId(item.getId())
|
||||||
|
.setWarehouseId(item.getWarehouseId())
|
||||||
|
.setAreaId(item.getAreaId())
|
||||||
|
.setCode(item.getCode())
|
||||||
|
.setName(item.getName())
|
||||||
|
.setStatus(item.getStatus())));
|
||||||
|
}
|
||||||
|
|
||||||
|
@GetMapping("/export-excel")
|
||||||
|
@Operation(summary = "导出ERP 库位信息 Excel")
|
||||||
|
@PreAuthorize("@ss.hasPermission('erp:warehouse-location:export')")
|
||||||
|
@ApiAccessLog(operateType = EXPORT)
|
||||||
|
public void exportWarehouseLocationExcel(@Valid WarehouseLocationPageReqVO pageReqVO,
|
||||||
|
HttpServletResponse response) throws IOException {
|
||||||
|
pageReqVO.setPageSize(PageParam.PAGE_SIZE_NONE);
|
||||||
|
List<WarehouseLocationDO> list = warehouseLocationService.getWarehouseLocationPage(pageReqVO).getList();
|
||||||
|
// 导出 Excel
|
||||||
|
ExcelUtils.write(response, "ERP 库位信息.xls", "数据", WarehouseLocationRespVO.class,
|
||||||
|
BeanUtils.toBean(list, WarehouseLocationRespVO.class));
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
||||||
@ -0,0 +1,59 @@
|
|||||||
|
package cn.iocoder.yudao.module.erp.controller.admin.warehouselocation.vo;
|
||||||
|
|
||||||
|
import lombok.*;
|
||||||
|
import java.util.*;
|
||||||
|
import io.swagger.v3.oas.annotations.media.Schema;
|
||||||
|
import cn.iocoder.yudao.framework.common.pojo.PageParam;
|
||||||
|
import java.math.BigDecimal;
|
||||||
|
import org.springframework.format.annotation.DateTimeFormat;
|
||||||
|
import java.time.LocalDateTime;
|
||||||
|
|
||||||
|
import static cn.iocoder.yudao.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND;
|
||||||
|
|
||||||
|
@Schema(description = "管理后台 - ERP 库位信息分页 Request VO")
|
||||||
|
@Data
|
||||||
|
@EqualsAndHashCode(callSuper = true)
|
||||||
|
@ToString(callSuper = true)
|
||||||
|
public class WarehouseLocationPageReqVO extends PageParam {
|
||||||
|
|
||||||
|
@Schema(description = "所属仓库ID", example = "19287")
|
||||||
|
private Long warehouseId;
|
||||||
|
|
||||||
|
@Schema(description = "所属库区ID", example = "513")
|
||||||
|
private Long areaId;
|
||||||
|
|
||||||
|
@Schema(description = "库位编码")
|
||||||
|
private String code;
|
||||||
|
|
||||||
|
@Schema(description = "库位名称", example = "张三")
|
||||||
|
private String name;
|
||||||
|
|
||||||
|
@Schema(description = "面积")
|
||||||
|
private BigDecimal areaSize;
|
||||||
|
|
||||||
|
@Schema(description = "最大载重量")
|
||||||
|
private BigDecimal maxLoadWeight;
|
||||||
|
|
||||||
|
@Schema(description = "库位位置X")
|
||||||
|
private Integer positionX;
|
||||||
|
|
||||||
|
@Schema(description = "库位位置Y")
|
||||||
|
private Integer positionY;
|
||||||
|
|
||||||
|
@Schema(description = "库位位置Z")
|
||||||
|
private Integer positionZ;
|
||||||
|
|
||||||
|
@Schema(description = "是否允许产品混放")
|
||||||
|
private Boolean allowProductMix;
|
||||||
|
|
||||||
|
@Schema(description = "是否允许批次混放")
|
||||||
|
private Boolean allowBatchMix;
|
||||||
|
|
||||||
|
@Schema(description = "开启状态", example = "1")
|
||||||
|
private Integer status;
|
||||||
|
|
||||||
|
@Schema(description = "创建时间")
|
||||||
|
@DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
|
||||||
|
private LocalDateTime[] createTime;
|
||||||
|
|
||||||
|
}
|
||||||
@ -0,0 +1,72 @@
|
|||||||
|
package cn.iocoder.yudao.module.erp.controller.admin.warehouselocation.vo;
|
||||||
|
|
||||||
|
import io.swagger.v3.oas.annotations.media.Schema;
|
||||||
|
import lombok.*;
|
||||||
|
import java.util.*;
|
||||||
|
import java.math.BigDecimal;
|
||||||
|
import org.springframework.format.annotation.DateTimeFormat;
|
||||||
|
import java.time.LocalDateTime;
|
||||||
|
import com.alibaba.excel.annotation.*;
|
||||||
|
|
||||||
|
@Schema(description = "管理后台 - ERP 库位信息 Response VO")
|
||||||
|
@Data
|
||||||
|
@ExcelIgnoreUnannotated
|
||||||
|
public class WarehouseLocationRespVO {
|
||||||
|
|
||||||
|
@Schema(description = "id", requiredMode = Schema.RequiredMode.REQUIRED, example = "7300")
|
||||||
|
@ExcelProperty("id")
|
||||||
|
private Long id;
|
||||||
|
|
||||||
|
@Schema(description = "所属仓库ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "19287")
|
||||||
|
@ExcelProperty("所属仓库ID")
|
||||||
|
private Long warehouseId;
|
||||||
|
|
||||||
|
@Schema(description = "所属库区ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "513")
|
||||||
|
@ExcelProperty("所属库区ID")
|
||||||
|
private Long areaId;
|
||||||
|
|
||||||
|
@Schema(description = "库位编码", requiredMode = Schema.RequiredMode.REQUIRED)
|
||||||
|
@ExcelProperty("库位编码")
|
||||||
|
private String code;
|
||||||
|
|
||||||
|
@Schema(description = "库位名称", requiredMode = Schema.RequiredMode.REQUIRED, example = "张三")
|
||||||
|
@ExcelProperty("库位名称")
|
||||||
|
private String name;
|
||||||
|
|
||||||
|
@Schema(description = "面积")
|
||||||
|
@ExcelProperty("面积")
|
||||||
|
private BigDecimal areaSize;
|
||||||
|
|
||||||
|
@Schema(description = "最大载重量")
|
||||||
|
@ExcelProperty("最大载重量")
|
||||||
|
private BigDecimal maxLoadWeight;
|
||||||
|
|
||||||
|
@Schema(description = "库位位置X")
|
||||||
|
@ExcelProperty("库位位置X")
|
||||||
|
private Integer positionX;
|
||||||
|
|
||||||
|
@Schema(description = "库位位置Y")
|
||||||
|
@ExcelProperty("库位位置Y")
|
||||||
|
private Integer positionY;
|
||||||
|
|
||||||
|
@Schema(description = "库位位置Z")
|
||||||
|
@ExcelProperty("库位位置Z")
|
||||||
|
private Integer positionZ;
|
||||||
|
|
||||||
|
@Schema(description = "是否允许产品混放", requiredMode = Schema.RequiredMode.REQUIRED)
|
||||||
|
@ExcelProperty("是否允许产品混放")
|
||||||
|
private Boolean allowProductMix;
|
||||||
|
|
||||||
|
@Schema(description = "是否允许批次混放", requiredMode = Schema.RequiredMode.REQUIRED)
|
||||||
|
@ExcelProperty("是否允许批次混放")
|
||||||
|
private Boolean allowBatchMix;
|
||||||
|
|
||||||
|
@Schema(description = "开启状态", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
|
||||||
|
@ExcelProperty("开启状态")
|
||||||
|
private Integer status;
|
||||||
|
|
||||||
|
@Schema(description = "创建时间", requiredMode = Schema.RequiredMode.REQUIRED)
|
||||||
|
@ExcelProperty("创建时间")
|
||||||
|
private LocalDateTime createTime;
|
||||||
|
|
||||||
|
}
|
||||||
@ -0,0 +1,59 @@
|
|||||||
|
package cn.iocoder.yudao.module.erp.controller.admin.warehouselocation.vo;
|
||||||
|
|
||||||
|
import io.swagger.v3.oas.annotations.media.Schema;
|
||||||
|
import lombok.Data;
|
||||||
|
|
||||||
|
import javax.validation.constraints.NotEmpty;
|
||||||
|
import javax.validation.constraints.NotNull;
|
||||||
|
import java.math.BigDecimal;
|
||||||
|
|
||||||
|
@Schema(description = "管理后台 - ERP 库位信息新增/修改 Request VO")
|
||||||
|
@Data
|
||||||
|
public class WarehouseLocationSaveReqVO {
|
||||||
|
|
||||||
|
@Schema(description = "id", requiredMode = Schema.RequiredMode.REQUIRED, example = "7300")
|
||||||
|
private Long id;
|
||||||
|
|
||||||
|
@Schema(description = "所属仓库ID", example = "19287")
|
||||||
|
private Long warehouseId;
|
||||||
|
|
||||||
|
@Schema(description = "所属库区ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "513")
|
||||||
|
@NotNull(message = "所属库区ID不能为空")
|
||||||
|
private Long areaId;
|
||||||
|
|
||||||
|
@Schema(description = "库位编码", requiredMode = Schema.RequiredMode.REQUIRED)
|
||||||
|
// @NotEmpty(message = "库位编码不能为空")
|
||||||
|
private String code;
|
||||||
|
|
||||||
|
@Schema(description = "库位名称", requiredMode = Schema.RequiredMode.REQUIRED, example = "A-01-01")
|
||||||
|
@NotEmpty(message = "库位名称不能为空")
|
||||||
|
private String name;
|
||||||
|
|
||||||
|
@Schema(description = "面积")
|
||||||
|
private BigDecimal areaSize;
|
||||||
|
|
||||||
|
@Schema(description = "最大载重量")
|
||||||
|
private BigDecimal maxLoadWeight;
|
||||||
|
|
||||||
|
@Schema(description = "库位位置X")
|
||||||
|
private Integer positionX;
|
||||||
|
|
||||||
|
@Schema(description = "库位位置Y")
|
||||||
|
private Integer positionY;
|
||||||
|
|
||||||
|
@Schema(description = "库位位置Z")
|
||||||
|
private Integer positionZ;
|
||||||
|
|
||||||
|
@Schema(description = "是否允许产品混放", requiredMode = Schema.RequiredMode.REQUIRED)
|
||||||
|
@NotNull(message = "是否允许产品混放不能为空")
|
||||||
|
private Boolean allowProductMix;
|
||||||
|
|
||||||
|
@Schema(description = "是否允许批次混放", requiredMode = Schema.RequiredMode.REQUIRED)
|
||||||
|
@NotNull(message = "是否允许批次混放不能为空")
|
||||||
|
private Boolean allowBatchMix;
|
||||||
|
|
||||||
|
@Schema(description = "开启状态", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
|
||||||
|
@NotNull(message = "开启状态不能为空")
|
||||||
|
private Integer status;
|
||||||
|
|
||||||
|
}
|
||||||
@ -0,0 +1,56 @@
|
|||||||
|
package cn.iocoder.yudao.module.erp.dal.dataobject.warehousearea;
|
||||||
|
|
||||||
|
import lombok.*;
|
||||||
|
import java.util.*;
|
||||||
|
import java.math.BigDecimal;
|
||||||
|
import java.time.LocalDateTime;
|
||||||
|
import java.time.LocalDateTime;
|
||||||
|
import com.baomidou.mybatisplus.annotation.*;
|
||||||
|
import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDO;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* ERP 库区信息 DO
|
||||||
|
*
|
||||||
|
* @author 必硕智能
|
||||||
|
*/
|
||||||
|
@TableName("erp_warehouse_area")
|
||||||
|
@KeySequence("erp_warehouse_area_seq") // 用于 Oracle、PostgreSQL、Kingbase、DB2、H2 数据库的主键自增。如果是 MySQL 等数据库，可不写。
|
||||||
|
@Data
|
||||||
|
@EqualsAndHashCode(callSuper = true)
|
||||||
|
@ToString(callSuper = true)
|
||||||
|
@Builder
|
||||||
|
@NoArgsConstructor
|
||||||
|
@AllArgsConstructor
|
||||||
|
public class WarehouseAreaDO extends BaseDO {
|
||||||
|
|
||||||
|
/**
|
||||||
|
* id
|
||||||
|
*/
|
||||||
|
@TableId
|
||||||
|
private Long id;
|
||||||
|
/**
|
||||||
|
* 所属仓库id
|
||||||
|
*/
|
||||||
|
private Long warehouseId;
|
||||||
|
/**
|
||||||
|
* 库区编码
|
||||||
|
*/
|
||||||
|
private String areaCode;
|
||||||
|
/**
|
||||||
|
* 库区名称
|
||||||
|
*/
|
||||||
|
private String areaName;
|
||||||
|
/**
|
||||||
|
* 面积(平方米)
|
||||||
|
*/
|
||||||
|
private BigDecimal areaSize;
|
||||||
|
/**
|
||||||
|
* 库区描述
|
||||||
|
*/
|
||||||
|
private String description;
|
||||||
|
/**
|
||||||
|
* 开启状态
|
||||||
|
*/
|
||||||
|
private Integer status;
|
||||||
|
|
||||||
|
}
|
||||||
@ -0,0 +1,81 @@
|
|||||||
|
package cn.iocoder.yudao.module.erp.dal.dataobject.warehouselocation;
|
||||||
|
|
||||||
|
import lombok.*;
|
||||||
|
import java.util.*;
|
||||||
|
import java.math.BigDecimal;
|
||||||
|
import java.math.BigDecimal;
|
||||||
|
import java.time.LocalDateTime;
|
||||||
|
import java.time.LocalDateTime;
|
||||||
|
import com.baomidou.mybatisplus.annotation.*;
|
||||||
|
import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDO;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* ERP 库位信息 DO
|
||||||
|
*
|
||||||
|
* @author 必硕智能
|
||||||
|
*/
|
||||||
|
@TableName("erp_warehouse_location")
|
||||||
|
@KeySequence("erp_warehouse_location_seq") // 用于 Oracle、PostgreSQL、Kingbase、DB2、H2 数据库的主键自增。如果是 MySQL 等数据库，可不写。
|
||||||
|
@Data
|
||||||
|
@EqualsAndHashCode(callSuper = true)
|
||||||
|
@ToString(callSuper = true)
|
||||||
|
@Builder
|
||||||
|
@NoArgsConstructor
|
||||||
|
@AllArgsConstructor
|
||||||
|
public class WarehouseLocationDO extends BaseDO {
|
||||||
|
|
||||||
|
/**
|
||||||
|
* id
|
||||||
|
*/
|
||||||
|
@TableId
|
||||||
|
private Long id;
|
||||||
|
/**
|
||||||
|
* 所属仓库ID
|
||||||
|
*/
|
||||||
|
private Long warehouseId;
|
||||||
|
/**
|
||||||
|
* 所属库区ID
|
||||||
|
*/
|
||||||
|
private Long areaId;
|
||||||
|
/**
|
||||||
|
* 库位编码
|
||||||
|
*/
|
||||||
|
private String code;
|
||||||
|
/**
|
||||||
|
* 库位名称
|
||||||
|
*/
|
||||||
|
private String name;
|
||||||
|
/**
|
||||||
|
* 面积
|
||||||
|
*/
|
||||||
|
private BigDecimal areaSize;
|
||||||
|
/**
|
||||||
|
* 最大载重量
|
||||||
|
*/
|
||||||
|
private BigDecimal maxLoadWeight;
|
||||||
|
/**
|
||||||
|
* 库位位置X
|
||||||
|
*/
|
||||||
|
private Integer positionX;
|
||||||
|
/**
|
||||||
|
* 库位位置Y
|
||||||
|
*/
|
||||||
|
private Integer positionY;
|
||||||
|
/**
|
||||||
|
* 库位位置Z
|
||||||
|
*/
|
||||||
|
private Integer positionZ;
|
||||||
|
/**
|
||||||
|
* 是否允许产品混放
|
||||||
|
*/
|
||||||
|
private Boolean allowProductMix;
|
||||||
|
/**
|
||||||
|
* 是否允许批次混放
|
||||||
|
*/
|
||||||
|
private Boolean allowBatchMix;
|
||||||
|
/**
|
||||||
|
* 开启状态
|
||||||
|
*/
|
||||||
|
private Integer status;
|
||||||
|
|
||||||
|
}
|
||||||
@ -0,0 +1,53 @@
|
|||||||
|
package cn.iocoder.yudao.module.erp.dal.mysql.warehousearea;
|
||||||
|
|
||||||
|
import java.util.*;
|
||||||
|
|
||||||
|
import cn.iocoder.yudao.framework.common.pojo.PageResult;
|
||||||
|
import cn.iocoder.yudao.framework.mybatis.core.query.LambdaQueryWrapperX;
|
||||||
|
import cn.iocoder.yudao.framework.mybatis.core.mapper.BaseMapperX;
|
||||||
|
import cn.iocoder.yudao.module.erp.dal.dataobject.warehousearea.WarehouseAreaDO;
|
||||||
|
import org.apache.ibatis.annotations.Mapper;
|
||||||
|
import cn.iocoder.yudao.module.erp.controller.admin.warehousearea.vo.*;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* ERP 库区信息 Mapper
|
||||||
|
*
|
||||||
|
* @author 必硕智能
|
||||||
|
*/
|
||||||
|
@Mapper
|
||||||
|
public interface WarehouseAreaMapper extends BaseMapperX<WarehouseAreaDO> {
|
||||||
|
|
||||||
|
default PageResult<WarehouseAreaDO> selectPage(WarehouseAreaPageReqVO reqVO) {
|
||||||
|
return selectPage(reqVO, new LambdaQueryWrapperX<WarehouseAreaDO>()
|
||||||
|
.eqIfPresent(WarehouseAreaDO::getWarehouseId, reqVO.getWarehouseId())
|
||||||
|
.eqIfPresent(WarehouseAreaDO::getAreaCode, reqVO.getAreaCode())
|
||||||
|
.likeIfPresent(WarehouseAreaDO::getAreaName, reqVO.getAreaName())
|
||||||
|
.eqIfPresent(WarehouseAreaDO::getAreaSize, reqVO.getAreaSize())
|
||||||
|
.eqIfPresent(WarehouseAreaDO::getDescription, reqVO.getDescription())
|
||||||
|
.eqIfPresent(WarehouseAreaDO::getStatus, reqVO.getStatus())
|
||||||
|
.betweenIfPresent(WarehouseAreaDO::getCreateTime, reqVO.getCreateTime())
|
||||||
|
.orderByDesc(WarehouseAreaDO::getId));
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
default WarehouseAreaDO selectByNo(String no) {
|
||||||
|
return selectOne(WarehouseAreaDO::getAreaCode, no);
|
||||||
|
}
|
||||||
|
|
||||||
|
default List<WarehouseAreaDO> selectListByStatus(Integer status) {
|
||||||
|
return selectList(WarehouseAreaDO::getStatus, status);
|
||||||
|
}
|
||||||
|
|
||||||
|
default List<WarehouseAreaDO> selectListByWarehouseId(Long warehouseId) {
|
||||||
|
return selectList(WarehouseAreaDO::getWarehouseId, warehouseId);
|
||||||
|
}
|
||||||
|
|
||||||
|
default void deleteByWarehouseId(Long warehouseId) {
|
||||||
|
delete(WarehouseAreaDO::getWarehouseId, warehouseId);
|
||||||
|
}
|
||||||
|
|
||||||
|
default Long selectCountByWarehouseId(Long warehouseId) {
|
||||||
|
return selectCount(WarehouseAreaDO::getWarehouseId, warehouseId);
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
||||||
@ -0,0 +1,61 @@
|
|||||||
|
package cn.iocoder.yudao.module.erp.dal.mysql.warehouselocation;
|
||||||
|
|
||||||
|
import java.util.*;
|
||||||
|
|
||||||
|
import cn.iocoder.yudao.framework.common.pojo.PageResult;
|
||||||
|
import cn.iocoder.yudao.framework.mybatis.core.query.LambdaQueryWrapperX;
|
||||||
|
import cn.iocoder.yudao.framework.mybatis.core.mapper.BaseMapperX;
|
||||||
|
import cn.iocoder.yudao.module.erp.dal.dataobject.warehouselocation.WarehouseLocationDO;
|
||||||
|
import org.apache.ibatis.annotations.Mapper;
|
||||||
|
import cn.iocoder.yudao.module.erp.controller.admin.warehouselocation.vo.*;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* ERP 库位信息 Mapper
|
||||||
|
*
|
||||||
|
* @author 必硕智能
|
||||||
|
*/
|
||||||
|
@Mapper
|
||||||
|
public interface WarehouseLocationMapper extends BaseMapperX<WarehouseLocationDO> {
|
||||||
|
|
||||||
|
default PageResult<WarehouseLocationDO> selectPage(WarehouseLocationPageReqVO reqVO) {
|
||||||
|
return selectPage(reqVO, new LambdaQueryWrapperX<WarehouseLocationDO>()
|
||||||
|
.eqIfPresent(WarehouseLocationDO::getWarehouseId, reqVO.getWarehouseId())
|
||||||
|
.eqIfPresent(WarehouseLocationDO::getAreaId, reqVO.getAreaId())
|
||||||
|
.eqIfPresent(WarehouseLocationDO::getCode, reqVO.getCode())
|
||||||
|
.likeIfPresent(WarehouseLocationDO::getName, reqVO.getName())
|
||||||
|
.eqIfPresent(WarehouseLocationDO::getAreaSize, reqVO.getAreaSize())
|
||||||
|
.eqIfPresent(WarehouseLocationDO::getMaxLoadWeight, reqVO.getMaxLoadWeight())
|
||||||
|
.eqIfPresent(WarehouseLocationDO::getPositionX, reqVO.getPositionX())
|
||||||
|
.eqIfPresent(WarehouseLocationDO::getPositionY, reqVO.getPositionY())
|
||||||
|
.eqIfPresent(WarehouseLocationDO::getPositionZ, reqVO.getPositionZ())
|
||||||
|
.eqIfPresent(WarehouseLocationDO::getAllowProductMix, reqVO.getAllowProductMix())
|
||||||
|
.eqIfPresent(WarehouseLocationDO::getAllowBatchMix, reqVO.getAllowBatchMix())
|
||||||
|
.eqIfPresent(WarehouseLocationDO::getStatus, reqVO.getStatus())
|
||||||
|
.betweenIfPresent(WarehouseLocationDO::getCreateTime, reqVO.getCreateTime())
|
||||||
|
.orderByDesc(WarehouseLocationDO::getId));
|
||||||
|
}
|
||||||
|
|
||||||
|
default WarehouseLocationDO selectByNo(String no) {
|
||||||
|
return selectOne(WarehouseLocationDO::getCode, no);
|
||||||
|
}
|
||||||
|
|
||||||
|
default List<WarehouseLocationDO> selectListByWarehouseId(Long warehouseId) {
|
||||||
|
return selectList(WarehouseLocationDO::getWarehouseId, warehouseId);
|
||||||
|
}
|
||||||
|
|
||||||
|
default void deleteByWarehouseId(Long warehouseId) {
|
||||||
|
delete(WarehouseLocationDO::getWarehouseId, warehouseId);
|
||||||
|
}
|
||||||
|
|
||||||
|
default List<WarehouseLocationDO> selectListByStatus(Integer status) {
|
||||||
|
return selectList(WarehouseLocationDO::getStatus, status);
|
||||||
|
}
|
||||||
|
|
||||||
|
default List<WarehouseLocationDO> selectListByAreaId(Long areaId) {
|
||||||
|
return selectList(WarehouseLocationDO::getAreaId, areaId);
|
||||||
|
}
|
||||||
|
|
||||||
|
default Long selectCountByWarehouseId(Long warehouseId) {
|
||||||
|
return selectCount(WarehouseLocationDO::getWarehouseId, warehouseId);
|
||||||
|
}
|
||||||
|
}
|
||||||
@ -0,0 +1,59 @@
|
|||||||
|
package cn.iocoder.yudao.module.erp.service.warehousearea;
|
||||||
|
|
||||||
|
import java.util.*;
|
||||||
|
import cn.iocoder.yudao.module.erp.controller.admin.warehousearea.vo.*;
|
||||||
|
import cn.iocoder.yudao.module.erp.dal.dataobject.warehousearea.WarehouseAreaDO;
|
||||||
|
import cn.iocoder.yudao.framework.common.pojo.PageResult;
|
||||||
|
import cn.iocoder.yudao.framework.common.pojo.PageParam;
|
||||||
|
|
||||||
|
import javax.validation.Valid;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* ERP 库区信息 Service 接口
|
||||||
|
*
|
||||||
|
* @author 必硕智能
|
||||||
|
*/
|
||||||
|
public interface WarehouseAreaService {
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 创建ERP 库区信息
|
||||||
|
*
|
||||||
|
* @param createReqVO 创建信息
|
||||||
|
* @return 编号
|
||||||
|
*/
|
||||||
|
Long createWarehouseArea(@Valid WarehouseAreaSaveReqVO createReqVO);
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 更新ERP 库区信息
|
||||||
|
*
|
||||||
|
* @param updateReqVO 更新信息
|
||||||
|
*/
|
||||||
|
void updateWarehouseArea(@Valid WarehouseAreaSaveReqVO updateReqVO);
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 删除ERP 库区信息
|
||||||
|
*
|
||||||
|
* @param id 编号
|
||||||
|
*/
|
||||||
|
void deleteWarehouseArea(Long id);
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 获得ERP 库区信息
|
||||||
|
*
|
||||||
|
* @param id 编号
|
||||||
|
* @return ERP 库区信息
|
||||||
|
*/
|
||||||
|
WarehouseAreaDO getWarehouseArea(Long id);
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 获得ERP 库区信息分页
|
||||||
|
*
|
||||||
|
* @param pageReqVO 分页查询
|
||||||
|
* @return ERP 库区信息分页
|
||||||
|
*/
|
||||||
|
PageResult<WarehouseAreaDO> getWarehouseAreaPage(WarehouseAreaPageReqVO pageReqVO);
|
||||||
|
|
||||||
|
List<WarehouseAreaDO> getWarehouseListByStatus(Integer status);
|
||||||
|
|
||||||
|
List<WarehouseAreaDO> getWarehouseListByStatusAndWarehouseId(Integer status, Long warehouseId);
|
||||||
|
}
|
||||||
@ -0,0 +1,100 @@
|
|||||||
|
package cn.iocoder.yudao.module.erp.service.warehousearea;
|
||||||
|
|
||||||
|
import cn.iocoder.yudao.framework.common.pojo.PageResult;
|
||||||
|
import cn.iocoder.yudao.framework.common.util.object.BeanUtils;
|
||||||
|
import cn.iocoder.yudao.module.erp.controller.admin.autocode.util.AutoCodeUtil;
|
||||||
|
import cn.iocoder.yudao.module.erp.controller.admin.warehousearea.vo.WarehouseAreaPageReqVO;
|
||||||
|
import cn.iocoder.yudao.module.erp.controller.admin.warehousearea.vo.WarehouseAreaSaveReqVO;
|
||||||
|
import cn.iocoder.yudao.module.erp.dal.dataobject.warehousearea.WarehouseAreaDO;
|
||||||
|
import cn.iocoder.yudao.module.erp.dal.mysql.warehousearea.WarehouseAreaMapper;
|
||||||
|
import cn.iocoder.yudao.module.erp.dal.mysql.warehouselocation.WarehouseLocationMapper;
|
||||||
|
import org.apache.commons.lang3.StringUtils;
|
||||||
|
import org.springframework.stereotype.Service;
|
||||||
|
import org.springframework.validation.annotation.Validated;
|
||||||
|
|
||||||
|
import javax.annotation.Resource;
|
||||||
|
import java.util.ArrayList;
|
||||||
|
import java.util.List;
|
||||||
|
|
||||||
|
import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception;
|
||||||
|
import static cn.iocoder.yudao.module.erp.enums.ErrorCodeConstants.WAREHOUSE_AREA_CODE_EXISTS;
|
||||||
|
import static cn.iocoder.yudao.module.erp.enums.ErrorCodeConstants.WAREHOUSE_AREA_DELETE_FAIL_EXISTS_LOCATION;
|
||||||
|
import static cn.iocoder.yudao.module.erp.enums.ErrorCodeConstants.WAREHOUSE_AREA_NOT_EXISTS;
|
||||||
|
|
||||||
|
@Service
|
||||||
|
@Validated
|
||||||
|
public class WarehouseAreaServiceImpl implements WarehouseAreaService {
|
||||||
|
|
||||||
|
@Resource
|
||||||
|
private WarehouseAreaMapper warehouseAreaMapper;
|
||||||
|
|
||||||
|
@Resource
|
||||||
|
private WarehouseLocationMapper warehouseLocationMapper;
|
||||||
|
|
||||||
|
@Resource
|
||||||
|
private AutoCodeUtil autoCodeUtil;
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public Long createWarehouseArea(WarehouseAreaSaveReqVO createReqVO) {
|
||||||
|
WarehouseAreaDO warehouseArea = BeanUtils.toBean(createReqVO, WarehouseAreaDO.class);
|
||||||
|
if (StringUtils.isEmpty(warehouseArea.getAreaCode())) {
|
||||||
|
warehouseArea.setAreaCode(autoCodeUtil.genSerialCode("RESERVOIR_AREA_GENERATE", null));
|
||||||
|
} else if (warehouseAreaMapper.selectByNo(warehouseArea.getAreaCode()) != null) {
|
||||||
|
throw exception(WAREHOUSE_AREA_CODE_EXISTS);
|
||||||
|
}
|
||||||
|
warehouseAreaMapper.insert(warehouseArea);
|
||||||
|
return warehouseArea.getId();
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public void updateWarehouseArea(WarehouseAreaSaveReqVO updateReqVO) {
|
||||||
|
validateWarehouseAreaExists(updateReqVO.getId());
|
||||||
|
warehouseAreaMapper.updateById(BeanUtils.toBean(updateReqVO, WarehouseAreaDO.class));
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public void deleteWarehouseArea(Long id) {
|
||||||
|
validateWarehouseAreaExists(id);
|
||||||
|
if (!warehouseLocationMapper.selectListByAreaId(id).isEmpty()) {
|
||||||
|
throw exception(WAREHOUSE_AREA_DELETE_FAIL_EXISTS_LOCATION);
|
||||||
|
}
|
||||||
|
warehouseAreaMapper.deleteById(id);
|
||||||
|
}
|
||||||
|
|
||||||
|
private void validateWarehouseAreaExists(Long id) {
|
||||||
|
if (warehouseAreaMapper.selectById(id) == null) {
|
||||||
|
throw exception(WAREHOUSE_AREA_NOT_EXISTS);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public WarehouseAreaDO getWarehouseArea(Long id) {
|
||||||
|
return warehouseAreaMapper.selectById(id);
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public PageResult<WarehouseAreaDO> getWarehouseAreaPage(WarehouseAreaPageReqVO pageReqVO) {
|
||||||
|
return warehouseAreaMapper.selectPage(pageReqVO);
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public List<WarehouseAreaDO> getWarehouseListByStatus(Integer status) {
|
||||||
|
return warehouseAreaMapper.selectListByStatus(status);
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public List<WarehouseAreaDO> getWarehouseListByStatusAndWarehouseId(Integer status, Long warehouseId) {
|
||||||
|
List<WarehouseAreaDO> list = warehouseAreaMapper.selectListByStatus(status);
|
||||||
|
if (warehouseId == null) {
|
||||||
|
return list;
|
||||||
|
}
|
||||||
|
List<WarehouseAreaDO> result = new ArrayList<>();
|
||||||
|
for (WarehouseAreaDO item : list) {
|
||||||
|
if (warehouseId.equals(item.getWarehouseId())) {
|
||||||
|
result.add(item);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return result;
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
||||||
@ -0,0 +1,58 @@
|
|||||||
|
package cn.iocoder.yudao.module.erp.service.warehouselocation;
|
||||||
|
|
||||||
|
import java.util.*;
|
||||||
|
import cn.iocoder.yudao.module.erp.controller.admin.warehouselocation.vo.*;
|
||||||
|
import cn.iocoder.yudao.module.erp.dal.dataobject.warehouselocation.WarehouseLocationDO;
|
||||||
|
import cn.iocoder.yudao.framework.common.pojo.PageResult;
|
||||||
|
import cn.iocoder.yudao.framework.common.pojo.PageParam;
|
||||||
|
|
||||||
|
import javax.validation.Valid;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* ERP 库位信息 Service 接口
|
||||||
|
*
|
||||||
|
* @author 必硕智能
|
||||||
|
*/
|
||||||
|
public interface WarehouseLocationService {
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 创建ERP 库位信息
|
||||||
|
*
|
||||||
|
* @param createReqVO 创建信息
|
||||||
|
* @return 编号
|
||||||
|
*/
|
||||||
|
Long createWarehouseLocation(@Valid WarehouseLocationSaveReqVO createReqVO);
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 更新ERP 库位信息
|
||||||
|
*
|
||||||
|
* @param updateReqVO 更新信息
|
||||||
|
*/
|
||||||
|
void updateWarehouseLocation(@Valid WarehouseLocationSaveReqVO updateReqVO);
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 删除ERP 库位信息
|
||||||
|
*
|
||||||
|
* @param id 编号
|
||||||
|
*/
|
||||||
|
void deleteWarehouseLocation(Long id);
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 获得ERP 库位信息
|
||||||
|
*
|
||||||
|
* @param id 编号
|
||||||
|
* @return ERP 库位信息
|
||||||
|
*/
|
||||||
|
WarehouseLocationDO getWarehouseLocation(Long id);
|
||||||
|
|
||||||
|
List<WarehouseLocationDO> getWarehouseLocationListByStatus(Integer status);
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 获得ERP 库位信息分页
|
||||||
|
*
|
||||||
|
* @param pageReqVO 分页查询
|
||||||
|
* @return ERP 库位信息分页
|
||||||
|
*/
|
||||||
|
PageResult<WarehouseLocationDO> getWarehouseLocationPage(WarehouseLocationPageReqVO pageReqVO);
|
||||||
|
|
||||||
|
}
|
||||||
@ -0,0 +1,95 @@
|
|||||||
|
package cn.iocoder.yudao.module.erp.service.warehouselocation;
|
||||||
|
|
||||||
|
import cn.iocoder.yudao.framework.common.pojo.PageResult;
|
||||||
|
import cn.iocoder.yudao.framework.common.util.object.BeanUtils;
|
||||||
|
import cn.iocoder.yudao.module.erp.controller.admin.autocode.util.AutoCodeUtil;
|
||||||
|
import cn.iocoder.yudao.module.erp.controller.admin.warehouselocation.vo.WarehouseLocationPageReqVO;
|
||||||
|
import cn.iocoder.yudao.module.erp.controller.admin.warehouselocation.vo.WarehouseLocationSaveReqVO;
|
||||||
|
import cn.iocoder.yudao.module.erp.dal.dataobject.warehousearea.WarehouseAreaDO;
|
||||||
|
import cn.iocoder.yudao.module.erp.dal.dataobject.warehouselocation.WarehouseLocationDO;
|
||||||
|
import cn.iocoder.yudao.module.erp.dal.mysql.warehousearea.WarehouseAreaMapper;
|
||||||
|
import cn.iocoder.yudao.module.erp.dal.mysql.warehouselocation.WarehouseLocationMapper;
|
||||||
|
import org.apache.commons.lang3.StringUtils;
|
||||||
|
import org.springframework.stereotype.Service;
|
||||||
|
import org.springframework.validation.annotation.Validated;
|
||||||
|
|
||||||
|
import javax.annotation.Resource;
|
||||||
|
import java.util.List;
|
||||||
|
|
||||||
|
import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception;
|
||||||
|
import static cn.iocoder.yudao.module.erp.enums.ErrorCodeConstants.WAREHOUSE_AREA_NOT_EXISTS;
|
||||||
|
import static cn.iocoder.yudao.module.erp.enums.ErrorCodeConstants.WAREHOUSE_LOCATION_CODE_EXISTS;
|
||||||
|
import static cn.iocoder.yudao.module.erp.enums.ErrorCodeConstants.WAREHOUSE_LOCATION_NOT_EXISTS;
|
||||||
|
import static cn.iocoder.yudao.module.erp.enums.ErrorCodeConstants.WAREHOUSE_LOCATION_WAREHOUSE_AREA_NOT_MATCH;
|
||||||
|
|
||||||
|
@Service
|
||||||
|
@Validated
|
||||||
|
public class WarehouseLocationServiceImpl implements WarehouseLocationService {
|
||||||
|
|
||||||
|
@Resource
|
||||||
|
private WarehouseLocationMapper warehouseLocationMapper;
|
||||||
|
|
||||||
|
@Resource
|
||||||
|
private WarehouseAreaMapper warehouseAreaMapper;
|
||||||
|
|
||||||
|
@Resource
|
||||||
|
private AutoCodeUtil autoCodeUtil;
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public Long createWarehouseLocation(WarehouseLocationSaveReqVO createReqVO) {
|
||||||
|
validateWarehouseAreaMatch(createReqVO.getWarehouseId(), createReqVO.getAreaId());
|
||||||
|
WarehouseLocationDO warehouseLocation = BeanUtils.toBean(createReqVO, WarehouseLocationDO.class);
|
||||||
|
if (StringUtils.isEmpty(warehouseLocation.getCode())) {
|
||||||
|
warehouseLocation.setCode(autoCodeUtil.genSerialCode("RESERVOIR_AREA_GENERATE", null));
|
||||||
|
} else if (warehouseLocationMapper.selectByNo(warehouseLocation.getCode()) != null) {
|
||||||
|
throw exception(WAREHOUSE_LOCATION_CODE_EXISTS);
|
||||||
|
}
|
||||||
|
warehouseLocationMapper.insert(warehouseLocation);
|
||||||
|
return warehouseLocation.getId();
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public void updateWarehouseLocation(WarehouseLocationSaveReqVO updateReqVO) {
|
||||||
|
validateWarehouseLocationExists(updateReqVO.getId());
|
||||||
|
validateWarehouseAreaMatch(updateReqVO.getWarehouseId(), updateReqVO.getAreaId());
|
||||||
|
warehouseLocationMapper.updateById(BeanUtils.toBean(updateReqVO, WarehouseLocationDO.class));
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public void deleteWarehouseLocation(Long id) {
|
||||||
|
validateWarehouseLocationExists(id);
|
||||||
|
warehouseLocationMapper.deleteById(id);
|
||||||
|
}
|
||||||
|
|
||||||
|
private void validateWarehouseLocationExists(Long id) {
|
||||||
|
if (warehouseLocationMapper.selectById(id) == null) {
|
||||||
|
throw exception(WAREHOUSE_LOCATION_NOT_EXISTS);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
private void validateWarehouseAreaMatch(Long warehouseId, Long areaId) {
|
||||||
|
WarehouseAreaDO area = warehouseAreaMapper.selectById(areaId);
|
||||||
|
if (area == null) {
|
||||||
|
throw exception(WAREHOUSE_AREA_NOT_EXISTS);
|
||||||
|
}
|
||||||
|
if (warehouseId == null || !warehouseId.equals(area.getWarehouseId())) {
|
||||||
|
throw exception(WAREHOUSE_LOCATION_WAREHOUSE_AREA_NOT_MATCH);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public WarehouseLocationDO getWarehouseLocation(Long id) {
|
||||||
|
return warehouseLocationMapper.selectById(id);
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public List<WarehouseLocationDO> getWarehouseLocationListByStatus(Integer status) {
|
||||||
|
return warehouseLocationMapper.selectListByStatus(status);
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public PageResult<WarehouseLocationDO> getWarehouseLocationPage(WarehouseLocationPageReqVO pageReqVO) {
|
||||||
|
return warehouseLocationMapper.selectPage(pageReqVO);
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
||||||
Loading…
Reference in New Issue