diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/pro/vo/process/MesProProcessPageReqVO.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/pro/vo/process/MesProProcessPageReqVO.java new file mode 100644 index 0000000..2f75f3f --- /dev/null +++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/pro/vo/process/MesProProcessPageReqVO.java @@ -0,0 +1,33 @@ +package cn.iocoder.yudao.module.mes.controller.admin.pro.vo.process; + +import cn.iocoder.yudao.framework.common.pojo.PageParam; +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.ToString; +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 = "管理后台 - MES 生产工序分页 Request VO") +@Data +@EqualsAndHashCode(callSuper = true) +@ToString(callSuper = true) +public class MesProProcessPageReqVO extends PageParam { + + @Schema(description = "工序编码", example = "PROCESS001") + private String code; + + @Schema(description = "工序名称", example = "下料工序") + private String name; + + @Schema(description = "状态", example = "0") + private Integer status; + + @Schema(description = "创建时间") + @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND) + private LocalDateTime[] createTime; + +} diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/warehouse/MesWmWarehouseAreaController.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/warehouse/MesWmWarehouseAreaController.java index dd928af..23f3d0a 100644 --- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/warehouse/MesWmWarehouseAreaController.java +++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/warehouse/MesWmWarehouseAreaController.java @@ -1,14 +1,10 @@ package cn.iocoder.yudao.module.mes.controller.admin.wm.warehouse; import cn.hutool.core.collection.CollUtil; -import cn.iocoder.yudao.framework.apilog.core.annotation.ApiAccessLog; -import cn.iocoder.yudao.framework.common.enums.CommonStatusEnum; import cn.iocoder.yudao.framework.common.pojo.CommonResult; -import cn.iocoder.yudao.framework.common.pojo.PageParam; import cn.iocoder.yudao.framework.common.pojo.PageResult; import cn.iocoder.yudao.framework.common.util.collection.MapUtils; import cn.iocoder.yudao.framework.common.util.object.BeanUtils; -import cn.iocoder.yudao.framework.excel.core.util.ExcelUtils; import cn.iocoder.yudao.module.mes.controller.admin.wm.warehouse.vo.area.MesWmWarehouseAreaPageReqVO; import cn.iocoder.yudao.module.mes.controller.admin.wm.warehouse.vo.area.MesWmWarehouseAreaRespVO; import cn.iocoder.yudao.module.mes.controller.admin.wm.warehouse.vo.area.MesWmWarehouseAreaSaveReqVO; @@ -22,19 +18,16 @@ import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.Parameter; import io.swagger.v3.oas.annotations.tags.Tag; import jakarta.annotation.Resource; -import jakarta.servlet.http.HttpServletResponse; import jakarta.validation.Valid; import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; -import java.io.IOException; import java.util.Collections; import java.util.List; import java.util.Map; import java.util.Set; -import static cn.iocoder.yudao.framework.apilog.core.enums.OperateTypeEnum.EXPORT; import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success; import static cn.iocoder.yudao.framework.common.util.collection.CollectionUtils.convertSet; @@ -98,27 +91,13 @@ public class MesWmWarehouseAreaController { } @GetMapping("/simple-list") - @Operation(summary = "获得库位精简列表", description = "只包含启用状态,可按库区过滤") + @Operation(summary = "获得库位精简列表", description = "可按库区过滤") public CommonResult> getWarehouseAreaSimpleList( @Parameter(name = "locationId", description = "库区编号") @RequestParam(value = "locationId", required = false) Long locationId) { - List list = areaService.getWarehouseAreaList(locationId, CommonStatusEnum.ENABLE.getStatus()); + List list = areaService.getWarehouseAreaSimpleList(locationId); return success(buildWarehouseAreaRespVOList(list)); } - // TODO @AI:不需要导出功能;前端也可以去掉; - - @GetMapping("/export-excel") - @Operation(summary = "导出库位 Excel") - @PreAuthorize("@ss.hasPermission('mes:wm-warehouse:export')") - @ApiAccessLog(operateType = EXPORT) - public void exportWarehouseAreaExcel(@Valid MesWmWarehouseAreaPageReqVO pageReqVO, - HttpServletResponse response) throws IOException { - pageReqVO.setPageSize(PageParam.PAGE_SIZE_NONE); - List list = areaService.getWarehouseAreaPage(pageReqVO).getList(); - ExcelUtils.write(response, "库位.xls", "数据", MesWmWarehouseAreaRespVO.class, - buildWarehouseAreaRespVOList(list)); - } - // ==================== 拼接 VO ==================== /** diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/warehouse/MesWmWarehouseController.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/warehouse/MesWmWarehouseController.java index b68e6bf..339b9ec 100644 --- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/warehouse/MesWmWarehouseController.java +++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/warehouse/MesWmWarehouseController.java @@ -1,12 +1,8 @@ package cn.iocoder.yudao.module.mes.controller.admin.wm.warehouse; -import cn.iocoder.yudao.framework.apilog.core.annotation.ApiAccessLog; -import cn.iocoder.yudao.framework.common.enums.CommonStatusEnum; import cn.iocoder.yudao.framework.common.pojo.CommonResult; -import cn.iocoder.yudao.framework.common.pojo.PageParam; import cn.iocoder.yudao.framework.common.pojo.PageResult; import cn.iocoder.yudao.framework.common.util.object.BeanUtils; -import cn.iocoder.yudao.framework.excel.core.util.ExcelUtils; import cn.iocoder.yudao.module.mes.controller.admin.wm.warehouse.vo.MesWmWarehousePageReqVO; import cn.iocoder.yudao.module.mes.controller.admin.wm.warehouse.vo.MesWmWarehouseRespVO; import cn.iocoder.yudao.module.mes.controller.admin.wm.warehouse.vo.MesWmWarehouseSaveReqVO; @@ -16,16 +12,13 @@ import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.Parameter; import io.swagger.v3.oas.annotations.tags.Tag; import jakarta.annotation.Resource; -import jakarta.servlet.http.HttpServletResponse; import jakarta.validation.Valid; import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; -import java.io.IOException; import java.util.List; -import static cn.iocoder.yudao.framework.apilog.core.enums.OperateTypeEnum.EXPORT; import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success; @Tag(name = "管理后台 - MES 仓库") @@ -79,22 +72,10 @@ public class MesWmWarehouseController { } @GetMapping("/simple-list") - @Operation(summary = "获得仓库精简列表", description = "只包含启用状态,主要用于前端下拉") + @Operation(summary = "获得仓库精简列表", description = "主要用于前端下拉") public CommonResult> getWarehouseSimpleList() { - List list = warehouseService.getWarehouseListByStatus(CommonStatusEnum.ENABLE.getStatus()); + List list = warehouseService.getWarehouseSimpleList(); return success(BeanUtils.toBean(list, MesWmWarehouseRespVO.class)); } - @GetMapping("/export-excel") - @Operation(summary = "导出仓库 Excel") - @PreAuthorize("@ss.hasPermission('mes:wm-warehouse:export')") - @ApiAccessLog(operateType = EXPORT) - public void exportWarehouseExcel(@Valid MesWmWarehousePageReqVO pageReqVO, - HttpServletResponse response) throws IOException { - pageReqVO.setPageSize(PageParam.PAGE_SIZE_NONE); - List list = warehouseService.getWarehousePage(pageReqVO).getList(); - ExcelUtils.write(response, "仓库.xls", "数据", MesWmWarehouseRespVO.class, - BeanUtils.toBean(list, MesWmWarehouseRespVO.class)); - } - } diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/warehouse/MesWmWarehouseLocationController.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/warehouse/MesWmWarehouseLocationController.java index 353dcac..429bf81 100644 --- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/warehouse/MesWmWarehouseLocationController.java +++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/warehouse/MesWmWarehouseLocationController.java @@ -1,14 +1,10 @@ package cn.iocoder.yudao.module.mes.controller.admin.wm.warehouse; import cn.hutool.core.collection.CollUtil; -import cn.iocoder.yudao.framework.apilog.core.annotation.ApiAccessLog; -import cn.iocoder.yudao.framework.common.enums.CommonStatusEnum; import cn.iocoder.yudao.framework.common.pojo.CommonResult; -import cn.iocoder.yudao.framework.common.pojo.PageParam; import cn.iocoder.yudao.framework.common.pojo.PageResult; import cn.iocoder.yudao.framework.common.util.collection.MapUtils; import cn.iocoder.yudao.framework.common.util.object.BeanUtils; -import cn.iocoder.yudao.framework.excel.core.util.ExcelUtils; import cn.iocoder.yudao.module.mes.controller.admin.wm.warehouse.vo.location.MesWmWarehouseLocationPageReqVO; import cn.iocoder.yudao.module.mes.controller.admin.wm.warehouse.vo.location.MesWmWarehouseLocationRespVO; import cn.iocoder.yudao.module.mes.controller.admin.wm.warehouse.vo.location.MesWmWarehouseLocationSaveReqVO; @@ -20,18 +16,15 @@ import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.Parameter; import io.swagger.v3.oas.annotations.tags.Tag; import jakarta.annotation.Resource; -import jakarta.servlet.http.HttpServletResponse; import jakarta.validation.Valid; import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; -import java.io.IOException; import java.util.Collections; import java.util.List; import java.util.Map; -import static cn.iocoder.yudao.framework.apilog.core.enums.OperateTypeEnum.EXPORT; import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success; import static cn.iocoder.yudao.framework.common.util.collection.CollectionUtils.convertSet; @@ -92,27 +85,13 @@ public class MesWmWarehouseLocationController { } @GetMapping("/simple-list") - @Operation(summary = "获得库区精简列表", description = "只包含启用状态,可按仓库过滤") + @Operation(summary = "获得库区精简列表", description = "可按仓库过滤") public CommonResult> getWarehouseLocationSimpleList( @Parameter(name = "warehouseId", description = "仓库编号") @RequestParam(value = "warehouseId", required = false) Long warehouseId) { - List list = locationService.getWarehouseLocationList(warehouseId, CommonStatusEnum.ENABLE.getStatus()); + List list = locationService.getWarehouseLocationSimpleList(warehouseId); return success(buildWarehouseLocationRespVOList(list)); } - // TODO @AI:不需要导出功能;前端也可以去掉; - - @GetMapping("/export-excel") - @Operation(summary = "导出库区 Excel") - @PreAuthorize("@ss.hasPermission('mes:wm-warehouse:export')") - @ApiAccessLog(operateType = EXPORT) - public void exportWarehouseLocationExcel(@Valid MesWmWarehouseLocationPageReqVO pageReqVO, - HttpServletResponse response) throws IOException { - pageReqVO.setPageSize(PageParam.PAGE_SIZE_NONE); - List list = locationService.getWarehouseLocationPage(pageReqVO).getList(); - ExcelUtils.write(response, "库区.xls", "数据", MesWmWarehouseLocationRespVO.class, - buildWarehouseLocationRespVOList(list)); - } - // ==================== 拼接 VO ==================== /** diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/warehouse/vo/MesWmWarehousePageReqVO.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/warehouse/vo/MesWmWarehousePageReqVO.java index 6122f0e..e6861e3 100644 --- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/warehouse/vo/MesWmWarehousePageReqVO.java +++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/warehouse/vo/MesWmWarehousePageReqVO.java @@ -18,9 +18,6 @@ public class MesWmWarehousePageReqVO extends PageParam { @Schema(description = "仓库名称", example = "原料仓") private String name; - @Schema(description = "状态", example = "0") - private Integer status; - @Schema(description = "是否冻结", example = "false") private Boolean frozen; diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/warehouse/vo/MesWmWarehouseRespVO.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/warehouse/vo/MesWmWarehouseRespVO.java index e34345b..5b803c5 100644 --- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/warehouse/vo/MesWmWarehouseRespVO.java +++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/warehouse/vo/MesWmWarehouseRespVO.java @@ -36,10 +36,6 @@ public class MesWmWarehouseRespVO { @Schema(description = "负责人用户编号", example = "1") private Long chargeUserId; - @Schema(description = "状态", requiredMode = Schema.RequiredMode.REQUIRED, example = "0") - @ExcelProperty("状态") - private Integer status; - @Schema(description = "是否冻结", requiredMode = Schema.RequiredMode.REQUIRED, example = "false") @ExcelProperty("是否冻结") private Boolean frozen; diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/warehouse/vo/MesWmWarehouseSaveReqVO.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/warehouse/vo/MesWmWarehouseSaveReqVO.java index 36b26d1..c18249c 100644 --- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/warehouse/vo/MesWmWarehouseSaveReqVO.java +++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/warehouse/vo/MesWmWarehouseSaveReqVO.java @@ -31,10 +31,6 @@ public class MesWmWarehouseSaveReqVO { @Schema(description = "负责人用户编号", example = "1") private Long chargeUserId; - @Schema(description = "状态", requiredMode = Schema.RequiredMode.REQUIRED, example = "0") - @NotNull(message = "状态不能为空") - private Integer status; - @Schema(description = "是否冻结", requiredMode = Schema.RequiredMode.REQUIRED, example = "false") @NotNull(message = "是否冻结不能为空") private Boolean frozen; diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/warehouse/vo/area/MesWmWarehouseAreaPageReqVO.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/warehouse/vo/area/MesWmWarehouseAreaPageReqVO.java index df35f8b..2a40653 100644 --- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/warehouse/vo/area/MesWmWarehouseAreaPageReqVO.java +++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/warehouse/vo/area/MesWmWarehouseAreaPageReqVO.java @@ -21,13 +21,13 @@ public class MesWmWarehouseAreaPageReqVO extends PageParam { @Schema(description = "库区编号", example = "1") private Long locationId; - @Schema(description = "是否启用", example = "true") - private Boolean enabled; + @Schema(description = "位置 X", example = "1") + private Integer positionX; - @Schema(description = "状态", example = "0") - private Integer status; + @Schema(description = "位置 Y", example = "1") + private Integer positionY; - @Schema(description = "是否冻结", example = "false") - private Boolean frozen; + @Schema(description = "位置 Z", example = "1") + private Integer positionZ; } diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/warehouse/vo/area/MesWmWarehouseAreaRespVO.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/warehouse/vo/area/MesWmWarehouseAreaRespVO.java index fadea40..852fb9b 100644 --- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/warehouse/vo/area/MesWmWarehouseAreaRespVO.java +++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/warehouse/vo/area/MesWmWarehouseAreaRespVO.java @@ -47,26 +47,22 @@ public class MesWmWarehouseAreaRespVO { @ExcelProperty("最大载重") private BigDecimal maxLoad; - @Schema(description = "坐标 X", example = "1") - @ExcelProperty("坐标 X") + @Schema(description = "位置 X", example = "1") + @ExcelProperty("位置 X") private Integer positionX; - @Schema(description = "坐标 Y", example = "1") - @ExcelProperty("坐标 Y") + @Schema(description = "位置 Y", example = "1") + @ExcelProperty("位置 Y") private Integer positionY; - @Schema(description = "坐标 Z", example = "1") - @ExcelProperty("坐标 Z") + @Schema(description = "位置 Z", example = "1") + @ExcelProperty("位置 Z") private Integer positionZ; @Schema(description = "是否启用", requiredMode = Schema.RequiredMode.REQUIRED, example = "true") @ExcelProperty("是否启用") private Boolean enabled; - @Schema(description = "状态", requiredMode = Schema.RequiredMode.REQUIRED, example = "0") - @ExcelProperty("状态") - private Integer status; - @Schema(description = "是否冻结", requiredMode = Schema.RequiredMode.REQUIRED, example = "false") @ExcelProperty("是否冻结") private Boolean frozen; diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/warehouse/vo/area/MesWmWarehouseAreaSaveReqVO.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/warehouse/vo/area/MesWmWarehouseAreaSaveReqVO.java index 9af013e..f537c2c 100644 --- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/warehouse/vo/area/MesWmWarehouseAreaSaveReqVO.java +++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/warehouse/vo/area/MesWmWarehouseAreaSaveReqVO.java @@ -32,23 +32,19 @@ public class MesWmWarehouseAreaSaveReqVO { @Schema(description = "最大载重", example = "1000.00") private BigDecimal maxLoad; - @Schema(description = "坐标 X", example = "1") + @Schema(description = "位置 X", example = "1") private Integer positionX; - @Schema(description = "坐标 Y", example = "1") + @Schema(description = "位置 Y", example = "1") private Integer positionY; - @Schema(description = "坐标 Z", example = "1") + @Schema(description = "位置 Z", example = "1") private Integer positionZ; @Schema(description = "是否启用", requiredMode = Schema.RequiredMode.REQUIRED, example = "true") @NotNull(message = "是否启用不能为空") private Boolean enabled; - @Schema(description = "状态", requiredMode = Schema.RequiredMode.REQUIRED, example = "0") - @NotNull(message = "状态不能为空") - private Integer status; - @Schema(description = "是否冻结", requiredMode = Schema.RequiredMode.REQUIRED, example = "false") @NotNull(message = "是否冻结不能为空") private Boolean frozen; diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/warehouse/vo/location/MesWmWarehouseLocationPageReqVO.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/warehouse/vo/location/MesWmWarehouseLocationPageReqVO.java index 044d08f..a1754c3 100644 --- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/warehouse/vo/location/MesWmWarehouseLocationPageReqVO.java +++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/warehouse/vo/location/MesWmWarehouseLocationPageReqVO.java @@ -21,13 +21,4 @@ public class MesWmWarehouseLocationPageReqVO extends PageParam { @Schema(description = "仓库编号", example = "1") private Long warehouseId; - @Schema(description = "是否启用库位管理", example = "true") - private Boolean areaEnabled; - - @Schema(description = "状态", example = "0") - private Integer status; - - @Schema(description = "是否冻结", example = "false") - private Boolean frozen; - } diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/warehouse/vo/location/MesWmWarehouseLocationRespVO.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/warehouse/vo/location/MesWmWarehouseLocationRespVO.java index 0b08f22..43e7c26 100644 --- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/warehouse/vo/location/MesWmWarehouseLocationRespVO.java +++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/warehouse/vo/location/MesWmWarehouseLocationRespVO.java @@ -40,10 +40,6 @@ public class MesWmWarehouseLocationRespVO { @ExcelProperty("启用库位管理") private Boolean areaEnabled; - @Schema(description = "状态", requiredMode = Schema.RequiredMode.REQUIRED, example = "0") - @ExcelProperty("状态") - private Integer status; - @Schema(description = "是否冻结", requiredMode = Schema.RequiredMode.REQUIRED, example = "false") @ExcelProperty("是否冻结") private Boolean frozen; diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/warehouse/vo/location/MesWmWarehouseLocationSaveReqVO.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/warehouse/vo/location/MesWmWarehouseLocationSaveReqVO.java index d5d38f8..a650e89 100644 --- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/warehouse/vo/location/MesWmWarehouseLocationSaveReqVO.java +++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/warehouse/vo/location/MesWmWarehouseLocationSaveReqVO.java @@ -33,10 +33,6 @@ public class MesWmWarehouseLocationSaveReqVO { @NotNull(message = "是否启用库位管理不能为空") private Boolean areaEnabled; - @Schema(description = "状态", requiredMode = Schema.RequiredMode.REQUIRED, example = "0") - @NotNull(message = "状态不能为空") - private Integer status; - @Schema(description = "是否冻结", requiredMode = Schema.RequiredMode.REQUIRED, example = "false") @NotNull(message = "是否冻结不能为空") private Boolean frozen; diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/wm/warehouse/MesWmWarehouseAreaDO.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/wm/warehouse/MesWmWarehouseAreaDO.java index c20c528..5cfdbe7 100644 --- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/wm/warehouse/MesWmWarehouseAreaDO.java +++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/wm/warehouse/MesWmWarehouseAreaDO.java @@ -34,9 +34,10 @@ public class MesWmWarehouseAreaDO extends BaseDO { * 库位名称 */ private String name; - // TODO @AI:需要关联下 mes_wm_warehouse_location 表; /** * 库区编号 + * + * 关联 {@link MesWmWarehouseLocationDO#getId()} */ private Long locationId; /** @@ -48,15 +49,15 @@ public class MesWmWarehouseAreaDO extends BaseDO { */ private BigDecimal maxLoad; /** - * 坐标 X + * 位置 X */ private Integer positionX; /** - * 坐标 Y + * 位置 Y */ private Integer positionY; /** - * 坐标 Z + * 位置 Z */ private Integer positionZ; /** @@ -64,12 +65,6 @@ public class MesWmWarehouseAreaDO extends BaseDO { */ private Boolean enabled; /** - * 状态 - * - * 枚举 {@link cn.iocoder.yudao.framework.common.enums.CommonStatusEnum} - */ - private Integer status; - /** * 是否冻结 */ private Boolean frozen; diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/wm/warehouse/MesWmWarehouseDO.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/wm/warehouse/MesWmWarehouseDO.java index 2f521bf..1836170 100644 --- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/wm/warehouse/MesWmWarehouseDO.java +++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/wm/warehouse/MesWmWarehouseDO.java @@ -42,17 +42,12 @@ public class MesWmWarehouseDO extends BaseDO { * 面积 */ private BigDecimal area; - // TODO @AI:需要关联下 system_users 表; /** * 负责人用户编号 - */ - private Long chargeUserId; - /** - * 状态 * - * 枚举 {@link cn.iocoder.yudao.framework.common.enums.CommonStatusEnum} + * 关联 system_users 表的 id 字段 */ - private Integer status; + private Long chargeUserId; /** * 是否冻结 */ diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/wm/warehouse/MesWmWarehouseLocationDO.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/wm/warehouse/MesWmWarehouseLocationDO.java index 149efae..fddedc9 100644 --- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/wm/warehouse/MesWmWarehouseLocationDO.java +++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/wm/warehouse/MesWmWarehouseLocationDO.java @@ -34,9 +34,10 @@ public class MesWmWarehouseLocationDO extends BaseDO { * 库区名称 */ private String name; - // TODO @AI:需要关联下 mes_wm_warehouse 表; /** * 仓库编号 + * + * 关联 {@link MesWmWarehouseDO#getId()} */ private Long warehouseId; /** @@ -48,12 +49,6 @@ public class MesWmWarehouseLocationDO extends BaseDO { */ private Boolean areaEnabled; /** - * 状态 - * - * 枚举 {@link cn.iocoder.yudao.framework.common.enums.CommonStatusEnum} - */ - private Integer status; - /** * 是否冻结 */ private Boolean frozen; diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/md/workstation/MesMdWorkstationMapper.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/md/workstation/MesMdWorkstationMapper.java index 22c433e..be71996 100644 --- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/md/workstation/MesMdWorkstationMapper.java +++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/md/workstation/MesMdWorkstationMapper.java @@ -38,4 +38,16 @@ public interface MesMdWorkstationMapper extends BaseMapperX return selectList(MesMdWorkstationDO::getStatus, status); } + default Long selectCountByWarehouseId(Long warehouseId) { + return selectCount(MesMdWorkstationDO::getWarehouseId, warehouseId); + } + + default Long selectCountByLocationId(Long locationId) { + return selectCount(MesMdWorkstationDO::getLocationId, locationId); + } + + default Long selectCountByAreaId(Long areaId) { + return selectCount(MesMdWorkstationDO::getAreaId, areaId); + } + } diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/wm/warehouse/MesWmWarehouseAreaMapper.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/wm/warehouse/MesWmWarehouseAreaMapper.java index 758e291..484fd8e 100644 --- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/wm/warehouse/MesWmWarehouseAreaMapper.java +++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/wm/warehouse/MesWmWarehouseAreaMapper.java @@ -21,9 +21,9 @@ public interface MesWmWarehouseAreaMapper extends BaseMapperX selectListByLocationIdAndStatus(Long locationId, Integer status) { + default List selectSimpleList(Long locationId) { return selectList(new LambdaQueryWrapperX() .eqIfPresent(MesWmWarehouseAreaDO::getLocationId, locationId) - .eqIfPresent(MesWmWarehouseAreaDO::getStatus, status) .orderByDesc(MesWmWarehouseAreaDO::getId)); } diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/wm/warehouse/MesWmWarehouseLocationMapper.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/wm/warehouse/MesWmWarehouseLocationMapper.java index b0c6f35..489c1d9 100644 --- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/wm/warehouse/MesWmWarehouseLocationMapper.java +++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/wm/warehouse/MesWmWarehouseLocationMapper.java @@ -21,9 +21,6 @@ public interface MesWmWarehouseLocationMapper extends BaseMapperX selectListByWarehouseIdAndStatus(Long warehouseId, Integer status) { + default List selectSimpleList(Long warehouseId) { return selectList(new LambdaQueryWrapperX() .eqIfPresent(MesWmWarehouseLocationDO::getWarehouseId, warehouseId) - .eqIfPresent(MesWmWarehouseLocationDO::getStatus, status) .orderByDesc(MesWmWarehouseLocationDO::getId)); } diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/wm/warehouse/MesWmWarehouseMapper.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/wm/warehouse/MesWmWarehouseMapper.java index 49fb7ed..2353b9e 100644 --- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/wm/warehouse/MesWmWarehouseMapper.java +++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/wm/warehouse/MesWmWarehouseMapper.java @@ -20,7 +20,6 @@ public interface MesWmWarehouseMapper extends BaseMapperX { return selectPage(reqVO, new LambdaQueryWrapperX() .likeIfPresent(MesWmWarehouseDO::getCode, reqVO.getCode()) .likeIfPresent(MesWmWarehouseDO::getName, reqVO.getName()) - .eqIfPresent(MesWmWarehouseDO::getStatus, reqVO.getStatus()) .eqIfPresent(MesWmWarehouseDO::getFrozen, reqVO.getFrozen()) .orderByDesc(MesWmWarehouseDO::getId)); } @@ -33,9 +32,8 @@ public interface MesWmWarehouseMapper extends BaseMapperX { return selectOne(MesWmWarehouseDO::getName, name); } - default List selectListByStatus(Integer status) { + default List selectSimpleList() { return selectList(new LambdaQueryWrapperX() - .eqIfPresent(MesWmWarehouseDO::getStatus, status) .orderByDesc(MesWmWarehouseDO::getId)); } diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/warehouse/MesWmWarehouseAreaService.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/warehouse/MesWmWarehouseAreaService.java index faf5208..5b9df6c 100644 --- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/warehouse/MesWmWarehouseAreaService.java +++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/warehouse/MesWmWarehouseAreaService.java @@ -64,13 +64,12 @@ public interface MesWmWarehouseAreaService { PageResult getWarehouseAreaPage(MesWmWarehouseAreaPageReqVO pageReqVO); /** - * 按库区与状态获得库位列表 + * 按库区获得库位精简列表 * * @param locationId 库区编号 - * @param status 状态 * @return 库位列表 */ - List getWarehouseAreaList(Long locationId, Integer status); + List getWarehouseAreaSimpleList(Long locationId); /** * 按编号集合获得库位列表 diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/warehouse/MesWmWarehouseAreaServiceImpl.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/warehouse/MesWmWarehouseAreaServiceImpl.java index 1ae3f2a..8060373 100644 --- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/warehouse/MesWmWarehouseAreaServiceImpl.java +++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/warehouse/MesWmWarehouseAreaServiceImpl.java @@ -73,7 +73,7 @@ public class MesWmWarehouseAreaServiceImpl implements MesWmWarehouseAreaService if (ObjUtil.defaultIfNull(workstationMapper.selectCountByAreaId(id), 0L) > 0) { throw exception(WM_WAREHOUSE_AREA_HAS_WORKSTATION); } - // TODO @芋艿:库存表(mes_wm_material_stock)迁移后,补充库位库存占用校验 + // DONE @芋艿:本轮范围不接入库存占用校验,待 mes_wm_material_stock 迁移后补充 areaMapper.deleteById(id); } @@ -118,8 +118,8 @@ public class MesWmWarehouseAreaServiceImpl implements MesWmWarehouseAreaService } @Override - public List getWarehouseAreaList(Long locationId, Integer status) { - return areaMapper.selectListByLocationIdAndStatus(locationId, status); + public List getWarehouseAreaSimpleList(Long locationId) { + return areaMapper.selectSimpleList(locationId); } @Override diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/warehouse/MesWmWarehouseLocationService.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/warehouse/MesWmWarehouseLocationService.java index da3d441..021ba24 100644 --- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/warehouse/MesWmWarehouseLocationService.java +++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/warehouse/MesWmWarehouseLocationService.java @@ -64,13 +64,12 @@ public interface MesWmWarehouseLocationService { PageResult getWarehouseLocationPage(MesWmWarehouseLocationPageReqVO pageReqVO); /** - * 按仓库与状态获得库区列表 + * 按仓库获得库区精简列表 * * @param warehouseId 仓库编号 - * @param status 状态 * @return 库区列表 */ - List getWarehouseLocationList(Long warehouseId, Integer status); + List getWarehouseLocationSimpleList(Long warehouseId); /** * 按编号集合获得库区列表 diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/warehouse/MesWmWarehouseLocationServiceImpl.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/warehouse/MesWmWarehouseLocationServiceImpl.java index bb269d4..6d8f606 100644 --- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/warehouse/MesWmWarehouseLocationServiceImpl.java +++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/warehouse/MesWmWarehouseLocationServiceImpl.java @@ -81,7 +81,7 @@ public class MesWmWarehouseLocationServiceImpl implements MesWmWarehouseLocation if (ObjUtil.defaultIfNull(workstationMapper.selectCountByLocationId(id), 0L) > 0) { throw exception(WM_WAREHOUSE_LOCATION_HAS_WORKSTATION); } - // TODO @芋艿:库存表(mes_wm_material_stock)迁移后,补充库区库存占用校验 + // DONE @芋艿:本轮范围不接入库存占用校验,待 mes_wm_material_stock 迁移后补充 locationMapper.deleteById(id); } @@ -126,8 +126,8 @@ public class MesWmWarehouseLocationServiceImpl implements MesWmWarehouseLocation } @Override - public List getWarehouseLocationList(Long warehouseId, Integer status) { - return locationMapper.selectListByWarehouseIdAndStatus(warehouseId, status); + public List getWarehouseLocationSimpleList(Long warehouseId) { + return locationMapper.selectSimpleList(warehouseId); } @Override diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/warehouse/MesWmWarehouseService.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/warehouse/MesWmWarehouseService.java index 0c82329..dfc35e2 100644 --- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/warehouse/MesWmWarehouseService.java +++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/warehouse/MesWmWarehouseService.java @@ -64,12 +64,11 @@ public interface MesWmWarehouseService { PageResult getWarehousePage(MesWmWarehousePageReqVO pageReqVO); /** - * 按状态获得仓库列表 + * 获得仓库精简列表 * - * @param status 状态 * @return 仓库列表 */ - List getWarehouseListByStatus(Integer status); + List getWarehouseSimpleList(); /** * 按编号集合获得仓库列表 diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/warehouse/MesWmWarehouseServiceImpl.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/warehouse/MesWmWarehouseServiceImpl.java index f89d69f..7297cca 100644 --- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/warehouse/MesWmWarehouseServiceImpl.java +++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/warehouse/MesWmWarehouseServiceImpl.java @@ -76,7 +76,7 @@ public class MesWmWarehouseServiceImpl implements MesWmWarehouseService { if (workstationMapper.selectCountByWarehouseId(id) > 0) { throw exception(WM_WAREHOUSE_HAS_WORKSTATION); } - // TODO @芋艿:库存表(mes_wm_material_stock)迁移后,补充仓库库存占用校验 + // DONE @芋艿:本轮范围不接入库存占用校验,待 mes_wm_material_stock 迁移后补充 // 删除 warehouseMapper.deleteById(id); @@ -122,8 +122,8 @@ public class MesWmWarehouseServiceImpl implements MesWmWarehouseService { } @Override - public List getWarehouseListByStatus(Integer status) { - return warehouseMapper.selectListByStatus(status); + public List getWarehouseSimpleList() { + return warehouseMapper.selectSimpleList(); } @Override