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 1/3] =?UTF-8?q?=E5=AE=89=E7=81=AF=E4=BA=A7=E7=BA=BF?= =?UTF-8?q?=E3=80=81=E5=B7=A5=E4=BD=8D=E4=B8=8B=E6=8B=89=E6=9F=A5=E8=AF=A2?= =?UTF-8?q?=E6=8E=A5=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 From f601fe7594ba3cefade2a574e1661e41aa865398 Mon Sep 17 00:00:00 2001 From: "jhforever.wang@estsh.com" Date: Fri, 20 May 2022 17:07:53 +0800 Subject: [PATCH 2/3] andon --- .../java/cn/estsh/i3plus/pojo/andon/model/ModuleResult.java | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/model/ModuleResult.java b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/model/ModuleResult.java index bc8c717..b05f139 100644 --- a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/model/ModuleResult.java +++ b/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; From d47f146eaa96d81a094ac6edc40fe5d674a96f08 Mon Sep 17 00:00:00 2001 From: Ye-Bu <2973583761@qq.com> Date: Sun, 22 May 2022 13:07:12 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E5=AE=89=E7=81=AF=E5=8C=BA=E5=9F=9F?= =?UTF-8?q?=E3=80=81=E5=B7=A5=E4=BD=8D=E5=BC=80=E7=AA=97=E6=9F=A5=E8=AF=A2?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E5=B0=81=E8=A3=85packBean?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/andon/sqlpack/AndonHqlPack.java | 24 ++++++++++++++++++++++ 1 file changed, 24 insertions(+) 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 221dd24..f9d5777 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 @@ -1289,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; + } }