From 4895b3ae85db5038a137a7bfd7db69d113ba4305 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9F=AF=E8=A3=95?= <hansen.ke@estsh.com>
Date: Mon, 13 May 2019 19:23:15 +0800
Subject: [PATCH] =?UTF-8?q?ANDON=E5=AE=9E=E4=BD=93=E6=9B=B4=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../cn.estsh.i3plus.pojo.andon/bean/MesShift.java     | 13 +++++++++++++
 .../sqlpack/AndonHqlPack.java                         | 19 +++++++++++++++----
 2 files changed, 28 insertions(+), 4 deletions(-)

diff --git a/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/bean/MesShift.java b/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/bean/MesShift.java
index 43cfce1..533c56a 100644
--- a/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/bean/MesShift.java
+++ b/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/bean/MesShift.java
@@ -28,6 +28,11 @@ import javax.persistence.Table;
 @Table(name="MES_SHIFT")
 @Api("班次信息")
 public class MesShift extends BaseBean {
+
+    @Column(name = "WORK_CENTER_CODE")
+    @ApiParam("工作中心")
+    private String workCenterCode;
+
     @Column(name="SHIFT_CODE")
     @ApiParam("班次代码")
     private String shiftCode;
@@ -43,4 +48,12 @@ public class MesShift extends BaseBean {
     @Column(name="WORK_TIMES")
     @ApiParam("作业时长")
     private String workTimes;
+
+    public MesShift() {
+    }
+
+    public MesShift(String workCenterCode,String organizeCode) {
+        this.workCenterCode = workCenterCode;
+        this.organizeCode = organizeCode;
+    }
 }
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 db59c17..098f73b 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
@@ -1,9 +1,6 @@
 package cn.estsh.i3plus.pojo.andon.sqlpack;
 
-import cn.estsh.i3plus.pojo.andon.bean.AndonAlarmCause;
-import cn.estsh.i3plus.pojo.andon.bean.MesEquipment;
-import cn.estsh.i3plus.pojo.andon.bean.MesWorkCell;
-import cn.estsh.i3plus.pojo.andon.bean.MesWorkCenter;
+import cn.estsh.i3plus.pojo.andon.bean.*;
 import cn.estsh.i3plus.pojo.base.bean.BaseBean;
 import cn.estsh.i3plus.pojo.base.bean.DdlPackBean;
 import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil;
@@ -82,6 +79,20 @@ public class AndonHqlPack {
     }
 
     /**
+     * 按条件查询班次
+     * @param mesShift
+     * @return
+     */
+    public static DdlPackBean packHqlMesShift(MesShift mesShift){
+        DdlPackBean result = new DdlPackBean();
+
+        DdlPreparedPack.getStringEqualPack(mesShift.getWorkCenterCode(), "workCenterCode", result);
+        getStringBuilderPack(mesShift, result);
+
+        return result;
+    }
+
+    /**
      * 按条件查询ANDON呼叫原因
      * @param andonAlarmCause
      * @return