安灯产线、工位下拉查询接口

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() {
+    }
 }

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