From ce187f9720da92fb0d994482cf5830b81ad1b03f Mon Sep 17 00:00:00 2001
From: crish <570360737@qq.com>
Date: Wed, 16 Oct 2019 15:55:42 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AE=89=E7=81=AF=E5=B9=BF=E6=92=AD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/cn/estsh/i3plus/pojo/andon/bean/AndonBroadCast.java   |  4 ++++
 .../cn/estsh/i3plus/pojo/andon/bean/AndonBroadCastCfg.java     | 10 +++++++---
 .../java/cn/estsh/i3plus/pojo/andon/sqlpack/AndonHqlPack.java  |  3 ++-
 3 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonBroadCast.java b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonBroadCast.java
index 9b2017c..afd4cb0 100644
--- a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonBroadCast.java
+++ b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonBroadCast.java
@@ -32,6 +32,10 @@ public class AndonBroadCast extends BaseBean {
     @ApiParam("广播设备编号")
     private String targetIds;
 
+    @Column(name="GROUP_NO")
+    @ApiParam("分组号")
+    private String groupNo;
+
     @Column(name="WORK_CENTER_CODE")
     @ApiParam("工作中心")
     private String workCenterCode;
diff --git a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonBroadCastCfg.java b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonBroadCastCfg.java
index dfc769a..750e650 100644
--- a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonBroadCastCfg.java
+++ b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonBroadCastCfg.java
@@ -35,11 +35,15 @@ public class AndonBroadCastCfg extends BaseBean {
     @ApiParam("安灯类型代码")
     private String alarmCode;
 
-    @Column(name="DEVICE_NUM")
-    @ApiParam("广播设备编号")
-    private String targetIds;
+//    @Column(name="DEVICE_NUM")
+//    @ApiParam("广播设备编号")
+//    private String targetIds;
 
     @Column(name="WORK_CENTER_CODE")
     @ApiParam("工作中心")
     private String workCenterCode;
+
+    @Column(name="GROUP_NO")
+    @ApiParam("分组号")
+    private String groupNo;
 }
diff --git a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/sqlpack/AndonHqlPack.java b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/sqlpack/AndonHqlPack.java
index fd44ca9..ad97b67 100644
--- a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/sqlpack/AndonHqlPack.java
+++ b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/sqlpack/AndonHqlPack.java
@@ -91,6 +91,7 @@ public class AndonHqlPack {
         DdlPreparedPack.getStringEqualPack(andonBroadCast.getOrganizeCode(), "organizeCode", packBean);
         DdlPreparedPack.getStringEqualPack(andonBroadCast.getWorkCenterCode(), "workCenterCode", packBean);
         DdlPreparedPack.getStringEqualPack(andonBroadCast.getTargetIds(), "targetIds", packBean);
+        DdlPreparedPack.getStringEqualPack(andonBroadCast.getGroupNo(), "groupNo", packBean);
         DdlPreparedPack.getStringEqualPack(andonBroadCast.getDeviceDec(), "deviceDec", packBean);
         DdlPreparedPack.getNumEqualPack(andonBroadCast.getIsValid(),"isValid",packBean);
         return packBean;
@@ -106,7 +107,7 @@ public class AndonHqlPack {
         DdlPreparedPack.getStringEqualPack(andonBroadCastCfg.getOrganizeCode(), "organizeCode", packBean);
         DdlPreparedPack.getStringEqualPack(andonBroadCastCfg.getWorkCenterCode(), "workCenterCode", packBean);
         DdlPreparedPack.getStringEqualPack(andonBroadCastCfg.getAlarmCode(), "alarmCode", packBean);
-        DdlPreparedPack.getStringEqualPack(andonBroadCastCfg.getTargetIds(), "targetIds", packBean);
+        DdlPreparedPack.getStringEqualPack(andonBroadCastCfg.getGroupNo(), "groupNo", packBean);
         DdlPreparedPack.getNumEqualPack(andonBroadCastCfg.getIsValid(),"isValid",packBean);
         return packBean;
     }