diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesStateMachineStatus.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesStateMachineStatus.java index 5c49a5b..3423710 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesStateMachineStatus.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesStateMachineStatus.java @@ -85,6 +85,10 @@ public class MesStateMachineStatus extends BaseBean implements Serializable { @ApiParam("是否初始化") private Integer isInit = 1; + @Column(name = "TRIGGER_GUIDE_STEP") + @ApiParam("默认触发引导工步") + private String triggerGuideStep; + @Transient @ApiParam("流程代码") private String routeCode; @@ -139,4 +143,27 @@ public class MesStateMachineStatus extends BaseBean implements Serializable { this.processCode = processCode; } + public MesStateMachineStatus(Long id, String smCode, String statusCode, String nextStatus, String statusName, String nextStatusName, Integer triggerType, + String triggerEvent, String triggerWhere, String triggerGuideStep, Long triggerAmgId, Long inAmgId, Long outAmgId, Integer statusType, Integer seq, + Integer isInit, String routeCode, String processCode) { + this.id = id; + this.smCode = smCode; + this.statusCode = statusCode; + this.nextStatus = nextStatus; + this.statusName = statusName; + this.nextStatusName = nextStatusName; + this.triggerType = triggerType; + this.triggerEvent = triggerEvent; + this.triggerWhere = triggerWhere; + this.triggerGuideStep = triggerGuideStep; + this.triggerAmgId = triggerAmgId; + this.inAmgId = inAmgId; + this.outAmgId = outAmgId; + this.statusType = statusType; + this.seq = seq; + this.isInit = isInit; + this.routeCode = routeCode; + this.processCode = processCode; + } + } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/StationRequestBean.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/StationRequestBean.java index d8a8973..12515c1 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/StationRequestBean.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/StationRequestBean.java @@ -3,9 +3,11 @@ package cn.estsh.i3plus.pojo.mes.model; import cn.estsh.i3plus.pojo.base.enumutil.MesPcnEnumUtil; import cn.estsh.i3plus.pojo.mes.bean.MesStateMachineStatus; +import com.alibaba.fastjson.JSONObject; import com.fasterxml.jackson.annotation.JsonIgnore; import io.swagger.annotations.ApiParam; import lombok.Data; +import org.springframework.util.CollectionUtils; import java.io.Serializable; import java.util.HashMap; @@ -135,6 +137,12 @@ public class StationRequestBean implements Serializable { @ApiParam("工位参数") private Map wcpcMap; + @ApiParam("fsm参数") + private Map fsmCfgMap; + + @ApiParam("fsm参数key") + private String prodRouteOptParamKey; + @ApiParam("生产主队列编号") private String orderNo; @@ -238,24 +246,28 @@ public class StationRequestBean implements Serializable { return "StationRequestBean{" + "scanInfo='" + scanInfo + '\'' + ", serialNumber='" + serialNumber + '\'' + + ", productSn='" + productSn + '\'' + ", partNo='" + partNo + '\'' + + ", pptCode='" + pptCode + '\'' + ", organizeCode='" + organizeCode + '\'' + - ", organizeName='" + organizeName + '\'' + ", workCenterCode='" + workCenterCode + '\'' + ", workCellCode='" + workCellCode + '\'' + ", routeCode='" + routeCode + '\'' + ", processCode='" + processCode + '\'' + + ", smCode='" + smCode + '\'' + + ", prodRouteOptParamKey='" + prodRouteOptParamKey + '\'' + ", clientInfo='" + clientInfo + '\'' + ", userInfo='" + userInfo + '\'' + ", buttonCode='" + buttonCode + '\'' + ", stepCode='" + stepCode + '\'' + ", busiType='" + busiType + '\'' + + ", forceJumpProcess='" + forceJumpProcess + '\'' + ", workOrderNo='" + workOrderNo + '\'' + - ", tray='" + tray + '\'' + - ", finishCount=" + finishCount + - ", packageNo=" + packageNo + - ", createDatetime=" + createDatetime + - ", cacheSourceClass=" + cacheSourceClass + + ", packageNo='" + packageNo + '\'' + + ", cacheSourceClass='" + cacheSourceClass + '\'' + + ", dataMap=" + (!CollectionUtils.isEmpty(dataMap) ? JSONObject.toJSONString(dataMap) : "[]") + + ", curFsmState=" + (null != curFsmState ? JSONObject.toJSONString(curFsmState) : "[]") + '}'; } } + diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/StepResult.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/StepResult.java index 9a15c9a..6488762 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/StepResult.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/StepResult.java @@ -27,6 +27,8 @@ public class StepResult { private String nextTriggerEvent; + private Object obj; + public static StepResult getNonComplete() { return new StepResult(false, ""); } @@ -154,4 +156,31 @@ public class StepResult { this.msg = msg; this.stationRequestBean = stationRequestBean; } + + public StepResult isCompleted(boolean isCompleted) { + this.isCompleted = isCompleted; + return this; + } + + public StepResult msg(String msg) { + this.msg = msg; + return this; + } + + public StepResult nextTriggerEvent(String nextTriggerEvent) { + this.nextTriggerEvent = nextTriggerEvent; + return this; + } + + public StepResult data(T t) { + this.data = t; + return this; + } + + public StepResult obj(Object obj) { + this.obj = obj; + return this; + } + } + diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java index 626958f..9af95ae 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java @@ -10,6 +10,7 @@ import cn.estsh.i3plus.pojo.mes.bean.template.BasImportTemplate; import cn.estsh.i3plus.pojo.mes.bean.template.BasImportTemplateDetails; import cn.estsh.i3plus.pojo.mes.dbinterface.MesInterfaceDataMapper; import cn.estsh.i3plus.pojo.mes.engine.script.EngineScriptPersistence; +import cn.estsh.i3plus.pojo.mes.engine.script.EngineScriptPersistenceHistory; import cn.estsh.i3plus.pojo.mes.model.MgnPaintPolishingReportModel; import org.springframework.util.CollectionUtils; import org.springframework.util.StringUtils; @@ -24,20 +25,30 @@ import java.util.List; * @Modify: **/ public class MesHqlPack { - - /** - * 通用查询条件 - * - * @param organizeCode - * @return - */ + public static DdlPackBean packHqlScriptHistory(EngineScriptPersistenceHistory history) { + DdlPackBean packBean = new DdlPackBean(); + DdlPreparedPack.getStringEqualPack(history.getScriptNo(), "scriptNo", packBean); + getStringBuilderPack(history, packBean); + return packBean; + } public static DdlPackBean getAllBaseData(String organizeCode) { DdlPackBean packBean = new DdlPackBean(); DdlPreparedPack.getStringEqualPack(organizeCode, "organizeCode", packBean); DdlPreparedPack.getNumEqualPack(CommonEnumUtil.IS_DEAL.NO.getValue(), "isDeleted", packBean); return packBean; } + public static DdlPackBean packEngineScriptPersistence(EngineScriptPersistence scriptPersistence) { + DdlPackBean packBean = new DdlPackBean(); + DdlPreparedPack.getStringLikerPack(scriptPersistence.getScriptNo(), "scriptNo", packBean); + DdlPreparedPack.getStringRightLikerPack(scriptPersistence.getScriptName(), "scriptName", packBean); + DdlPreparedPack.getNumEqualPack(scriptPersistence.getScriptType(), "scriptType", packBean); + DdlPreparedPack.getNumEqualPack(scriptPersistence.getLanguageType(), "languageType", packBean); + + getStringBuilderPack(scriptPersistence, packBean); + DdlPreparedPack.getOrderByPack(new Object[]{2}, new String[]{"createDatetime"}, packBean); + return packBean; + } public static DdlPackBean getMesPcnByCondition(MesPcn mesPcn, String organizeCode) { DdlPackBean packBean = getAllBaseData(organizeCode); if (!StringUtils.isEmpty(mesPcn.getConnectIp())) { @@ -3847,17 +3858,4 @@ public class MesHqlPack { DdlPreparedPack.getNumEqualPack(mesFailureModeParts.getIsValid(), "isValid", packBean); return packBean; } - - public static DdlPackBean packEngineScriptPersistence(EngineScriptPersistence scriptPersistence) { - DdlPackBean packBean = new DdlPackBean(); - DdlPreparedPack.getStringLikerPack(scriptPersistence.getScriptNo(), "scriptNo", packBean); - DdlPreparedPack.getStringRightLikerPack(scriptPersistence.getScriptName(), "scriptName", packBean); - DdlPreparedPack.getNumEqualPack(scriptPersistence.getScriptType(), "scriptType", packBean); - DdlPreparedPack.getNumEqualPack(scriptPersistence.getLanguageType(), "languageType", packBean); - - getStringBuilderPack(scriptPersistence, packBean); - - DdlPreparedPack.getOrderByPack(new Object[]{2}, new String[]{"createDatetime"}, packBean); - return packBean; - } }