From 55cc12c01a6039783d770616470e9cb90d49744d Mon Sep 17 00:00:00 2001 From: nies Date: Wed, 18 May 2022 09:38:21 +0800 Subject: [PATCH 1/7] =?UTF-8?q?=E6=96=B0=E5=A2=9Eandon=E6=9F=A5=E8=AF=A2co?= =?UTF-8?q?re=E7=9A=84model?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pojo/model/platform/AndonQueryUserModel.java | 27 ++++++++++++++++++++ .../model/platform/AndonQueryUserResultModel.java | 29 ++++++++++++++++++++++ .../model/platform/DingSendBatchRequestModel.java | 4 ++- 3 files changed, 59 insertions(+), 1 deletion(-) create mode 100644 modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/platform/AndonQueryUserModel.java create mode 100644 modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/platform/AndonQueryUserResultModel.java diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/platform/AndonQueryUserModel.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/platform/AndonQueryUserModel.java new file mode 100644 index 0000000..2d6bf63 --- /dev/null +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/platform/AndonQueryUserModel.java @@ -0,0 +1,27 @@ +package cn.estsh.i3plus.pojo.model.platform; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; + +/** + * @author ns + * @create 2022/5/17 0017 下午 15:38 + * andon 查询用户信息model + */ +@Data +@NoArgsConstructor +@AllArgsConstructor +@ApiModel("andon 调用core查询的model") +public class AndonQueryUserModel { + @ApiModelProperty(value ="工厂代码" , access ="工厂代码") + private String organizeCode; + @ApiModelProperty(value ="账号登录名" , access ="账号登录名") + private String userLoginName; + @ApiModelProperty(value ="用户名称" , access ="用户名称") + private String userName; + @ApiModelProperty(value ="部门名称" , access ="部门名称") + private String department; +} diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/platform/AndonQueryUserResultModel.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/platform/AndonQueryUserResultModel.java new file mode 100644 index 0000000..62405be --- /dev/null +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/platform/AndonQueryUserResultModel.java @@ -0,0 +1,29 @@ +package cn.estsh.i3plus.pojo.model.platform; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; + +/** + * @author ns + * @create 2022/5/17 0017 下午 15:39 + * 松下andon 查询结果返回model + */ +@Data +@NoArgsConstructor +@AllArgsConstructor +@ApiModel("根据条件查询数据返回给andon的结果") +public class AndonQueryUserResultModel { + @ApiModelProperty(value ="用户账号id" , access ="用户账号id") + private Long userId; + @ApiModelProperty(value ="用户信息id" , access ="用户信息id") + private Long userInfoId; + @ApiModelProperty(value ="账号登录名" , access ="账号登录名") + private String loginName; + @ApiModelProperty(value ="用户名称" , access ="用户名称") + private String userName; + @ApiModelProperty(value ="部门名称" , access ="部门名称") + private String department; +} diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/platform/DingSendBatchRequestModel.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/platform/DingSendBatchRequestModel.java index 0f1cf1a..55de6ed 100644 --- a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/platform/DingSendBatchRequestModel.java +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/platform/DingSendBatchRequestModel.java @@ -19,7 +19,9 @@ import java.util.List; public class DingSendBatchRequestModel { @ApiModelProperty(value ="手机号" , access ="手机号") - private List phoneNumberList ; + private List phoneNumberList; + @ApiModelProperty(value ="账号登录名列表" , access ="账号登录名列表") + private List userLoginNameList ; @ApiModelProperty(value ="消息标题" , access ="消息标题") private String title ; @ApiModelProperty(value ="消息内容" , access ="消息内容") From f7f1b464033c8125e061521220d6173e9012d5e7 Mon Sep 17 00:00:00 2001 From: backo880607 Date: Wed, 18 May 2022 15:07:36 +0800 Subject: [PATCH 2/7] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E4=B8=8B=E5=8F=91?= =?UTF-8?q?=E7=94=9F=E4=BA=A7=E8=AE=A1=E5=88=92=E4=B8=8B=E7=8F=AD=E6=97=B6?= =?UTF-8?q?=E9=97=B4=E6=8E=A7=E5=88=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/aps/bean/StandOperation.java | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/StandOperation.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/StandOperation.java index 6f08046..e11de37 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/StandOperation.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/StandOperation.java @@ -72,6 +72,11 @@ public class StandOperation extends BaseAPS { @FieldAnnotation(editType = ApsEnumUtil.EDIT_TYPE.DURATION) private String baseTimeLimit; + @Column(name="OVER_SHIFT_SPLIT_LIMIT") + @ApiParam(value ="跨班次时间限制") + @FieldAnnotation(editType = ApsEnumUtil.EDIT_TYPE.DURATION) + private String overShiftSplitLimit; + @Column(name="COMB_TYPE") @ApiParam(value ="生产组合方式") @FieldAnnotation(defaultValue = "MAX_ALL_RESOURCE") From 6e47adcdd2a6172183628fca499ba70c1103e445 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=92=8B=E9=B8=BF=E8=BE=89?= <2579728558@qq.com> Date: Wed, 18 May 2022 17:48:27 +0800 Subject: [PATCH 3/7] =?UTF-8?q?MesQueueOrderDetai=E6=96=B0=E5=A2=9E?= =?UTF-8?q?=E8=B4=A8=E9=87=8F=E7=8A=B6=E6=80=81=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueOrderDetail.java | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueOrderDetail.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueOrderDetail.java index 379048c..bfcda35 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueOrderDetail.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueOrderDetail.java @@ -147,6 +147,10 @@ public class MesQueueOrderDetail extends BaseBean implements Serializable { @ApiParam("回冲标识") private String jisBackflushStatus; + @Column(name = "QC_STATUS") + @ApiParam("质量状态") + private String qcStatus; + @Transient @ApiParam("Vin") private String vinCode; From 05331ea5de973ce97755a7150cf19781c35aef91 Mon Sep 17 00:00:00 2001 From: "jhforever.wang@estsh.com" Date: Thu, 19 May 2022 20:18:58 +0800 Subject: [PATCH 4/7] =?UTF-8?q?=E5=AE=89=E7=81=AF=E7=BB=84=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cn/estsh/i3plus/pojo/andon/model/FsmModel.java | 3 -- .../i3plus/pojo/andon/model/ModuleResult.java | 63 ++++++++++++++++++++++ 2 files changed, 63 insertions(+), 3 deletions(-) create mode 100644 modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/model/ModuleResult.java diff --git a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/model/FsmModel.java b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/model/FsmModel.java index 1c5d24a..6197372 100644 --- a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/model/FsmModel.java +++ b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/model/FsmModel.java @@ -69,7 +69,4 @@ public class FsmModel implements Serializable { @ApiParam("进入触发方法时默认不需要校验外部触发") private boolean checkTriggerTypeFalg = false; - @ApiParam("下个触发事件") - private String nextTriggerEvent; - } 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 new file mode 100644 index 0000000..bc8c717 --- /dev/null +++ b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/model/ModuleResult.java @@ -0,0 +1,63 @@ +package cn.estsh.i3plus.pojo.andon.model; + + +import io.swagger.annotations.Api; +import lombok.Data; + +@Data +@Api("组件返回信息") +public class ModuleResult { + + private boolean isCompleted; + + private String msg; + + private String nextTriggerEvent; + + public static ModuleResult getNonComplete() { + return new ModuleResult(false, ""); + } + + public static ModuleResult getNonComplete(String msg) { + return new ModuleResult(false, msg); + } + + public static ModuleResult getCustomNonComplete(String nextTriggerEvent) { + return new ModuleResult(false, "", nextTriggerEvent); + } + + public static ModuleResult getCustomNonComplete(String msg, String nextTriggerEvent) { + return new ModuleResult(false, msg, nextTriggerEvent); + } + + public static ModuleResult getSuccessComplete() { + return new ModuleResult(true, ""); + } + + public static ModuleResult getSuccessComplete(String msg) { + return new ModuleResult(true, msg); + } + + public static ModuleResult getCustomSuccessComplete(String nextTriggerEvent) { + return new ModuleResult(true, "", nextTriggerEvent); + } + + public static ModuleResult getCustomSuccessComplete(String msg, String nextTriggerEvent) { + return new ModuleResult(true, msg, nextTriggerEvent); + } + + private ModuleResult() { + } + + private ModuleResult(boolean isCompleted, String msg) { + this.isCompleted = isCompleted; + this.msg = msg; + } + + public ModuleResult(boolean isCompleted, String msg, String nextTriggerEvent) { + this.isCompleted = isCompleted; + this.msg = msg; + this.nextTriggerEvent = nextTriggerEvent; + } + +} 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 5/7] =?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 6/7] 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 7/7] =?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; + } }