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 6c2d59d..e312525 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 @@ -1128,7 +1128,6 @@ public class CommonEnumUtil { } } - // 数据有效的静态常量 public static final int VALID = CommonEnumUtil.IS_VAILD.VAILD.getValue(); // 数据未删除的静态常量 diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/ImppEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/ImppEnumUtil.java index 561ce58..ce67a7d 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/ImppEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/ImppEnumUtil.java @@ -1023,7 +1023,8 @@ public class ImppEnumUtil { MAIL(3, "邮件配置"), CONTACT(4, "联系人"), BASIS(5, "基础"), - CONFIG(6, "系统配置"); + CONFIG(6, "系统配置"), + LOG(7, "日志配置"); private int value; private String description; diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/LacEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/LacEnumUtil.java index e5ad0f4..d64eb01 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/LacEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/LacEnumUtil.java @@ -62,7 +62,8 @@ public class LacEnumUtil { @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum HARDWARE_TYPE { OPC_READ(10, "读OPC"), - OPC_WRITE(20, "写OPC"); + OPC_WRITE(20, "写OPC"), + OPC_SUBSCRIPTION(30, "订阅OPC"); private int value; private String description; @@ -180,4 +181,74 @@ public class LacEnumUtil { } } + /** + * 返回方式 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum RETURN_METHOD{ + SYNC(1,"同步"), + ASYNC(2,"异步"); + + private int value; + private String description; + + RETURN_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; + } + } + + /** + * 参数值类型 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum PARAM_VALUE_TYPE{ + NUMBER(1,"数字"), + STRING(2,"字符串"); + + private int value; + private String description; + + PARAM_VALUE_TYPE(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; + } + } + } diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java index 0f8069f..53f325f 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java @@ -4105,4 +4105,77 @@ public class WmsEnumUtil { return tmp; } } + + /** + * 生产质检单的方式 + * 默认为 10 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum CREATE_QC_ORDER_TYPE { + BY_MOVE(10, "按库存移动单"), BY_PART(20, "按物料编号"); + + private int value; + private String description; + + CREATE_QC_ORDER_TYPE(int value, String description) { + this.value = value; + this.description = description; + } + + public int getValue() { + return value; + } + + public String getDescription() { + return description; + } + + public static String valueOf(int val) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].value == val) { + tmp = values()[i].description; + } + } + return tmp; + } + } + + /** + * 编组管理操作类型 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum PACKAGE_OPERATE_TYPE { + PACKAGE_ADD("PACKAGE_ADD", "新增"), + PACKAGE_ADDITIONAL("PACKAGE_ADDITIONAL", "追加"), + PACKAGE_DELETE("PACKAGE_DELETE", "删除"), + PACKAGE_CLEAR("PACKAGE_CLEAR", "清空"); + + private String value; + private String description; + + PACKAGE_OPERATE_TYPE(String value, String description) { + this.value = value; + this.description = description; + } + + public String getValue() { + return value; + } + + public String getDescription() { + return description; + } + + public static String getDescription(String val) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (val.equals(values()[i].value)) { + tmp = values()[i].description; + } + } + return tmp; + } + } + } \ No newline at end of file diff --git a/modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/bean/LacCommandStackStep.java b/modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/bean/LacCommandStackStep.java index 41be18c..e9cacb4 100644 --- a/modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/bean/LacCommandStackStep.java +++ b/modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/bean/LacCommandStackStep.java @@ -56,12 +56,16 @@ public class LacCommandStackStep extends BaseBean { @JsonSerialize(using = ToStringSerializer.class) private Long templateId; - @Column(name="STEP_NAME") + @Column(name="TEMPLATE_NAME_RDD") @ApiParam(value ="模板名称") + private String templateNameRdd; + + @Column(name="STEP_NAME") + @ApiParam(value ="步骤名称") private String stepName; @Column(name="STEP_CODE") - @ApiParam(value ="模板代码") + @ApiParam(value ="步骤代码") private String stepCode; @Column(name="STEP_SORT") @@ -73,7 +77,7 @@ public class LacCommandStackStep extends BaseBean { private Double stepExecCond; @Column(name="STEP_DESCRIPTION") - @ApiParam(value ="步骤执行条件") + @ApiParam(value ="步骤描述") private String stepDescription; @Transient diff --git a/modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/bean/LacSuitCase.java b/modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/bean/LacSuitCase.java index c821de0..9caa3b2 100644 --- a/modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/bean/LacSuitCase.java +++ b/modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/bean/LacSuitCase.java @@ -81,10 +81,6 @@ public class LacSuitCase extends BaseBean { @ApiParam(value ="返回类型") private Integer returnMethod; - @Column(name="SUTI_CASE_STATUS") - @ApiParam(value ="适配器状态") - private Integer sutiCaseStatus; - @Column(name="SUIT_CASE_DESCRIPTION") @ApiParam(value ="适配器描述") private String suitCaseDescription; diff --git a/modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/bean/LacSuitTaskParamAdapter.java b/modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/bean/LacSuitTaskParamAdapter.java index b44528b..3ed31a6 100644 --- a/modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/bean/LacSuitTaskParamAdapter.java +++ b/modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/bean/LacSuitTaskParamAdapter.java @@ -91,7 +91,7 @@ public class LacSuitTaskParamAdapter extends BaseBean { @Column(name="TRANSFER_PARAM_VALUE_TYPE") @ApiParam(value ="转换后参数值类型") - private String transferParamValueType; + private Integer transferParamValueType; @Column(name="DEFAULT_VALUE") @ApiParam(value ="参数默认值") diff --git a/modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/sqlpack/LacHqlPack.java b/modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/sqlpack/LacHqlPack.java index 9a42293..6bb3a32 100644 --- a/modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/sqlpack/LacHqlPack.java +++ b/modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/sqlpack/LacHqlPack.java @@ -67,6 +67,9 @@ public class LacHqlPack { public static DdlPackBean packHqlLacSuitTask(LacSuitTask bean) { DdlPackBean ddlPackBean = DdlPackBean.getDdlPackBean(); + DdlPreparedPack.getStringLikerPack(bean.getTaskName(),"taskName",ddlPackBean); + DdlPreparedPack.getStringLikerPack(bean.getTaskCode(),"taskCode",ddlPackBean); + return ddlPackBean; } @@ -94,6 +97,8 @@ public class LacHqlPack { public static DdlPackBean packHqlLacSuitTaskParam(LacSuitTaskParam bean) { DdlPackBean ddlPackBean = DdlPackBean.getDdlPackBean(); + DdlPreparedPack.getNumEqualPack(bean.getParamType(),"paramType",ddlPackBean); + DdlPreparedPack.getNumEqualPack(bean.getTaskId(),"taskId",ddlPackBean); return ddlPackBean; } diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysConfig.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysConfig.java index 3ab55af..3a9268b 100644 --- a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysConfig.java +++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysConfig.java @@ -1,14 +1,12 @@ package cn.estsh.i3plus.pojo.platform.bean; import cn.estsh.i3plus.pojo.base.bean.BaseBean; -import cn.estsh.i3plus.pojo.base.enumutil.ImppEnumUtil; 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; @@ -57,7 +55,7 @@ public class SysConfig extends BaseBean { private String configValue; @Column(name="CONFIG_VALUE_OPTION") - @ApiParam(value ="参数值选项（参数类型为多选时使用），格式：{key:'',value:''}") + @ApiParam(value ="参数值选项（参数类型为多选时使用），格式：{\"key\":\"value\"}") private String configValueOption; @Column(name="CONFIG_DESCRIPTION") 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 5ea76e3..79dfe71 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 @@ -334,6 +334,7 @@ public class SoftSwitchHqlPack { DdlPreparedPack.getStringLikerPack(bsSuitRecord.getSuitCaseNameRdd(),"suitCaseNameRdd",ddlPackBean); DdlPreparedPack.getNumEqualPack(bsSuitRecord.getSuitTypeId(),"suitTypeId",ddlPackBean); DdlPreparedPack.getStringLikerPack(bsSuitRecord.getSuitCaseCode(),"suitCaseCode",ddlPackBean); + DdlPreparedPack.getNumEqualPack(bsSuitRecord.getProcessState(),"processState",ddlPackBean); DdlPreparedPack.getNumEqualPack(bsSuitRecord.getSuitCaseId(),"suitCaseId",ddlPackBean); DdlPreparedPack.getNumEqualPack(bsSuitRecord.getCaseTypeId(),"caseTypeId",ddlPackBean); DdlPreparedPack.timeBuilder(bsSuitRecord.getCreateDatetime(), "createDatetime", ddlPackBean, false, true);