diff --git a/mhd_oms/src/main/java/com/mhd/oms/domain/businessDocumentCargoMulti/entity/BusinessDocumentCargoMulti.java b/mhd_oms/src/main/java/com/mhd/oms/domain/businessDocumentCargoMulti/entity/BusinessDocumentCargoMulti.java index 22880a0b9..81182421e 100644 --- a/mhd_oms/src/main/java/com/mhd/oms/domain/businessDocumentCargoMulti/entity/BusinessDocumentCargoMulti.java +++ b/mhd_oms/src/main/java/com/mhd/oms/domain/businessDocumentCargoMulti/entity/BusinessDocumentCargoMulti.java @@ -105,4 +105,7 @@ public class BusinessDocumentCargoMulti extends BaseVOEntity{ @ApiModelProperty("货物内容") private String materialContent; + + @ApiModelProperty("商品类型/货物类型(0料件,1半成品,2成品)") + private Integer productType; } diff --git a/mhd_oms/src/main/java/com/mhd/oms/domain/businessDocumentCargoMulti/repository/po/BusinessDocumentCargoMultiPO.java b/mhd_oms/src/main/java/com/mhd/oms/domain/businessDocumentCargoMulti/repository/po/BusinessDocumentCargoMultiPO.java index 4b635ffe5..8335fac62 100644 --- a/mhd_oms/src/main/java/com/mhd/oms/domain/businessDocumentCargoMulti/repository/po/BusinessDocumentCargoMultiPO.java +++ b/mhd_oms/src/main/java/com/mhd/oms/domain/businessDocumentCargoMulti/repository/po/BusinessDocumentCargoMultiPO.java @@ -62,6 +62,10 @@ public class BusinessDocumentCargoMultiPO extends BaseVOEntity{ @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") private BigDecimal cargoWeight; + @ApiModelProperty("商品类型/货物类型(0料件,1半成品,2成品)") + private Integer productType; + @ApiModelProperty("物料id") + private Long materialBaseInfoId; } diff --git a/mhd_oms/src/main/java/com/mhd/oms/domain/businessDocumentCargoMulti/repository/todo/BusinessDocumentCargoMultiDO.java b/mhd_oms/src/main/java/com/mhd/oms/domain/businessDocumentCargoMulti/repository/todo/BusinessDocumentCargoMultiDO.java index 6d6244e98..1f9e2c7f8 100644 --- a/mhd_oms/src/main/java/com/mhd/oms/domain/businessDocumentCargoMulti/repository/todo/BusinessDocumentCargoMultiDO.java +++ b/mhd_oms/src/main/java/com/mhd/oms/domain/businessDocumentCargoMulti/repository/todo/BusinessDocumentCargoMultiDO.java @@ -67,4 +67,10 @@ public class BusinessDocumentCargoMultiDO extends BaseVOEntity{ @ApiModelProperty(name = "权限菜单ID") private Long permissionMenuId; + + @ApiModelProperty("商品类型/货物类型(0料件,1半成品,2成品)") + private Integer productType; + + @ApiModelProperty("物料id") + private Long materialBaseInfoId; } diff --git a/mhd_oms/src/main/java/com/mhd/oms/interfaces/dto/businessDocumentCargoMulti/BusinessDocumentCargoMultiDTO.java b/mhd_oms/src/main/java/com/mhd/oms/interfaces/dto/businessDocumentCargoMulti/BusinessDocumentCargoMultiDTO.java index d9f04a307..c5fbd0692 100644 --- a/mhd_oms/src/main/java/com/mhd/oms/interfaces/dto/businessDocumentCargoMulti/BusinessDocumentCargoMultiDTO.java +++ b/mhd_oms/src/main/java/com/mhd/oms/interfaces/dto/businessDocumentCargoMulti/BusinessDocumentCargoMultiDTO.java @@ -108,4 +108,7 @@ public class BusinessDocumentCargoMultiDTO extends BaseVOEntity{ @ApiModelProperty("货物内容") private String materialContent; + @ApiModelProperty("商品类型/货物类型(0料件,1半成品,2成品)") + private Integer productType; + }