From f302b4d5f1289d89ba9097ec8f38d188ec1515ca Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AE=8B=E5=86=9B=E8=B6=85?= <adair.song@estsh.com>
Date: Sat, 9 May 2020 18:14:07 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9MES=5F=E6=A3=80=E9=AA=8C?=
 =?UTF-8?q?=E5=8D=95=E5=AE=9E=E4=BD=93=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../cn/estsh/i3plus/pojo/mes/bean/MesQcOrderDetail.java     | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQcOrderDetail.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQcOrderDetail.java
index 33fb5c9..7af9162 100644
--- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQcOrderDetail.java
+++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQcOrderDetail.java
@@ -12,6 +12,7 @@ import org.hibernate.annotations.DynamicUpdate;
 import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.persistence.Table;
+import javax.persistence.Transient;
 import java.io.Serializable;
 
 /**
@@ -52,7 +53,7 @@ public class MesQcOrderDetail extends BaseBean implements Serializable {
 
     @Column(name = "CHECK_GUIDE")
     @ApiParam("检测指导")
-    private String supplierCode;
+    private String checkGuide;
 
     @Column(name = "CHECK_FREQUENCY")
     @ApiParam("频率")
@@ -60,7 +61,7 @@ public class MesQcOrderDetail extends BaseBean implements Serializable {
 
     @Column(name = "IS_CONCESSION")
     @ApiParam("是否允许让步")
-    private String fixLotNo;
+    private String isConCession;
 
     @Column(name = "STATUS")
     @ApiParam("状态")
@@ -73,4 +74,12 @@ public class MesQcOrderDetail extends BaseBean implements Serializable {
     @Column(name = "CHECK_VALUE")
     @ApiParam("检测值")
     private String checkValue;
+
+    @Transient
+    @ApiParam("本批次生产总数")
+    private Integer currentLotNoSum;
+
+    @Transient
+    @ApiParam("收货批次")
+    private String srcLotNo;
 }