diff --git a/mhd-modules/mhd-system/src/main/java/com/mhd/basic/domain/storageLocation/entity/StorageLocation.java b/mhd-modules/mhd-system/src/main/java/com/mhd/basic/domain/storageLocation/entity/StorageLocation.java index 70ffc6d94..dd0080288 100644 --- a/mhd-modules/mhd-system/src/main/java/com/mhd/basic/domain/storageLocation/entity/StorageLocation.java +++ b/mhd-modules/mhd-system/src/main/java/com/mhd/basic/domain/storageLocation/entity/StorageLocation.java @@ -165,6 +165,8 @@ public class StorageLocation extends BaseVOEntity{ @ApiModelProperty("是否作废: 1-否 2-是") @Excel(name = "是否作废: 1-否 2-是") private Integer nullify; + @ApiModelProperty("库位条码") + @Excel(name = "库位条码") + private String locationBarCode; - -} +} \ No newline at end of file diff --git a/mhd-modules/mhd-system/src/main/java/com/mhd/basic/domain/storageLocation/repository/po/StorageLocationPO.java b/mhd-modules/mhd-system/src/main/java/com/mhd/basic/domain/storageLocation/repository/po/StorageLocationPO.java index 6a3a87500..f5ed89202 100644 --- a/mhd-modules/mhd-system/src/main/java/com/mhd/basic/domain/storageLocation/repository/po/StorageLocationPO.java +++ b/mhd-modules/mhd-system/src/main/java/com/mhd/basic/domain/storageLocation/repository/po/StorageLocationPO.java @@ -165,6 +165,8 @@ public class StorageLocationPO extends BaseVOEntity{ @Excel(name = "是否作废: 1-否 2-是") private Integer nullify; + @ApiModelProperty("库位条码") + @Excel(name = "库位条码") + private String locationBarCode; - -} +} \ No newline at end of file diff --git a/mhd-modules/mhd-system/src/main/java/com/mhd/basic/domain/storageLocation/repository/todo/StorageLocationDO.java b/mhd-modules/mhd-system/src/main/java/com/mhd/basic/domain/storageLocation/repository/todo/StorageLocationDO.java index e7ca22e26..b46cbb574 100644 --- a/mhd-modules/mhd-system/src/main/java/com/mhd/basic/domain/storageLocation/repository/todo/StorageLocationDO.java +++ b/mhd-modules/mhd-system/src/main/java/com/mhd/basic/domain/storageLocation/repository/todo/StorageLocationDO.java @@ -204,4 +204,8 @@ public class StorageLocationDO extends BaseVOEntity{ @ApiModelProperty("坐标-层 终止") @Excel(name = "坐标-层 终止") private String coordinateLayerEnd; -} + + @ApiModelProperty("库位条码") + @Excel(name = "库位条码") + private String locationBarCode; +} \ No newline at end of file diff --git a/mhd-modules/mhd-system/src/main/java/com/mhd/basic/interfaces/dto/storageLocation/StorageLocationDTO.java b/mhd-modules/mhd-system/src/main/java/com/mhd/basic/interfaces/dto/storageLocation/StorageLocationDTO.java index 7c5968adb..3693b405c 100644 --- a/mhd-modules/mhd-system/src/main/java/com/mhd/basic/interfaces/dto/storageLocation/StorageLocationDTO.java +++ b/mhd-modules/mhd-system/src/main/java/com/mhd/basic/interfaces/dto/storageLocation/StorageLocationDTO.java @@ -212,7 +212,11 @@ public class StorageLocationDTO extends BaseVOEntity{ @Excel(name = "坐标-层 终止") private String coordinateLayerEnd; + @ApiModelProperty("库位条码") + @Excel(name = "库位条码") + private String locationBarCode; + public interface Edit {} public interface BatchInsert {} -} +} \ No newline at end of file diff --git a/mhd-modules/mhd-system/src/main/resources/mapper/basic/storageLocation/StorageLocationMapper.xml b/mhd-modules/mhd-system/src/main/resources/mapper/basic/storageLocation/StorageLocationMapper.xml index 4ff52f6cc..e2915658e 100644 --- a/mhd-modules/mhd-system/src/main/resources/mapper/basic/storageLocation/StorageLocationMapper.xml +++ b/mhd-modules/mhd-system/src/main/resources/mapper/basic/storageLocation/StorageLocationMapper.xml @@ -47,6 +47,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + @@ -58,7 +59,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" a.storage_location_classify, a.storage_location_classify_name, a.storage_location_type, a.storage_location_type_name, a.mixing_strategy, a.mixing_strategy_name, a.storage_location_group_id, a.storage_location_group_code, a.storage_location_group_name, a.weight_limit, a.volume_limit, a.location_size, a.location_length, a.location_width, a.location_height, - a.coordinate, a.coordinate_area, a.coordinate_column, a.coordinate_row, a.coordinate_layer, a.remark, + a.coordinate, a.coordinate_area, a.coordinate_column, a.coordinate_row, a.coordinate_layer, a.remark, a.LOCATION_BAR_CODE, a.opening_up, a.nullify, a.status, a.create_time, a.create_by, a.create_by_name, a.update_time, a.update_by, a.update_by_name, a.del_flag from storage_location a LEFT JOIN warehouse w ON a.warehouse_id = w.warehouse_id AND w.del_flag = 1