diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java index 37ae66f..5e2a4b1 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java @@ -857,7 +857,8 @@ public class WmsEnumUtil { CUSTOMER_RETURN_SCRAP(660, "CUSTOMER_RETURN_SCRAP", "客户退货报废"), MATERIAL_SCRAP(670, "MATERIAL_SCRAP", "物料报废"), PROD_SCRAP(680, "PROD_SCRAP", "生产报废"), - OUT_RETURN_SOURCING(690, "PROD_SCRAP", "委外返工发料"); + OUT_RETURN_SOURCING(690, "OUT_RETURN_SOURCING", "委外返工发料"), + OUT_RETURN_RECOVER(700, "OUT_RETURN_RECOVER", "委外返工收回"); private int value; private String code; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPartStockSchedule.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPartStockSchedule.java index 6c41884..98adfc4 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPartStockSchedule.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPartStockSchedule.java @@ -11,6 +11,7 @@ import org.hibernate.annotations.DynamicUpdate; import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Table; +import javax.persistence.Transient; import java.io.Serializable; /** @@ -65,4 +66,8 @@ public class MesPartStockSchedule extends BaseBean implements Serializable { @Column(name = "PROD_CFG_CODE") @ApiParam("配置代码") private String prodCfgCode; + + @Transient + @ApiParam("物料名称") + private String partName; } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/InjectionFeedingModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/InjectionFeedingModel.java index 8820837..7148de0 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/InjectionFeedingModel.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/InjectionFeedingModel.java @@ -20,6 +20,9 @@ public class InjectionFeedingModel { @ApiParam("原材料物料号") private String partNo; + @ApiParam("原材料物料名称") + private String partName; + @ApiParam("是否锁定:1=是,2=否") private Integer lockFlag;