From db23233a8f9cd24c962416358219929f07ab33b9 Mon Sep 17 00:00:00 2001
From: "joke.wang" <joke.wang@estsh.com>
Date: Sat, 1 May 2021 12:32:43 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=AE=B9=E5=99=A8=E6=9D=A1?=
 =?UTF-8?q?=E7=A0=81=E8=AE=B0=E5=BD=95=E8=A1=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../i3plus/pojo/mes/bean/MesContainerSnRecord.java | 55 ++++++++++++++++++++++
 .../estsh/i3plus/pojo/mes/bean/MesWorkOrder.java   |  4 ++
 .../repository/MesContainerSnRecordRepository.java | 13 +++++
 3 files changed, 72 insertions(+)
 create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesContainerSnRecord.java
 create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesContainerSnRecordRepository.java

diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesContainerSnRecord.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesContainerSnRecord.java
new file mode 100644
index 0000000..5438adf
--- /dev/null
+++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesContainerSnRecord.java
@@ -0,0 +1,55 @@
+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.*;
+import java.io.Serializable;
+
+/**
+ * @Description:
+ * @Reference:
+ * @Author: Crish
+ * @CreateDate:2019-04-16-17:36
+ * @Modify:
+ **/
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Inheritance(strategy = InheritanceType.JOINED)
+@Table(name = "MES_CONTAINER_SN_RECORD", indexes = {
+        @Index(columnList = "SERIAL_NUMBER"),
+        @Index(columnList = "PART_NO"),
+        @Index(columnList = "CT_NO")
+})
+@Api("容器条码记录表")
+public class MesContainerSnRecord extends BaseBean implements Serializable {
+    private static final long serialVersionUID = -1630924042562178494L;
+
+    @Column(name = "SERIAL_NUMBER")
+    @ApiParam("过程条码")
+    private String serialNumber;
+
+    @Column(name = "PART_NO")
+    @ApiParam("物料号")
+    private String partNo;
+
+    @Column(name = "PART_NAME")
+    @ApiParam("物料名称")
+    private String partName;
+
+    @Column(name = "CT_NO")
+    @ApiParam("容器号")
+    private String ctNo;
+
+    @Column(name = "QTY")
+    @ApiParam("数量")
+    private Double qty;
+}
diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkOrder.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkOrder.java
index 57fe9f5..6d92fb6 100644
--- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkOrder.java
+++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkOrder.java
@@ -393,6 +393,10 @@ public class MesWorkOrder extends BaseBean implements Serializable {
     @ApiParam("生产节拍")
     private Integer takt;
 
+    @Transient
+    @ApiParam("容器号")
+    private String ctNo;
+
     /**********************  动态冗余字段（界面维护大写） *********************************/
 
     @Transient
diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesContainerSnRecordRepository.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesContainerSnRecordRepository.java
new file mode 100644
index 0000000..86ae6e7
--- /dev/null
+++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesContainerSnRecordRepository.java
@@ -0,0 +1,13 @@
+package cn.estsh.i3plus.pojo.mes.repository;
+
+import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
+import cn.estsh.i3plus.pojo.mes.bean.MesContainerSnRecord;
+
+/**
+ * @Description:
+ * @Author: jokelin
+ * @Date: 2021/5/1 12:21 PM
+ * @Modify:
+ */
+public interface MesContainerSnRecordRepository extends BaseRepository<MesContainerSnRecord, Long> {
+}