From 1c8c945f8e49ef923ea594ac53f164b3d3b1ab01 Mon Sep 17 00:00:00 2001
From: "joke.wang" <joke.wang@estsh.com>
Date: Mon, 4 Jan 2021 17:56:26 +0800
Subject: [PATCH] =?UTF-8?q?Tha=20=E5=B7=A5=E5=8D=95=E6=89=93=E5=8D=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../estsh/i3plus/pojo/mes/bean/MesProduceSn.java   | 50 +++++++++++++++++++++-
 .../i3plus/pojo/mes/model/StepPrintSnModel.java    |  2 +
 2 files changed, 51 insertions(+), 1 deletion(-)

diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProduceSn.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProduceSn.java
index 0bdd015..b07ece5 100644
--- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProduceSn.java
+++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProduceSn.java
@@ -131,7 +131,6 @@ public class MesProduceSn extends BaseBean implements Serializable {
     @ApiParam("条码类型 10=正常 20=首检件")
     private Integer snType;
 
-
     @Column(name = "TRAY_NO")
     @ApiParam("托盘号")
     private String trayNo;
@@ -233,6 +232,10 @@ public class MesProduceSn extends BaseBean implements Serializable {
     @ApiParam("颜色名称")
     private String colorName;
 
+    @Transient
+    @ApiParam("物料版本号")
+    private String versionNo;
+
     public MesProduceSn() {
     }
 
@@ -241,6 +244,51 @@ public class MesProduceSn extends BaseBean implements Serializable {
         this.qcStatus = qcStatus;
         this.qty = qty;
     }
+//sn.serialNumber, sn.productSn, " +
+//                " sn.partNo, sn.partNameRdd, sn.qty, sn.qcStatus, sn.snStatus, sn.printCount, sn.printStatus" +
+//                " sn.workCenterCode, sn.workCellCode, sn.routeCode, sn.processCode, sn.nextProcessCode, sn.inWorkCenterTime, " +
+//                " sn.outWorkCenterTime, sn.shippingTime, sn.workOrderNo, sn.custSn, sn.custPartNo, sn.custCode," +
+//                " sn.snType, sn.trayNo, sn.operateType, sn.processLabelTemplate, sn.prodLabelTemplate, sn.custLabelTemplate, " +
+//                " sn.lotNo, sn.defectActionType, sn.vinCode, p.versionNo
+    public MesProduceSn(Long id, String serialNumber, String productSn, String partNo, String partNameRdd, Double qty, Integer qcStatus, Integer snStatus,
+                        Integer printCount, Integer printStatus, String workCenterCode, String workCellCode, String routeCode, String processCode,
+                        String nextProcessCode, String inWorkCenterTime, String outWorkCenterTime, String shippingTime, String workOrderNo,
+                        String custSn, String custPartNo, String custCode, Integer snType, String trayNo, Integer operateType,
+                        String processLabelTemplate, String prodLabelTemplate, String custLabelTemplate, String lotNo,
+                        String defectActionType, String vinCode, String versionNo) {
+        this.id = id;
+        this.serialNumber = serialNumber;
+        this.productSn = productSn;
+        this.partNo = partNo;
+        this.partNameRdd = partNameRdd;
+        this.qty = qty;
+        this.qcStatus = qcStatus;
+        this.snStatus = snStatus;
+        this.printCount = printCount;
+        this.printStatus = printStatus;
+        this.workCenterCode = workCenterCode;
+        this.workCellCode = workCellCode;
+        this.routeCode = routeCode;
+        this.processCode = processCode;
+        this.nextProcessCode = nextProcessCode;
+        this.inWorkCenterTime = inWorkCenterTime;
+        this.outWorkCenterTime = outWorkCenterTime;
+        this.shippingTime = shippingTime;
+        this.workOrderNo = workOrderNo;
+        this.custSn = custSn;
+        this.custPartNo = custPartNo;
+        this.custCode = custCode;
+        this.snType = snType;
+        this.trayNo = trayNo;
+        this.operateType = operateType;
+        this.processLabelTemplate = processLabelTemplate;
+        this.prodLabelTemplate = prodLabelTemplate;
+        this.custLabelTemplate = custLabelTemplate;
+        this.lotNo = lotNo;
+        this.defectActionType = defectActionType;
+        this.vinCode = vinCode;
+        this.versionNo = versionNo;
+    }
 
     public double getQtyVal() {
         return this.qty == null ? 0.0d : this.qty;
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 e93626f..82dfdf8 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
@@ -139,4 +139,6 @@ public class StepPrintSnModel extends MesProduceSn {
     @ApiParam("产品位置名称")
     private String produceCategoryName;
 
+    @ApiParam("版本号")
+    private String versionNo;
 }