I3_YF_SEAT
/
i3plus-pojo
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'test'

Browse Source
yun-zuoyi
王杰 5 years ago
parent 46b8c6babb b516ca254c
commit 7662905caa
404 changed files with 6617 additions and 924 deletions
Show Stats Download Patch File Download Diff File

50
modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/BomTree.java
Unescape Escape View File

@ -1,50 +0,0 @@
package cn.estsh.i3plus.pojo.aps.bean;
import cn.estsh.i3plus.pojo.aps.annotation.ExcludeImportExport;
import cn.estsh.i3plus.pojo.aps.common.BaseAPS;
import cn.estsh.i3plus.pojo.base.enumutil.ApsEnumUtil;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiParam;
import lombok.Data;
import lombok.EqualsAndHashCode;
/**
* @Description :BOM树
* @Reference :
* @Author : jason.niu
* @CreateDate : 2019-09-17
* @Modify:
**/
@Data
@EqualsAndHashCode(callSuper = true)
@Api("BOM树")
@ExcludeImportExport
public class BomTree extends BaseAPS {
@ApiParam(value ="物料类型")
private ApsEnumUtil.MATERIAL_TYPE type;
@ApiParam(value ="备料类型")
private ApsEnumUtil.PREPARE_TYPE prepareType;
@ApiParam(value ="补充类型")
private ApsEnumUtil.REPLENISHMENT_TYPE replType;
@ApiParam(value ="采购提前期")
private String purchaseLeadTime;
@ApiParam(value ="制造提前期")
private String manufLeadTime;
@ApiParam(value ="配送提前期")
private String shipmentLeadTime;
@ApiParam(value ="单位采购量")
private Integer unitPurchase;
@ApiParam(value ="单位制造量")
private Integer unitManuf;
@ApiParam(value ="单位配送量")
private Integer unitShipment;
}

6
modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ExportProject.java
Unescape Escape View File

