Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev

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;
+}

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;
+}