diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesScatterCfgDetail.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesScatterCfgDetail.java new file mode 100644 index 0000000..cb0457f --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesScatterCfgDetail.java @@ -0,0 +1,43 @@ +package cn.estsh.i3plus.pojo.mes.bean; + +import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.hibernate.annotations.DynamicInsert; +import org.hibernate.annotations.DynamicUpdate; + +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.Table; +import java.io.Serializable; +import java.math.BigDecimal; + +/** + * @Description : + * @Reference : + * @Author : zcg + * @Date : 2020/3/9 0009 - 17:58 + */ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "MES_SCATTER_CFG_DETAIL") +@Api("MES_散件配置报文关系") +public class MesScatterCfgDetail extends BaseBean implements Serializable { + + @Column(name = "SP_CFG_CODE") + @ApiParam("散件配置编码") + private String spCfgCode; + + @Column(name = "PART_NO") + @ApiParam("散件产品代码") + private String partNo; + + @Column(name = "QTY") + @ApiParam("用量") + private BigDecimal qty; +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesToolingDetail.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesToolingDetail.java new file mode 100644 index 0000000..2deb16a --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesToolingDetail.java @@ -0,0 +1,56 @@ +package cn.estsh.i3plus.pojo.mes.bean; + +import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.hibernate.annotations.DynamicInsert; +import org.hibernate.annotations.DynamicUpdate; + +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.Table; +import java.io.Serializable; + +/** + * @Description :MES工装明细 + * @Reference : + * @Author : qianhuasheng + * @CreateDate : 2020-03-19 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "MES_TOOLING_DETAIL") +@Api("MES_工装明细") +public class MesToolingDetail extends BaseBean implements Serializable { + private static final long serialVersionUID = -5033127912653649665L; + + @Column(name = "TOOLING_NO") + @ApiParam("工装编号") + private String toolingNo; + + @Column(name = "TOOLING_CODE ") + @ApiParam("工装代码") + private String toolingCode ; + + @Column(name = "TOOLING_NAME") + @ApiParam("工装名称") + private String toolingName; + + @Column(name = "TOOLING_TYPE") + @ApiParam("工装类型") + private Integer toolingType; + + @Column(name = "USE_COUNT") + @ApiParam("使用次数") + private Integer useCount; + + @Column(name = "STATUS") + @ApiParam("状态") + private Integer status; +} diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsBusiType.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsBusiType.java index f235943..3657a64 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsBusiType.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsBusiType.java @@ -49,7 +49,7 @@ public class WmsBusiType extends BaseBean { public Integer moveType; /** - * 是否启用波次计划 10-是,20-否 + * 是否启用波次计划 1-是,2-否 */ @Column(name = "IS_ENABLE_WAVE") @ApiParam("是否启用波次计划") diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTaskDetails.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTaskDetails.java index ef16765..61cb767 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTaskDetails.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTaskDetails.java @@ -28,10 +28,10 @@ import java.math.BigDecimal; @Index(columnList = "ORDER_NO"), @Index(columnList = "PART_NO"), @Index(columnList = "ITEM_STATUS") -}, uniqueConstraints = {@UniqueConstraint(columnNames = {"REF_SRC", "ITEM", "TRANS_TYPE_CODE_RDD"})}) +}) +// uniqueConstraints = {@UniqueConstraint(columnNames = {"REF_SRC", "ITEM", "TRANS_TYPE_CODE_RDD"})} @Api("作业任务明细信息") public class WmsTaskDetails extends BaseBean { - private static final long serialVersionUID = 2938720878619662102L; @Column(name = "ORDER_NO") @ApiParam(value = "单号") diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsDocMovementModel.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsDocMovementModel.java index 8f0336a..5b43149 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsDocMovementModel.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsDocMovementModel.java @@ -4,6 +4,7 @@ import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.AllArgsConstructor; import lombok.Data; +import lombok.NoArgsConstructor; import org.hibernate.annotations.ColumnDefault; /** @@ -14,6 +15,7 @@ import org.hibernate.annotations.ColumnDefault; * @Modify: **/ @Data +@NoArgsConstructor @AllArgsConstructor @Api("移库单数据模型") public class WmsDocMovementModel { @@ -43,7 +45,7 @@ public class WmsDocMovementModel { private String partGroupNo; @ApiParam("订单状态") - private String orderStatus; + private Integer orderStatus; @ApiParam(value = "优先级", example = "1") public Integer priority;