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 e92ddbf..d7677ae 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 @@ -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() { + } } 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..b05f139 --- /dev/null +++ b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/model/ModuleResult.java @@ -0,0 +1,75 @@ +package cn.estsh.i3plus.pojo.andon.model; + + +import io.swagger.annotations.Api; +import lombok.Data; + +@Data +@Api("组件返回信息") +public class ModuleResult { + + private boolean isCompleted; + + private boolean isError = false; + + 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 getErrorComplete(String msg) { + return new ModuleResult(false, true, msg); + } + + 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; + } + + 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; + this.nextTriggerEvent = nextTriggerEvent; + } + +} 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 9c713e1..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 @@ -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; + } } 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") 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; 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 ="消息内容")