Commit 8b785cf2fe12526ce3fe55932f309934e213a89f
1 parent
ebe2bc57
♻️ refactor(location): 移除库位管理状态字段
Showing
4 changed files
with
1 additions
and
16 deletions
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/warehouse/vo/location/MesWmWarehouseLocationRespVO.java
| @@ -36,10 +36,6 @@ public class MesWmWarehouseLocationRespVO { | @@ -36,10 +36,6 @@ public class MesWmWarehouseLocationRespVO { | ||
| 36 | @ExcelProperty("面积") | 36 | @ExcelProperty("面积") |
| 37 | private BigDecimal area; | 37 | private BigDecimal area; |
| 38 | 38 | ||
| 39 | - @Schema(description = "库位管理状态", requiredMode = Schema.RequiredMode.REQUIRED, example = "0") | ||
| 40 | - @ExcelProperty("库位管理状态") | ||
| 41 | - private Integer areaStatus; | ||
| 42 | - | ||
| 43 | @Schema(description = "是否冻结", requiredMode = Schema.RequiredMode.REQUIRED, example = "false") | 39 | @Schema(description = "是否冻结", requiredMode = Schema.RequiredMode.REQUIRED, example = "false") |
| 44 | @ExcelProperty("是否冻结") | 40 | @ExcelProperty("是否冻结") |
| 45 | private Boolean frozen; | 41 | private Boolean frozen; |
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/warehouse/vo/location/MesWmWarehouseLocationSaveReqVO.java
| @@ -29,10 +29,6 @@ public class MesWmWarehouseLocationSaveReqVO { | @@ -29,10 +29,6 @@ public class MesWmWarehouseLocationSaveReqVO { | ||
| 29 | @Schema(description = "面积", example = "500.00") | 29 | @Schema(description = "面积", example = "500.00") |
| 30 | private BigDecimal area; | 30 | private BigDecimal area; |
| 31 | 31 | ||
| 32 | - @Schema(description = "库位管理状态", requiredMode = Schema.RequiredMode.REQUIRED, example = "0") | ||
| 33 | - @NotNull(message = "库位管理状态不能为空") | ||
| 34 | - private Integer areaStatus; | ||
| 35 | - | ||
| 36 | @Schema(description = "是否冻结", requiredMode = Schema.RequiredMode.REQUIRED, example = "false") | 32 | @Schema(description = "是否冻结", requiredMode = Schema.RequiredMode.REQUIRED, example = "false") |
| 37 | @NotNull(message = "是否冻结不能为空") | 33 | @NotNull(message = "是否冻结不能为空") |
| 38 | private Boolean frozen; | 34 | private Boolean frozen; |
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/wm/warehouse/MesWmWarehouseLocationDO.java
| @@ -50,12 +50,6 @@ public class MesWmWarehouseLocationDO extends BaseDO { | @@ -50,12 +50,6 @@ public class MesWmWarehouseLocationDO extends BaseDO { | ||
| 50 | */ | 50 | */ |
| 51 | private BigDecimal area; | 51 | private BigDecimal area; |
| 52 | /** | 52 | /** |
| 53 | - * 库位管理状态 | ||
| 54 | - * | ||
| 55 | - * 枚举 {@link cn.iocoder.yudao.framework.common.enums.CommonStatusEnum} | ||
| 56 | - */ | ||
| 57 | - private Integer areaStatus; | ||
| 58 | - /** | ||
| 59 | * 是否冻结 | 53 | * 是否冻结 |
| 60 | */ | 54 | */ |
| 61 | private Boolean frozen; | 55 | private Boolean frozen; |
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/warehouse/MesWmWarehouseLocationServiceImpl.java
| @@ -6,8 +6,8 @@ import cn.iocoder.yudao.framework.common.pojo.PageResult; | @@ -6,8 +6,8 @@ import cn.iocoder.yudao.framework.common.pojo.PageResult; | ||
| 6 | import cn.iocoder.yudao.framework.common.util.object.BeanUtils; | 6 | import cn.iocoder.yudao.framework.common.util.object.BeanUtils; |
| 7 | import cn.iocoder.yudao.module.mes.controller.admin.wm.warehouse.vo.location.MesWmWarehouseLocationPageReqVO; | 7 | import cn.iocoder.yudao.module.mes.controller.admin.wm.warehouse.vo.location.MesWmWarehouseLocationPageReqVO; |
| 8 | import cn.iocoder.yudao.module.mes.controller.admin.wm.warehouse.vo.location.MesWmWarehouseLocationSaveReqVO; | 8 | import cn.iocoder.yudao.module.mes.controller.admin.wm.warehouse.vo.location.MesWmWarehouseLocationSaveReqVO; |
| 9 | -import cn.iocoder.yudao.module.mes.dal.dataobject.wm.warehouse.MesWmWarehouseLocationDO; | ||
| 10 | import cn.iocoder.yudao.module.mes.dal.dataobject.wm.warehouse.MesWmWarehouseDO; | 9 | import cn.iocoder.yudao.module.mes.dal.dataobject.wm.warehouse.MesWmWarehouseDO; |
| 10 | +import cn.iocoder.yudao.module.mes.dal.dataobject.wm.warehouse.MesWmWarehouseLocationDO; | ||
| 11 | import cn.iocoder.yudao.module.mes.dal.mysql.wm.warehouse.MesWmWarehouseLocationMapper; | 11 | import cn.iocoder.yudao.module.mes.dal.mysql.wm.warehouse.MesWmWarehouseLocationMapper; |
| 12 | import cn.iocoder.yudao.module.mes.enums.wm.BarcodeBizTypeEnum; | 12 | import cn.iocoder.yudao.module.mes.enums.wm.BarcodeBizTypeEnum; |
| 13 | import cn.iocoder.yudao.module.mes.service.md.workstation.MesMdWorkstationService; | 13 | import cn.iocoder.yudao.module.mes.service.md.workstation.MesMdWorkstationService; |
| @@ -190,7 +190,6 @@ public class MesWmWarehouseLocationServiceImpl implements MesWmWarehouseLocation | @@ -190,7 +190,6 @@ public class MesWmWarehouseLocationServiceImpl implements MesWmWarehouseLocation | ||
| 190 | // 2.2 自动初始化 | 190 | // 2.2 自动初始化 |
| 191 | MesWmWarehouseLocationDO newLocation = MesWmWarehouseLocationDO.builder() | 191 | MesWmWarehouseLocationDO newLocation = MesWmWarehouseLocationDO.builder() |
| 192 | .warehouseId(warehouse.getId()).code(code).name("虚拟线边库区") | 192 | .warehouseId(warehouse.getId()).code(code).name("虚拟线边库区") |
| 193 | - .areaStatus(cn.iocoder.yudao.framework.common.enums.CommonStatusEnum.ENABLE.getStatus()) | ||
| 194 | .frozen(false).remark("系统自动初始化的虚拟线边库区") | 193 | .frozen(false).remark("系统自动初始化的虚拟线边库区") |
| 195 | .build(); | 194 | .build(); |
| 196 | locationMapper.insert(newLocation); | 195 | locationMapper.insert(newLocation); |