diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/common/Pager.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/common/Pager.java index 0a90b00..a8731c8 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/common/Pager.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/common/Pager.java @@ -159,13 +159,6 @@ public class Pager { } public int getEndRow() { - if(pageSize > 0){ - if(currentPage > 1){ - return currentPage * pageSize; - }else { - return pageSize; - } - } return endRow; } diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/dynamic/DynamicEntity.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/dynamic/DynamicEntity.java index 91b8cd0..7488292 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/dynamic/DynamicEntity.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/dynamic/DynamicEntity.java @@ -5,7 +5,6 @@ import io.swagger.annotations.ApiParam; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import javax.persistence.Transient; import java.io.Serializable; import java.lang.reflect.Field; import java.lang.reflect.InvocationTargetException; diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/BlockSoftSwitchEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/BlockSoftSwitchEnumUtil.java index dd4bd75..97c8733 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/BlockSoftSwitchEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/BlockSoftSwitchEnumUtil.java @@ -918,4 +918,147 @@ public class BlockSoftSwitchEnumUtil { } + /** + * 脚本类型 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum BS_SCRIPT_TYPE { + MESSAGE_PROCESS(10, "报文处理","可用参数:transData,orginData"); + + private int value; + private String description; + private String scriptRule; + + private BS_SCRIPT_TYPE (int value, String description,String scriptRule) { + this.value = value; + this.description = description; + this.scriptRule = scriptRule; + } + + public int getValue() { + return value; + } + + public String getDescription() { + return description; + } + public String getScriptRule() { + return scriptRule; + } + + public static String valueOfDescription(int val) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].value == val) { + tmp = values()[i].description; + } + } + return tmp; + } + + public static BS_SCRIPT_TYPE valueOf(int val) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].value == val) { + return values()[i]; + } + } + return null; + } + + } + + /** + * 脚本语言 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum BS_SCRIPT_LANGUAGE { +// SPEL(10, "Spring表达式语言(SpEL)"), + JAVASCRIPT(20, "JavaScript(JS)"); + + private int value; + private String description; + + private BS_SCRIPT_LANGUAGE (int value, String description) { + this.value = value; + this.description = description; + } + + public int getValue() { + return value; + } + + public String getDescription() { + return description; + } + + public static String valueOfDescription(int val) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].value == val) { + tmp = values()[i].description; + } + } + return tmp; + } + + public static BS_SCRIPT_LANGUAGE valueOf(int val) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].value == val) { + return values()[i]; + } + } + return null; + } + + } + + /** + * 脚本执行方式 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum BS_SCRIPT_EXECUTE_METHOD { + EXECUTE_SCRIPT(10, "执行脚本"), + EXECUTE_METHOD(20, "执行方法"), + EXECUTE_OBJECT_METHOD(30, "执行对象方法"); + + private int value; + private String description; + + private BS_SCRIPT_EXECUTE_METHOD (int value, String description) { + this.value = value; + this.description = description; + } + + public int getValue() { + return value; + } + + public String getDescription() { + return description; + } + + public static String valueOfDescription(int val) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].value == val) { + tmp = values()[i].description; + } + } + return tmp; + } + + public static BS_SCRIPT_EXECUTE_METHOD valueOf(int val) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].value == val) { + return values()[i]; + } + } + return null; + } + + } + } diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/CommonEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/CommonEnumUtil.java index 9162a1f..91912ab 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/CommonEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/CommonEnumUtil.java @@ -4,6 +4,7 @@ import com.fasterxml.jackson.annotation.JsonFormat; import org.apache.commons.lang3.StringUtils; import java.math.BigDecimal; +import java.sql.Timestamp; /** * @Description : @@ -1573,7 +1574,7 @@ public class CommonEnumUtil { BIG_DECIMAL(32, "BigDecimal", "大浮点型", "java.math.BigDecimal", BigDecimal.class, PROPERTY_CONTROL_TYPE.NUMBER, SQL_WHERE.EQUAL, "0.0"), BOOLEAN(40, "Boolean", "布尔值", "java.lang.Boolean", Boolean.class, PROPERTY_CONTROL_TYPE.RADIO, SQL_WHERE.EQUAL, null), BYTE(50, "Byte", "字节", "java.lang.Byte", Byte.class, PROPERTY_CONTROL_TYPE.TEXT, SQL_WHERE.EQUAL, null), - DATE_TIME(12, "String", "日期时分秒", "java.sql.Timestamp", String.class, PROPERTY_CONTROL_TYPE.DATE_TIME, SQL_WHERE.BETWEEN, null, "yyyy-MM-dd hh:mm:ss"); + DATE_TIME(12, "String", "日期时分秒", "java.sql.Timestamp", Timestamp.class, PROPERTY_CONTROL_TYPE.DATE_TIME, SQL_WHERE.BETWEEN, null, "yyyy-MM-dd hh:mm:ss"); /** * 属性类型值 @@ -1911,6 +1912,19 @@ public class CommonEnumUtil { return null; } + public String getJDBCUrl(String database,String host,Integer port,String instanceName){ + if(this.getValue() == SOURCE_MARIA_DB.getValue()){ + return getJDBCUrlMySQL(database,host,port); + }else if(this.getValue() == SOURCE_ORACLE.getValue()){ + return getJDBCUrlOracle(database,host,port); + }else if(this.getValue() == SOURCE_POSTGRE_SQL.getValue()){ + return getJDBCUrlPostgreSQL(database,host,port); + }else if(this.getValue() == SOURCE_SQL_SERVER.getValue()){ + return getJDBCUrlSQLServer(database,host,port,instanceName); + } + return null; + } + public static DATA_SOURCE_TYPE getDataSourceURL(String databaseProductName){ if(StringUtils.isNotBlank(databaseProductName)){ if(databaseProductName.indexOf(":mysql:") != -1){ @@ -1941,6 +1955,22 @@ public class CommonEnumUtil { private String getJDBCUrlSQLServer(String database,String host,Integer port){ return "jdbc:sqlserver://" + host + ":" + port + ";database=" + database+";autoReconnect=true"; } + + private String getJDBCUrlSQLServer(String database,String host,Integer port,String instanceName){ + StringBuffer sb = new StringBuffer(); + sb.append("jdbc:sqlserver://").append(host); + // 实例 + if (StringUtils.isNotBlank(instanceName)) { + sb.append("\\").append(instanceName); + } + // 端口 + sb.append(":").append(port); + // 数据库 + sb.append(";database=").append(database); + // 自动重连 + sb.append(";autoReconnect=true"); + return sb.toString(); + } } /** diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesPcnEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesPcnEnumUtil.java index 4a38289..8040d62 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesPcnEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesPcnEnumUtil.java @@ -13,6 +13,47 @@ import org.apache.commons.lang3.StringUtils; public class MesPcnEnumUtil { /** + * 注塑生产操作模式 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum IPC_ACTION_TYPE { + HAND_WORK(10, "10", "手工录入模式"), + PLC_WORK(20, "20", "PLC监听模式"); + + private int value; + private String code; + private String description; + + IPC_ACTION_TYPE(int value, String code, String description) { + this.value = value; + this.code = code; + this.description = description; + } + + public int getValue() { + return value; + } + + public String getCode() { + return code; + } + + public String getDescription() { + return description; + } + + public static String codeOfDescription(String code) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].code.equals(code)) { + tmp = values()[i].description; + } + } + return tmp; + } + } + + /** * 作业程序组件类型 */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) @@ -4604,4 +4645,5 @@ public class MesPcnEnumUtil { } + } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesBoardDisplay.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesBoardDisplay.java index 535d9c1..7077a43 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesBoardDisplay.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesBoardDisplay.java @@ -40,9 +40,9 @@ public class MesBoardDisplay extends BaseBean implements Serializable { @Column(name = "IS_ROLL") @ApiParam("是否滚动") - private String isRoll; + private Integer isRoll; @Column(name = "ROLL_SPEED") @ApiParam("滚动速度") - private String rollSpeed; + private Integer rollSpeed; } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesDefect.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesDefect.java index a4a2dca..c7cdeb4 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesDefect.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesDefect.java @@ -61,6 +61,10 @@ public class MesDefect extends BaseBean implements Serializable { private String defectLocation; @Transient + @ApiParam("颜色值") + private String colorValue; + + @Transient @ApiParam("缺陷类型子集") private List mesDefectList; public MesDefect() { diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesHncAgvRunning.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesHncAgvRunning.java new file mode 100644 index 0000000..ca6cde8 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesHncAgvRunning.java @@ -0,0 +1,50 @@ +package cn.estsh.i3plus.pojo.mes.bean; + +import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.hibernate.annotations.DynamicInsert; +import org.hibernate.annotations.DynamicUpdate; + +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.Table; +import java.io.Serializable; + +/** + * @author Wynne.Lu + * @date 2020/8/3 17:51 + * @desc + */ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "MES_HNC_AGV_RUNNING") +@Api("延锋海纳川agv运行状态表") +public class MesHncAgvRunning extends BaseBean implements Serializable { + private static final long serialVersionUID = 4293079676019967513L; + + @Column(name = "WORK_CENTER_CODE") + @ApiParam("产线") + private String workCenterCode; + + @Column(name = "WORK_CELL_CODE") + @ApiParam("工位") + private String workCellCode; + + @Column(name = "TIME_OUT") + @ApiParam("倒计时超时") + private Integer timeOut; + + @Column(name = "DELAY_HELP") + @ApiParam("延时帮助") + private Integer delayHelp; + + @Column(name = "EMERGENCY_STOP") + @ApiParam("紧急停止") + private Integer emergencyStop; +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesMouldPart.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesMouldPart.java index 34186bd..698ffde 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesMouldPart.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesMouldPart.java @@ -38,4 +38,12 @@ public class MesMouldPart extends BaseBean implements Serializable { @Column(name = "MOULD_CODE") @ApiParam("模具代码") private String mouldCode; + + @Column(name = "QTY") + @ApiParam("数量") + private Double qty = 0d; + + @Column(name = "MOULD_TYPE") + @ApiParam("模具类型") + private String mouldType; } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPlc.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPlc.java index 6cf3353..d43d5af 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPlc.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPlc.java @@ -86,6 +86,10 @@ public class MesPlc extends BaseBean implements Serializable { @ApiParam("PLC配置") private String plcCfg; + @Column(name = "BUSI_TYPE") + @ApiParam("业务类型") + private String busiType; + @Column(name = "EQUIPMENT_CODE") @ApiParam("设备代码") private String equipmentCode; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesTypeCfg.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesTypeCfg.java index 9f87ea7..3b1c38e 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesTypeCfg.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesTypeCfg.java @@ -45,4 +45,8 @@ public class MesTypeCfg extends BaseBean implements Serializable { @Column(name = "BUSINESS_TYPE_NAME") @ApiParam("业务类型名称") private String businessTypeName; + + @Column(name = "COLOR_VALUE") + @ApiParam("颜色值") + private String colorValue; } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/template/MesWorkCellDefect.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkCellDefect.java similarity index 85% rename from modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/template/MesWorkCellDefect.java rename to modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkCellDefect.java index 025ae54..25ac166 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/template/MesWorkCellDefect.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkCellDefect.java @@ -1,4 +1,4 @@ -package cn.estsh.i3plus.pojo.mes.bean.template; +package cn.estsh.i3plus.pojo.mes.bean; import cn.estsh.i3plus.pojo.base.bean.BaseBean; import io.swagger.annotations.Api; @@ -47,6 +47,14 @@ public class MesWorkCellDefect extends BaseBean implements Serializable { @ApiParam("物料集") private String partAssemble; + @Column(name = "AREA_CODE") + @ApiParam("物料集") + private String areaCode; + + @Column(name = "DEFECT_TYPE") + @ApiParam("缺陷类型") + private String defectType; + @Transient @ApiParam("缺陷名称") private String defectCodeName; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkOrder.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkOrder.java index 677525f..1e81a07 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkOrder.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkOrder.java @@ -290,6 +290,14 @@ public class MesWorkOrder extends BaseBean implements Serializable { @ApiParam("客户集合") private List custList; + @Transient + @ApiParam("工位完成数量") + private Integer stationCompleteQty = 0; + + @Transient + @ApiParam("客户物料号") + private String customerPartNo; + public double getQtyVal() { return this.qty == null ? 0.0d : this.qty; } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/dbinterface/MesInterfaceEnumUtil.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/dbinterface/MesInterfaceEnumUtil.java index 76123e8..b1355c7 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/dbinterface/MesInterfaceEnumUtil.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/dbinterface/MesInterfaceEnumUtil.java @@ -9,7 +9,8 @@ public class MesInterfaceEnumUtil { SAP2WMS(10, "SAP2WMS", "SAP --> WMS"), WMS2SAP(20, "WMS2SAP", "WMS --> SAP"), MES2WMS(30, "MES2WMS", "MES --> WMS"), - WMS2MES(40, "WMS2MES", "WMS --> MES"); + WMS2MES(40, "WMS2MES", "WMS --> MES"), + MES2SAP(50, "MES2SAP", "MES --> SAP"); private int value; private String name; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/DataReviewModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/DataReviewModel.java index 36f5cb9..843eb9c 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/DataReviewModel.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/DataReviewModel.java @@ -31,4 +31,10 @@ public class DataReviewModel { @ApiParam("是否合格") private String reviewResult; + @ApiParam("关键件颜色") + private String keyPartColor; + + @ApiParam("生产数据颜色") + private String prodDataColor; + } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/ProductInfoManageModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/ProductInfoManageModel.java index 21d2f7e..d73253f 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/ProductInfoManageModel.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/ProductInfoManageModel.java @@ -81,6 +81,9 @@ public class ProductInfoManageModel { @ApiParam("明细队列序列") private Double queDetailSeq; + @ApiParam("主队列编号") + private String orderNo; + @ApiParam("总队列类型") private List queueTypeList; @@ -97,4 +100,13 @@ public class ProductInfoManageModel { this.produceColor = produceColor; this.queDetailSeq = queDetailSeq; } + + public ProductInfoManageModel(String vinCode, String produceCategoryCode, String orderNo, Double queDetailSeq, Double queueSeq, String workType) { + this.vinCode = vinCode; + this.produceCategoryCode = produceCategoryCode; + this.orderNo = orderNo; + this.queDetailSeq = queDetailSeq; + this.queueSeq = queueSeq; + this.workType = workType; + } } 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 62c4058..e566905 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 @@ -180,6 +180,9 @@ public class StationRequestBean implements Serializable { @ApiParam("班次名称") private String shiftName; + @ApiParam("创建时间") + private String createDatetime; + @Override public String toString() { return "StationRequestBean{" + diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/TorqueReviewModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/TorqueReviewModel.java new file mode 100644 index 0000000..e29550d --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/TorqueReviewModel.java @@ -0,0 +1,24 @@ +package cn.estsh.i3plus.pojo.mes.model; + +import io.swagger.annotations.ApiParam; +import lombok.Data; + +@Data +public class TorqueReviewModel { + + @ApiParam("工作单元代码") + private String workCellCode; + + @ApiParam("工作单元名称") + private String workCellName; + + @ApiParam("枪类型") + private String gunType; + + @ApiParam("检测结果") + private String checkResult; + + @ApiParam("显示颜色") + private String showColor; + +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/ZzMesWorkOrderModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/ZzMesWorkOrderModel.java index fb93d98..834aedf 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/ZzMesWorkOrderModel.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/ZzMesWorkOrderModel.java @@ -62,4 +62,16 @@ public class ZzMesWorkOrderModel extends BaseBean { @AnnoOutputColumn(required = false) private Integer rows; + @ApiParam("模具类型") + @AnnoOutputColumn(required = false) + private String mouldType; + + @ApiParam("模具编号集合") + @AnnoOutputColumn(required = false) + private String mouldCodeList; + + @ApiParam("工作中心名称") + @AnnoOutputColumn(required = false) + private String workCenterName; + } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesHncAgvRunningRepository.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesHncAgvRunningRepository.java new file mode 100644 index 0000000..f1d8b5a --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesHncAgvRunningRepository.java @@ -0,0 +1,12 @@ +package cn.estsh.i3plus.pojo.mes.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.mes.bean.MesHncAgvRunning; + +/** + * @author Wynne.Lu + * @date 2020/8/3 17:54 + * @desc + */ +public interface MesHncAgvRunningRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesWorkCellDefectRepository.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesWorkCellDefectRepository.java index 43b09f2..6cf2246 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesWorkCellDefectRepository.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesWorkCellDefectRepository.java @@ -1,7 +1,7 @@ package cn.estsh.i3plus.pojo.mes.repository; import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; -import cn.estsh.i3plus.pojo.mes.bean.template.MesWorkCellDefect; +import cn.estsh.i3plus.pojo.mes.bean.MesWorkCellDefect; import org.springframework.stereotype.Repository; /** diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesWorkCellDefectsRepository.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesWorkCellDefectsRepository.java index be056c0..ad54293 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesWorkCellDefectsRepository.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesWorkCellDefectsRepository.java @@ -1,7 +1,7 @@ package cn.estsh.i3plus.pojo.mes.repository; import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; -import cn.estsh.i3plus.pojo.mes.bean.template.MesWorkCellDefect; +import cn.estsh.i3plus.pojo.mes.bean.MesWorkCellDefect; import org.springframework.stereotype.Repository; /** * @Description: 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 cd30d03..d0caed6 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 @@ -9,7 +9,7 @@ import cn.estsh.i3plus.pojo.base.util.StringUtil; import cn.estsh.i3plus.pojo.mes.bean.*; import cn.estsh.i3plus.pojo.mes.bean.template.BasImportTemplate; import cn.estsh.i3plus.pojo.mes.bean.template.BasImportTemplateDetails; -import cn.estsh.i3plus.pojo.mes.bean.template.MesWorkCellDefect; +import cn.estsh.i3plus.pojo.mes.bean.MesWorkCellDefect; import cn.estsh.i3plus.pojo.mes.dbinterface.MesInterfaceDataMapper; import org.springframework.util.CollectionUtils; import org.springframework.util.StringUtils; diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/mes/TorqueCollectionModel.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/mes/TorqueCollectionModel.java index d5f7f23..9d94855 100644 --- a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/mes/TorqueCollectionModel.java +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/mes/TorqueCollectionModel.java @@ -142,6 +142,9 @@ public class TorqueCollectionModel implements Serializable { @ApiParam("防错码") private String pokeYokeFix; + @ApiParam("防错码长度") + private String pokeYokeLength; + private Map psets = new LinkedHashMap<>(); public TorqueCollectionModel(String vinCode) { @@ -207,7 +210,7 @@ public class TorqueCollectionModel implements Serializable { public TorqueCollectionModel(String vinCode, String prodCfgTypeCode, String gradeCode, String colorCode, String partNo, String partName, Integer pset1, Integer pset2, Integer pset3, Integer pset4, Integer pset5, Integer pset6, Integer pset7, Integer pset8, - Integer torqueNo, Integer sendSeq, Integer checkScanCount, String pokeYokeFix) { + Integer torqueNo, Integer sendSeq, Integer checkScanCount, String pokeYokeFix, String pokeYokeLength) { this.vinCode = vinCode; this.prodCfgTypeCode = prodCfgTypeCode; this.gradeCode = gradeCode; @@ -226,6 +229,7 @@ public class TorqueCollectionModel implements Serializable { this.sendSeq = sendSeq; this.checkScanCount = checkScanCount; this.pokeYokeFix = pokeYokeFix; + this.pokeYokeLength = pokeYokeLength; assemblePsets(); } diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/softswitch/SuitClientModel.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/softswitch/SuitClientModel.java index eac5415..4c82b54 100644 --- a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/softswitch/SuitClientModel.java +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/softswitch/SuitClientModel.java @@ -105,6 +105,8 @@ public class SuitClientModel implements Serializable { @XStreamCDATA private Object suitResultMessage; + private boolean isNeedRetry = false; + public SuitClientModel() { } diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/sqlpack/CoreHqlPack.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/sqlpack/CoreHqlPack.java index 225cfd7..e00e6e9 100644 --- a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/sqlpack/CoreHqlPack.java +++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/sqlpack/CoreHqlPack.java @@ -345,8 +345,8 @@ public class CoreHqlPack { public static DdlPackBean packDdlSysRoleCheckOnly(SysRole role) { DdlPackBean result = DdlPackBean.getDdlPackBean(); + DdlPreparedPack.getNumNOEqualPack(role.getId(), "id", result); DdlPreparedPack.getStringEqualPack(role.getName(), "name", result); - DdlPreparedPack.getNumEqualPack(role.getId(), "id", result); return result; } diff --git a/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsBusiScript.java b/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsBusiScript.java new file mode 100644 index 0000000..3168c77 --- /dev/null +++ b/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsBusiScript.java @@ -0,0 +1,107 @@ +package cn.estsh.i3plus.pojo.softswitch.bean; + +import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn; +import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import cn.estsh.i3plus.pojo.base.enumutil.BlockSoftSwitchEnumUtil; +import com.fasterxml.jackson.databind.annotation.JsonSerialize; +import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.apache.commons.lang3.math.NumberUtils; +import org.hibernate.annotations.DynamicInsert; +import org.hibernate.annotations.DynamicUpdate; + +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.Table; + +/** + * @Description : 业务脚本 + * @Reference : + * @Author : yunhao + * @CreateDate : 2020-07-28 14:35 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "BS_BUSI_SCRIPT") +@ApiModel(value = "业务脚本", description = "业务脚本") +public class BsBusiScript extends BaseBean { + + private static final long serialVersionUID = 1419277265159912600L; + + @Column(name = "SCRIPT_NAME") + @ApiModelProperty(value = "脚本名称") + private String scriptName; + + @Column(name = "SCRIPT_CODE") + @ApiModelProperty(value = "脚本代码") + private String scriptCode; + + @Column(name = "SCRIPT_TYPE") + @ApiModelProperty(value = "脚本类型") + @AnnoOutputColumn(refClass = BlockSoftSwitchEnumUtil.BS_SCRIPT_TYPE.class) + private Integer scriptType; + + public String getScriptTypeTxt() { + return scriptType == null ? "无" : BlockSoftSwitchEnumUtil.BS_SCRIPT_TYPE.valueOfDescription(scriptType); + } + + @Column(name = "SCRIPT_LANGUAGE") + @ApiModelProperty(value = "脚本语言") + @AnnoOutputColumn(refClass = BlockSoftSwitchEnumUtil.BS_SCRIPT_LANGUAGE.class) + private Integer scriptLanguage; + + public String getScriptLanguageTxt() { + return scriptLanguage == null ? "无" : BlockSoftSwitchEnumUtil.BS_SCRIPT_LANGUAGE.valueOfDescription(scriptLanguage); + } + + @Column(name = "SCRIPT_EXECUTE_METHOD") + @ApiModelProperty(value = "脚本执行方式") + @AnnoOutputColumn(refClass = BlockSoftSwitchEnumUtil.BS_SCRIPT_EXECUTE_METHOD.class) + private Integer scriptExecuteMethod; + + public String getScriptExecuteMethodTxt() { + return scriptExecuteMethod == null ? "无" : BlockSoftSwitchEnumUtil.BS_SCRIPT_EXECUTE_METHOD.valueOfDescription(scriptExecuteMethod); + } + + @Column(name = "SCRIPT_OBJ_NAME") + @ApiModelProperty(value = "脚本对象名称") + private String scriptObjName; + + @Column(name = "SCRIPT_METHOD_NAME") + @ApiModelProperty(value = "脚本方法名称") + private String scriptMethodName; + + @Column(name = "SCRIPT_CONTENT") + @ApiModelProperty(value = "脚本内容") + private String scriptContent; + + @Column(name = "SCRIPT_DESC") + @ApiModelProperty(value = "脚本描述") + private String scriptDesc; + + @Column(name = "REF_ID") + @ApiModelProperty(value = "关联id") + @JsonSerialize(using = ToStringSerializer.class) + private Long refId; + + @Column(name = "SCRIPT_VERSION") + @ApiModelProperty(value = "脚本版本") + private Integer scriptVersion; + + public int getScriptVersion(){ + return scriptVersion == null ? NumberUtils.INTEGER_ONE : scriptVersion; + } + + public BsBusiScript nextVersion() { + setScriptVersion(getScriptVersion() + 1); + return this; + } + +} diff --git a/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsDataSource.java b/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsDataSource.java index 2f04bc8..e3ddc94 100644 --- a/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsDataSource.java +++ b/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsDataSource.java @@ -52,6 +52,10 @@ public class BsDataSource extends BaseBean { @ApiParam(value = "数据源端口") private Integer dataSourcePort; + @Column(name = "DATA_SOURCE_INSTANCE_NAME") + @ApiParam(value = "数据源实例名称") + private String dataSourceInstanceName; + @Column(name = "DATA_SOURCE_USER") @ApiParam(value = "用户名") private String dataSourceUser; diff --git a/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsLongData.java b/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsLongData.java index 4f87d41..ed054c8 100644 --- a/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsLongData.java +++ b/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsLongData.java @@ -3,6 +3,8 @@ package cn.estsh.i3plus.pojo.softswitch.bean; import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn; import cn.estsh.i3plus.pojo.base.bean.BaseBean; import cn.estsh.i3plus.pojo.base.enumutil.BlockSoftSwitchEnumUtil; +import com.fasterxml.jackson.databind.annotation.JsonSerialize; +import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; @@ -34,6 +36,7 @@ public class BsLongData extends BaseBean { private static final long serialVersionUID = -329128754646765129L; @Column(name = "REF_ID") @ApiParam(value = "关联id") + @JsonSerialize(using = ToStringSerializer.class) private Long refId; @Column(name = "REF_DATA_TYPE") diff --git a/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitCase.java b/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitCase.java index a515e18..200ba31 100644 --- a/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitCase.java +++ b/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitCase.java @@ -1,5 +1,6 @@ package cn.estsh.i3plus.pojo.softswitch.bean; +import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn; import cn.estsh.i3plus.pojo.base.bean.BaseBean; import cn.estsh.i3plus.pojo.base.enumutil.BlockSoftSwitchEnumUtil; import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil; @@ -40,6 +41,7 @@ public class BsSuitCase extends BaseBean { @Column(name = "CASE_TYPE_ID") @ApiParam(value = "套件类型id(枚举)") + @AnnoOutputColumn(refClass = BlockSoftSwitchEnumUtil.CASE_TYPE.class) private Integer caseTypeId; public int getCaseTypeIdVal(){ @@ -76,6 +78,7 @@ public class BsSuitCase extends BaseBean { @Column(name = "SUIT_MODE_ID") @ApiParam(value = "适配模式(枚举,主动，被动)") + @AnnoOutputColumn(refClass = BlockSoftSwitchEnumUtil.SUIT_MODE.class) private Integer suitModeId; @Column(name = "SUIT_ACTION_ID") @@ -230,6 +233,10 @@ public class BsSuitCase extends BaseBean { @ApiParam(value = "适配器状态") private Integer suitCaseStatus; + @Column(name = "BIND_BUSI_SCRIPT_CODE") + @ApiParam(value = "绑定业务脚本Code") + private String bindBusiScriptCode; + @Transient @ApiParam(value = "适配器套件明细") private Object bsSuitCaseDetail; diff --git a/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitRecord.java b/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitRecord.java index 957bd5e..d67c241 100644 --- a/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitRecord.java +++ b/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitRecord.java @@ -133,6 +133,10 @@ public class BsSuitRecord extends BaseBean { @ApiParam(value = "处理时间") private String processTime; + @Column(name = "SCRIPT_RESULT") + @ApiParam(value = "脚本结果") + private String scriptResult; + @Transient @ApiParam(value = "适配记录参数") private List bsSuitRecordParamList; diff --git a/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitRequestRecord.java b/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitRequestRecord.java index 81ae451..6ba934f 100644 --- a/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitRequestRecord.java +++ b/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitRequestRecord.java @@ -11,6 +11,7 @@ import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; import javax.persistence.*; +import java.util.List; /** * @Description : 请求适配记录 @@ -46,10 +47,12 @@ public class BsSuitRequestRecord extends BaseBean { private Integer requestSource; // 移动至记录数据表 - @Lob @Column(name = "REQUEST_ORGIN_PARAM") @ApiParam(value = "请求原始参数") private String requestOrginParam; + @Transient + @ApiParam(value = "id-查询条件") + private List searchIdList; } diff --git a/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/repository/BsBusiScriptRepository.java b/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/repository/BsBusiScriptRepository.java new file mode 100644 index 0000000..99401ba --- /dev/null +++ b/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/repository/BsBusiScriptRepository.java @@ -0,0 +1,14 @@ +package cn.estsh.i3plus.pojo.softswitch.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.softswitch.bean.BsBusiScript; + +/** + * @Description : 业务脚本 + * @Reference : + * @Author : yunhao + * @CreateDate : 2020-07-28 15:13 + * @Modify: + **/ +public interface BsBusiScriptRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/sqlpack/SoftSwitchHqlPack.java b/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/sqlpack/SoftSwitchHqlPack.java index 28aa126..cfa357f 100644 --- a/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/sqlpack/SoftSwitchHqlPack.java +++ b/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/sqlpack/SoftSwitchHqlPack.java @@ -261,7 +261,7 @@ public class SoftSwitchHqlPack { DdlPackBean ddlPackBean = DdlPackBean.getDdlPackBean(); DdlPreparedPack.getNumEqualPack(bsDataSource.getId(), "id", ddlPackBean); - DdlPreparedPack.getStringLikerPack(bsDataSource.getDataSourceCode(), "dataSourceCode", ddlPackBean); + DdlPreparedPack.getStringEqualPack(bsDataSource.getDataSourceCode(), "dataSourceCode", ddlPackBean); return ddlPackBean; } @@ -323,6 +323,7 @@ public class SoftSwitchHqlPack { DdlPreparedPack.getStringLikerPack(bsSuitRecord.getSuitCaseNameRdd(),"suitCaseNameRdd",ddlPackBean); DdlPreparedPack.getNumEqualPack(bsSuitRecord.getSuitTypeId(),"suitTypeId",ddlPackBean); DdlPreparedPack.getStringLikerPack(bsSuitRecord.getSuitCaseCode(),"suitCaseCode",ddlPackBean); + DdlPreparedPack.getStringLikerPack(bsSuitRecord.getScriptResult(),"scriptResult",ddlPackBean); DdlPreparedPack.getNumEqualPack(bsSuitRecord.getProcessState(),"processState",ddlPackBean); DdlPreparedPack.getNumEqualPack(bsSuitRecord.getSuitCaseId(),"suitCaseId",ddlPackBean); DdlPreparedPack.getNumEqualPack(bsSuitRecord.getCaseTypeId(),"caseTypeId",ddlPackBean); @@ -367,6 +368,7 @@ public class SoftSwitchHqlPack { public static DdlPackBean packHqlBsSuitRequestRecord(BsSuitRequestRecord bsSuitRequestRecord){ DdlPackBean ddlPackBean = DdlPackBean.getDdlPackBean(bsSuitRequestRecord); + DdlPreparedPack.getInPackList(bsSuitRequestRecord.getSearchIdList(),"id",ddlPackBean); DdlPreparedPack.getNumEqualPack(bsSuitRequestRecord.getSuitCaseId(),"suitCaseId",ddlPackBean); DdlPreparedPack.timeBuilder(bsSuitRequestRecord.getCreateDatetime(), "createDatetime", ddlPackBean, false, true); @@ -416,7 +418,16 @@ public class SoftSwitchHqlPack { DdlPackBean ddlPackBean = DdlPackBean.getDdlPackBean(bsLongData); DdlPreparedPack.timeBuilder(bsLongData.getCreateDatetime(), "createDatetime", ddlPackBean, false, true); DdlPreparedPack.getNumEqualPack(bsLongData.getRefDataType(),"refDataType",ddlPackBean); - DdlPreparedPack.getStringLikePack(bsLongData.getData(),"data",ddlPackBean); + DdlPreparedPack.getStringLikerPack(bsLongData.getData(),"data",ddlPackBean); + return ddlPackBean; + } + + public static DdlPackBean packHqlBsBusiScript(BsBusiScript bsBusiScript){ + DdlPackBean ddlPackBean = DdlPackBean.getDdlPackBean(bsBusiScript); + DdlPreparedPack.getStringLikerPack(bsBusiScript.getScriptName(),"scriptName",ddlPackBean); + DdlPreparedPack.getStringLikerPack(bsBusiScript.getScriptCode(),"scriptCode",ddlPackBean); + DdlPreparedPack.getNumEqualPack(bsBusiScript.getScriptType(),"scriptType",ddlPackBean); + DdlPreparedPack.getNumEqualPack(bsBusiScript.getRefId(),"refId",ddlPackBean); return ddlPackBean; } } diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionCallResult.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionCallResult.java new file mode 100644 index 0000000..aef56f0 --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionCallResult.java @@ -0,0 +1,24 @@ +package cn.estsh.i3plus.pojo.wms.bean; + +import lombok.Data; + +/** + * @Description : 调用流程处理组件时的返回对象 + * @Reference : + * @Author : rock.yu + * @CreateDate : 2020-08-03 20:54 + * @Modify: + **/ +@Data +public class WmsActionCallResult { + private Object resultObj; + /** + * 执行耗时，单位 ms + */ + private Integer duration; + + public WmsActionCallResult(Object resultObj, Integer duration) { + this.resultObj = resultObj; + this.duration = duration; + } +} diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionLog.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionLog.java index 4b8e558..ea59343 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionLog.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionLog.java @@ -124,6 +124,10 @@ public class WmsActionLog extends BaseBean { @ApiParam(value = "结束组件编号", example = "0") public Long endAmId; + @Column(name = "DURATION") + @ApiParam(value = "执行耗时，单位：毫秒", example = "0") + public Integer duration = 0; + public Long getInitAmId() { if (initAmId != null) { return initAmId.longValue(); diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionLogData.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionLogData.java index b96ae52..1ca730c 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionLogData.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionLogData.java @@ -11,10 +11,7 @@ import lombok.EqualsAndHashCode; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Lob; -import javax.persistence.Table; +import javax.persistence.*; /** * @Description :作业记录参数表 @@ -33,14 +30,41 @@ import javax.persistence.Table; public class WmsActionLogData extends BaseBean { private static final long serialVersionUID = -8150713013135101134L; - @Column(name = "ALD_ID") - @ApiParam(value = "记录明细编号") + + @Column(name = "TASK_NO") + @ApiParam(value = "作业任务编号", example = "1") + @JsonSerialize(using = ToStringSerializer.class) + public String taskNo; + + @Column(name = "TRANS_TYPE_CODE") + @ApiParam(value = "交易类型编号") + public String transTypeCode; + + @Transient + @Column(name = "MOVE_NO") + @ApiParam(value = "移动单单号") + public String moveNo; + + @Column(name = "AG_ID") + @ApiParam(value = "作业流程编号", example = "1") @JsonSerialize(using = ToStringSerializer.class) - private Long aldId; + public Long agId; + + @Column(name = "AL_NAME_RDD") + @ApiParam(value = "流程名称") + public String agNameRdd; - @Column(name = "ALD_SEQ") - @ApiParam(value = "步骤序号") - private Integer aldSeq; + @Column(name = "ACTION_USER_NAME") + @ApiParam(value = "作业人员") + public String actionUserName; + + @Column(name = "FIX_NO") + @ApiParam(value = "设备编号") + public String fixNo; + + @Column(name = "AGD_SEQ") + @ApiParam(value = "作业步骤序号") + private Integer agdSeq; @Column(name = "CALL_CLASS") @ApiParam(value = "实现类") @@ -54,21 +78,17 @@ public class WmsActionLogData extends BaseBean { @ApiParam(value = "执行状态") private Integer executeStatus; - @Column(name = "START_TIME") - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") - @ApiParam(value="开始执行时间",example = "2000-01-01 01:00:00") - private String startTime; - - @Column(name = "END_TIME") - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") - @ApiParam(value="结束执行时间",example = "2000-01-01 01:00:00") - private String endTime; - + /** + * 保存调用组件时的 params + */ @Lob @Column(name = "IN_PARAMS", columnDefinition = "TEXT") @ApiParam(value = "输入参数") private String inParams; + /** + * 保存调用组件后的返回值 + */ @Lob @Column(name = "OUT_PARAMS", columnDefinition = "TEXT") @ApiParam(value = "输出参数") @@ -78,4 +98,8 @@ public class WmsActionLogData extends BaseBean { @Column(name = "ERROR_MSG", columnDefinition = "TEXT") @ApiParam(value = "异常信息") private String errorMsg; + + @Column(name = "DURATION") + @ApiParam(value = "执行耗时，单位：毫秒", example = "0") + public Integer duration = 0; } diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionLogDetails.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionLogDetails.java index facb1fc..a4d878e 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionLogDetails.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionLogDetails.java @@ -116,6 +116,11 @@ public class WmsActionLogDetails extends BaseBean { @Column(name="MOVE_NO") @ApiParam(value = "移动单单号") public String moveNo; + + @Column(name = "DURATION") + @ApiParam(value = "执行耗时，单位：毫秒", example = "0") + public Integer duration = 0; + public Long getAsId() { if (asId != null) { return asId.longValue(); diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java index cbddf7b..86c2074 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java @@ -2985,7 +2985,7 @@ public class WmsHqlPack { public static DdlPackBean packHqlWmsFieldInfo(WmsFieldInfo wmsFieldInfo) { DdlPackBean result = new DdlPackBean(); DdlPreparedPack.getStringEqualPack(wmsFieldInfo.getFieldName(), "fieldName", result); - DdlPreparedPack.getStringEqualPack(wmsFieldInfo.getEntityName(), "dataSrc", result); + DdlPreparedPack.getStringEqualPack(wmsFieldInfo.getEntityName(), "entityName", result); getStringBuilderPack(wmsFieldInfo, result); return result; }