diff --git a/mhd_oms/src/main/java/com/mhd/oms/domain/reservationOutMaterialDetail/entity/ReservationOutMaterialDetail.java b/mhd_oms/src/main/java/com/mhd/oms/domain/reservationOutMaterialDetail/entity/ReservationOutMaterialDetail.java index d0191d560..4c5df285d 100644 --- a/mhd_oms/src/main/java/com/mhd/oms/domain/reservationOutMaterialDetail/entity/ReservationOutMaterialDetail.java +++ b/mhd_oms/src/main/java/com/mhd/oms/domain/reservationOutMaterialDetail/entity/ReservationOutMaterialDetail.java @@ -60,7 +60,9 @@ public class ReservationOutMaterialDetail extends BaseVOEntity { @ApiModelProperty("物料名称") @Excel(name = "物料名称") private String materialName; - + @ApiModelProperty("物料名称") + @Excel(name = "物料名称") + private String reserveMaterialName; @ApiModelProperty("物料条形码") @Excel(name = "物料条形码") private String barCode; diff --git a/mhd_oms/src/main/java/com/mhd/oms/domain/reservationOutMaterialDetail/repository/po/ReservationOutMaterialDetailPO.java b/mhd_oms/src/main/java/com/mhd/oms/domain/reservationOutMaterialDetail/repository/po/ReservationOutMaterialDetailPO.java index 8a33c427c..8164f2a13 100644 --- a/mhd_oms/src/main/java/com/mhd/oms/domain/reservationOutMaterialDetail/repository/po/ReservationOutMaterialDetailPO.java +++ b/mhd_oms/src/main/java/com/mhd/oms/domain/reservationOutMaterialDetail/repository/po/ReservationOutMaterialDetailPO.java @@ -62,7 +62,9 @@ public class ReservationOutMaterialDetailPO extends ReservationStockOutOrderBase @ApiModelProperty("物料名称") @Excel(name = "物料名称") private String materialName; - + @ApiModelProperty("物料名称") + @Excel(name = "物料名称") + private String reserveMaterialName; @ApiModelProperty("物料条形码") @Excel(name = "物料条形码") private String barCode; diff --git a/mhd_oms/src/main/java/com/mhd/oms/domain/reservationOutMaterialDetail/repository/todo/ReservationOutMaterialDetailDO.java b/mhd_oms/src/main/java/com/mhd/oms/domain/reservationOutMaterialDetail/repository/todo/ReservationOutMaterialDetailDO.java index 2bb863e47..ab5e26364 100644 --- a/mhd_oms/src/main/java/com/mhd/oms/domain/reservationOutMaterialDetail/repository/todo/ReservationOutMaterialDetailDO.java +++ b/mhd_oms/src/main/java/com/mhd/oms/domain/reservationOutMaterialDetail/repository/todo/ReservationOutMaterialDetailDO.java @@ -60,7 +60,9 @@ public class ReservationOutMaterialDetailDO extends BaseVOEntity { @ApiModelProperty("物料名称") @Excel(name = "物料名称") private String materialName; - + @ApiModelProperty("物料名称") + @Excel(name = "物料名称") + private String reserveMaterialName; @ApiModelProperty("物料条形码") @Excel(name = "物料条形码") private String barCode; diff --git a/mhd_oms/src/main/java/com/mhd/oms/domain/reservationOutMaterialDetail/repository/todo/ReservationOutMaterialDetailDTO.java b/mhd_oms/src/main/java/com/mhd/oms/domain/reservationOutMaterialDetail/repository/todo/ReservationOutMaterialDetailDTO.java index 16c980536..46e5cdee6 100644 --- a/mhd_oms/src/main/java/com/mhd/oms/domain/reservationOutMaterialDetail/repository/todo/ReservationOutMaterialDetailDTO.java +++ b/mhd_oms/src/main/java/com/mhd/oms/domain/reservationOutMaterialDetail/repository/todo/ReservationOutMaterialDetailDTO.java @@ -58,7 +58,9 @@ public class ReservationOutMaterialDetailDTO extends BaseVOEntity { @ApiModelProperty("物料名称") @Excel(name = "物料名称") private String materialName; - + @ApiModelProperty("物料名称") + @Excel(name = "物料名称") + private String reserveMaterialName; @ApiModelProperty("物料条形码") @Excel(name = "物料条形码") private String barCode; diff --git a/mhd_oms/src/main/java/com/mhd/oms/domain/reserveOutMaterialDetail/entity/ReserveOutMaterialDetail.java b/mhd_oms/src/main/java/com/mhd/oms/domain/reserveOutMaterialDetail/entity/ReserveOutMaterialDetail.java index 7ad91c848..aa716108d 100644 --- a/mhd_oms/src/main/java/com/mhd/oms/domain/reserveOutMaterialDetail/entity/ReserveOutMaterialDetail.java +++ b/mhd_oms/src/main/java/com/mhd/oms/domain/reserveOutMaterialDetail/entity/ReserveOutMaterialDetail.java @@ -60,7 +60,9 @@ public class ReserveOutMaterialDetail extends BaseVOEntity { @ApiModelProperty("物料名称") @Excel(name = "物料名称") private String materialName; - + @ApiModelProperty("物料名称") + @Excel(name = "物料名称") + private String reserveMaterialName; @ApiModelProperty("物料条形码") @Excel(name = "物料条形码") private String barCode; diff --git a/mhd_oms/src/main/java/com/mhd/oms/domain/reserveOutMaterialDetail/repository/po/ReserveOutMaterialDetailPO.java b/mhd_oms/src/main/java/com/mhd/oms/domain/reserveOutMaterialDetail/repository/po/ReserveOutMaterialDetailPO.java index 08678da7b..43b3be623 100644 --- a/mhd_oms/src/main/java/com/mhd/oms/domain/reserveOutMaterialDetail/repository/po/ReserveOutMaterialDetailPO.java +++ b/mhd_oms/src/main/java/com/mhd/oms/domain/reserveOutMaterialDetail/repository/po/ReserveOutMaterialDetailPO.java @@ -64,7 +64,9 @@ public class ReserveOutMaterialDetailPO extends ReserveStockOutOrderBaseDO { @ApiModelProperty("物料名称") @Excel(name = "物料名称") private String materialName; - + @ApiModelProperty("物料名称") + @Excel(name = "物料名称") + private String reserveMaterialName; @ApiModelProperty("物料条形码") @Excel(name = "物料条形码") private String barCode; diff --git a/mhd_oms/src/main/java/com/mhd/oms/domain/reserveOutMaterialDetail/repository/todo/ReserveOutMaterialDetailDO.java b/mhd_oms/src/main/java/com/mhd/oms/domain/reserveOutMaterialDetail/repository/todo/ReserveOutMaterialDetailDO.java index f620a8d28..f7b6767b2 100644 --- a/mhd_oms/src/main/java/com/mhd/oms/domain/reserveOutMaterialDetail/repository/todo/ReserveOutMaterialDetailDO.java +++ b/mhd_oms/src/main/java/com/mhd/oms/domain/reserveOutMaterialDetail/repository/todo/ReserveOutMaterialDetailDO.java @@ -57,7 +57,9 @@ public class ReserveOutMaterialDetailDO extends BaseVOEntity { @ApiModelProperty("物料名称") @Excel(name = "物料名称") private String materialName; - + @ApiModelProperty("物料名称") + @Excel(name = "物料名称") + private String reserveMaterialName; @ApiModelProperty("物料条形码") @Excel(name = "物料条形码") private String barCode; diff --git a/mhd_oms/src/main/java/com/mhd/oms/domain/reserveOutMaterialDetail/repository/todo/ReserveOutMaterialDetailDTO.java b/mhd_oms/src/main/java/com/mhd/oms/domain/reserveOutMaterialDetail/repository/todo/ReserveOutMaterialDetailDTO.java index dd0c4e76f..1424e30d4 100644 --- a/mhd_oms/src/main/java/com/mhd/oms/domain/reserveOutMaterialDetail/repository/todo/ReserveOutMaterialDetailDTO.java +++ b/mhd_oms/src/main/java/com/mhd/oms/domain/reserveOutMaterialDetail/repository/todo/ReserveOutMaterialDetailDTO.java @@ -56,7 +56,9 @@ public class ReserveOutMaterialDetailDTO extends BaseVOEntity { @ApiModelProperty("物料名称") @Excel(name = "物料名称") private String materialName; - + @ApiModelProperty("物料名称") + @Excel(name = "物料名称") + private String reserveMaterialName; @ApiModelProperty("物料条形码") @Excel(name = "物料条形码") private String barCode;