From 463e863ea4ebac3936e0202f8ba9e430f0eedc6a Mon Sep 17 00:00:00 2001
From: Ye-Bu <2973583761@qq.com>
Date: Fri, 20 May 2022 12:03:54 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AE=89=E7=81=AF=E4=BA=A7=E7=BA=BF=E3=80=81?=
 =?UTF-8?q?=E5=B7=A5=E4=BD=8D=E4=B8=8B=E6=8B=89=E6=9F=A5=E8=AF=A2=E6=8E=A5?=
 =?UTF-8?q?=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../i3plus/pojo/andon/bean/AndonWorkCenter.java    |  9 +++++--
 .../i3plus/pojo/andon/sqlpack/AndonHqlPack.java    | 29 ++++++++++++++++++++++
 2 files changed, 36 insertions(+), 2 deletions(-)

diff --git a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonWorkCenter.java b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonWorkCenter.java
index cdfc419..b80bc49 100644
--- a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonWorkCenter.java
+++ b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonWorkCenter.java
@@ -1,6 +1,5 @@
 package cn.estsh.i3plus.pojo.andon.bean;
 
-import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn;
 import cn.estsh.i3plus.pojo.base.bean.BaseBean;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiParam;
@@ -11,7 +10,6 @@ import org.hibernate.annotations.DynamicUpdate;
 
 import javax.persistence.*;
 import java.io.Serializable;
-import java.util.List;
 
 /**
  * @Description :安灯工作中心
@@ -44,4 +42,11 @@ public class AndonWorkCenter extends BaseBean implements Serializable {
     @Column(name = "AREA_CODE")
     @ApiParam("生产区域代码")
     private String areaCode;
+
+    public AndonWorkCenter(String organizeCode) {
+        this.organizeCode = organizeCode;
+    }
+
+    public AndonWorkCenter() {
+    }
 }
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 86135c1..ade9b26 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
@@ -264,6 +264,20 @@ public class AndonHqlPack {
     }
 
     /**
+     * 按条件查询安灯工作中心
+     * @param andonWorkCenter
+     * @return
+     */
+    public static DdlPackBean packHqlAndonWorkCenter(AndonWorkCenter andonWorkCenter){
+        DdlPackBean result = new DdlPackBean();
+
+        DdlPreparedPack.getStringEqualPack(andonWorkCenter.getWorkCenterCode(), "workCenterCode", result);
+        getStringBuilderPack(andonWorkCenter, result);
+
+        return result;
+    }
+
+    /**
      * 按条件查询工作单元（工位）
      * @param mesWorkCell
      * @return
@@ -279,6 +293,21 @@ public class AndonHqlPack {
     }
 
     /**
+     * 按条件查询工作单元（工位）
+     * @param andonWorkCell
+     * @return
+     */
+    public static DdlPackBean packHqlAndonWorkCell(AndonWorkCell andonWorkCell){
+        DdlPackBean result = new DdlPackBean();
+        DdlPreparedPack.getStringEqualPack(andonWorkCell.getOrganizeCode(), "organizeCode", result);
+        DdlPreparedPack.getStringEqualPack(andonWorkCell.getWorkCenterCode(), "workCenterCode", result);
+        DdlPreparedPack.getStringEqualPack(andonWorkCell.getWorkCellCode(), "workCellCode", result);
+        getStringBuilderPack(andonWorkCell, result);
+
+        return result;
+    }
+
+    /**
      * 按条件查询设备
      * @param mesEquipment
      * @return