Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev

modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonCellGroupCfg.java

@@ -0,0 +1,52 @@
+package cn.estsh.i3plus.pojo.andon.bean;
+
+import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn;
+import cn.estsh.i3plus.pojo.base.bean.BaseBean;
+import cn.estsh.i3plus.pojo.base.enumutil.AndonEnumUtil;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.hibernate.annotations.DynamicInsert;
+import org.hibernate.annotations.DynamicUpdate;
+
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.Table;
+
+/**
+ * @Description : ANDON_工位分组配置
+ * @Reference :
+ * @Author : crish.li
+ * @CreateDate : 2019-11-21 11:07
+ * @Modify:
+ **/
+@Data
+@Entity
+@Table(name="ANDON_CELL_GROUP_CFG")
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Api("ANDON_工位分组配置")
+public class AndonCellGroupCfg extends BaseBean {
+    @Column(name = "WORK_CENTER_CODE")
+    @ApiParam(value = "工作中心代码")
+    private String workCenterCode;
+
+    @Column(name = "WORK_CENTER_NAME")
+    @ApiParam(value = "工作中心名称")
+    private String workCenterName;
+
+    @Column(name = "CELL_GROUP")
+    @ApiParam(value = "工作单元组")
+    private String cellGroup;
+
+
+    @Column(name = "GROUP_CODE")
+    @ApiParam(value = "分组代码")
+    private String groupCode;
+
+    @Column(name = "GROUP_NAME")
+    @ApiParam(value = "分组名称")
+    private String groupName;
+}

modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/repository/IAndonCellGroupCfgRepository.java

@@ -0,0 +1,17 @@
+package cn.estsh.i3plus.pojo.andon.repository;
+
+import cn.estsh.i3plus.pojo.andon.bean.AndonAlarmCause;
+import cn.estsh.i3plus.pojo.andon.bean.AndonCellGroupCfg;
+import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
+import org.springframework.stereotype.Repository;
+
+/**
+ * @Description : 对象持久层仓用方法控制（ANDON_工位分组配置）
+ * @Reference :
+ * @Author : crish.li
+ * @CreateDate : 2019-11-21 11:07
+ * @Modify:
+ **/
+@Repository
+public interface IAndonCellGroupCfgRepository extends BaseRepository<AndonCellGroupCfg, Long> {
+}

modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/sqlpack/AndonHqlPack.java

@@ -23,6 +23,21 @@ public class AndonHqlPack {
 
     /**
      * 安灯通知方式查询封装
+     * @param andonCellGroupCfg
+     * @return
+     */
+    public static DdlPackBean getAndonCellGroupCfg(AndonCellGroupCfg andonCellGroupCfg) {
+        DdlPackBean packBean = DdlPackBean.getDdlPackBean();
+        DdlPreparedPack.getStringEqualPack(andonCellGroupCfg.getOrganizeCode(), "organizeCode", packBean);
+        DdlPreparedPack.getStringEqualPack(andonCellGroupCfg.getWorkCenterCode(), "workCenterCode", packBean);
+        DdlPreparedPack.getStringEqualPack(andonCellGroupCfg.getCellGroup(), "cellGroup", packBean);
+        DdlPreparedPack.getStringEqualPack(andonCellGroupCfg.getGroupCode(), "groupCode", packBean);
+        DdlPreparedPack.getStringEqualPack(andonCellGroupCfg.getGroupName(), "groupName", packBean);
+        return packBean;
+    }
+
+    /**
+     * 安灯通知方式查询封装
      * @param andonResponse
      * @return
      */
@@ -176,12 +191,12 @@ public class AndonHqlPack {
      * @param andonManageQueue
      * @return
      */
-    public static DdlPackBean getAndonQueuePack(AndonManageQueue andonManageQueue, String statusCode) {
+    public static DdlPackBean getAndonQueuePack(AndonManageQueue andonManageQueue, String[] statusCodeArray) {
         DdlPackBean packBean = DdlPackBean.getDdlPackBean();
         DdlPreparedPack.getStringEqualPack(andonManageQueue.getOrganizeCode(), "organizeCode", packBean);
         DdlPreparedPack.getStringEqualPack(andonManageQueue.getWorkCenterCode(), "workCenterCode", packBean);
         DdlPreparedPack.getStringEqualPack(andonManageQueue.getWorkCellCode(), "workCellCode", packBean);
-        DdlPreparedPack.getStringEqualPack(statusCode, "statusCode", packBean);
+        DdlPreparedPack.getInPackArray(statusCodeArray, "statusCode", packBean);
         return packBean;
     }
     /**