From bb3039d1f2a77db9e18837581184560e7b092175 Mon Sep 17 00:00:00 2001
From: "jhforever.wang@estsh.com" <jhforever.wang@estsh.com>
Date: Thu, 22 Oct 2020 15:15:43 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8C=85=E8=A3=85=E5=85=B3=E7=B3=BB=E6=9F=A5?=
 =?UTF-8?q?=E8=AF=A2=E5=AE=9D=E8=B4=9D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../i3plus/pojo/base/enumutil/MesEnumUtil.java     | 33 ++++++++++++
 .../mes/model/MgnPackageSnTraceReportModel.java    | 62 ++++++++++++++++++++++
 2 files changed, 95 insertions(+)
 create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MgnPackageSnTraceReportModel.java

diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java
index a3bc65a..a0e0dde 100644
--- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java
+++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java
@@ -12,6 +12,39 @@ import com.fasterxml.jackson.annotation.JsonFormat;
 
 public class MesEnumUtil {
 
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum PACKAGE_IS_SEALED {
+
+        UNSEALED(1, "未封箱"),
+        SEALED(2, "已封箱");
+
+        private int value;
+        private String description;
+
+        PACKAGE_IS_SEALED(int value, String description) {
+            this.value = value;
+            this.description = description;
+        }
+
+        public int getValue() {
+            return value;
+        }
+
+        public String getDescription() {
+            return description;
+        }
+
+        public static String valueOfDescription(int val) {
+            String tmp = null;
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].value == val) {
+                    tmp = values()[i].description;
+                }
+            }
+            return tmp;
+        }
+    }
+
     /**
      * MES_SPC关键数据
      */
diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MgnPackageSnTraceReportModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MgnPackageSnTraceReportModel.java
new file mode 100644
index 0000000..ad4b799
--- /dev/null
+++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MgnPackageSnTraceReportModel.java
@@ -0,0 +1,62 @@
+package cn.estsh.i3plus.pojo.mes.model;
+
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+
+@Data
+public class MgnPackageSnTraceReportModel {
+
+    @ApiParam("箱条码")
+    private String packageNo;
+
+    @ApiParam("托条码")
+    private String packageNo2;
+
+    @ApiParam("过程条码")
+    private String serialNumber;
+
+    @ApiParam("物料编号")
+    private String partNo;
+
+    @ApiParam("物料名称")
+    private String partNameRdd;
+
+    @ApiParam("工作中心代码")
+    private String workCenterCode;
+
+    @ApiParam("工作中心名称")
+    private String workCenterName;
+
+    @ApiParam(value = "创建日期")
+    public String createDatetime;
+
+    @ApiParam("是否封箱")
+    private Integer isSealed;
+
+    @ApiParam("是否封箱名称")
+    private String isSealedName;
+
+    @ApiParam(value = "工厂")
+    public String organizeCode;
+
+    @ApiParam(value="修改日期查询用，查询起始日期")
+    public String createDateTimeStart;
+
+    @ApiParam(value = "修改日期查询用，查询结束日期")
+    public String createDateTimeEnd;
+
+    public MgnPackageSnTraceReportModel() {
+    }
+
+    public MgnPackageSnTraceReportModel(String packageNo, String packageNo2, String serialNumber, String partNo, String partNameRdd, Integer isSealed, String createDatetime, String workCenterCode, String workCenterName) {
+        this.packageNo = packageNo;
+        this.packageNo2 = packageNo2;
+        this.serialNumber = serialNumber;
+        this.partNo = partNo;
+        this.partNameRdd = partNameRdd;
+        this.isSealed = isSealed;
+        this.createDatetime = createDatetime;
+        this.workCenterCode = workCenterCode;
+        this.workCenterName = workCenterName;
+    }
+}