@ -38,6 +38,12 @@ public class ExportProject extends BaseAPS {
@FieldAnnotation(relation = "Link", notEmpty = true)
private Long linkId;
@ApiParam(value ="当前执行的明细序号")
private transient Integer curDetailNumber;
@ApiParam(value ="当前执行的明细名称")
private transient String curDetailName;
public DataLink getLink() {
return BeanRelation.get(this, EExportProject.Link);
}

2
modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/HeuristicRule.java
Unescape Escape View File

@ -1,6 +1,7 @@
package cn.estsh.i3plus.pojo.aps.bean;
import cn.estsh.i3plus.pojo.aps.annotation.FieldAnnotation;
import cn.estsh.i3plus.pojo.base.enumutil.ApsEnumUtil;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiParam;
import lombok.Data;
@ -42,5 +43,6 @@ public class HeuristicRule extends BaseRule {
@Column(name="BATCH_PERIOD")
@ApiParam(value ="组炉区间")
@FieldAnnotation(editType = ApsEnumUtil.EDIT_TYPE.DURATION)
private String batchPeriod;
}

6
modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ImportProject.java
Unescape Escape View File

@ -37,6 +37,12 @@ public class ImportProject extends BaseAPS {
@FieldAnnotation(relation = "Link", notEmpty = true)
private Long linkId;
@ApiParam(value ="当前执行的明细序号")
private transient Integer curDetailNumber;
@ApiParam(value ="当前执行的明细名称")
private transient String curDetailName;
public DataLink getLink() {
return BeanRelation.get(this, EImportProject.Link);
}

7
modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/Material.java
Unescape Escape View File

@ -61,14 +61,17 @@ public class Material extends BaseAPS {
@Column(name="PURCHASE_LEAD_TIME")
@ApiParam(value ="采购提前期")
@FieldAnnotation(editType = ApsEnumUtil.EDIT_TYPE.DURATION)
private String purchaseLeadTime;
@Column(name="MANUF_LEAD_TIME")
@ApiParam(value ="制造提前期")
@FieldAnnotation(editType = ApsEnumUtil.EDIT_TYPE.DURATION)
private String manufLeadTime;
@Column(name="SHIPMENT_LEAD_TIME")
@ApiParam(value ="配送提前期")
@FieldAnnotation(editType = ApsEnumUtil.EDIT_TYPE.DURATION)
private String shipmentLeadTime;
@Column(name="UNIT_PURCHASE")
@ -121,18 +124,22 @@ public class Material extends BaseAPS {
@Column(name="MIN_STOCK_COUNT", columnDefinition = "decimal(18,8)")
@ApiParam(value ="最小库存数量")
@FieldAnnotation(property = false)
private Double minStockCount;
@Column(name="SAFE_STOCK_COUNT", columnDefinition = "decimal(18,8)")
@ApiParam(value ="安全库存数量")
@FieldAnnotation(property = false)
private Double safeStockCount;
@Column(name="MAX_STOCK_COUNT", columnDefinition = "decimal(18,8)")
@ApiParam(value ="最大库存数量")
@FieldAnnotation(property = false)
private Double maxStockCount;
@Column(name="ORDER_BATCH_PERIOD")
@ApiParam(value ="订单合并期间")
@FieldAnnotation(editType = ApsEnumUtil.EDIT_TYPE.DURATION)
private String orderBatchPeriod;
@JsonBackReference

21
modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/OperInput.java
Unescape Escape View File

@ -34,21 +34,24 @@ public class OperInput extends BaseAPS {
@FieldAnnotation(relation = "Operation", notEmpty = true, display = false)
private Long operationId;
@Column(name="MATERIAL_ID")
@Column(name="INPUT_MATERIAL_ID")
@ApiParam(value ="物料")
@FieldAnnotation(relation = "Material", notEmpty = true)
private Long materialId;
@FieldAnnotation(relation = "InputMaterial", notEmpty = true)
private Long inputMaterialId;
@Column(name="INPUT_COUNT", columnDefinition = "decimal(18,8)")
@ApiParam(value ="单位输入量")
@FieldAnnotation(defaultValue = "1.0")
private Double inputCount;
@Column(name="YIELD", columnDefinition = "decimal(18,8)")
@ApiParam(value ="成品率")
@FieldAnnotation(defaultValue = "1.0")
private Double yield;
@Column(name="FIX_SCRAP_COUNT", columnDefinition = "decimal(18,8)")
@ApiParam(value ="固定报废数")
@FieldAnnotation(defaultValue = "0.0")
private Double fixScrapCount;
@Column(name="CONS_TYPE")
@ -58,10 +61,12 @@ public class OperInput extends BaseAPS {
@Column(name="MAX_SPACE_TIME")
@ApiParam(value ="最大时间间隔")
@FieldAnnotation(editType = ApsEnumUtil.EDIT_TYPE.DURATION)
private String maxSpaceTime;
@Column(name="MIN_SPACE_TIME")
@ApiParam(value ="最小时间间隔")
@FieldAnnotation(editType = ApsEnumUtil.EDIT_TYPE.DURATION)
private String minSpaceTime;
public Operation getOperation() {
@ -73,13 +78,13 @@ public class OperInput extends BaseAPS {
BeanRelation.set(this, EOperInput.Operation, oper);
}
public Material getMaterial() {
return BeanRelation.get(this, EOperInput.Material);
public Material getInputMaterial() {
return BeanRelation.get(this, EOperInput.InputMaterial);
}
public void setMaterial(Material material) {
this.materialId = material != null ? material.getId() : 0l;
BeanRelation.set(this, EOperInput.Material, material);
public void setInputMaterial(Material material) {
this.inputMaterialId = material != null ? material.getId() : 0l;
BeanRelation.set(this, EOperInput.InputMaterial, material);
}
@JsonBackReference

17
modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/OperOutput.java
Unescape Escape View File

@ -33,21 +33,24 @@ public class OperOutput extends BaseAPS {
@FieldAnnotation(relation = "Operation", notEmpty = true, display = false)
private Long operationId;
@Column(name="MATERIAL_ID")
@Column(name="OUTPUT_MATERIAL_ID")
@ApiParam(value ="物料")
@FieldAnnotation(relation = "Material", notEmpty = true)
private Long materialId;
private Long outputMaterialId;
@Column(name="OUTPUT_COUNT", columnDefinition = "decimal(18,8)")
@ApiParam(value ="单位输出量")
@FieldAnnotation(defaultValue = "1.0")
private Double outputCount;
@Column(name="YIELD", columnDefinition = "decimal(18,8)")
@ApiParam(value ="成品率")
@FieldAnnotation(defaultValue = "1.0")
private Double yield;
@Column(name="FIX_SCRAP_COUNT", columnDefinition = "decimal(18,8)")
@ApiParam(value ="固定报废数")
@FieldAnnotation(defaultValue = "0.0")
private Double fixScrapCount;
public Operation getOperation() {
@ -59,13 +62,13 @@ public class OperOutput extends BaseAPS {
BeanRelation.set(this, EOperOutput.Operation, oper);
}
public Material getMaterial() {
return BeanRelation.get(this, EOperOutput.Material);
public Material getOutputMaterial() {
return BeanRelation.get(this, EOperOutput.OutputMaterial);
}
public void setMaterial(Material material) {
this.materialId = material != null ? material.getId() : 0l;
BeanRelation.set(this, EOperOutput.Material, material);
public void setOutputMaterial(Material material) {
this.outputMaterialId = material != null ? material.getId() : 0l;
BeanRelation.set(this, EOperOutput.OutputMaterial, material);
}
@JsonBackReference

7
modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/OperResource.java
Unescape Escape View File

@ -46,27 +46,32 @@ public class OperResource extends BaseAPS {
@Column(name="PREV_TIME")
@ApiParam(value ="前设置时间")
@FieldAnnotation(editType = ApsEnumUtil.EDIT_TYPE.DURATION)
private String prevTime;
@Column(name="PRODUCE_TIME")
@ApiParam(value ="生产时间")
@FieldAnnotation(notEmpty = true)
@FieldAnnotation(notEmpty = true, editType = ApsEnumUtil.EDIT_TYPE.DURATION)
private String produceTime;
@Column(name="POST_TIME")
@ApiParam(value ="后设置时间")
@FieldAnnotation(editType = ApsEnumUtil.EDIT_TYPE.DURATION)
private String postTime;
@Column(name="MAX_PREV_SD_TIME")
@ApiParam(value ="最大前设置中断时间")
@FieldAnnotation(editType = ApsEnumUtil.EDIT_TYPE.DURATION)
private String maxPrevSdTime;
@Column(name="MAX_PRODUCE_SD_TIME")
@ApiParam(value ="最大生产中断时间")
@FieldAnnotation(editType = ApsEnumUtil.EDIT_TYPE.DURATION)
private String maxProduceSdTime;
@Column(name="MAX_POST_SD_TIME")
@ApiParam(value ="最大后设置中断时间")
@FieldAnnotation(editType = ApsEnumUtil.EDIT_TYPE.DURATION)
private String maxPostSdTime;
@Column(name="PRIORITY")

2
modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/Operation.java
Unescape Escape View File

@ -77,10 +77,12 @@ public class Operation extends BaseAPS {
@Column(name="MAX_SPACE_TIME")
@ApiParam(value ="最大时间间隔")
@FieldAnnotation(editType = ApsEnumUtil.EDIT_TYPE.DURATION)
private String maxSpaceTime;
@Column(name="MIN_SPACE_TIME")
@ApiParam(value ="最小时间间隔")
@FieldAnnotation(editType = ApsEnumUtil.EDIT_TYPE.DURATION)
private String minSpaceTime;
public ProductRouting getProductRouting() {

3
modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ProductOrder.java
Unescape Escape View File

@ -4,6 +4,7 @@ import cn.estsh.i3plus.pojo.aps.annotation.FieldAnnotation;
import cn.estsh.i3plus.pojo.aps.common.BeanRelation;
import cn.estsh.i3plus.pojo.aps.holders.EProductOrder;
import cn.estsh.i3plus.pojo.aps.holders.EProductRouting;
import cn.estsh.i3plus.pojo.base.enumutil.ApsEnumUtil;
import com.fasterxml.jackson.annotation.JsonBackReference;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiParam;
@ -51,6 +52,7 @@ public class ProductOrder extends BaseOrder {
@Column(name="SPECIFY_ROUTING")
@ApiParam(value ="指定工艺路线")
@FieldAnnotation(editType = ApsEnumUtil.EDIT_TYPE.OBJECT, typeName = "ProductRouting")
private String specifyRouting;
@Column(name="RECALC_COUNT")
@ -72,6 +74,7 @@ public class ProductOrder extends BaseOrder {
@Column(name="SPECIFY_LEAD_TIME")
@ApiParam(value ="指定提前期")
@FieldAnnotation(editType = ApsEnumUtil.EDIT_TYPE.DURATION)
private String specifyLeadTime;
@Column(name="CALC_LEAD_TIME")

2
modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/PurchaseOrder.java
Unescape Escape View File

@ -3,6 +3,7 @@ package cn.estsh.i3plus.pojo.aps.bean;
import cn.estsh.i3plus.pojo.aps.annotation.FieldAnnotation;
import cn.estsh.i3plus.pojo.aps.common.BeanRelation;
import cn.estsh.i3plus.pojo.aps.holders.EBaseOrder;
import cn.estsh.i3plus.pojo.base.enumutil.ApsEnumUtil;
import com.fasterxml.jackson.annotation.JsonIgnore;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiParam;
@ -40,6 +41,7 @@ public class PurchaseOrder extends BaseOrder {
@Column(name="SPECIFY_LEAD_TIME")
@ApiParam(value ="指定提前期")
@FieldAnnotation(editType = ApsEnumUtil.EDIT_TYPE.DURATION)
private String specifyLeadTime;
@Column(name="CALC_LEAD_TIME")

6
modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/Resource.java
Unescape Escape View File

@ -60,10 +60,12 @@ public class Resource extends BaseAPS {
@Column(name="PREV_BUFFER")
@ApiParam(value ="前缓冲时间")
@FieldAnnotation(editType = ApsEnumUtil.EDIT_TYPE.DURATION)
private String prevBuffer;
@Column(name="POST_BUFFER")
@ApiParam(value ="后缓冲时间")
@FieldAnnotation(editType = ApsEnumUtil.EDIT_TYPE.DURATION)
private String postBuffer;
@Column(name="MAX_PRODUCE_BATCH", columnDefinition = "decimal(18,8)")
@ -80,14 +82,17 @@ public class Resource extends BaseAPS {
@Column(name="MAX_PREV_SD_TIME")
@ApiParam(value ="最大前设置中断时间")
@FieldAnnotation(editType = ApsEnumUtil.EDIT_TYPE.DURATION)
private String maxPrevSdTime;
@Column(name="MAX_PRODUCE_SD_TIME")
@ApiParam(value ="最大生产中断时间")
@FieldAnnotation(editType = ApsEnumUtil.EDIT_TYPE.DURATION)
private String maxProduceSdTime;
@Column(name="MAX_POST_SD_TIME")
@ApiParam(value ="最大后设置中断时间")
@FieldAnnotation(editType = ApsEnumUtil.EDIT_TYPE.DURATION)
private String maxPostSdTime;
@Column(name="ROUND_TYPE")
@ -117,6 +122,7 @@ public class Resource extends BaseAPS {
@Column(name="LOCK_TIME")
@ApiParam(value ="锁定时间长度")
@FieldAnnotation(editType = ApsEnumUtil.EDIT_TYPE.DURATION)
private String lockTime;
@JsonBackReference

6
modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/RuleGroup.java
Unescape Escape View File

@ -37,6 +37,12 @@ public class RuleGroup extends BaseAPS {
@ApiParam(value ="序号")
private Integer orderNumber;
@ApiParam(value ="当前执行的规则序号")
private transient Integer curDetailNumber;
@ApiParam(value ="当前执行的规则名称")
private transient String curDetailName;
@JsonBackReference
public List<RuleDetail> getDetails() { return BeanRelation.list(this, ERuleGroup.Details); }
}

2
modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/SalesOrder.java
Unescape Escape View File

@ -3,6 +3,7 @@ package cn.estsh.i3plus.pojo.aps.bean;
import cn.estsh.i3plus.pojo.aps.annotation.FieldAnnotation;
import cn.estsh.i3plus.pojo.aps.common.BeanRelation;
import cn.estsh.i3plus.pojo.aps.holders.EBaseOrder;
import cn.estsh.i3plus.pojo.base.enumutil.ApsEnumUtil;
import com.fasterxml.jackson.annotation.JsonIgnore;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiParam;
@ -41,6 +42,7 @@ public class SalesOrder extends BaseOrder {
@Column(name="SPECIFY_LEAD_TIME")
@ApiParam(value ="指定提前期")
@FieldAnnotation(editType = ApsEnumUtil.EDIT_TYPE.DURATION)
private String specifyLeadTime;
@Column(name="CALC_LEAD_TIME")

13
modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/common/BeanInfo.java
Unescape Escape View File

@ -211,7 +211,12 @@ public class BeanInfo {
}
public static Set<Class<? extends BaseBean>> getBeanClasses() {
return beanInfos.keySet();
Set<Class<? extends BaseBean>> beanClasses = new HashSet<>();
for (Map.Entry<Class<? extends BaseBean>, BeanInfo> entry : beanInfos.entrySet()) {
beanClasses.add(entry.getKey());
}
return beanClasses;
}
public static BeanInfo getBeanInfo(Class<? extends BaseBean> cls) {
@ -234,9 +239,9 @@ public class BeanInfo {
public static List<Class<? extends BaseBean>> getChildClasses(Class<? extends BaseBean> cls) {
List<Class<? extends BaseBean>> beanClasses = new ArrayList<>();
List<BeanInfo> beanInfos = getBeanInfo(cls).childsBeanInfos;
for (BeanInfo beanInfo : beanInfos) {
beanClasses.add(beanInfo.getBeanClass());
List<BeanInfo> childBeanInfos = getBeanInfo(cls).childsBeanInfos;
for (BeanInfo childBeanInfo : childBeanInfos) {
beanClasses.add(childBeanInfo.getBeanClass());
}
return beanClasses;
}

11
modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/converter/CustomDateDeserializer.java
Unescape Escape View File

@ -4,6 +4,7 @@ import com.fasterxml.jackson.core.JsonParser;
import com.fasterxml.jackson.core.JsonProcessingException;
import com.fasterxml.jackson.databind.DeserializationContext;
import com.fasterxml.jackson.databind.JsonDeserializer;
import org.springframework.util.StringUtils;
import java.io.IOException;
import java.text.ParseException;
@ -15,10 +16,12 @@ public class CustomDateDeserializer extends JsonDeserializer<Date> {
@Override
public Date deserialize(JsonParser jsonParser, DeserializationContext deserializationContext) throws IOException, JsonProcessingException {
try {
return DATETIME_FORMATOR.parse(jsonParser.getText());
} catch (ParseException e) {
e.printStackTrace();
String text = jsonParser.getText();
if (!StringUtils.isEmpty(text)) {
try {
return DATETIME_FORMATOR.parse(text);
} catch (ParseException e) {
}
}
return null;
}

2
modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EOperInput.java
Unescape Escape View File

@ -2,6 +2,6 @@ package cn.estsh.i3plus.pojo.aps.holders;
public enum EOperInput {
Operation,
Material,
InputMaterial,
WorkInputs
}

2
modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EOperOutput.java
Unescape Escape View File

@ -2,6 +2,6 @@ package cn.estsh.i3plus.pojo.aps.holders;
public enum EOperOutput {
Operation,
Material,
OutputMaterial,
WorkOutputs
}

1
modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/APSPager.java
Unescape Escape View File

@ -40,4 +40,5 @@ public class APSPager extends Pager {
}
private String filter;
private List<SortData> sorts;
private String query;
}

16
modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/RuleGroupProgress.java
Unescape Escape View File

@ -0,0 +1,16 @@
package cn.estsh.i3plus.pojo.aps.model;
import lombok.Data;
/**
* @Description : 进度条显示信息。
* @Reference :
* @Author : jason.niu
* @CreateDate : 2020-01-21
* @Modify:
**/
@Data
public class RuleGroupProgress {
private String message;
private Long progress;
}

2
modules/i3plus-pojo-aps/src/main/resources/relations/OperInput.xml
Unescape Escape View File

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<Class name="OperInput">
<Relation field="Material" name="Material" reverse="OperInputs" type="MULTI_TO_ONE" owner="false">
<Relation field="InputMaterial" name="Material" reverse="OperInputs" type="MULTI_TO_ONE" owner="false">
</Relation>
</Class>

2
modules/i3plus-pojo-aps/src/main/resources/relations/OperOutput.xml
Unescape Escape View File

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<Class name="OperOutput">
<Relation field="Material" name="Material" reverse="OperOutputs" type="MULTI_TO_ONE" owner="false">
<Relation field="OutputMaterial" name="Material" reverse="OperOutputs" type="MULTI_TO_ONE" owner="false">
</Relation>
</Class>

8
modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/annotation/FieldAnnotation.java → modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/annotation/DynamicField.java
Unescape Escape View File

@ -9,8 +9,8 @@ import java.lang.annotation.*;
*/
@Documented
@Retention(RetentionPolicy.RUNTIME)
@Target({ElementType.FIELD})
public @interface FieldAnnotation {
@Target({ElementType.FIELD, ElementType.TYPE})
public @interface DynamicField {
// Web前端字段数据类型
WmsEnumUtil.FIELD_TYPE webFieldType();
// 条件表达式:>,<,>=等
@ -31,4 +31,8 @@ public @interface FieldAnnotation {
int isRequire() default 1;
// 是否表单字段展示:默认1-显示，2-隐藏
int isShow() default 1;
// 是否跳过本字段扫描 0-不跳过，1-跳过
int isSkip() default 0;
// 下拉枚举名称
String enumName() default "";
}

26
modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/bean/BaseBean.java
Unescape Escape View File

@ -1,7 +1,7 @@
package cn.estsh.i3plus.pojo.base.bean;
import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn;
import cn.estsh.i3plus.pojo.base.annotation.FieldAnnotation;
import cn.estsh.i3plus.pojo.base.annotation.DynamicField;
import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil;
import cn.estsh.i3plus.pojo.base.enumutil.WmsEnumUtil;
import com.alibaba.fastjson.annotation.JSONField;
@ -41,7 +41,7 @@ public abstract class BaseBean implements Serializable {
@ApiParam(value = "主键",example = "0")
@JsonSerialize(using = ToStringSerializer.class)
@AnnoOutputColumn(hidden = true)
@FieldAnnotation(webFieldType = WmsEnumUtil.FIELD_TYPE.NUMBER)
@DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.NUMBER, isRequire = 2)
public Long id;
//get单独处理
@ -62,21 +62,21 @@ public abstract class BaseBean implements Serializable {
this.id = id;
}
@Column(name="ORGANIZE_CODE")
@Column(name="ORGANIZE_CODE", nullable = false)
@ApiParam(value ="组织代码")
@FieldAnnotation(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT)
@DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT, isRequire = 2)
// @AnnoOutputColumn(hidden = true)
public String organizeCode;
@Column(name="IS_VALID", columnDefinition = "int default 1", nullable = false)
@ApiParam(value = "有效性",example = "1")
@FieldAnnotation(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT)
@DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT, isSkip = 1)
@AnnoOutputColumn(refClass = WmsEnumUtil.TRUE_OR_FALSE.class,refForeignKey = "value",value = "description", hidden = true)
public Integer isValid; //CommonEnumUtil.IS_VAILD;
@Column(name="IS_DELETED", columnDefinition = "int default 2", nullable = false)
@ApiParam(value = "是否已删除",example = "2")
@FieldAnnotation(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT)
@DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT, isSkip = 1)
@AnnoOutputColumn(hidden = true)
//逻辑删除，软删除
public Integer isDeleted; //CommonEnumUtil.TRUE_OR_FALSEA
@ -84,58 +84,64 @@ public abstract class BaseBean implements Serializable {
@Column(name="CREATE_USER",updatable = false)
@ApiParam(value = "创建用户")
@AnnoOutputColumn(hidden = true)
@DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT, isRequire = 2)
public String createUser;
@Indexed(direction = IndexDirection.DESCENDING)
@Column(name="CREATE_DATE_TIME",updatable = false)
@ApiParam(value = "创建日期")
@FieldAnnotation(webFieldType = WmsEnumUtil.FIELD_TYPE.DATETIME)
@DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.DATETIME, isRequire = 2)
public String createDatetime;
@Column(name="MODIFY_USER")
@ApiParam(value = "修改人")
@AnnoOutputColumn(hidden = true)
@FieldAnnotation(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT)
@DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT, isRequire = 2)
public String modifyUser;
@Column(name="MODIFY_DATE_TIME")
@ApiParam(value = "修改日期")
@FieldAnnotation(webFieldType = WmsEnumUtil.FIELD_TYPE.DATETIME)
@DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.DATETIME, isRequire = 2)
public String modifyDatetime;
@Transient
// @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
@ApiParam(value="创建日期查询用，查询起始日期",example = "2018-01-01 01:00:00")
@AnnoOutputColumn(hidden = true)
@DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT, isSkip = 1)
public String createDateTimeStart;
@Transient
// @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
@ApiParam(value="创建日期查询用，查询结束日期",example = "2018-12-31 23:59:59")
@AnnoOutputColumn(hidden = true)
@DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT, isSkip = 1)
public String createDateTimeEnd;
@Transient
// @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
@ApiParam(value="修改日期查询用，查询起始日期",example = "2018-01-01 01:00:00")
@AnnoOutputColumn(hidden = true)
@DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT, isSkip = 1)
public String modifyDateTimeStart;
@Transient
// @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
@ApiParam(value = "修改日期查询用，查询结束日期",example = "2018-12-31 23:59:59")
@AnnoOutputColumn(hidden = true)
@DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT, isSkip = 1)
public String modifyDateTimeEnd;
@Transient
@ApiParam(value = "排序属性")
@AnnoOutputColumn(hidden = true)
@DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT, isSkip = 1)
public String orderByParam = "";
@Transient
@ApiParam(value = "排序类型，1 正序，2 倒序",example = "1")
@AnnoOutputColumn(hidden = true)
@FieldAnnotation(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT)
@DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT, isSkip = 1)
//CommonEnumUtil.ASC_OR_DESC 1 asc,2 desc
public transient Integer ascOrDesc = 1;

2
modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/ApsEnumUtil.java
Unescape Escape View File

@ -333,7 +333,7 @@ public class ApsEnumUtil {
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum RESOURCE_LOCK_TYPE {
NONE("NONE", "不锁定"), //
NONE("NONE", "不锁定"),
PRODUCE_BEGIN("PRODUCE_BEGIN", "后工序生产开始时刻"),
PRODUCE_END("PRODUCE_END", "后工序生产结束时刻");

145
modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/BlockFormEnumUtil.java
Unescape Escape View File

@ -1843,151 +1843,6 @@ public class BlockFormEnumUtil {
}
}
/**
* 数据库连接方式
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum DATA_SOURCE_TYPE {
SOURCE_MARIA_DB(100, "MariaDB", "MariaDB 10.1","com.mysql.jdbc.Driver",3306,null),
SOURCE_SQL_SERVER(200, "SQL Server", "SQL Server 2017","com.microsoft.sqlserver.jdbc.SQLServerDriver",1433,"dbo"),
SOURCE_ORACLE(300, "Oracle", "Oralce 12C","oracle.jdbc.driver.OracleDriver",1521,null),
SOURCE_POSTGRE_SQL(400, "PostgreSql", "PostgreSql 10.5","org.postgresql.Driver",5432,"public");
private int value;
private String code;
private String description;
private String driverClassName;
private int defaultPort;
private String defaultSchemaPattern;
private DATA_SOURCE_TYPE (int value, String code, String description,String driverClassName,int port,String defaultSchemaPattern) {
this.value = value;
this.code = code;
this.description = description;
this.driverClassName = driverClassName;
this.defaultPort = port;
this.defaultSchemaPattern = defaultSchemaPattern;
}
public int getValue() {
return value;
}
public String getCode() {
return code;
}
public String getDescription() {
return description;
}
public String getDriverClassName() {
return driverClassName;
}
public int getDefaultPort() {
return defaultPort;
}
public String getDefaultSchemaPattern() {
return defaultSchemaPattern;
}
public static String valueOfCode(int val) {
String tmp = null;
for (int i = 0; i < values().length; i++) {
if (values()[i].value == val) {
tmp = values()[i].code;
}
}
return tmp;
}
public static int codeOfValue(String code) {
int tmp = 1;
for (int i = 0; i < values().length; i++) {
if (values()[i].code.equals(code)) {
tmp = values()[i].value;
}
}
return tmp;
}
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 DATA_SOURCE_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;
}
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;
}
public String getJDBCUrl(String database,String host,Integer port){
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);
}
return null;
}
public static DATA_SOURCE_TYPE getDataSourceURL(String databaseProductName){
if(StringUtils.isNotBlank(databaseProductName)){
if(databaseProductName.indexOf(":mysql:") != -1){
return SOURCE_MARIA_DB;
}else if(databaseProductName.indexOf(":oracle:") != -1){
return SOURCE_ORACLE;
}else if(databaseProductName.indexOf(":postgresql:") != -1){
return SOURCE_POSTGRE_SQL;
}else if(databaseProductName.indexOf(":sqlserver:") != -1){
return SOURCE_SQL_SERVER;
}
}
return null;
}
private String getJDBCUrlMySQL(String database,String host,Integer port){
return "jdbc:mysql://"+host+":"+port+"/"+database+"?autoReconnect=true&useSSL=false&characterEncoding=utf-8";
}
private String getJDBCUrlOracle(String database,String host,Integer port){
return "jdbc:oracle:thin:@"+host+":"+port+":"+database;
}
private String getJDBCUrlPostgreSQL(String database,String host,Integer port){
return "jdbc:postgresql://"+host+":"+port+"/"+database;
}
private String getJDBCUrlSQLServer(String database,String host,Integer port){
return "jdbc:sqlserver://" + host + ":" + port + ";database=" + database+";autoReconnect=true";
}
}
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum DATA_SOURCE_STATUS {
CONN_SUCCESS(10, "连接成功", "连接成功"),

3
modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/BlockReportEnumUtil.java
Unescape Escape View File

@ -286,7 +286,8 @@ public class BlockReportEnumUtil {
ECHARTS_PIE(10, "饼图", "实芯饼图"),
ECHARTS_BAR(20, "柱状图", "柱状图-向上具状图"),
ECHARTS_LINE(30, "折线图", "向右折线条图"),
ECHARTS_TREEMAP(40, "矩形图", "矩形图");
ECHARTS_TREEMAP(40, "矩形图", "矩形图"),
SELECT_SINGLE(50, "下拉单选", "下拉单选");
private int value;
private String name;

1
modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/BlockSoftSwitchEnumUtil.java
Unescape Escape View File

@ -331,6 +331,7 @@ public class BlockSoftSwitchEnumUtil {
/**
* 数据库连接方式
*/
@Deprecated // 不建议使用 推荐使用 CommonEnumUtil.DATA_SOURCE_TYPE
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum DATA_SOURCE_TYPE {
SOURCE_MARIA_DB(100, "MariaDB", "MariaDB 10.1","com.mysql.jdbc.Driver",3306,null),

176
modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/CommonEnumUtil.java
Unescape Escape View File

@ -27,6 +27,9 @@ public class CommonEnumUtil {
MES_PCN(6, 8350, 12, "i3mes-pcn", "生产管理软件-节点中心"),
SWEB(7, 8800, 19, "i3sweb", "供应商服务"),
PTL(8, 8700, 20, "i3ptl", "亮灯自动拣选"),
PTL_PCN(9, 8750, 21, "i3ptl-pcn", "亮灯自动拣选-节点中心"),
FORM(20, 8900, 16, "block-form", "智能表单"),
REPORT(21, 8910, 17, "block-report", "智能报表"),
WORKFLOW(22, 0, 0, "block-workflow", "智能工作流"),
@ -35,7 +38,7 @@ public class CommonEnumUtil {
HARDSWITCH(25, 0, 0, "block-hardswitch", "硬件适配器"),
LAC(26, 8600, 13, "lac", "连接适配器"),
ANDON(27, 8500, 14, "andon", "安灯"),
APS(28, 8410, 15, "APS", "高级计划与排程"),
APS(28, 8400, 15, "i3aps", "高级计划与排程"),
CENTER(99, 8000, 1, "icloud-server", "注册中心"),
SURFACE(98, 0, 0, "i3surface", "对外服务"),
CLOUD(97, 0, 0, "i3cloud", "微服务"),
@ -1295,7 +1298,8 @@ public class CommonEnumUtil {
// DATE_TIME(310, "DATE_TIME", "时间(yyyy-MM-dd hh:mm:ss)"),
// ELEMENT(700, "DICT_SELECT", "元素"),
DICTIONARY(800, "DICT_SELECT", "字典"),
CASCADE(900, "CASCADE", "级联");
CASCADE(900, "CASCADE", "级联"),
PICK_UP(1000, "PICK_UP", "拾取");
//FILE(400, "file", "文件"),
//IMAGE(410, "image", "image"),
//OFF(500, "color", "颜色"),
@ -1394,17 +1398,17 @@ public class CommonEnumUtil {
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum SQL_WHERE {
EQUAL(1, " = ", "等于"),
NOT_EQUAL(2, " <> ", "不等于"),
MORE(3, " > ", "大于"),
LESS(4, " < ", "小于"),
MORE_OR_EQUAL(5, " >= ", "大于等于"),
LESS_OR_EQUAL (6, " <= ", "小于等于"),
LIKE(7, " LIKE ", "全模糊"),
START_LIKE(7, " LIKE ", "前模糊"),
END_LIKE(7, " LIKE ", "后模糊"),
IN(8, " IN ", " in "),
BETWEEN(9, " BETWEEN ", "区间查询(逗号区分)"),;
EQUAL(10, " = ", "等于"),
NOT_EQUAL(11, " <> ", "不等于"),
MORE(20, " > ", "大于"),
LESS(30, " < ", "小于"),
MORE_OR_EQUAL(21, " >= ", "大于等于"),
LESS_OR_EQUAL (31, " <= ", "小于等于"),
LIKE(40, " LIKE ", "全模糊"),
START_LIKE(41, " LIKE ", "前模糊"),
END_LIKE(52, " LIKE ", "后模糊"),
IN(50, " IN ", " in "),
BETWEEN(60, " BETWEEN ", "区间查询(逗号区分)"),;
private int value;
private String code;
@ -1721,4 +1725,150 @@ public class CommonEnumUtil {
}
}
/**
* 数据库连接方式
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum DATA_SOURCE_TYPE {
SOURCE_MARIA_DB(100, "MariaDB", "MariaDB 10.1","com.mysql.jdbc.Driver",3306,null),
SOURCE_SQL_SERVER(200, "SQL Server", "SQL Server 2017","com.microsoft.sqlserver.jdbc.SQLServerDriver",1433,"dbo"),
SOURCE_ORACLE(300, "Oracle", "Oralce 12C","oracle.jdbc.driver.OracleDriver",1521,null),
SOURCE_POSTGRE_SQL(400, "PostgreSql", "PostgreSql 10.5","org.postgresql.Driver",5432,"public");
private int value;
private String code;
private String description;
private String driverClassName;
private int defaultPort;
private String defaultSchemaPattern;
private DATA_SOURCE_TYPE (int value, String code, String description,String driverClassName,int port,String defaultSchemaPattern) {
this.value = value;
this.code = code;
this.description = description;
this.driverClassName = driverClassName;
this.defaultPort = port;
this.defaultSchemaPattern = defaultSchemaPattern;
}
public int getValue() {
return value;
}
public String getCode() {
return code;
}
public String getDescription() {
return description;
}
public String getDriverClassName() {
return driverClassName;
}
public int getDefaultPort() {
return defaultPort;
}
public String getDefaultSchemaPattern() {
return defaultSchemaPattern;
}
public static String valueOfCode(int val) {
String tmp = null;
for (int i = 0; i < values().length; i++) {
if (values()[i].value == val) {
tmp = values()[i].code;
}
}
return tmp;
}
public static int codeOfValue(String code) {
int tmp = 1;
for (int i = 0; i < values().length; i++) {
if (values()[i].code.equals(code)) {
tmp = values()[i].value;
}
}
return tmp;
}
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 DATA_SOURCE_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;
}
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;
}
public String getJDBCUrl(String database,String host,Integer port){
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);
}
return null;
}
public static DATA_SOURCE_TYPE getDataSourceURL(String databaseProductName){
if(StringUtils.isNotBlank(databaseProductName)){
if(databaseProductName.indexOf(":mysql:") != -1){
return SOURCE_MARIA_DB;
}else if(databaseProductName.indexOf(":oracle:") != -1){
return SOURCE_ORACLE;
}else if(databaseProductName.indexOf(":postgresql:") != -1){
return SOURCE_POSTGRE_SQL;
}else if(databaseProductName.indexOf(":sqlserver:") != -1){
return SOURCE_SQL_SERVER;
}
}
return null;
}
private String getJDBCUrlMySQL(String database,String host,Integer port){
return "jdbc:mysql://"+host+":"+port+"/"+database+"?autoReconnect=true&useSSL=false&characterEncoding=utf-8";
}
private String getJDBCUrlOracle(String database,String host,Integer port){
return "jdbc:oracle:thin:@"+host+":"+port+":"+database;
}
private String getJDBCUrlPostgreSQL(String database,String host,Integer port){
return "jdbc:postgresql://"+host+":"+port+"/"+database;
}
private String getJDBCUrlSQLServer(String database,String host,Integer port){
return "jdbc:sqlserver://" + host + ":" + port + ";database=" + database+";autoReconnect=true";
}
}
}

123
modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java
Unescape Escape View File

@ -13,17 +13,51 @@ import com.fasterxml.jackson.annotation.JsonFormat;
public class MesEnumUtil {
/**
* 动作-module
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum MES_ACTION_MODULE {
WORK_ORDER_LANDED(10, "生产工单下达");
private int value;
private String description;
MES_ACTION_MODULE(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;
}
}
/**
* JIS发运模式类型
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum MES_JIS_PATTERN_TYPE {
public enum JIS_PATTERN_TYPE {
ONE_PROD(10, "单产品发运"),
MANY_PROD(20, "多产品发运");
private int value;
private String description;
MES_JIS_PATTERN_TYPE(int value, String description) {
JIS_PATTERN_TYPE(int value, String description) {
this.value = value;
this.description = description;
}
@ -3345,6 +3379,7 @@ public class MesEnumUtil {
TASK_COMPLETE("taskComplete", "整个扫描完成"),
STEP_RAN_STATUS("stepRanStatus", "工步列表执行前"),
RUNNING_INFO("runningInfo", "执行信息"),
STOP_PCS_CTL("stopPcsCtl", "停止监控"),
RENEW_REQUEST_PARAMS("renewRequestParams", "回传刷新StationResultBean");
@ -3385,7 +3420,8 @@ public class MesEnumUtil {
EXP_TEXT("exp_text", "异常文本"),
FILE("file", "定制内容文件"),
IMAGE("image", "图片"),
BUTTON("button", "按钮");
BUTTON("button", "按钮"),
TABLES("tables", "多个表格");
private String value;
private String description;
@ -3945,4 +3981,85 @@ public class MesEnumUtil {
}
}
/**
* MesMonitorTask实体对应的status值 监听任务状态
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum MONITOR_TASK_STATUS {
NORMAL(10, "正常"),
CLOSE(20, "关闭");
private int value;
private String description;
MONITOR_TASK_STATUS(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 MONITOR_TASK_OBJECT_TYPE {
PLC(10, "PLC");
// DB(20, "DB");
private int value;
private String description;
MONITOR_TASK_OBJECT_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;
}
public static Integer descriptionOfValue(String description) {
Integer tmp = null;
for (int i = 0; i < values().length; i++) {
if (values()[i].description.equals(description)) {
tmp = values()[i].value;
}
}
return tmp;
}
}
}

215
modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesPcnEnumUtil.java
Unescape Escape View File

@ -16,49 +16,14 @@ public class MesPcnEnumUtil {
* JIS发运模式类型
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum MES_JIS_PATTERN_TYPE {
public enum JIS_PATTERN_TYPE {
ONE_PROD(10, "单产品发运"),
MANY_PROD(20, "多产品发运");
private int value;
private String description;
MES_JIS_PATTERN_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;
}
}
/**
* JIS发运是否按主队列顺序扫描
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum MES_JIS_SCAN_TYPE {
TRUE(10, "是"),
FALSE(20, "否");
private int value;
private String description;
MES_JIS_SCAN_TYPE(int value, String description) {
JIS_PATTERN_TYPE(int value, String description) {
this.value = value;
this.description = description;
}
@ -86,7 +51,7 @@ public class MesPcnEnumUtil {
* JIS发运队列状态
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum MES_QUEUE_JIS_STATUS {
public enum JIS_QUEUE_STATUS {
TRUE(10, "已发运"),
FALSE(20, "未发运");
@ -94,7 +59,7 @@ public class MesPcnEnumUtil {
private int value;
private String description;
MES_QUEUE_JIS_STATUS(int value, String description) {
JIS_QUEUE_STATUS(int value, String description) {
this.value = value;
this.description = description;
}
@ -1530,13 +1495,16 @@ public class MesPcnEnumUtil {
/**
* 数据库连接方式
* wei.peng
* Copy 代码禁止修改枚举内容,整合枚举会产生兼容性问题 ;
*/
@Deprecated // 不推荐使用 ， 推荐使用 CommonEnumUtil.DATA_SOURCE_TYPE
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum DATA_SOURCE_TYPE {
SOURCE_MARIA_DB(10, "MariaDB", "MariaDB 10.1", "com.mysql.jdbc.Driver", 3306, null),
SOURCE_SQL_SERVER(20, "SQL Server", "SQL Server 2017", "com.microsoft.sqlserver.jdbc.SQLServerDriver", 1433, "dbo"),
SOURCE_ORACLE(30, "Oracle", "Oralce 12C", "oracle.jdbc.driver.OracleDriver", 1521, null),
SOURCE_POSTGRE_SQL(40, "PostgreSql", "PostgreSql 10.5", "org.postgresql.Driver", 5432, "public");
SOURCE_MARIA_DB(100, "MariaDB", "MariaDB 10.1", "com.mysql.jdbc.Driver", 3306, null),
SOURCE_SQL_SERVER(200, "SQL Server", "SQL Server 2017", "com.microsoft.sqlserver.jdbc.SQLServerDriver", 1433, "dbo"),
SOURCE_ORACLE(300, "Oracle", "Oralce 12C", "oracle.jdbc.driver.OracleDriver", 1521, null),
SOURCE_POSTGRE_SQL(400, "PostgreSql", "PostgreSql 10.5", "org.postgresql.Driver", 5432, "public");
private int value;
private String code;
@ -1767,8 +1735,8 @@ public class MesPcnEnumUtil {
STANDARD_ORDER(10, "标准工单"),
BTS_ORDER(20, "BTS工单"),
ATTEMPT_ORDER(30, "试制工单"),
BH_ORDER(40, "B&H工单"),
JIT_ORDER(50, "JIT工单");
BH_ORDER(40, "B&H工单");
// JIT_ORDER(50, "JIT工单");
private int value;
private String description;
@ -2473,9 +2441,9 @@ public class MesPcnEnumUtil {
TASK_COMPLETE("taskComplete", "整个扫描完成"),
STEP_RAN_STATUS("stepRanStatus", "工步列表执行前"),
RUNNING_INFO("runningInfo", "执行信息"),
STOP_PCS_CTL("stopPcsCtl", "停止监控"),
RENEW_REQUEST_PARAMS("renewRequestParams", "回传刷新StationResultBean");
private String value;
private String description;
@ -2513,7 +2481,8 @@ public class MesPcnEnumUtil {
EXP_TEXT("exp_text", "异常文本"),
FILE("file", "定制内容文件"),
IMAGE("image", "图片"),
BUTTON("button", "按钮");
BUTTON("button", "按钮"),
TABLES("tables", "多个表格");
private String value;
private String description;
@ -2685,4 +2654,156 @@ public class MesPcnEnumUtil {
}
}
/**
* 监听任务任务对象类型
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum MONITOR_TASK_OBJECT_TYPE {
PLC(10, "PLC");
// DB(20, "DB");
private int value;
private String description;
MONITOR_TASK_OBJECT_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;
}
public static Integer descriptionOfValue(String description) {
Integer tmp = null;
for (int i = 0; i < values().length; i++) {
if (values()[i].description.equals(description)) {
tmp = values()[i].value;
}
}
return tmp;
}
}
/**
* MesMonitorTask实体对应的status值 监听任务状态
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum MONITOR_TASK_STATUS {
NORMAL(10, "正常"),
CLOSE(20, "关闭");
private int value;
private String description;
MONITOR_TASK_STATUS(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 PLC_IS_PARSE {
TRUE(1, "是"),
FALSE(2, "否");
private int value;
private String description;
PLC_IS_PARSE(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 PASS_FAIL {
PASS(1, "合格"),
FAIL(2, "不合格");
private int value;
private String description;
PASS_FAIL(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;
}
}
}

10
modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/PtlEnumUtil.java
Unescape Escape View File

@ -0,0 +1,10 @@
package cn.estsh.i3plus.pojo.base.enumutil;
/**
* @author Wynne.Lu
* @date 2020/2/12 17:41
* @desc
*/
public class PtlEnumUtil {
}

725
modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/PtlPcnEnumUtil.java
Unescape Escape View File

@ -0,0 +1,725 @@
package cn.estsh.i3plus.pojo.base.enumutil;
import com.fasterxml.jackson.annotation.JsonFormat;
import org.springframework.util.StringUtils;
/**
* @author Wynne.Lu
* @date 2020/2/12 17:41
* @desc
*/
public class PtlPcnEnumUtil {
/**
* 标签器LED数字解析枚举
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum TAG_LED_CONTENT_CMD {
TAG_0("30", "0", "0"),
TAG_1("31", "1", "1"),
TAG_2("32", "2", "2"),
TAG_3("33", "3", "3"),
TAG_4("34", "4", "4"),
TAG_5("35", "5", "5"),
TAG_6("36", "6", "6"),
TAG_7("37", "7", "7"),
TAG_8("38", "8", "8"),
TAG_9("39", "9", "9"),
TAG_A("41", "A", "A"),
TAG_b("62", "b", "b"),
TAG_C("43", "C", "C"),
TAG_d("64", "d", "d"),
TAG_E("45", "E", "E"),
TAG_F("46", "F", "F"),
TAG_c("63", "c", "c"),
TAG_H("48", "H", "H"),
TAG_L("4C", "L", "L"),
TAG_SPACE("20", " ", " "),
TAG_n("6E", "n", "n"),
TAG_o("6F", "o", "o"),
TAG_h("68", "h", "h"),
TAG_r("72", "r", "r"),
TAG_u("75", "u", "u"),
TAG_i("69", "i", "i"),
TAG_y("79", "y", "y"),
TAG_t("74", "t", "t"),
TAG_q("71", "q", "q"),
TAG_G("47", "G", "G"),
TAG_S("53", "S", "S"),
TAG_l("6C", "l", "l"),
TAG_O("4F", "O", "O"),
TAG_SQUARE_BRACKET_LEFT("5B", "[", "["),
TAG_SQUARE_BRACKET_RIGHT("5D", "]", "]"),
TAG_P("50", "P", "P"),
TAG_U("55", "U", "U"),
TAG_HYPHEN("2D", "-", "-");
private String code;
private String value;
private String description;
TAG_LED_CONTENT_CMD(String code, String value, String description) {
this.code = code;
this.value = value;
this.description = description;
}
public String getCode() {
return code;
}
public String getValue() {
return value;
}
public String getDescription() {
return description;
}
public static String valueOfCode(String value) {
String tmp = null;
for (int i = 0; i < values().length; i++) {
if (values()[i].value.equals(value)) {
tmp = values()[i].code;
}
}
return tmp;
}
}
/**
* 标签器LED小数点解析枚举
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum TAG_LED_POINT_CMD {
TAG_POINT_0("00", "000000", "000000"),
TAG_POINT_1("01", "000000.", "000000."),
TAG_POINT_2("02", "00000.0", "00000.0"),
TAG_POINT_12("03", "00000.0.", "00000.0."),
TAG_POINT_3("04", "0000.00", "0000.00"),
TAG_POINT_13("05", "0000.00.", "0000.00."),
TAG_POINT_23("06", "0000.0.0", "0000.0.0"),
TAG_POINT_123("07", "0000.0.0.", "0000.0.0."),
TAG_POINT_4("08", "000.000", "000.000"),
TAG_POINT_14("09", "000.000.", "000.000."),
TAG_POINT_24("0A", "000.00.0", "000.00.0"),
TAG_POINT_124("0B", "000.00.0.", "000.00.0."),
TAG_POINT_34("0C", "000.0.00", "000.0.00"),
TAG_POINT_134("0D", "000.0.00.", "000.0.00."),
TAG_POINT_234("0E", "000.0.0.0", "000.0.0.0"),
TAG_POINT_1234("0F", "000.0.0.0.", "000.0.0.0."),
TAG_POINT_5("10", "00.0000", "00.0000"),
TAG_POINT_15("11", "00.0000.", "00.0000."),
TAG_POINT_25("12", "00.000.0", "00.000.0"),
TAG_POINT_125("13", "00.000.0.", "00.000.0."),
TAG_POINT_35("14", "00.00.00", "00.00.00"),
TAG_POINT_135("15", "00.00.00.", "00.00.00."),
TAG_POINT_235("16", "00.00.0.0", "00.00.0.0"),
TAG_POINT_1235("17", "00.00.0.0.", "00.00.0.0."),
TAG_POINT_45("18", "00.0.000", "00.0.000"),
TAG_POINT_145("19", "00.0.000.", "00.0.000."),
TAG_POINT_245("1A", "00.0.00.0", "00.0.00.0"),
TAG_POINT_1245("1B", "00.0.00.0.", "00.0.00.0."),
TAG_POINT_345("1C", "00.0.0.00", "00.0.0.00"),
TAG_POINT_1345("1D", "00.0.0.00.", "00.0.0.00."),
TAG_POINT_2345("1E", "00.0.0.0.0", "00.0.0.0.0"),
TAG_POINT_12345("1F", "00.0.0.0.0.", "00.0.0.0.0."),
TAG_POINT_6("20", "0.00000", "0.00000"),
TAG_POINT_16("21", "0.00000.", "0.00000."),
TAG_POINT_26("22", "0.0000.0", "0.0000.0"),
TAG_POINT_126("23", "0.0000.0.", "0.0000.0."),
TAG_POINT_36("24", "0.000.00", "0.000.00"),
TAG_POINT_136("25", "0.000.00.", "0.000.00."),
TAG_POINT_236("26", "0.000.0.0", "0.000.0.0"),
TAG_POINT_1236("27", "0.000.0.0.", "0.000.0.0."),
TAG_POINT_46("28", "0.00.000", "0.00.000"),
TAG_POINT_146("29", "0.00.000.", "0.00.000."),
TAG_POINT_246("2A", "0.00.00.0", "0.00.00.0"),
TAG_POINT_1246("2B", "0.00.00.0.", "0.00.00.0."),
TAG_POINT_346("2C", "0.00.0.00", "0.00.0.00"),
TAG_POINT_1346("2D", "0.00.0.00.", "0.00.0.00."),
TAG_POINT_2346("2E", "0.00.0.0.0", "0.00.0.0.0"),
TAG_POINT_12346("2F", "0.00.0.0.0.", "0.00.0.0.0."),
TAG_POINT_56("30", "0.0.0000", "0.0.0000"),
TAG_POINT_156("31", "0.0.0000.", "0.0.0000."),
TAG_POINT_256("32", "0.0.000.0", "0.0.000.0"),
TAG_POINT_1256("33", "0.0.000.0.", "0.0.000.0."),
TAG_POINT_356("34", "0.0.00.00", "0.0.00.00"),
TAG_POINT_1356("35", "0.0.00.00.", "0.0.00.00."),
TAG_POINT_2356("36", "0.0.00.0.0", "0.0.00.0.0"),
TAG_POINT_12356("37", "0.0.00.0.0.", "0.0.00.0.0."),
TAG_POINT_456("38", "0.0.0.000", "0.0.0.000"),
TAG_POINT_1456("39", "0.0.0.000.", "0.0.0.000."),
TAG_POINT_2456("3A", "0.0.0.00.0", "0.0.0.00.0"),
TAG_POINT_12456("3B", "0.0.0.00.0.", "0.0.0.00.0."),
TAG_POINT_3456("3C", "0.0.0.0.00", "0.0.0.0.00"),
TAG_POINT_13456("3D", "0.0.0.0.00.", "0.0.0.0.00."),
TAG_POINT_23456("3E", "0.0.0.0.0.0", "0.0.0.0.0.0"),
TAG_POINT_123456("3F", "0.0.0.0.0.0.", "0.0.0.0.0.0.");
private String code;
private String value;
private String description;
TAG_LED_POINT_CMD(String code, String value, String description) {
this.code = code;
this.value = value;
this.description = description;
}
public String getCode() {
return code;
}
public String getValue() {
return value;
}
public String getDescription() {
return description;
}
public static String valueOfCode(String value) {
String tmp = null;
for (int i = 0; i < values().length; i++) {
if (values()[i].value.equals(value)) {
tmp = values()[i].code;
}
}
return tmp;
}
}
/**
* 标签控制器子命令枚举
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum TAG_CONTROL_CHILD_CMD {
CHILD_CMD_00H("00", "在标签上显示字母数字(备注)"),
CHILD_CMD_01H("01", "关闭标签所有字符/清除缓冲区中的所有显示"),
CHILD_CMD_02H("02", "打开灯光指示器"),
CHILD_CMD_03H("03", "关闭灯光指示器"),
CHILD_CMD_04H("04", "蜂鸣器打开"),
CHILD_CMD_05H("05", "蜂鸣器关闭"),
CHILD_CMD_06H("06", "按钮返回确认消息"),
CHILD_CMD_07H("07", "按下按钮返回缺货信息"),
CHILD_CMD_08H("08", "设置最大地址轮询值"),
CHILD_CMD_09H("09", "连接的现场设备的返回状态"),
CHILD_CMD_0AH("0A", "现场设备超时"),
CHILD_CMD_0BH("0B", "查询设备故障，返回设备故障"),
CHILD_CMD_0CH("0C", "设备无法执行命令"),
CHILD_CMD_0DH("0D", "返回按钮锁定消息 (只有在从本机发送消息到设备后才激活)"),
CHILD_CMD_FCH("FC", "设备重置 OK，获取设备详细信息，返回设备的详细信息(与重置 OK 相同)"),
CHILD_CMD_0FH("0F", "返回库存模式下的缺货量"),
CHILD_CMD_10H("10", "在标签上闪烁字母数字"),
CHILD_CMD_11H("11", "指示灯闪烁"),
CHILD_CMD_12H("12", "设置闪烁时间间隔"),
CHILD_CMD_13H("13", "显示标签地址"),
CHILD_CMD_14H("14", "重置设备"),
CHILD_CMD_15H("15", "禁用缺货按钮"),
CHILD_CMD_16H("16", "启用缺货按钮"),
CHILD_CMD_17H("17", "模拟确认按钮"),
CHILD_CMD_18H("18", "模拟缺货按键"),
CHILD_CMD_19H("19", "切换为盘点模式"),
CHILD_CMD_1AH("1A", "切换为拣货模式"),
CHILD_CMD_1BH("1B", "禁用确认键"),
CHILD_CMD_1CH("1C", "启用确认和缺货按钮"),
CHILD_CMD_1EH("1E", "设置计数位"),
CHILD_CMD_1FH("1F", "设置标签多个配置"),
CHILD_CMD_3AH("3A", "设置设备地址"),
CHILD_CMD_64H("64", "设备返回"),
CHILD_CMD_FAH("FA", "获取设备的 F/W 模型信息，返回设备的 F/W 模型信息"),
CHILD_CMD_F7H("F7", "获取/启用/禁用警报自动蜂鸣器功能,获取/启用/禁用报警自动报告模式");
private String code;
private String description;
TAG_CONTROL_CHILD_CMD(String code, String description) {
this.code = code;
this.description = description;
}
public String getCode() {
return code;
}
public String getDescription() {
return description;
}
}
/**
* 标签显示器亮灯颜色枚举
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum TAG_LIGHT_COLOR_CMD {
TAG_LIGHT_COLOR_RED("00", "红"),
TAG_LIGHT_COLOR_GREEN("01", "绿"),
TAG_LIGHT_COLOR_ORANGE("02", "橙"),
TAG_LIGHT_COLOR_BLUE("03", "蓝"),
TAG_LIGHT_COLOR_PINK_RED("04", "粉红"),
TAG_LIGHT_COLOR_BLUE_GREEN("05", "蓝绿");
private String code;
private String description;
TAG_LIGHT_COLOR_CMD(String code, String description) {
this.code = code;
this.description = description;
}
public static TAG_LIGHT_COLOR_CMD getByValue(String code) {
for (TAG_LIGHT_COLOR_CMD tagLightColorCmd : values()) {
if (tagLightColorCmd.getCode() == code) {
return tagLightColorCmd;
}
}
return null;
}
public String getCode() {
return code;
}
public String getDescription() {
return description;
}
}
/**
* 标签亮灯方式枚举
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum TAG_LIGHT_TYPE {
TAG_LIGHT_TYPE_LIGHT(10, "常亮"),
TAG_LIGHT_TYPE_TWINKLE(20, "闪烁");
private int value;
private String description;
TAG_LIGHT_TYPE(int value, String description) {
this.value = value;
this.description = description;
}
public int getValue() {
return value;
}
public String getDescription() {
return description;
}
}
/**
* 完成器音乐枚举
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum FINISH_TAG_LIGHT_MUSIC_CMD {
FINISH_TAG_LIGHT_MUSIC_00H("00", "Jingle bells"),
FINISH_TAG_LIGHT_MUSIC_01H("01", "Carmen"),
FINISH_TAG_LIGHT_MUSIC_02H("02", "Happy Chinese new year"),
FINISH_TAG_LIGHT_MUSIC_03H("03", "Edelweiss"),
FINISH_TAG_LIGHT_MUSIC_04H("04", "Going home"),
FINISH_TAG_LIGHT_MUSIC_05H("05", "PAPALA"),
FINISH_TAG_LIGHT_MUSIC_06H("06", "Classical"),
FINISH_TAG_LIGHT_MUSIC_07H("07", "Listen to the rhythm of the falling rain"),
FINISH_TAG_LIGHT_MUSIC_08H("08", "Rock and roll"),
FINISH_TAG_LIGHT_MUSIC_09H("09", "Happy birthday"),
FINISH_TAG_LIGHT_MUSIC_0AH("0A", "Do Re Me"),
FINISH_TAG_LIGHT_MUSIC_0BH("0B", "Strauss");
private String code;
private String description;
FINISH_TAG_LIGHT_MUSIC_CMD(String code, String description) {
this.code = code;
this.description = description;
}
public static FINISH_TAG_LIGHT_MUSIC_CMD getByValue(String code) {
for (FINISH_TAG_LIGHT_MUSIC_CMD finishTagLightMusicCmd : values()) {
if (finishTagLightMusicCmd.getCode() == code) {
return finishTagLightMusicCmd;
}
}
return null;
}
public String getCode() {
return code;
}
public String getDescription() {
return description;
}
}
/**
* 完成器音量枚举
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum FINISH_TAG_LIGHT_VOLUME_CMD {
FINISH_TAG_LIGHT_VOLUME_00H("00", "0"),
FINISH_TAG_LIGHT_VOLUME_01H("01", "1"),
FINISH_TAG_LIGHT_VOLUME_02H("02", "2"),
FINISH_TAG_LIGHT_VOLUME_03H("03", "3"),
FINISH_TAG_LIGHT_VOLUME_04H("04", "4"),
FINISH_TAG_LIGHT_VOLUME_05H("05", "5"),
FINISH_TAG_LIGHT_VOLUME_06H("06", "6"),
FINISH_TAG_LIGHT_VOLUME_07H("07", "7"),
FINISH_TAG_LIGHT_VOLUME_08H("08", "8"),
FINISH_TAG_LIGHT_VOLUME_09H("09", "9"),
FINISH_TAG_LIGHT_VOLUME_0AH("0A", "10"),
FINISH_TAG_LIGHT_VOLUME_0BH("0B", "11"),
FINISH_TAG_LIGHT_VOLUME_0CH("0C", "12"),
FINISH_TAG_LIGHT_VOLUME_0DH("0D", "13"),
FINISH_TAG_LIGHT_VOLUME_0EH("0E", "14"),
FINISH_TAG_LIGHT_VOLUME_0FH("0F", "15");
private String code;
private String description;
FINISH_TAG_LIGHT_VOLUME_CMD(String code, String description) {
this.code = code;
this.description = description;
}
public static FINISH_TAG_LIGHT_VOLUME_CMD getByValue(String code) {
for (FINISH_TAG_LIGHT_VOLUME_CMD finishTagLightVolumeCmd : values()) {
if (finishTagLightVolumeCmd.getCode() == code) {
return finishTagLightVolumeCmd;
}
}
return null;
}
public String getCode() {
return code;
}
public String getDescription() {
return description;
}
}
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum RouteEvent {
TRIGGER(10, "trigger", "触发"),
ENTRY(20, "entry", "进入状态"),
EXIT(30, "exit", "离开状态");
private int value;
private String code;
private String description;
RouteEvent(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;
}
}
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum RouteState {
START(10, "START", "开启流程"),
TERMINATE(20, "TERMINATE", "终止流程"),
FINISH(30, "FINISH", "结束流程");
private int value;
private String code;
private String description;
RouteState(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;
}
}
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum TagType {
BIN_TAG(10, "库位标签"),
FINALIZER_TAG(20, "完成器标签"),
SCREEN_TAG(30, "标签显示器"),
TAG_SCAN_API(40, "标签扫描接口");
private int value;
private String description;
TagType(int value, String description) {
this.value = value;
this.description = description;
}
public int getValue() {
return value;
}
public String getDescription() {
return description;
}
}
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum TriggerType {
INNER_TRIGGER(10, "内部触发"),
OUTER_TRIGGER(20, "外部触发");
private int value;
private String description;
TriggerType(int value, String description) {
this.value = value;
this.description = description;
}
public int getValue() {
return value;
}
public String getDescription() {
return description;
}
}
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum RouteType {
GEN_TASK(10, "GEN_TASK", "生成任务"),
OFF_TAG(20, "OFF_TAG", "灭灯");
private int value;
private String code;
private String description;
RouteType(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;
}
}
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum MonitorProcessMessageType {
CONNECT_CONTROL_CMD(10, "CONNECT_CONTROL_CMD", "connectControlService", "连接控制器"),
DISCONNECT_CONTROL_CMD(20, "DISCONNECT_CONTROL_CMD", "disconnectControlService", "断开控制器"),
LIGHT_ON_CMD(30, "LIGHT_ON_CMD", "lightOnService", "亮灯命令"),
LIGHT_OFF_CMD(40, "LIGHT_OFF_CMD", "", "灭灯命令"),
CONTROL_SIGNAL_CMD(50, "CONTROL_SIGNAL_CMD", "controlSignalService", "控制器反馈信号"),
INTERFACE_SIGNAL_CMD(60, "INTERFACE_SIGNAL_CMD", "", "发送给界面actor通过websocket返回");
private int value;
private String code;
private String callClass;
private String description;
MonitorProcessMessageType(int value, String code, String callClass, String description) {
this.value = value;
this.code = code;
this.callClass = callClass;
this.description = description;
}
public int getValue() {
return value;
}
public String getCode() {
return code;
}
public String getCallClass() {
return callClass;
}
public String getDescription() {
return description;
}
public static MonitorProcessMessageType getTypeByValue(String code) {
if (StringUtils.isEmpty(code)) {
return null;
}
for (MonitorProcessMessageType enums : MonitorProcessMessageType.values()) {
if (enums.getCode().equals(code)) {
return enums;
}
}
return null;
}
}
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum InterfaceSignalMessageType {
CONNECT_CONTROL_CMD(10, "111111", "connectControlService", "连接控制器"),
DISCONNECT_CONTROL_CMD(20, "222222", "disconnectControlService", "断开控制器"),
LIGHT_ON_CMD(30, "333333", "lightOnService", "亮灯命令");
private int value;
private String code;
private String callClass;
private String description;
InterfaceSignalMessageType(int value, String code, String callClass, String description) {
this.value = value;
this.code = code;
this.callClass = callClass;
this.description = description;
}
public int getValue() {
return value;
}
public String getCallClass() {
return callClass;
}
public String getCode() {
return code;
}
public String getDescription() {
return description;
}
public static InterfaceSignalMessageType getTypeByValue(String code) {
if (StringUtils.isEmpty(code)) {
return null;
}
for (InterfaceSignalMessageType enums : InterfaceSignalMessageType.values()) {
if (enums.getCode().equals(code)) {
return enums;
}
}
return null;
}
}
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum WsBusiType {
MONITOR_PROCESS(10, "MONITOR_PROCESS", "控制器相关");
private int value;
private String code;
private String description;
WsBusiType(int value, String code, String description) {
this.value = value;
this.description = description;
}
public int getValue() {
return value;
}
public String getCode() {
return code;
}
public String getDescription() {
return description;
}
}
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum WsDataType {
TEXT(10, "TEXT", "正常信息"),
EXP_TEXT(20, "EXP_TEXT", "异常信息"),
TABLE(30, "TABLE", "表格");
private int value;
private String code;
private String description;
WsDataType(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;
}
}
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum StatusType {
START(10, "START", "开始状态"),
FINISH(20, "FINISH", "完成状态"),
TERMINATE(30, "TERMINATE", "中断状态");
private int value;
private String code;
private String description;
StatusType(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;
}
}
}

283
modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java
Unescape Escape View File

@ -174,6 +174,7 @@ public class WmsEnumUtil {
return tmp;
}
}
/**
* 主表信息 单据类型
*/
@ -700,9 +701,9 @@ public class WmsEnumUtil {
KT_PURCHASE_RC(450, "KT_PURCHASE_RC", "采购收货"),
KT_PACK_RC(460, "KT_PACK_RC", "坤泰包装收货"),
FINISH_PRODUCT_SHPING(470, "FINISH_PRODUCT_SHPING", "成品发运"),
KT_PICK_RC(480,"KT_PICK_RC", "坤泰拣货"),
PRODUCE_INSTOCK(490,"PRODUCE_INSTOCK", "VDA生产入库"),
UTENSIL_CONSUMING(500,"UTENSIL_CONSUMING","器具领用");
KT_PICK_RC(480, "KT_PICK_RC", "坤泰拣货"),
PRODUCE_INSTOCK(490, "PRODUCE_INSTOCK", "VDA生产入库"),
UTENSIL_CONSUMING(500, "UTENSIL_CONSUMING", "器具领用");
private int value;
private String code;
@ -736,6 +737,16 @@ public class WmsEnumUtil {
return tmp;
}
public static String codeOf(int val) {
String tmp = null;
for (int i = 0; i < values().length; i++) {
if (values()[i].value == val) {
tmp = values()[i].code;
}
}
return tmp;
}
public static int descOf(String desc) {
int tmp = 1;
for (int i = 0; i < values().length; i++) {
@ -887,7 +898,7 @@ public class WmsEnumUtil {
VDA_STATIC_CS("VDA_STATIC_CS", "VDA静态盘点"),
VDA_PACKAGE_MANAGE("VDA_PACKAGE_MANAGE", "VDA编组管理"),
KT_PICK_RC("KT_PICK_RC", "坤泰拣货"),
UTENSIL_CONSUMING("UTENSIL_CONSUMING","器具领用");
UTENSIL_CONSUMING("UTENSIL_CONSUMING", "器具领用");
private String value;
private String description;
@ -1027,7 +1038,7 @@ public class WmsEnumUtil {
INSTOCKED(40, "入库"),
PICKED(50, "配料"),
OUT_STOCK(60, "出库"),
SCRAP(70,"报废"),
SCRAP(70, "报废"),
COMMING(80, "在途");
private int value;
@ -1253,6 +1264,46 @@ public class WmsEnumUtil {
}
}
/**
* 盘点主表 单据类型
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum CS_STRATEGY_TYPE {
PART_COVERAGE(110, "物料分类覆盖"),
TOUCH(120, "动碰"),
ZORE_STOCK(130, "零库存");
private int value;
private String description;
CS_STRATEGY_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;
}
public static String valueOfDescription(int val) {
return valueOf(val);
}
}
/**
* 盘点主表 单据类型
*/
@ -1262,7 +1313,11 @@ public class WmsEnumUtil {
MONTH_INVENTORY(20, "月度盘点"),
SEASON_INVENTORY(30, "季度盘点"),
YEAR_INVENTORY(40, "年度盘点"),
AJUST_INVENTORY(50, "库存调整盘点");
AJUST_INVENTORY(50, "库存调整盘点"),
PART_COVERAGE(110, "物料分类覆盖"),
TOUCH(120, "动碰"),
ZORE_STOCK(130, "零库存");
private int value;
private String description;
@ -1460,6 +1515,7 @@ public class WmsEnumUtil {
return valueOf(val);
}
}
/**
* 库存移动单状态状态:10=新建,20=已处理,30=处理出错
*/
@ -2107,7 +2163,8 @@ public class WmsEnumUtil {
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum COMMON_SN {
PO_SN("PO_SN", "PO条码"),
VDA_SN("VDA_SN", "VDA条码");
VDA_SN("VDA_SN", "VDA条码"),
SELF_SN("SELF_SN", "自制件条码");
private String code;
private String description;
@ -2925,64 +2982,56 @@ public class WmsEnumUtil {
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum IMPORT_ORDER_TYPE {
PO("PO", "要货计划"),
ASN("ASN", "ASN"),
INSTRUCTIONS("INSTRUCTIONS", "指令"),
SCATTERED_OUT("C00", "零星出库指令"),
SCATTERED_INT("C01", "零星入指令"),
NC_DISMANTLING_PICKING("C02", "NC拆解领料"),
NC_DISMANTLING_RETURN("C03", "NC拆解退料"),
NC_SCRAPPED("C04", "NC报废指令"),
NOT_JIS("NOTJIS", "非JIS指令"),
STOCK_DUMP("D00", "库存转储指令"),
NC_INSTOCK("D01", "NC入库指令"),
SMRR("B00", "SMRR退货"),
DMR("B01", "DMR退货"),
OUT_SOURCING("A00", "委外发料指令"),
OUT_REBACK("A01", "委外退料指令"),
OUT_RETURN_SOURCING("A02", "委外返工发料指令"),
OUT_RETURN_("A03", "委外返工退料指令"),
SALES_RETURN_REBACK("SALES_RETURN", "销售退货指令"),
CS("CS", "盘点指令"),
CS_ADUJUST("CS_ADUJUST", "盘点调差指令");
PO("1", "PO", "要货计划"),
ASN("2", "ASN", "ASN"),
INSTRUCTIONS("3", "INSTRUCTIONS", "指令"),
SCATTERED_OUT("C00", "C00", "零星出库指令"),
SCATTERED_INT("C01", "C01", "零星入指令"),
NC_DISMANTLING_PICKING("C02", "C02", "NC拆解领料"),
NC_DISMANTLING_RETURN("C03", "C03", "NC拆解退料"),
NC_SCRAPPED("C04", "C04", "NC报废指令"),
NOT_JIS("NOTJIS", "NOTJIS", "非JIS指令"),
STOCK_DUMP("D00", "D00", "库存转储指令"),
NC_INSTOCK("D01", "D01", "NC入库指令"),
SMRR("B00", "B00", "SMRR退货"),
DMR("B01", "B01", "DMR退货"),
OUT_SOURCING("A00", "A00", "委外发料指令"),
OUT_REBACK("A01", "A01", "委外退料指令"),
OUT_RETURN_SOURCING("A02", "A02", "委外返工发料指令"),
OUT_RETURN_("A03", "A03", "委外返工退料指令"),
SALES_RETURN_REBACK("SALES_RETURN", "SALES_RETURN", "销售退货指令"),
CS("CS", "CS", "盘点指令"),
CS_ADUJUST("CS_ADUJUST", "CS_ADUJUST", "盘点调差指令");
private String value;
private String code;
private String description;
IMPORT_ORDER_TYPE(String value, String description) {
IMPORT_ORDER_TYPE(String value, String code, String description) {
this.value = value;
this.code = code;
this.description = description;
}
public String getDescription() {
return description;
public String getValue() {
return value;
}
public String getCode() {
return value;
return code;
}
public String getValue() {
return value;
public String getDescription() {
return description;
}
public static IMPORT_ORDER_TYPE codeOf(String value) {
public static IMPORT_ORDER_TYPE codeOf(String code) {
for (int i = 0; i < values().length; i++) {
if (values()[i].value.equals(value)) {
if (values()[i].code.equals(code)) {
return values()[i];
}
}
return null;
}
public static String getDes(String val) {
String tmp = null;
for (int i = 0; i < values().length; i++) {
if (values()[i].value == val) {
tmp = values()[i].description;
}
}
return tmp;
}
}
/**
@ -3072,7 +3121,6 @@ public class WmsEnumUtil {
}
/**
* 任务数据来源：检查子数据
*/
@ -3485,7 +3533,7 @@ public class WmsEnumUtil {
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum WMS_STOCK_TYPE {
SOURCE(10, "实物条码"), TARGET(20, "虚拟条码"),CUST_SN(30, "客户条码");
SOURCE(10, "实物条码"), TARGET(20, "虚拟条码"), CUST_SN(30, "客户条码");
private int value;
private String description;
@ -4477,8 +4525,8 @@ public class WmsEnumUtil {
WAIT_RECEIVING(10, "待收货"),
RECEIVING(20, "收货中"),
COMPLETE_RECEIVING(30, "收货完成"),
CLOSE(40,"已关闭"),
CANCEL(50,"已取消"),
CLOSE(40, "已关闭"),
CANCEL(50, "已取消"),
UN_RECEIVED(60, "延迟未收货");
private int value;
@ -4569,9 +4617,9 @@ public class WmsEnumUtil {
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum WORK_ORDER_MASTER_STATUS {
CREATE(10,"CREATE", "创建"),
PLANNED(20,"PLANNED", "已计划"),
CLOSE(30,"CLOSE", "已关闭");
CREATE(10, "CREATE", "创建"),
PLANNED(20, "PLANNED", "已计划"),
CLOSE(30, "CLOSE", "已关闭");
private int value;
private String code;
@ -4657,8 +4705,8 @@ public class WmsEnumUtil {
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum PULL_TASK_DETAILS_STATUS {
BE_HANDLE(10,"BE_HANDLE", "待处理"),
CANCELLATION(20,"CANCELLATION", "已处理");
BE_HANDLE(10, "BE_HANDLE", "待处理"),
CANCELLATION(20, "CANCELLATION", "已处理");
private int value;
private String code;
@ -4709,10 +4757,10 @@ public class WmsEnumUtil {
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum PULL_TASK_MASTER_STATUS {
CREATE(10,"CREATE", "创建"),
ENABLED(20,"ENABLED", "已启动"),
COMPLETE(30,"COMPLETE", "已完成"),
CLOSE(40,"CLOSE", "已关闭");
CREATE(10, "CREATE", "创建"),
ENABLED(20, "ENABLED", "已启动"),
COMPLETE(30, "COMPLETE", "已完成"),
CLOSE(40, "CLOSE", "已关闭");
private int value;
private String code;
@ -4793,8 +4841,8 @@ public class WmsEnumUtil {
}
/**
* WEB页面字段类型
* 10-文本类型，20-数字类型，30-下拉框类型，40，时间类型，50-开窗查询类型
* WEB页面字段类型
* 10-文本类型，20-数字类型，30-下拉框类型，40，时间类型，50-开窗查询类型
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum FIELD_TYPE {
@ -4864,4 +4912,119 @@ public class WmsEnumUtil {
}
}
/**
* 流程提交类型
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum GROUP_COMMIT_MODE {
JUST_CURRENT(10, 10, "只提交当前移动单"), REF_SRC(20, 20, "关联单据提交"), REF_GROUP(30, 30, "关联分组号提交");
private int value;
private int code;
private String description;
GROUP_COMMIT_MODE(int value, int code, String description) {
this.value = value;
this.code = code;
this.description = description;
}
public int getValue() {
return value;
}
public int getCode() {
return code;
}
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;
}
public static String valueOfDescription(int val) {
return valueOf(val);
}
}
/**
* 自定义列表：优先级 (CUSTOMIZE_PROP)
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum CUSTOMIZE_PROP {
DEFAULT(1, "默认"), CUSTOMIZE(2, "自定义");
private int value;
private String description;
CUSTOMIZE_PROP(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 PICKING_EXECUTE_STATUS {
IN_PROGRESS(1, "执行中"), EXPIRED(2, "已超期"), NORMAL(3, "正常");
private int value;
private String description;
PICKING_EXECUTE_STATUS(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;
}
public static String valueOfDescription(int val) {
return valueOf(val);
}
}
}

23
modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/tool/DdlPreparedPack.java
Unescape Escape View File

@ -266,6 +266,18 @@ public class DdlPreparedPack {
}
/**
* 封装String对象成equal语句
*
* @param columnName 列名
* @param packBean
*/
public static void getStringLikePack(String val, String columnName, DdlPackBean packBean) {
if (val != null && val.trim().length() > 0) {
packBean.addColumnQuery(columnName, " and model." + columnName + " like :m_" + columnName, val);
}
}
/**
* 封装String对象成不等于语句
*
* @param columnName 列名
@ -321,6 +333,15 @@ public class DdlPreparedPack {
}
/**
* 两个字段不相等
*
* @param firstColumnName 列名
* @param packBean
*/
public static void getNotEqueals(String firstColumnName, String twoColumnName, DdlPackBean packBean) {
packBean.addColumnQuery(null, " and UPPER(model." + firstColumnName + ")!= UPPER(model." + twoColumnName+")", null);
}
/**
* 封装long或者int的负整数对象成equal语句
*
* @param columnName 列名
@ -577,7 +598,7 @@ public class DdlPreparedPack {
*/
public static void getNotInPackList(List<?> data, String columnName, DdlPackBean packBean) {
if (data != null && data.size() > 0) {
packBean.addColumnQuery(columnName, " and model." + columnName + "not in (:m_" + columnName + ")", data);
packBean.addColumnQuery(columnName, " and model." + columnName + " not in (:m_" + columnName + ")", data);
}
}

8
modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfElementProperty.java
Unescape Escape View File

@ -119,6 +119,14 @@ public class BfElementProperty extends BaseBean {
@ApiParam(value = "控件引用RefKey")
private String propertyControlRefKey;
@Column(name = "PROPERTY_CONTROL_TEXT_KEY")
@ApiParam(value = "控件显示文本Key")
private String propertyControlTextKey;
@Column(name = "PROPERTY_CONTROL_VALUE_KEY")
@ApiParam(value = "控件引用值Key")
private String propertyControlValueKey;
@Column(name = "PROPERTY_DESCRIPTION")
@ApiParam(value = "属性描述")
private String propertyDescription;

4
modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/bean/LacSuitTask.java
Unescape Escape View File

@ -146,6 +146,10 @@ public class LacSuitTask extends BaseBean {
private List<LacSuitTaskParam> lacSuitTaskParamList;
@Transient
@ApiParam(value ="适配出参")
private List<LacSuitTaskParam> lacSuitTaskOutParamList;
@Transient
@ApiParam(value ="入参适配")
private List<LacSuitTaskParamAdapter> inputParamAdapterList;

7
modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/bean/LacSuitTaskParam.java
Unescape Escape View File

@ -96,4 +96,11 @@ public class LacSuitTaskParam extends BaseBean {
@Transient
@ApiParam(value ="参数值")
private Object value;
public String getValueStr() {
if (value == null) {
return null;
}
return value.toString();
}
}

4
modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/sqlpack/LacHqlPack.java
Unescape Escape View File

@ -119,6 +119,10 @@ public class LacHqlPack {
public static DdlPackBean packHqlLacSuitTaskParamAdapter(LacSuitTaskParamAdapter bean) {
DdlPackBean ddlPackBean = DdlPackBean.getDdlPackBean();
if(bean!=null) {
DdlPreparedPack.getNumEqualPack(bean.getTaskId(), "taskId", ddlPackBean);
DdlPreparedPack.getStringLikerPack(bean.getParamName(), "paramName", ddlPackBean);
}
return ddlPackBean;
}

4
modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/IfDismantleRecord.java
Unescape Escape View File

@ -11,6 +11,7 @@ import org.hibernate.annotations.DynamicUpdate;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Table;
import java.io.Serializable;
import java.math.BigDecimal;
/**
@ -27,8 +28,9 @@ import java.math.BigDecimal;
@EqualsAndHashCode(callSuper = true)
@Table(name = "IF_DISMENTLE_RECORD")
@Api("物料拆解表")
public class IfDismantleRecord extends BaseBean {
public class IfDismantleRecord extends BaseBean implements Serializable {
private static final long serialVersionUID = -6010207359066736962L;
@Column(name = "DISMANTLE_ID")
@ApiParam("拆解编号")
private String dismantleId;

4
modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/IfPackageDetail.java
Unescape Escape View File

@ -11,6 +11,7 @@ import org.hibernate.annotations.DynamicUpdate;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Table;
import java.io.Serializable;
/**
* @Description:
@ -26,8 +27,9 @@ import javax.persistence.Table;
@EqualsAndHashCode(callSuper = true)
@Table(name = "IF_PACKAGE_DETAIL")
@Api("包装明细表")
public class IfPackageDetail extends BaseBean {
public class IfPackageDetail extends BaseBean implements Serializable {
private static final long serialVersionUID = -1873101288426218272L;
@Column(name = "PART_NO")
@ApiParam("物料号")
private String partNo;

4
modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/IfProductOffLine.java
Unescape Escape View File

@ -11,6 +11,7 @@ import org.hibernate.annotations.DynamicUpdate;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Table;
import java.io.Serializable;
/**
* @Description:
@ -26,8 +27,9 @@ import javax.persistence.Table;
@EqualsAndHashCode(callSuper = true)
@Table(name = "IF_PRODUCT_OFF_LINE")
@Api("生产报工表")
public class IfProductOffLine extends BaseBean {
public class IfProductOffLine extends BaseBean implements Serializable {
private static final long serialVersionUID = 200629529131241418L;
@Column(name = "PART_NO")
@ApiParam("物料号")
private String partNo;

4
modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesAction.java
Unescape Escape View File

@ -12,6 +12,7 @@ import org.hibernate.annotations.DynamicUpdate;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Table;
import java.io.Serializable;
/**
* @Description :mes系统业务动作
@ -27,7 +28,8 @@ import javax.persistence.Table;
@EqualsAndHashCode(callSuper = true)
@Table(name = "MES_ACTION")
@Api("mes系统业务动作")
public class MesAction extends BaseBean {
public class MesAction extends BaseBean implements Serializable {
private static final long serialVersionUID = -6451213228967727835L;
@Column(name = "ACTION_CODE")
@ApiParam("动作代码")
private String actionCode;

4
modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesActionIf.java
Unescape Escape View File

@ -11,6 +11,7 @@ import org.hibernate.annotations.DynamicUpdate;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Table;
import java.io.Serializable;
/**
* @Description:
@ -26,8 +27,9 @@ import javax.persistence.Table;
@EqualsAndHashCode(callSuper = true)
@Table(name = "MES_ACTION_IF")
@Api("动作接口配置")
public class MesActionIf extends BaseBean {
public class MesActionIf extends BaseBean implements Serializable {
private static final long serialVersionUID = -5058215339453766620L;
@Column(name = "ACTION_CODE")
@ApiParam("动作代码")
private String actionCode;

4
modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesActionMethod.java
Unescape Escape View File

@ -12,6 +12,7 @@ import org.hibernate.annotations.DynamicUpdate;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Table;
import java.io.Serializable;
/**
* @Description :mes系统业务动作方法
@ -27,7 +28,8 @@ import javax.persistence.Table;
@EqualsAndHashCode(callSuper = true)
@Table(name = "MES_ACTION_METHOD")
@Api("系统业务动作方法")
public class MesActionMethod extends BaseBean {
public class MesActionMethod extends BaseBean implements Serializable {
private static final long serialVersionUID = 6249418690993577108L;
@Column(name = "ACTION_CODE")
@ApiParam("动作代码")
private String actionCode;

4
modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesArea.java
Unescape Escape View File

@ -12,6 +12,7 @@ import org.hibernate.annotations.DynamicUpdate;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Table;
import java.io.Serializable;
/**
* @Description :生产区域
@ -27,7 +28,8 @@ import javax.persistence.Table;
@EqualsAndHashCode(callSuper = true)
@Table(name = "MES_AREA")
@Api("生产区域")
public class MesArea extends BaseBean {
public class MesArea extends BaseBean implements Serializable {
private static final long serialVersionUID = 1047604067591557689L;
@Column(name = "AREA_CODE")
@ApiParam("区域代码")
private String areaCode;

4
modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesBom.java
Unescape Escape View File

@ -14,6 +14,7 @@ import org.springframework.format.annotation.DateTimeFormat;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Table;
import java.io.Serializable;
/**
* @Description :BOM清单
@ -29,7 +30,8 @@ import javax.persistence.Table;
@EqualsAndHashCode(callSuper = true)
@Table(name = "MES_BOM")
@Api("BOM清单")
public class MesBom extends BaseBean {
public class MesBom extends BaseBean implements Serializable {
private static final long serialVersionUID = -1772273641263268564L;
@Column(name = "PART_NO")
@ApiParam("父零件号")
private String partNo;

10
modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesCellFeed.java
Unescape Escape View File

@ -12,6 +12,8 @@ import org.hibernate.annotations.DynamicUpdate;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Table;
import javax.persistence.Version;
import java.io.Serializable;
/**
* @Description :工位投料信息
@ -27,7 +29,8 @@ import javax.persistence.Table;
@EqualsAndHashCode(callSuper = true)
@Table(name = "MES_CELL_FEED")
@Api("工位投料信息")
public class MesCellFeed extends BaseBean {
public class MesCellFeed extends BaseBean implements Serializable {
private static final long serialVersionUID = 2412657464618960515L;
@Column(name = "WORK_CENTER_CODE")
@ApiParam("工作中心")
private String workCenterCode;
@ -64,6 +67,11 @@ public class MesCellFeed extends BaseBean {
@ApiParam("供应商代码")
private String supplierCode;
// @Version
// @Column(name = "LOCK_VERSION")
// @ApiParam(value = "乐观锁", example = "1")
// public Integer lockVersion;
public double getRawQtyVal() {
return this.rawQty == null ? 0l : this.rawQty;
}

4
modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesConfig.java
Unescape Escape View File

@ -12,6 +12,7 @@ import org.hibernate.annotations.DynamicUpdate;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Table;
import java.io.Serializable;
/**
* @Description :配置表
@ -27,7 +28,8 @@ import javax.persistence.Table;
@EqualsAndHashCode(callSuper = true)
@Table(name = "MES_CONFIG")
@Api("mes配置表")
public class MesConfig extends BaseBean {
public class MesConfig extends BaseBean implements Serializable {
private static final long serialVersionUID = -5759669472714287000L;
@Column(name = "CFG_CODE")
@ApiParam("配置代码")
private String cfgCode;

4
modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesCustProdLine.java
Unescape Escape View File

@ -12,6 +12,7 @@ import org.hibernate.annotations.DynamicUpdate;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Table;
import java.io.Serializable;
/**
* @Description :mes系统业务动作
@ -27,7 +28,8 @@ import javax.persistence.Table;
@EqualsAndHashCode(callSuper = true)
@Table(name = "MES_CUST_PROD_LINE")
@Api("客户产线代码")
public class MesCustProdLine extends BaseBean {
public class MesCustProdLine extends BaseBean implements Serializable {
private static final long serialVersionUID = 3049432665592161513L;
@Column(name = "CUST_PROD_LINE_CODE")
@ApiParam("客户产线代码")
private String custProdLineCode;

4
modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesCustomer.java
Unescape Escape View File

@ -12,6 +12,7 @@ import org.hibernate.annotations.DynamicUpdate;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Table;
import java.io.Serializable;
/**
* @Description :mes客户表
@ -27,7 +28,8 @@ import javax.persistence.Table;
@EqualsAndHashCode(callSuper = true)
@Table(name = "MES_CUSTOMER")
@Api("客户信息")
public class MesCustomer extends BaseBean {
public class MesCustomer extends BaseBean implements Serializable {
private static final long serialVersionUID = 167635887082538926L;
@Column(name = "CUSTOMER_CODE")
@ApiParam("客户代码")
private String customerCode;

4
modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesCustomerPart.java
Unescape Escape View File

@ -12,6 +12,7 @@ import org.hibernate.annotations.DynamicUpdate;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Table;
import java.io.Serializable;
/**
* @Description :mes客户表
@ -27,7 +28,8 @@ import javax.persistence.Table;
@EqualsAndHashCode(callSuper = true)
@Table(name = "MES_CUSTOMER_PART")
@Api("客户零件关系")
public class MesCustomerPart extends BaseBean {
public class MesCustomerPart extends BaseBean implements Serializable {
private static final long serialVersionUID = -4731252848471949263L;
@Column(name = "CUSTOMER_CODE")
@ApiParam("客户代码")
private String customerCode;

4
modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesDataObject.java
Unescape Escape View File

@ -12,6 +12,7 @@ import org.hibernate.annotations.DynamicUpdate;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Table;
import java.io.Serializable;
/**
* @Author: Wynne.Lu
@ -25,8 +26,9 @@ import javax.persistence.Table;
@EqualsAndHashCode(callSuper = true)
@Table(name = "MES_DATA_OBJECT")
@Api("数据对象")
public class MesDataObject extends BaseBean {
public class MesDataObject extends BaseBean implements Serializable {
private static final long serialVersionUID = -1419262751765770535L;
@Column(name = "OBJECT_CODE")
@ApiParam("对象代码")
private String objectCode;

4
modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesDatasource.java
Unescape Escape View File

@ -12,6 +12,7 @@ import org.hibernate.annotations.DynamicUpdate;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Table;
import java.io.Serializable;
/**
* @Author: Wynne.Lu
@ -25,8 +26,9 @@ import javax.persistence.Table;
@EqualsAndHashCode(callSuper = true)
@Table(name = "MES_DATASOURCE")
@Api("地址清单")
public class MesDatasource extends BaseBean {
public class MesDatasource extends BaseBean implements Serializable {
private static final long serialVersionUID = -7387559860198655900L;
@Column(name = "DS_CODE")
@ApiParam("数据源代码")
private String dsCode;

4
modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesDefect.java
Unescape Escape View File

@ -12,6 +12,7 @@ import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Table;
import javax.persistence.Transient;
import java.io.Serializable;
import java.util.List;
/**
@ -28,8 +29,9 @@ import java.util.List;
@EqualsAndHashCode(callSuper = true)
@Table(name = "MES_DEFECT")
@Api("缺陷表")
public class MesDefect extends BaseBean {
public class MesDefect extends BaseBean implements Serializable {
private static final long serialVersionUID = -6771813937279359333L;
@Column(name = "DEFECT_CODE")
@ApiParam("缺陷代码")
private String defectCode;

4
modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesDefectCause.java
Unescape Escape View File

@ -11,6 +11,7 @@ import org.hibernate.annotations.DynamicUpdate;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Table;
import java.io.Serializable;
/**
* @Description:
@ -26,8 +27,9 @@ import javax.persistence.Table;
@EqualsAndHashCode(callSuper = true)
@Table(name = "MES_DEFECT_CAUSE")
@Api("缺陷原因表")
public class MesDefectCause extends BaseBean {
public class MesDefectCause extends BaseBean implements Serializable {
private static final long serialVersionUID = -3867250593038812861L;
@Column(name = "DC_CODE")
@ApiParam("缺陷原因代码")
private String dcCode;

4
modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesDefectRecord.java
Unescape Escape View File

@ -9,6 +9,7 @@ import org.hibernate.annotations.DynamicInsert;
import org.hibernate.annotations.DynamicUpdate;
import javax.persistence.*;
import java.io.Serializable;
import java.util.List;
/**
@ -28,7 +29,8 @@ import java.util.List;
@Index(columnList = "CREATE_DATE_TIME")
})
@Api("不良信息记录表")
public class MesDefectRecord extends BaseBean {
public class MesDefectRecord extends BaseBean implements Serializable {
private static final long serialVersionUID = -2828208776424343584L;
@Column(name = "SERIAL_NUMBER")
@ApiParam("产品条码")
private String serialNumber;

4
modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesDismantleRecord.java
Unescape Escape View File

@ -9,6 +9,7 @@ import org.hibernate.annotations.DynamicInsert;
import org.hibernate.annotations.DynamicUpdate;
import javax.persistence.*;
import java.io.Serializable;
import java.math.BigDecimal;
/**
@ -28,8 +29,9 @@ import java.math.BigDecimal;
@Index(columnList = "CREATE_DATE_TIME")
})
@Api("物料拆解记录表")
public class MesDismantleRecord extends BaseBean {
public class MesDismantleRecord extends BaseBean implements Serializable {
private static final long serialVersionUID = -7924346039878218038L;
@Column(name = "DISMANTLE_ID")
@ApiParam("拆解编号")
private String dismantleId;

4
modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesEquipment.java
Unescape Escape View File

@ -15,6 +15,7 @@ import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Table;
import javax.persistence.Transient;
import java.io.Serializable;
/**
* @Description :生产设备
@ -30,7 +31,8 @@ import javax.persistence.Transient;
@EqualsAndHashCode(callSuper = true)
@Table(name = "MES_EQUIPMENT")
@Api("生产设备")
public class MesEquipment extends BaseBean {
public class MesEquipment extends BaseBean implements Serializable {
private static final long serialVersionUID = 7269069290035250108L;
@Column(name = "EQUIPMENT_CODE")
@ApiParam("设备代码")
private String equipmentCode;

4
modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesEsop.java
Unescape Escape View File

@ -13,6 +13,7 @@ import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Table;
import javax.persistence.Transient;
import java.io.Serializable;
/**
* @Author: Wynne.Lu
@ -26,8 +27,9 @@ import javax.persistence.Transient;
@EqualsAndHashCode(callSuper = true)
@Table(name = "MES_ESOP")
@Api("作业指导书信息表(ODS)")
public class MesEsop extends BaseBean {
public class MesEsop extends BaseBean implements Serializable {
private static final long serialVersionUID = -4869646502033099294L;
@Column(name = "PART_NO")
@ApiParam("零件号")
private String partNo;

4
modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesEvent.java
Unescape Escape View File

@ -12,6 +12,7 @@ import org.hibernate.annotations.DynamicUpdate;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Table;
import java.io.Serializable;
/**
* @Description :mes系统业务事件
@ -27,7 +28,8 @@ import javax.persistence.Table;
@EqualsAndHashCode(callSuper = true)
@Table(name = "MES_EVENT")
@Api("系统业务事件")
public class MesEvent extends BaseBean {
public class MesEvent extends BaseBean implements Serializable {
private static final long serialVersionUID = -5604724665202938464L;
@Column(name = "EVENT_CODE")
@ApiParam("事件代码")
private String eventCode;

4
modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesEventAction.java
Unescape Escape View File

@ -14,6 +14,7 @@ import org.hibernate.annotations.DynamicUpdate;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Table;
import java.io.Serializable;
/**
* @Description :mes系统业务事件动作
@ -31,7 +32,8 @@ import javax.persistence.Table;
@EqualsAndHashCode(callSuper = true)
@Table(name = "MES_EVENT_ACTION")
@Api("系统业务事件动作")
public class MesEventAction extends BaseBean {
public class MesEventAction extends BaseBean implements Serializable {
private static final long serialVersionUID = 3964084375279916831L;
@Column(name = "EVENT_CODE")
@ApiParam("事件代码")
private String eventCode;

4
modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesFiCfg.java
Unescape Escape View File

@ -12,6 +12,7 @@ import org.hibernate.annotations.DynamicUpdate;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Table;
import java.io.Serializable;
/**
* @Author: Wynne.Lu
@ -25,8 +26,9 @@ import javax.persistence.Table;
@EqualsAndHashCode(callSuper = true)
@Table(name = "MES_FI_CFG")
@Api("首检件配置")
public class MesFiCfg extends BaseBean {
public class MesFiCfg extends BaseBean implements Serializable {
private static final long serialVersionUID = 1791614973371037158L;
@Column(name = "WORK_CENTER_CODE")
@ApiParam("产线")
private String workCenterCode;

4
modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesFile.java
Unescape Escape View File

@ -12,6 +12,7 @@ import org.hibernate.annotations.DynamicUpdate;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Table;
import java.io.Serializable;
/**
* @Author: Wynne.Lu
@ -25,8 +26,9 @@ import javax.persistence.Table;
@EqualsAndHashCode(callSuper = true)
@Table(name = "MES_FILE")
@Api("文件表")
public class MesFile extends BaseBean {
public class MesFile extends BaseBean implements Serializable {
private static final long serialVersionUID = 7017379708394714424L;
@Column(name = "FILE_NAME")
@ApiParam("文件名称")
private String fileName;

4
modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesKpData.java
Unescape Escape View File

@ -13,6 +13,7 @@ import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Table;
import javax.persistence.Transient;
import java.io.Serializable;
/**
* @Description :物料关键数据
@ -28,7 +29,8 @@ import javax.persistence.Transient;
@EqualsAndHashCode(callSuper = true)
@Table(name = "MES_KP_DATA")
@Api("生产区域")
public class MesKpData extends BaseBean {
public class MesKpData extends BaseBean implements Serializable {
private static final long serialVersionUID = -3332582267186642790L;
@Column(name = "PART_NO")
@ApiParam("物料号")
private String partNo;

4
modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesKpsnRule.java
Unescape Escape View File

@ -11,6 +11,7 @@ import org.hibernate.annotations.DynamicUpdate;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Table;
import java.io.Serializable;
/**
* @Description:
@ -26,7 +27,8 @@ import javax.persistence.Table;
@EqualsAndHashCode(callSuper = true)
@Table(name = "MES_KPSN_RULE")
@Api("关键件条码校验规则")
public class MesKpsnRule extends BaseBean {
public class MesKpsnRule extends BaseBean implements Serializable {
private static final long serialVersionUID = 8238308232531730720L;
@Column(name = "PART_NO")
@ApiParam("物料号")
private String partNo;

6
modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesLabelTemplate.java
Unescape Escape View File

@ -9,6 +9,7 @@ import org.hibernate.annotations.DynamicInsert;
import org.hibernate.annotations.DynamicUpdate;
import javax.persistence.*;
import java.io.Serializable;
import java.util.List;
/**
@ -25,9 +26,10 @@ import java.util.List;
@EqualsAndHashCode(callSuper = true)
@Table(name = "MES_LABEL_TEMPLATE")
@Api(value = "打印模板", description = "打印模板")
public class MesLabelTemplate extends BaseBean {
public class MesLabelTemplate extends BaseBean implements Serializable {
private static final long serialVersionUID = 5371856566557305323L;
private static final long serialVersionUID = 3797103812377146878L;
@Column(name = "TEMPLATE_CODE")
@ApiParam(value = "模板代码")
private String templateCode;

5
modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesLabelTemplateParam.java
Unescape Escape View File

@ -11,6 +11,7 @@ import org.hibernate.annotations.DynamicInsert;
import org.hibernate.annotations.DynamicUpdate;
import javax.persistence.*;
import java.io.Serializable;
/**
* @Description : 打印模板参数
@ -26,9 +27,9 @@ import javax.persistence.*;
@EqualsAndHashCode(callSuper = true)
@Table(name = "MES_LABEL_TEMPLATE_PARAM")
@Api(value = "打印模板参数", description = "打印模板参数")
public class MesLabelTemplateParam extends BaseBean {
public class MesLabelTemplateParam extends BaseBean implements Serializable {
private static final long serialVersionUID = 6476163540527157643L;
private static final long serialVersionUID = -3595706874099358555L;
@Column(name = "TEMPLATE_ID")
@ApiParam(value = "模板ID", access = "模板ID", example = "-1")
@JsonSerialize(using = ToStringSerializer.class)

4
modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesMethod.java
Unescape Escape View File

@ -12,6 +12,7 @@ import org.hibernate.annotations.DynamicUpdate;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Table;
import java.io.Serializable;
/**
* @Description :mes系统业务方法
@ -27,7 +28,8 @@ import javax.persistence.Table;
@EqualsAndHashCode(callSuper = true)
@Table(name = "MES_METHOD")
@Api("系统业务方法")
public class MesMethod extends BaseBean {
public class MesMethod extends BaseBean implements Serializable {
private static final long serialVersionUID = -3629909409034083767L;
@Column(name = "METHOD_CODE")
@ApiParam("方法代码")
private String methodCode;

52
modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesMonitorTask.java
Unescape Escape View File

@ -0,0 +1,52 @@
package cn.estsh.i3plus.pojo.mes.pcn.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;
/**
* @Description :
* @Reference :
* @Author : zcg
* @Date : 2020/1/8 0008 - 17:11
*/
@Data
@Entity
@DynamicInsert
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
@Table(name = "MES_MONITOR_TASK")
@Api("监听任务")
public class MesMonitorTask extends BaseBean implements Serializable {
private static final long serialVersionUID = -8614480099840448294L;
@Column(name = "TASK_NO")
@ApiParam("任务编号")
private String taskNo;
@Column(name = "TASK_NAME")
@ApiParam("任务名称")
private String taskName;
@Column(name = "TASK_OBJECT_TYPE")
@ApiParam("任务对象类型")
private Integer taskObjectType;
@Column(name = "TASK_STATUS")
@ApiParam("任务状态")
private Integer taskStatus;
@Column(name = "TASK_EXCEPTION_DESC")
@ApiParam("异常描述")
private String taskExceptionDesc;
}

48
modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesMonitorTaskDetail.java
Unescape Escape View File

@ -0,0 +1,48 @@
package cn.estsh.i3plus.pojo.mes.pcn.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;
/**
* @Description :
* @Reference :
* @Author : zcg
* @Date : 2020/1/8 0008 - 17:19
*/
@Data
@Entity
@DynamicInsert
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
@Table(name = "MES_MONITOR_TASK_DETAIL")
@Api("监听任务明细")
public class MesMonitorTaskDetail extends BaseBean implements Serializable {
private static final long serialVersionUID = -4811270359386960747L;
@Column(name = "TASK_NO")
@ApiParam("任务编号")
private String taskNo;
@Column(name = "DATA_OBJECT_NO")
@ApiParam("数据对象编号")
private String dataObjectNo;
// @Column(name = "STORE_OBJECT_CODE")
// @ApiParam("存储对象代码")
// private String storeObjectCode;
//
// @Column(name = "STORE_FIELD_CODE")
// @ApiParam("存储字段代码")
// private String storeFieldCode;
}

4
modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesNumberRule.java
Unescape Escape View File

@ -12,6 +12,7 @@ import org.hibernate.annotations.DynamicUpdate;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Table;
import java.io.Serializable;
/**
* @Author: Wynne.Lu
@ -26,8 +27,9 @@ import javax.persistence.Table;
@EqualsAndHashCode(callSuper = true)
@Table(name = "MES_NUMBER_RULE")
@Api("条码生成规则")
public class MesNumberRule extends BaseBean {
public class MesNumberRule extends BaseBean implements Serializable {
private static final long serialVersionUID = -4039194855353751178L;
@Column(name = "RULE_CODE")
@ApiParam("规则代码")
private String ruleCode;

10
modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesNumberSerialno.java
Unescape Escape View File

@ -12,6 +12,8 @@ import org.hibernate.annotations.DynamicUpdate;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Table;
import javax.persistence.Version;
import java.io.Serializable;
/**
* @Author: Wynne.Lu
@ -25,8 +27,9 @@ import javax.persistence.Table;
@EqualsAndHashCode(callSuper = true)
@Table(name = "MES_NUMBER_SERIALNO")
@Api("编码序号")
public class MesNumberSerialno extends BaseBean {
public class MesNumberSerialno extends BaseBean implements Serializable {
private static final long serialVersionUID = -3024166851634742872L;
@Column(name = "CURRENT_NUMBER_PREFIX")
@ApiParam("当前编号前缀")
private String currentNumberPrefix;
@ -38,4 +41,9 @@ public class MesNumberSerialno extends BaseBean {
@Column(name = "CURRENT_NUMBER")
@ApiParam("当前编号")
private String currentNumber;
@Version
@Column(name = "LOCK_VERSION")
@ApiParam(value = "乐观锁", example = "1")
public transient Integer lockVersion;
}

4
modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesObjectCfg.java
Unescape Escape View File

@ -12,6 +12,7 @@ import org.hibernate.annotations.DynamicUpdate;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Table;
import java.io.Serializable;
/**
* @Author: Wynne.Lu
@ -25,8 +26,9 @@ import javax.persistence.Table;
@EqualsAndHashCode(callSuper = true)
@Table(name = "MES_OBJECT_CFG")
@Api("对象结构")
public class MesObjectCfg extends BaseBean {
public class MesObjectCfg extends BaseBean implements Serializable {
private static final long serialVersionUID = -3640782210450491835L;
@Column(name = "OBJECT_CODE")
@ApiParam("对象代码")
private String objectCode;

4
modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPLCConfigure.java
Unescape Escape View File

@ -12,6 +12,7 @@ import org.hibernate.annotations.DynamicUpdate;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Table;
import java.io.Serializable;
/**
* @Description :PLC设备信息配置表
@ -28,7 +29,8 @@ import javax.persistence.Table;
@Table(name = "MES_PLC_CONFIGURE")
@Api("PLC设备信息配置表")
@Deprecated
public class MesPLCConfigure extends BaseBean {
public class MesPLCConfigure extends BaseBean implements Serializable {
private static final long serialVersionUID = 8274445475806774L;
@Column(name = "IP")
@ApiParam("设备ip")
private String ipAddress;

4
modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPackSpec.java
Unescape Escape View File

@ -13,6 +13,7 @@ import org.hibernate.annotations.DynamicUpdate;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Table;
import java.io.Serializable;
/**
* @Description :包装规格
@ -28,7 +29,8 @@ import javax.persistence.Table;
@EqualsAndHashCode(callSuper = true)
@Table(name = "MES_PACK_SPEC")
@Api("包装规格")
public class MesPackSpec extends BaseBean {
public class MesPackSpec extends BaseBean implements Serializable {
private static final long serialVersionUID = -788654193624068327L;
@Column(name = "SPEC_CODE")
@ApiParam("包装规格代码")
private String specCode;

12
modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPackage.java
Unescape Escape View File

@ -10,6 +10,7 @@ import org.hibernate.annotations.DynamicInsert;
import org.hibernate.annotations.DynamicUpdate;
import javax.persistence.*;
import java.io.Serializable;
/**
* @Author: Wynne.Lu
@ -21,10 +22,15 @@ import javax.persistence.*;
@DynamicInsert
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
@Table(name = "MES_PACKAGE", indexes = {@Index(columnList = "PACKAGE_NO")})
@Table(name = "MES_PACKAGE", indexes = {@Index(columnList = "PACKAGE_NO")
}, uniqueConstraints = {
@UniqueConstraint(columnNames = {"ORGANIZE_CODE", "PACKAGE_NO"})
}
)
@Api("包装规格")
public class MesPackage extends BaseBean {
@Column(name = "PACKAGE_NO")
public class MesPackage extends BaseBean implements Serializable {
private static final long serialVersionUID = 2292859018089339608L;
@Column(name = "PACKAGE_NO", nullable = false)
@ApiParam("包装编号")
private String packageNo;

19
modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPackageDetail.java
Unescape Escape View File

@ -9,10 +9,8 @@ import lombok.EqualsAndHashCode;
import org.hibernate.annotations.DynamicInsert;
import org.hibernate.annotations.DynamicUpdate;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Index;
import javax.persistence.Table;
import javax.persistence.*;
import java.io.Serializable;
/**
* @Author: Wynne.Lu
@ -24,15 +22,20 @@ import javax.persistence.Table;
@DynamicInsert
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
@Table(name = "MES_PACKAGE_DETAIL", indexes = {@Index(columnList = "PACKAGE_NO")})
@Table(name = "MES_PACKAGE_DETAIL", indexes = {@Index(columnList = "PACKAGE_NO")
}, uniqueConstraints = {
@UniqueConstraint(columnNames = {"ORGANIZE_CODE", "PACKAGE_NO", "SERIAL_NUMBER"})
}
)
@Api("包装规格明细")
public class MesPackageDetail extends BaseBean {
public class MesPackageDetail extends BaseBean implements Serializable {
@Column(name = "PACKAGE_NO")
private static final long serialVersionUID = 8162606304720621672L;
@Column(name = "PACKAGE_NO", nullable = false)
@ApiParam("包装编码")
private String packageNo;
@Column(name = "SERIAL_NUMBER")
@Column(name = "SERIAL_NUMBER", nullable = false)
@ApiParam("过程条码")
private String serialNumber;

4
modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPackageTravel.java
Unescape Escape View File

@ -13,6 +13,7 @@ import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Index;
import javax.persistence.Table;
import java.io.Serializable;
/**
* @Author: Wynne.Lu
@ -26,8 +27,9 @@ import javax.persistence.Table;
@EqualsAndHashCode(callSuper = true)
@Table(name = "MES_PACKAGE_TRAVEL", indexes = {@Index(columnList = "PACKAGE_NO")})
@Api("包装履历表")
public class MesPackageTravel extends BaseBean {
public class MesPackageTravel extends BaseBean implements Serializable {
private static final long serialVersionUID = -2808747095415676213L;
@Column(name = "PACKAGE_NO")
@ApiParam("包装编码")
private String packageNo;

4
modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPart.java
Unescape Escape View File

@ -13,6 +13,7 @@ import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Table;
import javax.persistence.Transient;
import java.io.Serializable;
/**
* @Description :物料信息
@ -28,7 +29,8 @@ import javax.persistence.Transient;
@EqualsAndHashCode(callSuper = true)
@Table(name = "MES_PART")
@Api("物料信息")
public class MesPart extends BaseBean {
public class MesPart extends BaseBean implements Serializable {
private static final long serialVersionUID = 3936033255397936854L;
@Column(name = "PART_NO")
@ApiParam("零件号")
private String partNo;

4
modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPartCategory.java
Unescape Escape View File

@ -12,6 +12,7 @@ import org.hibernate.annotations.DynamicUpdate;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Table;
import java.io.Serializable;
/**
* @Description :零件种类
@ -27,7 +28,8 @@ import javax.persistence.Table;
@EqualsAndHashCode(callSuper = true)
@Table(name = "MES_PART_CATEGORY")
@Api("零件种类")
public class MesPartCategory extends BaseBean {
public class MesPartCategory extends BaseBean implements Serializable {
private static final long serialVersionUID = 9076081904146489470L;
@Column(name = "CATEGORY_CODE")
@ApiParam("分类代码")
private String categoryCode;

32
modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPatternJis.java
Unescape Escape View File

@ -11,7 +11,9 @@ import org.hibernate.annotations.DynamicUpdate;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Lob;
import javax.persistence.Table;
import java.io.Serializable;
/**
* @Description :JIS发运模式
@ -27,8 +29,9 @@ import javax.persistence.Table;
@EqualsAndHashCode(callSuper = true)
@Table(name = "MES_PATTERN_JIS")
@Api("JIS发运模式")
public class MesPatternJis extends BaseBean {
public class MesPatternJis extends BaseBean implements Serializable {
private static final long serialVersionUID = 1119289554542499312L;
@Column(name = "PATTERN_NO")
@ApiParam("模式编号")
private String patternNo;
@ -37,28 +40,29 @@ public class MesPatternJis extends BaseBean {
@ApiParam("模式名称")
private String patternName;
@Column(name = "RULE")
@ApiParam("规则")
private String rule;
@Column(name = "QUEUE_NO")
@ApiParam("显示主队列数")
private Integer queueNo;
@Column(name = "HANDLE_NO")
@ApiParam("一次处理套数")
private Integer handleNo;
@Column(name = "PATTERN_DESC")
@ApiParam("描述")
private String patternDesc;
@Column(name = "TOP_NO")
@ApiParam("一次显示TOP数")
private Integer topNo;
@Column(name = "HANDLE_NO")
@ApiParam("一次处理套数")
private Integer handleNo;
@Column(name = "PRODUCE_CTGY_CODE")
@ApiParam("产品类型组")
private String produceCategoryCode;
@Column(name = "PATTERN_TYPE")
@ApiParam("模式类型")
private Integer patternType;
@Column(name = "SCAN_TYPE")
@ApiParam("是否按主队列顺序扫描")
private Integer scanType;
@Lob
@Column(name = "RULE")
@ApiParam("规则")
private String rule;
}

4
modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPcn.java
Unescape Escape View File

@ -11,6 +11,7 @@ import org.hibernate.annotations.DynamicUpdate;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Table;
import java.io.Serializable;
/**
* @Description:
@ -26,7 +27,8 @@ import javax.persistence.Table;
@EqualsAndHashCode(callSuper = true)
@Table(name = "MES_PCN")
@Api("PCN节点")
public class MesPcn extends BaseBean {
public class MesPcn extends BaseBean implements Serializable {
private static final long serialVersionUID = -7570827672640277097L;
@Column(name = "PCN_CODE")
@ApiParam("PCN代码")
private String pcnCode;

4
modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPcnConnectLog.java
Unescape Escape View File

@ -11,6 +11,7 @@ import org.hibernate.annotations.DynamicUpdate;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Table;
import java.io.Serializable;
/**
* @Description:
@ -26,7 +27,8 @@ import javax.persistence.Table;
@EqualsAndHashCode(callSuper = true)
@Table(name = "MES_PCN_CONNECT_LOG")
@Api("PCN节点连接日志")
public class MesPcnConnectLog extends BaseBean {
public class MesPcnConnectLog extends BaseBean implements Serializable {
private static final long serialVersionUID = -4153357131289178766L;
@Column(name = "PCN_CODE")
@ApiParam("PCN代码")
private String pcnCode;

4
modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPcnSyncCfg.java
Unescape Escape View File

@ -12,6 +12,7 @@ import org.hibernate.annotations.DynamicUpdate;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Table;
import java.io.Serializable;
/**
* @Description:
@ -27,7 +28,8 @@ import javax.persistence.Table;
@EqualsAndHashCode(callSuper = true)
@Table(name = "MES_PCN_SYNC_CFG")
@Api("MES_PCN_同步配置")
public class MesPcnSyncCfg extends BaseBean {
public class MesPcnSyncCfg extends BaseBean implements Serializable {
private static final long serialVersionUID = -6869288362923390521L;
@Column(name = "PCN_CODE")
@ApiParam("PCN代码")
private String pcnCode;

4
modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPcnSyncErrorLog.java
Unescape Escape View File

@ -11,6 +11,7 @@ import org.hibernate.annotations.DynamicUpdate;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Table;
import java.io.Serializable;
/**
* @Description:
@ -26,7 +27,8 @@ import javax.persistence.Table;
@EqualsAndHashCode(callSuper = true)
@Table(name = "MES_PCN_SYNC_ERRORLOG")
@Api("MES_PCN同步异常日志")
public class MesPcnSyncErrorLog extends BaseBean {
public class MesPcnSyncErrorLog extends BaseBean implements Serializable {
private static final long serialVersionUID = -2249754641660006488L;
@Column(name = "PCN_CODE")
@ApiParam("PCN代码")
private String pcnCode;

4
modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPcnSysUserOffline.java
Unescape Escape View File

@ -11,6 +11,7 @@ import org.hibernate.annotations.DynamicInsert;
import org.hibernate.annotations.DynamicUpdate;
import javax.persistence.*;
import java.io.Serializable;
import java.util.List;
/**
@ -27,8 +28,9 @@ import java.util.List;
@EqualsAndHashCode(callSuper = true)
@Table(name = "MES_PCN_SYS_USER_OFFLINE")
@Api(value = "账号离线登陆表", description = "账号离线登陆表。")
public class MesPcnSysUserOffline extends BaseBean {
public class MesPcnSysUserOffline extends BaseBean implements Serializable {
private static final long serialVersionUID = 7617353154826718154L;
@Column(name = "USER_ID")
@ApiParam(value = "人员ID", example = "-1")
@JsonSerialize(using = ToStringSerializer.class)

4
modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPcnTask.java
Unescape Escape View File

@ -12,6 +12,7 @@ import org.hibernate.annotations.DynamicUpdate;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Table;
import java.io.Serializable;
/**
* @Description :mes-pcn定时任务工作清单
@ -27,8 +28,9 @@ import javax.persistence.Table;
@EqualsAndHashCode(callSuper = true)
@Table(name = "MES_PCN_TASK")
@Api("mes-pcn定时任务工作清单")
public class MesPcnTask extends BaseBean {
public class MesPcnTask extends BaseBean implements Serializable {
private static final long serialVersionUID = 4777357978430670966L;
@Column(name = "TASK_CODE")
@ApiParam("任务代码")
private String taskCode;

4
modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPcnTaskLog.java
Unescape Escape View File

@ -12,6 +12,7 @@ import org.hibernate.annotations.DynamicUpdate;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Table;
import java.io.Serializable;
/**
* @Description :mes-pcn定时任务工作清单同步记录
@ -27,8 +28,9 @@ import javax.persistence.Table;
@EqualsAndHashCode(callSuper = true)
@Table(name = "MES_PCN_TASK_LOG")
@Api("mes-pcn定时任务工作清单同步记录")
public class MesPcnTaskLog extends BaseBean {
public class MesPcnTaskLog extends BaseBean implements Serializable {
private static final long serialVersionUID = -784806389462540310L;
@Column(name = "SYNC_TIME_START")
@ApiParam("同步数据开始时间")
private String syncTimeStart;

12
modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPlanOrder.java
Unescape Escape View File

@ -10,6 +10,7 @@ import org.hibernate.annotations.DynamicInsert;
import org.hibernate.annotations.DynamicUpdate;
import javax.persistence.*;
import java.io.Serializable;
/**
* @Description:
@ -23,10 +24,15 @@ import javax.persistence.*;
@DynamicInsert
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
@Table(name = "MES_PLAN_ORDER", indexes = {@Index(columnList = "ORDER_NO")})
@Table(name = "MES_PLAN_ORDER", indexes = {@Index(columnList = "ORDER_NO")
}, uniqueConstraints = {
@UniqueConstraint(columnNames = {"ORGANIZE_CODE", "ORDER_NO"})
}
)
@Api("生产主计划")
public class MesPlanOrder extends BaseBean {
@Column(name = "ORDER_NO")
public class MesPlanOrder extends BaseBean implements Serializable {
private static final long serialVersionUID = 8571104279843276872L;
@Column(name = "ORDER_NO", nullable = false)
@ApiParam("生产计划单号")
private String orderNo;

8
modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPlc.java
Unescape Escape View File

@ -13,6 +13,7 @@ import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Table;
import javax.persistence.Transient;
import java.io.Serializable;
/**
* @Author: Wynne.Lu
@ -26,8 +27,9 @@ import javax.persistence.Transient;
@EqualsAndHashCode(callSuper = true)
@Table(name = "MES_PLC")
@Api("PLC配置表")
public class MesPlc extends BaseBean {
public class MesPlc extends BaseBean implements Serializable {
private static final long serialVersionUID = -5346536604317095818L;
@Column(name = "PLC_CODE")
@ApiParam("PLC代码")
private String plcCode;
@ -96,6 +98,10 @@ public class MesPlc extends BaseBean {
@ApiParam("反馈值")
private String feedValue;
@Column(name = "OBJECT_CODE")
@ApiParam("对象代码")
private String objectCode;
@Transient
@ApiParam("设备名称")
private String equipmentName;

4
modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesProcess.java
Unescape Escape View File

@ -11,6 +11,7 @@ import org.hibernate.annotations.DynamicUpdate;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Table;
import java.io.Serializable;
/**
* @Description :工序
@ -26,7 +27,8 @@ import javax.persistence.Table;
@EqualsAndHashCode(callSuper = true)
@Table(name = "MES_PROCESS")
@Api("工序")
public class MesProcess extends BaseBean {
public class MesProcess extends BaseBean implements Serializable {
private static final long serialVersionUID = -2619648674238082872L;
@Column(name = "PROCESS_CODE")
@ApiParam("工序代码")
private String processCode;

4
modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesProdBindRecord.java
Unescape Escape View File

@ -10,6 +10,7 @@ import org.hibernate.annotations.DynamicInsert;
import org.hibernate.annotations.DynamicUpdate;
import javax.persistence.*;
import java.io.Serializable;
/**
* @Description :产品绑定记录表
@ -28,7 +29,8 @@ import javax.persistence.*;
@Index(columnList = "KP_SN")
})
@Api("产品绑定记录表")
public class MesProdBindRecord extends BaseBean {
public class MesProdBindRecord extends BaseBean implements Serializable {
private static final long serialVersionUID = -4319604821328717354L;
@Column(name = "SERIAL_NUMBER")
@ApiParam(value = "产品条码")
private String serialNumber;

4
modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesProdCfg.java
Unescape Escape View File

@ -12,6 +12,7 @@ import org.hibernate.annotations.DynamicUpdate;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Table;
import java.io.Serializable;
/**
* @Description :产品配置
@ -27,7 +28,8 @@ import javax.persistence.Table;
@EqualsAndHashCode(callSuper = true)
@Table(name = "MES_PROD_CFG")
@Api("产品配置")
public class MesProdCfg extends BaseBean {
public class MesProdCfg extends BaseBean implements Serializable {
private static final long serialVersionUID = 7487874316722319947L;
@Column(name = "PROD_CFG_CODE")
@ApiParam("产品配置代码")
private String prodCfgCode;

4
modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesProdCfgDetail.java
Unescape Escape View File

@ -13,6 +13,7 @@ import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Table;
import javax.persistence.Transient;
import java.io.Serializable;
/**
* @Description :产品配置明细
@ -28,7 +29,8 @@ import javax.persistence.Transient;
@EqualsAndHashCode(callSuper = true)
@Table(name = "MES_PROD_CFG_DETAIL")
@Api("产品配置明细")
public class MesProdCfgDetail extends BaseBean {
public class MesProdCfgDetail extends BaseBean implements Serializable {
private static final long serialVersionUID = -8362302529703401583L;
@Column(name = "PROD_CFG_CODE")
@ApiParam("产品配置代码")
private String prodCfgCode;

4
modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesProdPack.java
Unescape Escape View File

@ -12,6 +12,7 @@ import org.hibernate.annotations.DynamicUpdate;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Table;
import java.io.Serializable;
/**
* @Author: Wynne.Lu
@ -25,8 +26,9 @@ import javax.persistence.Table;
@EqualsAndHashCode(callSuper = true)
@Table(name = "MES_PROD_PACK")
@Api("产品包装关系")
public class MesProdPack extends BaseBean {
public class MesProdPack extends BaseBean implements Serializable {
private static final long serialVersionUID = -2621135811864108025L;
@Column(name = "PART_NO")
@ApiParam("物料号")
private String partNo;

4
modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesProdRouteCfg.java
Unescape Escape View File

@ -11,6 +11,7 @@ import org.hibernate.annotations.DynamicUpdate;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Table;
import java.io.Serializable;
/**
* @Description :产品类流程配置表
@ -26,7 +27,8 @@ import javax.persistence.Table;
@EqualsAndHashCode(callSuper = true)
@Table(name = "MES_PROD_ROUTE_CFG")
@Api("产品类流程配置表")
public class MesProdRouteCfg extends BaseBean {
public class MesProdRouteCfg extends BaseBean implements Serializable {
private static final long serialVersionUID = -3768632071281056796L;
@Column(name = "PART_NO")
@ApiParam("物料号")
private String partNo;

4
modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesProdRouteOptParam.java
Unescape Escape View File

@ -11,6 +11,7 @@ import org.hibernate.annotations.DynamicUpdate;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Table;
import java.io.Serializable;
/**
* @Description :产品流程配置操作参数表
@ -26,7 +27,8 @@ import javax.persistence.Table;
@EqualsAndHashCode(callSuper = true)
@Table(name = "MES_PROD_ROUTE_OPT_PARAM")
@Api("产品流程配置操作参数表")
public class MesProdRouteOptParam extends BaseBean {
public class MesProdRouteOptParam extends BaseBean implements Serializable {
private static final long serialVersionUID = -932364659894292000L;
@Column(name = "PROD_ROUTE_CFG_ID")
@ApiParam("产品流程ID")
private Long prodRouteCfgId;

4
modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesProduceCategory.java
Unescape Escape View File

@ -11,6 +11,7 @@ import org.hibernate.annotations.DynamicUpdate;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Table;
import java.io.Serializable;
/**
* @Description:
@ -26,8 +27,9 @@ import javax.persistence.Table;
@EqualsAndHashCode(callSuper = true)
@Table(name = "MES_PRODUCE_CATEGORY")
@Api("系统业务动作")
public class MesProduceCategory extends BaseBean {
public class MesProduceCategory extends BaseBean implements Serializable {
private static final long serialVersionUID = 4593983703007675620L;
@Column(name = "PRODUCE_CTGY_CODE")
@ApiParam("产品类型代码")
private String produceCategoryCode;

4
modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesProduceCtgyPicture.java
Unescape Escape View File

@ -12,6 +12,7 @@ import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Table;
import javax.persistence.Transient;
import java.io.Serializable;
/**
* @Description:
@ -27,8 +28,9 @@ import javax.persistence.Transient;
@EqualsAndHashCode(callSuper = true)
@Table(name = "MES_PRODUCE_CTGY_PICTURE")
@Api("产品类型图片表")
public class MesProduceCtgyPicture extends BaseBean {
public class MesProduceCtgyPicture extends BaseBean implements Serializable {
private static final long serialVersionUID = -7223382567320219332L;
@Column(name = "PRODUCE_CTGY_CODE")
@ApiParam("产品类型代码")
private String produceCtgyCode;

Some files were not shown because too many files have changed in this diff Show More

Write Preview
Loading…
Cancel
Save