Merge remote-tracking branch 'origin/ext-dev' into ext-dev

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

@@ -46,4 +46,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/model/ModuleResult.java

@@ -10,6 +10,8 @@ public class ModuleResult {
 
     private boolean isCompleted;
 
+    private boolean isError = false;
+
     private String msg;
 
     private String nextTriggerEvent;
@@ -30,6 +32,10 @@ public class ModuleResult {
         return new ModuleResult(false, msg, nextTriggerEvent);
     }
 
+    public static ModuleResult getErrorComplete(String msg) {
+        return new ModuleResult(false, true, msg);
+    }
+
     public static ModuleResult getSuccessComplete() {
         return new ModuleResult(true, "");
     }
@@ -54,6 +60,12 @@ public class ModuleResult {
         this.msg = msg;
     }
 
+    private ModuleResult(boolean isCompleted, boolean isError, String msg) {
+        this.isCompleted = isCompleted;
+        this.isError = isError;
+        this.msg = msg;
+    }
+
     public ModuleResult(boolean isCompleted, String msg, String nextTriggerEvent) {
         this.isCompleted = isCompleted;
         this.msg = msg;

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
@@ -1260,5 +1289,29 @@ public class AndonHqlPack {
         return packBean;
     }
 
+    /**
+     * Andon工作单元信息查询条件封装
+     * @param workCell
+     * @return
+     */
+    public static DdlPackBean getAllCell(AndonWorkCell workCell) {
+        DdlPackBean packBean = DdlPackBean.getDdlPackBean(workCell.getOrganizeCode());
+        DdlPreparedPack.getStringLikerPack(workCell.getWorkCellCode(), "workCellCode", packBean);
+        DdlPreparedPack.getStringLikerPack(workCell.getWorkCellName(), "workCellName", packBean);
+        DdlPreparedPack.getStringEqualPack(workCell.getWorkCenterCode(), "workCenterCode", packBean);
+        return packBean;
+    }
+
+    /**
+     * Andon 区域信息查询条件封装
+     * @param area
+     * @return
+     */
+    public static DdlPackBean getAllArea(AndonArea area) {
+        DdlPackBean packBean = DdlPackBean.getDdlPackBean(area.getOrganizeCode());
+        DdlPreparedPack.getStringLikerPack(area.getAreaCode(), "areaCode", packBean);
+        DdlPreparedPack.getStringLikerPack(area.getAreaName(), "areaName", packBean);
+        return packBean;
+    }
 
 }