From fbab36aad2527ff2569092c56d242fbb9cce7999 Mon Sep 17 00:00:00 2001
From: "joke.wang" <joke.wang@estsh.com>
Date: Fri, 5 Mar 2021 14:40:25 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8A=A5=E5=BA=9F=E9=9A=94=E7=A6=BB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../i3plus/pojo/mes/bean/MesQuarantineRecord.java  | 76 ++++++++++++++++++++++
 .../i3plus/pojo/mes/model/StepPrintSnModel.java    | 12 +++-
 .../repository/MesQuarantineRecordRepository.java  | 13 ++++
 3 files changed, 100 insertions(+), 1 deletion(-)
 create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQuarantineRecord.java
 create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesQuarantineRecordRepository.java

diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQuarantineRecord.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQuarantineRecord.java
new file mode 100644
index 0000000..25aa552
--- /dev/null
+++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQuarantineRecord.java
@@ -0,0 +1,76 @@
+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.*;
+
+/**
+ * @Description:
+ * @Author: jokelin
+ * @Date: 2021/3/4 7:16 PM
+ * @Modify:
+ */
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Inheritance(strategy = InheritanceType.JOINED)
+@Table(name = "MES_QUARANTINE_RECORD", indexes = {
+        @Index(columnList = "SERIAL_NUMBER"),
+        @Index(columnList = "PART_NO")
+})
+@Api("隔离记录表")
+public class MesQuarantineRecord extends BaseBean {
+    private static final long serialVersionUID = -4667731056014803186L;
+
+    @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 = "QTY")
+    @ApiParam("用量")
+    private Integer qty;
+
+    @Column(name = "WORK_CELL_CODE")
+    @ApiParam("工作单元代码")
+    private String workCellCode;
+
+    @Column(name = "WORK_CENTER_CODE")
+    @ApiParam("工作中心")
+    private String workCenterCode;
+
+    @Column(name = "DEFECT_CODE")
+    @ApiParam("缺陷代码")
+    private String defectCode;
+
+    @Column(name = "DC_CODE")
+    @ApiParam("缺陷原因代码")
+    private String dcCode;
+
+    @Column(name = "REPAIR_CODE")
+    @ApiParam("维修代码")
+    private String repairCode;
+
+    @Column(name = "QUARANTINE_NO")
+    @ApiParam("隔离单号")
+    private String quarantineNo;
+
+    @Column(name = "SCRAP_No")
+    @ApiParam("报废单号")
+    private String scrapNo;
+}
diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/StepPrintSnModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/StepPrintSnModel.java
index fbc457b..232a945 100644
--- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/StepPrintSnModel.java
+++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/StepPrintSnModel.java
@@ -5,6 +5,7 @@ import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiParam;
 import lombok.Data;
 
+import javax.persistence.Column;
 import javax.persistence.Transient;
 
 /**
@@ -24,7 +25,7 @@ public class StepPrintSnModel extends MesProduceSn {
     private String printTime;
 
     @ApiParam("条码")
-    private String barCode;
+    private String /**/barCode;
 
     @ApiParam("物料号")
     private String partNo;
@@ -147,4 +148,13 @@ public class StepPrintSnModel extends MesProduceSn {
     private String tgPartDesc;
     @ApiParam("泰国过程条码截取前11位")
     private String snTop11;
+
+    @ApiParam("缺陷代码")
+    private String defectCode;
+    @ApiParam("缺陷原因代码")
+    private String dcCode;
+    @ApiParam("维修代码")
+    private String repairCode;
+    @ApiParam("质量代码")
+    private String qcCode;
 }
diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesQuarantineRecordRepository.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesQuarantineRecordRepository.java
new file mode 100644
index 0000000..bf36ba5
--- /dev/null
+++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesQuarantineRecordRepository.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.MesQuarantineRecord;
+
+/**
+ * @Description:
+ * @Author: jokelin
+ * @Date: 2021/3/4 7:38 PM
+ * @Modify:
+ */
+public interface MesQuarantineRecordRepository extends BaseRepository<MesQuarantineRecord, Long> {
+}