From d0840978de375b45ea3a9807b84793f07e1d3e16 Mon Sep 17 00:00:00 2001
From: crish <570360737@qq.com>
Date: Tue, 21 May 2019 21:54:22 +0800
Subject: [PATCH] =?UTF-8?q?PLC=E6=95=B0=E6=8D=AE=E9=87=87=E9=9B=86?=
 =?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: crish <570360737@qq.com>
---
 .../estsh/i3plus/pojo/mes/pcn/bean/MesPLCConfigure.java |  4 ++++
 .../estsh/i3plus/pojo/mes/pcn/bean/MesTorqueDetail.java | 17 +++++++++++++++--
 2 files changed, 19 insertions(+), 2 deletions(-)

diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPLCConfigure.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPLCConfigure.java
index 548db37..0d139b8 100644
--- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPLCConfigure.java
+++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPLCConfigure.java
@@ -32,6 +32,10 @@ public class MesPLCConfigure extends BaseBean {
     @ApiParam("设备ip")
     private String ipAddress;
 
+    @Column(name="CHANNEL_NAME")
+    @ApiParam("通道名称")
+    private String channelName;
+
     @Column(name="DEVICE_NAME")
     @ApiParam("设备地址")
     private String deviceName;
diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesTorqueDetail.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesTorqueDetail.java
index f99cd7f..52296a7 100644
--- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesTorqueDetail.java
+++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesTorqueDetail.java
@@ -28,6 +28,7 @@ import javax.persistence.Table;
 @Table(name="MES_TORQUE_DETAIL")
 @Api("扭矩信息记录表")
 public class MesTorqueDetail extends BaseBean {
+
     @Column(name="SN")
     @ApiParam("过程条码")
     private String serialNumber;
@@ -61,8 +62,8 @@ public class MesTorqueDetail extends BaseBean {
     private String ok;
 
     @Column(name="PART_NO")
-    @ApiParam("扭矩是否合格")
-    private String partNO;
+    @ApiParam("物料号")
+    private String partNo;
 
     @Column(name="p_set")
     @ApiParam("螺丝枪PSET设置值")
@@ -79,4 +80,16 @@ public class MesTorqueDetail extends BaseBean {
     @Column(name="FINALANGLE")
     @ApiParam("最终扭矩")
     private Integer finalAngle;
+
+    @Column(name="WORK_ORDER_NO")
+    @ApiParam("工单号")
+    private String workOrderNo;
+
+    @Column(name="KEY_DATA_CODE")
+    @ApiParam("关键数据代码")
+    private String keyDataCode;
+
+    @Column(name="RESULT_MSG")
+    @ApiParam("扭矩判定结果")
+    private String resultMsg;
 }