diff --git a/modules/i3plus-pojo-andon/pom.xml b/modules/i3plus-pojo-andon/pom.xml
index 4988f31..bc7071b 100644
--- a/modules/i3plus-pojo-andon/pom.xml
+++ b/modules/i3plus-pojo-andon/pom.xml
@@ -12,7 +12,6 @@
i3plus-pojo-andon
jar
- 1.0-TEST-SNAPSHOT
diff --git a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonAlarmCause.java b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonAlarmCause.java
index 749eae4..c8767a5 100644
--- a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonAlarmCause.java
+++ b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonAlarmCause.java
@@ -14,6 +14,7 @@ import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Table;
import javax.persistence.Transient;
+import java.io.Serializable;
/**
* @Description : ANDON_呼叫原因
@@ -29,7 +30,9 @@ import javax.persistence.Transient;
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
@Api(value = "ANDON_呼叫原因")
-public class AndonAlarmCause extends BaseBean {
+public class AndonAlarmCause extends BaseBean implements Serializable {
+
+ private static final long serialVersionUID = 5837347497945981811L;
@AnnoOutputColumn(refClass = AndonEnumUtil.ALARM_TYPE.class,refForeignKey = "value",value = "description")
@Column(name = "ALARM_CODE")
diff --git a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonAlarmDetailType.java b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonAlarmDetailType.java
index 1ec4182..0594355 100644
--- a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonAlarmDetailType.java
+++ b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonAlarmDetailType.java
@@ -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,9 @@ import javax.persistence.Table;
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
@Api("安灯子类型")
-public class AndonAlarmDetailType extends BaseBean {
+public class AndonAlarmDetailType extends BaseBean implements Serializable {
+
+ private static final long serialVersionUID = -1540491136291384925L;
@Column(name = "ALARM_DETAIL_CODE")
@ApiParam(value = "安灯子类型编码")
diff --git a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonAlarmResponseCfg.java b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonAlarmResponseCfg.java
index e0bbc8e..286fcbc 100644
--- a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonAlarmResponseCfg.java
+++ b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonAlarmResponseCfg.java
@@ -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 : ANDON_呼叫通知配置
@@ -28,7 +29,9 @@ import javax.persistence.Table;
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
@Api("ANDON_呼叫通知配置")
-public class AndonAlarmResponseCfg extends BaseBean {
+public class AndonAlarmResponseCfg extends BaseBean implements Serializable {
+
+ private static final long serialVersionUID = 4302725908675374347L;
@AnnoOutputColumn(refClass = AndonEnumUtil.ALARM_TYPE.class,refForeignKey = "value",value = "description")
@Column(name = "ALARM_CODE")
diff --git a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonBroadCast.java b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonBroadCast.java
index afd4cb0..82bfda2 100644
--- a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonBroadCast.java
+++ b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonBroadCast.java
@@ -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,10 @@ import javax.persistence.Table;
@EqualsAndHashCode(callSuper = true)
@Table(name="ANDON_BROADCAST")
@Api("安灯广播")
-public class AndonBroadCast extends BaseBean {
+public class AndonBroadCast extends BaseBean implements Serializable {
+
+ private static final long serialVersionUID = -5383684820100076411L;
+
@Column(name="DEVICE_NUM")
@ApiParam("广播设备编号")
private String targetIds;
diff --git a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonBroadCastCfg.java b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonBroadCastCfg.java
index 750e650..698bebb 100644
--- a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonBroadCastCfg.java
+++ b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonBroadCastCfg.java
@@ -14,6 +14,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;
/**
@@ -30,7 +31,10 @@ import java.util.List;
@EqualsAndHashCode(callSuper = true)
@Table(name="ANDON_BROADCAST_CFG")
@Api("生产区域")
-public class AndonBroadCastCfg extends BaseBean {
+public class AndonBroadCastCfg extends BaseBean implements Serializable {
+
+ private static final long serialVersionUID = 5434544329665544113L;
+
@Column(name="ALARM_CODE")
@ApiParam("安灯类型代码")
private String alarmCode;
diff --git a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonCellAlarmCause.java b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonCellAlarmCause.java
index 9d9df79..2e8c77e 100644
--- a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonCellAlarmCause.java
+++ b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonCellAlarmCause.java
@@ -14,6 +14,7 @@ import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Table;
import javax.persistence.Transient;
+import java.io.Serializable;
/**
* @Description : ANDON_工作单元呼叫原因配置
@@ -29,7 +30,10 @@ import javax.persistence.Transient;
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
@Api("ANDON_工作单元呼叫原因配置")
-public class AndonCellAlarmCause extends BaseBean {
+public class AndonCellAlarmCause extends BaseBean implements Serializable {
+
+ private static final long serialVersionUID = 3623997837738333774L;
+
@Column(name = "WORK_CENTER_CODE")
@ApiParam(value = "工作中心代码")
private String workCenterCode;
diff --git a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonCellEventCause.java b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonCellEventCause.java
index 1be0a94..abf5ff9 100644
--- a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonCellEventCause.java
+++ b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonCellEventCause.java
@@ -14,6 +14,7 @@ import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Table;
import javax.persistence.Transient;
+import java.io.Serializable;
/**
* @Description : ANDON_工作单元事件原因配置
@@ -29,7 +30,9 @@ import javax.persistence.Transient;
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
@Api("ANDON_工作单元事件原因配置")
-public class AndonCellEventCause extends BaseBean {
+public class AndonCellEventCause extends BaseBean implements Serializable {
+
+ private static final long serialVersionUID = -1641944472466007171L;
@Column(name = "WORK_CENTER_CODE")
@ApiParam(value = "工作中心代码")
diff --git a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonCellEventMethod.java b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonCellEventMethod.java
index 00dea5f..23c8d1b 100644
--- a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonCellEventMethod.java
+++ b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonCellEventMethod.java
@@ -14,6 +14,7 @@ import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Table;
import javax.persistence.Transient;
+import java.io.Serializable;
/**
* @Description : ANDON_工作单元处理方法配置
@@ -29,7 +30,10 @@ import javax.persistence.Transient;
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
@Api("ANDON_工作单元处理方法配置")
-public class AndonCellEventMethod extends BaseBean {
+public class AndonCellEventMethod extends BaseBean implements Serializable {
+
+ private static final long serialVersionUID = 8681966862823447650L;
+
@Column(name = "WORK_CENTER_CODE")
@ApiParam(value = "工作中心代码")
private String workCenterCode;
diff --git a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonCellEventPhenomenon.java b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonCellEventPhenomenon.java
index 8cfd0b7..ef790dc 100644
--- a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonCellEventPhenomenon.java
+++ b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonCellEventPhenomenon.java
@@ -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 : ANDON_工作单元事件现象
@@ -26,7 +27,9 @@ import javax.persistence.Table;
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
@Api("ANDON_工作单元事件现象")
-public class AndonCellEventPhenomenon extends BaseBean {
+public class AndonCellEventPhenomenon extends BaseBean implements Serializable {
+
+ private static final long serialVersionUID = 4413846938406056923L;
@Column(name = "WORK_CENTER_CODE")
@ApiParam(value = "工作中心代码")
diff --git a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonCellGroupCfg.java b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonCellGroupCfg.java
index c194faf..cd82b84 100644
--- a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonCellGroupCfg.java
+++ b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonCellGroupCfg.java
@@ -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 : ANDON_工位分组配置
@@ -29,7 +30,10 @@ import javax.persistence.Table;
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
@Api("ANDON_工位分组配置")
-public class AndonCellGroupCfg extends BaseBean {
+public class AndonCellGroupCfg extends BaseBean implements Serializable {
+
+ private static final long serialVersionUID = 4801397986303698999L;
+
@Column(name = "WORK_CENTER_CODE")
@ApiParam(value = "工作中心代码")
private String workCenterCode;
diff --git a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonConfig.java b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonConfig.java
index 0f39a62..a6653c7 100644
--- a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonConfig.java
+++ b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonConfig.java
@@ -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,9 @@ import javax.persistence.Table;
@EqualsAndHashCode(callSuper = true)
@Table(name="ANDON_CONFIG")
@Api(value="系统配置")
-public class AndonConfig extends BaseBean {
+public class AndonConfig extends BaseBean implements Serializable {
+
+ private static final long serialVersionUID = -3284234821448139251L;
@Column(name="NAME")
@ApiParam(value ="名称")
diff --git a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonDisposalCfg.java b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonDisposalCfg.java
index 9f8d287..1db40c9 100644
--- a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonDisposalCfg.java
+++ b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonDisposalCfg.java
@@ -14,7 +14,7 @@ import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Table;
import javax.persistence.Transient;
-import java.util.List;
+import java.io.Serializable;
/**
* @Description : ANDON_自处理配置
@@ -30,7 +30,9 @@ import java.util.List;
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
@Api("ANDON_自处理配置")
-public class AndonDisposalCfg extends BaseBean {
+public class AndonDisposalCfg extends BaseBean implements Serializable {
+
+ private static final long serialVersionUID = 161656982939855466L;
@Column(name = "WORK_CENTER_CODE")
@ApiParam(value = "工作中心代码")
diff --git a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonDisposalMaintenCfg.java b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonDisposalMaintenCfg.java
index 83e1572..d2bd2cd 100644
--- a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonDisposalMaintenCfg.java
+++ b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonDisposalMaintenCfg.java
@@ -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: 自处理维护配置
@@ -29,7 +30,9 @@ import javax.persistence.Table;
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
@Api("Andon自处理维护配置")
-public class AndonDisposalMaintenCfg extends BaseBean {
+public class AndonDisposalMaintenCfg extends BaseBean implements Serializable {
+
+ private static final long serialVersionUID = 474667557264134793L;
@AnnoOutputColumn(refClass = AndonEnumUtil.ALARM_TYPE.class,refForeignKey = "value",value = "description")
@Column(name = "ALARM_CODE")
diff --git a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonEventCause.java b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonEventCause.java
index 2491043..91bb41b 100644
--- a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonEventCause.java
+++ b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonEventCause.java
@@ -14,6 +14,7 @@ import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Table;
import javax.persistence.Transient;
+import java.io.Serializable;
/**
* @Description : ANDON_事件原因
@@ -29,7 +30,9 @@ import javax.persistence.Transient;
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
@Api(value = "ANDON_事件原因")
-public class AndonEventCause extends BaseBean {
+public class AndonEventCause extends BaseBean implements Serializable {
+
+ private static final long serialVersionUID = 3051829000971794178L;
@Column(name = "EC_CODE")
@ApiParam(value = "事件原因代码")
diff --git a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonEventMethod.java b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonEventMethod.java
index f681bb6..c5371c6 100644
--- a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonEventMethod.java
+++ b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonEventMethod.java
@@ -14,6 +14,7 @@ import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Table;
import javax.persistence.Transient;
+import java.io.Serializable;
/**
* @Description : ANDON_事件处理方法
@@ -29,7 +30,9 @@ import javax.persistence.Transient;
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
@Api(value = "ANDON_事件处理方法")
-public class AndonEventMethod extends BaseBean {
+public class AndonEventMethod extends BaseBean implements Serializable {
+
+ private static final long serialVersionUID = 2079366249221906256L;
@Column(name = "EM_CODE")
@ApiParam(value = "事件方法代码")
diff --git a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonEventPhenoMenon.java b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonEventPhenoMenon.java
index 43877a3..52cf481 100644
--- a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonEventPhenoMenon.java
+++ b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonEventPhenoMenon.java
@@ -14,6 +14,7 @@ import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Table;
import javax.persistence.Transient;
+import java.io.Serializable;
/**
* @Description : ANDON_事件现象
@@ -29,7 +30,9 @@ import javax.persistence.Transient;
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
@Api("ANDON_事件现象")
-public class AndonEventPhenoMenon extends BaseBean {
+public class AndonEventPhenoMenon extends BaseBean implements Serializable {
+
+ private static final long serialVersionUID = -3844606172813258352L;
@Column(name = "EPM_CODE")
@ApiParam(value = "事件现象代码")
diff --git a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonHaltCfg.java b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonHaltCfg.java
index 95aa421..a7dcae8 100644
--- a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonHaltCfg.java
+++ b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonHaltCfg.java
@@ -14,6 +14,7 @@ import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Index;
import javax.persistence.Table;
+import java.io.Serializable;
/**
* @Description : 安灯停线配置数据
@@ -34,7 +35,9 @@ import javax.persistence.Table;
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
@Api("安灯队列")
-public class AndonHaltCfg extends BaseBean {
+public class AndonHaltCfg extends BaseBean implements Serializable {
+
+ private static final long serialVersionUID = 6209233767460121461L;
@AnnoOutputColumn(refClass = AndonEnumUtil.ALARM_TYPE.class,refForeignKey = "value",value = "description")
@Column(name = "ALARM_CODE")
diff --git a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonHaltType.java b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonHaltType.java
index 3c89d14..4def408 100644
--- a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonHaltType.java
+++ b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonHaltType.java
@@ -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 : ANDON_停机类型
@@ -26,7 +27,9 @@ import javax.persistence.Table;
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
@Api("ANDON_停机类型")
-public class AndonHaltType extends BaseBean {
+public class AndonHaltType extends BaseBean implements Serializable {
+
+ private static final long serialVersionUID = -7816748747119429173L;
@Column(name = "HALT_CODE")
@ApiParam(value = "停机类型编码")
diff --git a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonKnowledgeBase.java b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonKnowledgeBase.java
index ff4853d..6213675 100644
--- a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonKnowledgeBase.java
+++ b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonKnowledgeBase.java
@@ -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,10 @@ import javax.persistence.Table;
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
@Api("ANDON知识库")
-public class AndonKnowledgeBase extends BaseManageQueue {
+public class AndonKnowledgeBase extends BaseManageQueue implements Serializable {
+
+ private static final long serialVersionUID = -1636250887271456543L;
+
@Column(name = "FLOW_STATUS")
@ApiParam(value = "审批状态")
private Integer flowStatus;
diff --git a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonManageQueue.java b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonManageQueue.java
index f2be38c..e02d1a3 100644
--- a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonManageQueue.java
+++ b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonManageQueue.java
@@ -14,6 +14,7 @@ import org.hibernate.annotations.DynamicInsert;
import org.hibernate.annotations.DynamicUpdate;
import javax.persistence.*;
+import java.io.Serializable;
import java.lang.reflect.InvocationTargetException;
import java.util.ArrayList;
import java.util.List;
@@ -41,7 +42,10 @@ import java.util.List;
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
@Api("安灯队列")
-public class AndonManageQueue extends BaseManageQueue {
+public class AndonManageQueue extends BaseManageQueue implements Serializable {
+
+ private static final long serialVersionUID = 183865984747203897L;
+
@Column(name = "SEQ")
@ApiParam(value = "序号", example = "1")
private Double seq;
diff --git a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonManageRecord.java b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonManageRecord.java
index a5d557a..0c285bc 100644
--- a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonManageRecord.java
+++ b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonManageRecord.java
@@ -12,6 +12,7 @@ import org.hibernate.annotations.DynamicInsert;
import org.hibernate.annotations.DynamicUpdate;
import javax.persistence.*;
+import java.io.Serializable;
/**
* @Description : 安灯记录
@@ -36,7 +37,9 @@ import javax.persistence.*;
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
@Api("安灯记录")
-public class AndonManageRecord extends BaseManageQueue {
+public class AndonManageRecord extends BaseManageQueue implements Serializable {
+
+ private static final long serialVersionUID = 4667499369694353351L;
@Column(name = "SEQ")
@ApiParam(value = "序号", example = "1")
diff --git a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonMessageRecord.java b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonMessageRecord.java
index 5c81250..59d4a55 100644
--- a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonMessageRecord.java
+++ b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonMessageRecord.java
@@ -14,6 +14,7 @@ import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Table;
import javax.persistence.Transient;
+import java.io.Serializable;
/**
* @Description: 安灯通知记录表
@@ -29,7 +30,10 @@ import javax.persistence.Transient;
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
@Api("通知记录")
-public class AndonMessageRecord extends BaseBean {
+public class AndonMessageRecord extends BaseBean implements Serializable {
+
+ private static final long serialVersionUID = -5002185160195696080L;
+
@Column(name = "WORK_CENTER_CODE")
@ApiParam(value = "工作中心")
private String workCenterCode;
diff --git a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonPLC.java b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonPLC.java
index e9bbc29..385b069 100644
--- a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonPLC.java
+++ b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonPLC.java
@@ -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 : ANDON_PLC控制
@@ -30,7 +31,9 @@ import javax.persistence.Transient;
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
@Api("安灯PLC控制")
-public class AndonPLC extends BaseBean {
+public class AndonPLC extends BaseBean implements Serializable {
+
+ private static final long serialVersionUID = -611094238158756163L;
@Column(name = "WORK_CENTER_CODE")
@ApiParam(value = "工作中心")
diff --git a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonPLCRecord.java b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonPLCRecord.java
index 33078db..ee4c926 100644
--- a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonPLCRecord.java
+++ b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonPLCRecord.java
@@ -12,6 +12,7 @@ import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Index;
import javax.persistence.Table;
+import java.io.Serializable;
/**
* @Description : ANDON_PLC监控记录
@@ -34,7 +35,9 @@ import javax.persistence.Table;
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
@Api("安灯PLC监控记录")
-public class AndonPLCRecord extends BaseBean {
+public class AndonPLCRecord extends BaseBean implements Serializable {
+
+ private static final long serialVersionUID = 1593292976397416635L;
@Column(name = "WORK_CENTER_CODE")
@ApiParam(value = "工作中心代码")
diff --git a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonQueueAttach.java b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonQueueAttach.java
index 31fda6a..cf92a50 100644
--- a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonQueueAttach.java
+++ b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonQueueAttach.java
@@ -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,9 @@ import javax.persistence.Table;
@EqualsAndHashCode(callSuper = true)
@Table(name="ANDON_MANAGE_ATTACH")
@Api(value="安灯附属表")
-public class AndonQueueAttach extends BaseBean {
+public class AndonQueueAttach extends BaseBean implements Serializable {
+
+ private static final long serialVersionUID = -6314624948969141111L;
@Column(name="PROD_INFO")
@ApiParam(value ="产品信息" , example ="-1")
diff --git a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonResponse.java b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonResponse.java
index fee0346..2a428d1 100644
--- a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonResponse.java
+++ b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonResponse.java
@@ -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,9 @@ import javax.persistence.Table;
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
@Api("通知方式")
-public class AndonResponse extends BaseBean {
+public class AndonResponse extends BaseBean implements Serializable {
+
+ private static final long serialVersionUID = -3558849492798328348L;
@Column(name = "RESPONSE_CODE")
@AnnoOutputColumn(refClass = AndonEnumUtil.NOTICE_MESSAGE_SEND_TYPE.class,refForeignKey = "value",value = "description")
diff --git a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonResponseObject.java b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonResponseObject.java
index b2ad1a2..7236d3a 100644
--- a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonResponseObject.java
+++ b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonResponseObject.java
@@ -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,9 @@ import javax.persistence.Transient;
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
@Api("安灯通知对象")
-public class AndonResponseObject extends BaseBean {
+public class AndonResponseObject extends BaseBean implements Serializable {
+
+ private static final long serialVersionUID = 7623038823371770473L;
@Column(name = "RP_OBJECT_CODE")
@ApiParam(value = "通知对象对象编码")
diff --git a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/MesArea.java b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/MesArea.java
index ae42d1b..3316350 100644
--- a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/MesArea.java
+++ b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/MesArea.java
@@ -16,6 +16,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;
/**
@@ -32,7 +33,10 @@ import java.util.List;
@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 = -6011431901401687892L;
+
@Column(name="AREA_CODE")
@ApiParam("区域代码")
private String areaCode;
diff --git a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/MesEquipment.java b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/MesEquipment.java
index 59d6249..2761fab 100644
--- a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/MesEquipment.java
+++ b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/MesEquipment.java
@@ -17,6 +17,7 @@ import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Table;
import javax.persistence.Transient;
+import java.io.Serializable;
/**
* @Description :生产设备
@@ -32,7 +33,10 @@ 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 = -4827453020382814751L;
+
@Column(name="EQUIPMENT_CODE")
@ApiParam("设备代码")
private String equipmentCode;
diff --git a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/MesShift.java b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/MesShift.java
index 533c56a..9098f6b 100644
--- a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/MesShift.java
+++ b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/MesShift.java
@@ -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,9 @@ import javax.persistence.Table;
@EqualsAndHashCode(callSuper = true)
@Table(name="MES_SHIFT")
@Api("班次信息")
-public class MesShift extends BaseBean {
+public class MesShift extends BaseBean implements Serializable {
+
+ private static final long serialVersionUID = -459263592129978101L;
@Column(name = "WORK_CENTER_CODE")
@ApiParam("工作中心")
diff --git a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/MesWorkCell.java b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/MesWorkCell.java
index 0533141..8bb58e7 100644
--- a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/MesWorkCell.java
+++ b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/MesWorkCell.java
@@ -15,6 +15,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;
/**
@@ -31,7 +32,10 @@ import java.util.List;
@EqualsAndHashCode(callSuper = true)
@Table(name = "MES_WORK_CELL")
@Api("工作单元")
-public class MesWorkCell extends BaseBean {
+public class MesWorkCell extends BaseBean implements Serializable {
+
+ private static final long serialVersionUID = -5981041286446162921L;
+
@Column(name = "WORK_CELL_CODE")
@ApiParam("工作单元代码")
private String workCellCode;
diff --git a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/MesWorkCenter.java b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/MesWorkCenter.java
index eb81426..8cf20a2 100644
--- a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/MesWorkCenter.java
+++ b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/MesWorkCenter.java
@@ -15,6 +15,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;
/**
@@ -31,7 +32,10 @@ import java.util.List;
@EqualsAndHashCode(callSuper = true)
@Table(name = "MES_WORK_CENTER")
@Api("工作中心")
-public class MesWorkCenter extends BaseBean {
+public class MesWorkCenter extends BaseBean implements Serializable {
+
+ private static final long serialVersionUID = 1988041859547182829L;
+
@Column(name = "WORK_CENTER_CODE")
@ApiParam("工作中心代码")
private String workCenterCode;
diff --git a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/model/AndonBoardModel.java b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/model/AndonBoardModel.java
index 6c8ff91..6c046d9 100644
--- a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/model/AndonBoardModel.java
+++ b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/model/AndonBoardModel.java
@@ -13,7 +13,9 @@ import java.io.Serializable;
* @Modify:
**/
@Data
-public class AndonBoardModel {
+public class AndonBoardModel implements Serializable {
+
+ private static final long serialVersionUID = 4995310176494124290L;
@ApiParam("工作单元代码")
private String workCellCode;
diff --git a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/model/AndonMenuInterfaceModel.java b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/model/AndonMenuInterfaceModel.java
index 79813f6..06230c4 100644
--- a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/model/AndonMenuInterfaceModel.java
+++ b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/model/AndonMenuInterfaceModel.java
@@ -6,6 +6,7 @@ import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiParam;
import lombok.Data;
+import java.io.Serializable;
import java.util.List;
/**
@@ -16,7 +17,9 @@ import java.util.List;
* @Modify:
**/
@Data
-public class AndonMenuInterfaceModel{
+public class AndonMenuInterfaceModel implements Serializable {
+
+ private static final long serialVersionUID = 6854130571481363067L;
@ApiParam("工作中心代码")
private String workCenterCode;
diff --git a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/model/BaseManageQueue.java b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/model/BaseManageQueue.java
index 5585338..e35260e 100644
--- a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/model/BaseManageQueue.java
+++ b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/model/BaseManageQueue.java
@@ -9,6 +9,7 @@ import lombok.Data;
import javax.persistence.Column;
import javax.persistence.MappedSuperclass;
+import java.io.Serializable;
/**
* @Description:
@@ -19,7 +20,9 @@ import javax.persistence.MappedSuperclass;
**/
@Data
@MappedSuperclass
-public class BaseManageQueue extends BaseBean {
+public class BaseManageQueue extends BaseBean implements Serializable {
+
+ private static final long serialVersionUID = 5223610541891941843L;
@Column(name = "ANDON_ORDER_NO")
@ApiParam(value = "安灯队列编号")
diff --git a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/model/CellGroupStatusModel.java b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/model/CellGroupStatusModel.java
index 42af00f..217927d 100644
--- a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/model/CellGroupStatusModel.java
+++ b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/model/CellGroupStatusModel.java
@@ -12,13 +12,16 @@ import io.swagger.annotations.ApiParam;
import lombok.Data;
import javax.persistence.Column;
+import java.io.Serializable;
import java.util.List;
/**
* 工位分组配置model
*/
@Data
-public class CellGroupStatusModel{
+public class CellGroupStatusModel implements Serializable {
+
+ private static final long serialVersionUID = -6614881484056090725L;
@ApiParam("工作中心代码")
private String workCenterCode;
diff --git a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/model/ProdOrgModel.java b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/model/ProdOrgModel.java
index 5df7d8d..d7be692 100644
--- a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/model/ProdOrgModel.java
+++ b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/model/ProdOrgModel.java
@@ -9,6 +9,7 @@ import org.hibernate.annotations.DynamicInsert;
import org.hibernate.annotations.DynamicUpdate;
import javax.persistence.Entity;
+import java.io.Serializable;
/**
* @Description:
@@ -23,7 +24,9 @@ import javax.persistence.Entity;
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
@Api("组织模型")
-public class ProdOrgModel extends BaseBean {
+public class ProdOrgModel extends BaseBean implements Serializable {
+
+ private static final long serialVersionUID = 2210888838877951435L;
@ApiParam("区域名称")
private String areaName;
diff --git a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/model/SysOrganizeModel.java b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/model/SysOrganizeModel.java
index 53e0faf..6f78bda 100644
--- a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/model/SysOrganizeModel.java
+++ b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/model/SysOrganizeModel.java
@@ -4,9 +4,12 @@ import cn.estsh.i3plus.pojo.andon.bean.MesArea;
import io.swagger.annotations.ApiParam;
import javax.persistence.Transient;
+import java.io.Serializable;
import java.util.List;
-public class SysOrganizeModel{
+public class SysOrganizeModel implements Serializable {
+
+ private static final long serialVersionUID = -8218859255737680832L;
@Transient
@ApiParam(value ="父节点")
diff --git a/modules/i3plus-pojo-aps/pom.xml b/modules/i3plus-pojo-aps/pom.xml
index 4104107..f902a7c 100644
--- a/modules/i3plus-pojo-aps/pom.xml
+++ b/modules/i3plus-pojo-aps/pom.xml
@@ -12,7 +12,6 @@
i3plus-pojo-aps
jar
- 1.0-TEST-SNAPSHOT
diff --git a/modules/i3plus-pojo-base/pom.xml b/modules/i3plus-pojo-base/pom.xml
index 96472ad..807bef5 100644
--- a/modules/i3plus-pojo-base/pom.xml
+++ b/modules/i3plus-pojo-base/pom.xml
@@ -12,7 +12,6 @@
i3plus-pojo-base
jar
- 1.0-TEST-SNAPSHOT
diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/bean/BaseBean.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/bean/BaseBean.java
index f51ab6a..9367fd1 100644
--- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/bean/BaseBean.java
+++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/bean/BaseBean.java
@@ -31,6 +31,8 @@ import java.io.Serializable;
//@JsonInclude(value = JsonInclude.Include.NON_EMPTY) //""或null属性不参加序列转换
public abstract class BaseBean implements Serializable {
+ private static final long serialVersionUID = 1L;
+
//此处使用hibernate的主键策略方式
//手动设置,使用iplus-platform-common中的idtool生成
//将Long类型系列化成String避免精度丢失
diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/bean/DdlPackBean.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/bean/DdlPackBean.java
index 8cc0971..8654728 100644
--- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/bean/DdlPackBean.java
+++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/bean/DdlPackBean.java
@@ -4,7 +4,6 @@ import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil;
import cn.estsh.i3plus.pojo.base.tool.DdlPreparedPack;
import java.util.HashMap;
-import java.util.Map;
/**
* @Description : hql脚本封装类
diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/CommonEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/CommonEnumUtil.java
index f7847e2..f196d65 100644
--- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/CommonEnumUtil.java
+++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/CommonEnumUtil.java
@@ -39,6 +39,8 @@ public class CommonEnumUtil {
LAC(26, 8600, 13, "lac", "连接适配器"),
ANDON(27, 8500, 14, "andon", "安灯"),
APS(28, 8400, 15, "i3aps", "高级计划与排产"),
+
+ MDM(29, 8150, 22, "i3mdm", "数据中心MDM"),
CENTER(99, 8000, 1, "icloud-server", "注册中心"),
SURFACE(98, 0, 0, "i3surface", "对外服务"),
CLOUD(97, 0, 0, "i3cloud", "微服务"),
diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/ImppEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/ImppEnumUtil.java
index f8581ff..0574e44 100644
--- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/ImppEnumUtil.java
+++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/ImppEnumUtil.java
@@ -16,12 +16,11 @@ public class ImppEnumUtil {
* 1.集团，2.公司，3.工厂
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
- public enum ORGANIZE_YTPE{
+ public enum ORGANIZE_YTPE {
- TYPE_GROUP(1,"集团","集团"),
- TYPE_COMPANY(2,"公司","公司"),
- TYPE_FACTORY(3,"工厂","工厂"),
- ;
+ TYPE_GROUP(1, "集团", "集团"),
+ TYPE_COMPANY(2, "公司", "公司"),
+ TYPE_FACTORY(3, "工厂", "工厂");
private int value;
private String name;
@@ -86,8 +85,8 @@ public class ImppEnumUtil {
* 3.权限CODE
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
- public enum TASK_METHOD_TYPE{
- CLASS_METHOD(1,"类方法","Java Class 方法");
+ public enum TASK_METHOD_TYPE {
+ CLASS_METHOD(1, "类方法", "Java Class 方法");
// TYPE_COMPANY(2,"链接","Http URL"),
// TYPE_FACTORY(3,"权限CODE","权限CODE");
@@ -148,7 +147,7 @@ public class ImppEnumUtil {
}
/**
- * 日志级别
+ * 日志级别
* 1.DEBUG：调试程序信息，
* 2.INFO：程序运行信息，
* 3.WARN：具有潜在危害的信息，
@@ -156,13 +155,13 @@ public class ImppEnumUtil {
* 5.FATAL：非常严重的错误，可能导致程序中止
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
- public enum LOG_LEVEL{
+ public enum LOG_LEVEL {
- DEBUG(1,"DEBUG","调试"),
- INFO(2,"INFO","信息"),
- WARN(3,"WARN","注意"),
- ERROR(4,"ERROR","错误"),
- FATAL(5,"FATAL","严重");
+ DEBUG(1, "DEBUG", "调试"),
+ INFO(2, "INFO", "信息"),
+ WARN(3, "WARN", "注意"),
+ ERROR(4, "ERROR", "错误"),
+ FATAL(5, "FATAL", "严重");
private int value;
private String name;
@@ -238,13 +237,13 @@ public class ImppEnumUtil {
* 4.SELECT：查询
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
- public enum OPERATE_TYPE{
+ public enum OPERATE_TYPE {
- INSERT(1,"post","新增"), //POST
- DELETE(2,"put","修改"), //PUT
- UPDATE(3,"delete","删除"), //DELETE
- SELECT(4,"get","查询"), //GET
- BUSI(5,"busi","处理");
+ INSERT(1, "post", "新增"), //POST
+ DELETE(2, "put", "修改"), //PUT
+ UPDATE(3, "delete", "删除"), //DELETE
+ SELECT(4, "get", "查询"), //GET
+ BUSI(5, "busi", "处理");
private int value;
private String name;
@@ -317,9 +316,9 @@ public class ImppEnumUtil {
* 1.PC：个人计算机
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
- public enum OPERATE_TERMINAL{
+ public enum OPERATE_TERMINAL {
- PC(1,"电脑端"),PDA(2,"PDA"),MOBILE(3,"手机");
+ PC(1, "电脑端"), PDA(2, "PDA"), MOBILE(3, "手机");
private int value;
private String description;
@@ -360,8 +359,8 @@ public class ImppEnumUtil {
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum MESSAGE_STATUS {
- READ(1,"已读","fa cell-fa fa-file-text"),
- UNREAD(2,"未读","fa cell-fa fa-file-o");
+ READ(1, "已读", "fa cell-fa fa-file-text"),
+ UNREAD(2, "未读", "fa cell-fa fa-file-o");
private int value;
private String name;
@@ -428,10 +427,10 @@ public class ImppEnumUtil {
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum MESSAGE_TYPE {
- MAIL(1,"邮件","邮件"),
- LETTER(2,"站内信","站内信"),
- SWEB_NOTICE(3,"SWEB通知","SWEB通知"),
- SWEB_PUBLIC_NOTICE(4,"SWEB公告","SWEB公告");
+ MAIL(1, "邮件", "邮件"),
+ LETTER(2, "站内信", "站内信"),
+ SWEB_NOTICE(3, "SWEB通知", "SWEB通知"),
+ SWEB_PUBLIC_NOTICE(4, "SWEB公告", "SWEB公告");
private int value;
private String name;
@@ -498,13 +497,13 @@ public class ImppEnumUtil {
* 5.MIDDLE_TABLE：中间表
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
- public enum TOOL_CONN_TYPE{
+ public enum TOOL_CONN_TYPE {
- SERIAL_PORT(1,"串口","串口"),
- NETWORK_PORT(2,"网口","网口"),
- OPC(3,"OPC","OPC"),
- USB(4,"USB","USB"),
- MIDDLE_TABLE(5,"中间表","中间表");
+ SERIAL_PORT(1, "串口", "串口"),
+ NETWORK_PORT(2, "网口", "网口"),
+ OPC(3, "OPC", "OPC"),
+ USB(4, "USB", "USB"),
+ MIDDLE_TABLE(5, "中间表", "中间表");
private int value;
private String name;
private String description;
@@ -568,11 +567,11 @@ public class ImppEnumUtil {
* 3.BINARY_PACKET：二进制数据包
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
- public enum TOOL_DATA_TYPE{
+ public enum TOOL_DATA_TYPE {
- STRING(1,"字符串","字符串"),
- TABLE(2,"数据表","数据表"),
- BINARY_PACKET(3,"二进制数据包","二进制数据包");
+ STRING(1, "字符串", "字符串"),
+ TABLE(2, "数据表", "数据表"),
+ BINARY_PACKET(3, "二进制数据包", "二进制数据包");
private int value;
private String name;
@@ -635,9 +634,9 @@ public class ImppEnumUtil {
* 1.SYSTEM：系统参数
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
- public enum SYS_CONFIG_TYPE{
+ public enum SYS_CONFIG_TYPE {
- SYSTEM(1,"系统参数","系统参数");
+ SYSTEM(1, "系统参数", "系统参数");
private int value;
private String name;
@@ -702,8 +701,8 @@ public class ImppEnumUtil {
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum MESSAGE_TYPE_CONTENT {
- HTML(1,"HTML","text/html;charset=UTF-8"),
- TEXT(2,"TEXT","text/plain;charset=UTF-8");
+ HTML(1, "HTML", "text/html;charset=UTF-8"),
+ TEXT(2, "TEXT", "text/plain;charset=UTF-8");
private int value;
private String name;
@@ -770,9 +769,9 @@ public class ImppEnumUtil {
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum DYN_TABLE_CELL_TYPE {
- STRING(1,"String","字符串类型"),
- NUMBER(2,"Number","数字类型"),
- DATE(3,"Date","时间类型");
+ STRING(1, "String", "字符串类型"),
+ NUMBER(2, "Number", "数字类型"),
+ DATE(3, "Date", "时间类型");
private int value;
private String name;
@@ -829,6 +828,7 @@ public class ImppEnumUtil {
return tmp;
}
}
+
/**
* 系统值类型
* 1. String
@@ -838,12 +838,12 @@ public class ImppEnumUtil {
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum SYS_VALUE_TYPE {
- STRING(1,"text","文本"),
- NUMBER(2,"number","数字"),
- DATE(3,"date","时间"),
- SWITCH(4,"switch","布尔"),
- SELECT(5,"select","选择"),
- FILE(6,"select","选择");
+ STRING(1, "text", "文本"),
+ NUMBER(2, "number", "数字"),
+ DATE(3, "date", "时间"),
+ SWITCH(4, "switch", "布尔"),
+ SELECT(5, "select", "选择"),
+ FILE(6, "select", "选择");
private int value;
private String name;
@@ -910,7 +910,7 @@ public class ImppEnumUtil {
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum SYS_CACHE_TYPE {
- REDIS(1,"Redis","Redis 缓存方式");
+ REDIS(1, "Redis", "Redis 缓存方式");
private int value;
private String name;
@@ -1054,6 +1054,7 @@ public class ImppEnumUtil {
}
}
+
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum MESSAGE_RECEIVER_TYPE {
INTERNAL(1, "内部人员"),
@@ -1095,10 +1096,10 @@ public class ImppEnumUtil {
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum FILE_ATTACH_SOURCE {
- MAIL(1,"邮件","邮件"),
- LETTER(2,"站内信","站内信"),
- SWEB_NOTICE(3,"SWEB通知","SWEB通知"),
- SWEB_PUBLIC_NOTICE(4,"SWEB公告","SWEB公告");
+ MAIL(1, "邮件", "邮件"),
+ LETTER(2, "站内信", "站内信"),
+ SWEB_NOTICE(3, "SWEB通知", "SWEB通知"),
+ SWEB_PUBLIC_NOTICE(4, "SWEB公告", "SWEB公告");
private int value;
private String name;
diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java
index 373ace1..eba9bab 100644
--- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java
+++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java
@@ -2564,17 +2564,19 @@ public class MesEnumUtil {
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum MES_QC_CHECK_TYPE {
-
- IN_MATERIAL_CHECK(5, "来料检验"),
- FIRST_CHECK(10, "首检"),
- ON_SITE_CHECK(20, "巡检"),
- END_CHECK(30, "尾检");
+ INCOMING_CHECK(5, "INCOMING_CHECK", "来料检验"),
+ FIRST_CHECK(10, "FIRST_CHECK", "首检"),
+ ON_SITE_CHECK(20, "ON_SITE_CHECK", "巡检"),
+ END_CHECK(30, "END_CHECK", "末检"),
+ RC_CHECK(40, "RC_CHECK", "发货检验");
private int value;
+ private String code;
private String description;
- MES_QC_CHECK_TYPE(int value, String description) {
+ MES_QC_CHECK_TYPE(int value, String code, String description) {
this.value = value;
+ this.code = code;
this.description = description;
}
@@ -2582,6 +2584,10 @@ public class MesEnumUtil {
return value;
}
+ public String getCode() {
+ return code;
+ }
+
public String getDescription() {
return description;
}
@@ -5559,6 +5565,78 @@ public class MesEnumUtil {
}
/**
+ * 质检单状态
+ */
+ @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+ public enum QC_STATUS {
+ CREATE(10, "创建"),
+ RECEIPT(20, "执行中"),
+ SUBMISSION(30, "提交"),
+ COMPLETE(40, "完成");
+
+ private int value;
+ private String description;
+
+ QC_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 IN_READ_FLAG {
+ NOTREAD(0, "未读取"),
+ READ(1, "已读取");
+
+ private int value;
+ private String description;
+
+ IN_READ_FLAG(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;
+ }
+ }
+
+ /**
* MES_检验单 状态
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesPcnEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesPcnEnumUtil.java
index 900dbb7..6ed4888 100644
--- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesPcnEnumUtil.java
+++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesPcnEnumUtil.java
@@ -925,10 +925,11 @@ public class MesPcnEnumUtil {
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum MES_QC_CHECK_TYPE {
-
+ INCOMING_CHECK(5, "来料检验"),
FIRST_CHECK(10, "首检"),
ON_SITE_CHECK(20, "巡检"),
- END_CHECK(30, "尾检");
+ END_CHECK(30, "末检"),
+ RC_CHECK(40, "发货检验");
private int value;
private String description;
@@ -3564,4 +3565,78 @@ public class MesPcnEnumUtil {
return description;
}
}
+
+ /**
+ * 质检单状态
+ */
+ @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+ public enum QC_STATUS {
+ CREATE(10, "创建"),
+ RECEIPT(20, "执行中"),
+ SUBMISSION(30, "提交"),
+ COMPLETE(40, "完成");
+
+ private int value;
+ private String description;
+
+ QC_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 CHECK_REULST {
+
+ PASS(10, "通过"),
+ NON_PASS(20, "不通过"),
+ CONCESSION_PRODUCTION(30, "让步生产");
+
+ private int value;
+ private String description;
+
+ CHECK_REULST(int value, String description) {
+ this.value = value;
+ this.description = description;
+ }
+
+ public int getValue() {
+ return value;
+ }
+
+ public String getDescription() {
+ return description;
+ }
+
+ public static String valueOfDescription(int val) {
+ String tmp = null;
+ for (int i = 0; i < values().length; i++) {
+ if (values()[i].value == val) {
+ tmp = values()[i].description;
+ }
+ }
+ return tmp;
+ }
+ }
}
diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java
index aa23984..6dd13e1 100644
--- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java
+++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java
@@ -881,7 +881,7 @@ public class WmsEnumUtil {
public static String getDes(String val) {
String tmp = null;
for (int i = 0; i < values().length; i++) {
- if (values()[i].value == val) {
+ if (values()[i].value.equals(val)) {
tmp = values()[i].description;
}
}
@@ -2831,7 +2831,7 @@ public class WmsEnumUtil {
// 根据枚举编号获取语言代码
public static String getCodeByIndex(Integer index) {
for (LANGUAGE_TYPE languageType : LANGUAGE_TYPE.values()) {
- if (languageType.getValue() == index.intValue()) {
+ if (languageType.getValue() == index) {
return languageType.getDescription();
}
}
@@ -3298,7 +3298,7 @@ public class WmsEnumUtil {
public static String getDes(String val) {
String tmp = null;
for (int i = 0; i < values().length; i++) {
- if (values()[i].value == val) {
+ if (values()[i].value.equals(val)) {
tmp = values()[i].description;
}
}
@@ -3381,7 +3381,7 @@ public class WmsEnumUtil {
}
public static Map getEnumByName(String enumName) throws Exception {
- Class innerClazz[] = WmsEnumUtil.class.getDeclaredClasses();// 获取常量类中的所有内部类
+ Class[] innerClazz = WmsEnumUtil.class.getDeclaredClasses();// 获取常量类中的所有内部类
Class clazz;
Enum[] enumConstants;
@@ -3479,7 +3479,7 @@ public class WmsEnumUtil {
public static String getDescription(String code) {
String tmp = null;
for (int i = 0; i < values().length; i++) {
- if (values()[i].value == code) {
+ if (values()[i].value.equals(code)) {
tmp = values()[i].description;
}
}
@@ -3727,7 +3727,7 @@ public class WmsEnumUtil {
public static String getDes(String val) {
String tmp = null;
for (int i = 0; i < values().length; i++) {
- if (values()[i].value == val) {
+ if (values()[i].value.equals(val)) {
tmp = values()[i].description;
}
}
@@ -3767,7 +3767,7 @@ public class WmsEnumUtil {
public static String getDes(String val) {
String tmp = null;
for (int i = 0; i < values().length; i++) {
- if (values()[i].value == val) {
+ if (values()[i].value.equals(val)) {
tmp = values()[i].description;
}
}
@@ -3901,7 +3901,7 @@ public class WmsEnumUtil {
public static String getDes(String val) {
String tmp = null;
for (int i = 0; i < values().length; i++) {
- if (values()[i].value == val) {
+ if (values()[i].value.equals(val)) {
tmp = values()[i].description;
}
}
@@ -6613,6 +6613,112 @@ public class WmsEnumUtil {
}
/**
+ * 运输方式
+ */
+ @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+ public enum TRANSPORT_TYPE {
+ LONG_HAUL(10, "长途运输"),
+ SHORT_DISTANCE(20, "短途运输");
+
+ private int value;
+ private String description;
+
+ TRANSPORT_TYPE(int value, String description) {
+ this.value = value;
+ this.description = description;
+ }
+
+ public int getValue() {
+ return value;
+ }
+
+ public String getDescription() {
+ return description;
+ }
+
+ public static TRANSPORT_TYPE codeOf(int value) {
+ for (int i = 0; i < values().length; i++) {
+ if (values()[i].value == value) {
+ return values()[i];
+ }
+ }
+ return null;
+ }
+
+ 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 int descriptionOfValue(String desc) {
+ return descOf(desc);
+ }
+
+
+ public static int descOf(String desc) {
+ int tmp = 1;
+ for (int i = 0; i < values().length; i++) {
+ if (values()[i].description.equals(desc)) {
+ tmp = values()[i].value;
+ }
+ }
+ return tmp;
+ }
+
+ public static String valueOfDescription(int val) {
+ return valueOf(val);
+ }
+ }
+
+ /**
+ * 物流供应商类型
+ */
+ @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+ public enum LOGISTICS_PROVIDER_TYPE {
+ VENDOR(10, "承运商");
+
+ private int value;
+ private String description;
+
+ LOGISTICS_PROVIDER_TYPE(int value, String description) {
+ this.value = value;
+ this.description = description;
+ }
+
+ public int getValue() {
+ return value;
+ }
+
+ public String getDescription() {
+ return description;
+ }
+
+ public static LOGISTICS_PROVIDER_TYPE codeOf(int value) {
+ for (int i = 0; i < values().length; i++) {
+ if (values()[i].value == value) {
+ return values()[i];
+ }
+ }
+ return null;
+ }
+
+ 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;
+ }
+ }
+
+ /**
* BatchHold 物料检测标准值
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
diff --git a/modules/i3plus-pojo-form/pom.xml b/modules/i3plus-pojo-form/pom.xml
index 9be7e80..b948580 100644
--- a/modules/i3plus-pojo-form/pom.xml
+++ b/modules/i3plus-pojo-form/pom.xml
@@ -12,7 +12,6 @@
i3plus-pojo-form
jar
- 1.0-TEST-SNAPSHOT
diff --git a/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfButton.java b/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfButton.java
index f350e27..11a0bcf 100644
--- a/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfButton.java
+++ b/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfButton.java
@@ -29,6 +29,7 @@ import javax.persistence.Table;
@Api(value = "表单按钮", description = "表单按钮")
public class BfButton extends BaseBean {
+ private static final long serialVersionUID = -1675967061983417558L;
@Column(name = "BUTTON_NAME")
@ApiParam(value = "按钮名称")
private String buttonName;
diff --git a/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfCascade.java b/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfCascade.java
index 44bd93e..14be338 100644
--- a/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfCascade.java
+++ b/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfCascade.java
@@ -33,6 +33,7 @@ import java.util.List;
@Api(value="级联元素",description = "级联元素")
public class BfCascade extends BaseBean {
+ private static final long serialVersionUID = -2114224803602089395L;
@Column(name = "ELEMENT_ID")
@ApiParam(value = "对象元素ID", example = "-1")
@JsonSerialize(using = ToStringSerializer.class)
diff --git a/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfCascadeDetail.java b/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfCascadeDetail.java
index ffbebed..368da78 100644
--- a/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfCascadeDetail.java
+++ b/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfCascadeDetail.java
@@ -30,6 +30,7 @@ import javax.persistence.Table;
@Api(value="级联元素明细",description = "级联元素")
public class BfCascadeDetail extends BaseBean {
+ private static final long serialVersionUID = -8365699249398175846L;
@Column(name = "CASCADE_ID")
@ApiParam(value = "级联ID", example = "-1")
@JsonSerialize(using = ToStringSerializer.class)
diff --git a/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfDataObject.java b/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfDataObject.java
index b673a6a..5d5f78a 100644
--- a/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfDataObject.java
+++ b/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfDataObject.java
@@ -30,6 +30,7 @@ import java.util.List;
@Api(value="数据对象",description = "原数据对象，最原始数据")
public class BfDataObject extends BaseBean {
+ private static final long serialVersionUID = -6450328805517462673L;
@Column(name = "DATA_SOURCE_ID")
@ApiParam(value = "数据源ID", example = "-1")
@JsonSerialize(using = ToStringSerializer.class)
diff --git a/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfDataObjectProperty.java b/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfDataObjectProperty.java
index c5d2d9a..c12f8d0 100644
--- a/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfDataObjectProperty.java
+++ b/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfDataObjectProperty.java
@@ -33,6 +33,7 @@ import java.util.List;
@Api(value = "数据对象属性表", description = "数据对象的属性明细表")
public class BfDataObjectProperty extends BaseBean {
+ private static final long serialVersionUID = 2607149135728621568L;
//外键关联数据对象主键
@Column(name = "DATA_OBJECT_ID")
@ApiParam(value = "数据对象ID", example = "-1")
diff --git a/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfDataSource.java b/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfDataSource.java
index 9d00452..cfce1b5 100644
--- a/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfDataSource.java
+++ b/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfDataSource.java
@@ -29,6 +29,7 @@ import java.util.List;
@Api(value="数据对象",description = "原数据对象，最原始数据")
public class BfDataSource extends BaseBean {
+ private static final long serialVersionUID = -749606489129498769L;
@Column(name="SOURCE_NAME")
@ApiParam(value ="数据源名称")
private String sourceName;
diff --git a/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfElement.java b/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfElement.java
index 549d365..29d0044 100644
--- a/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfElement.java
+++ b/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfElement.java
@@ -33,6 +33,7 @@ import java.util.List;
@Api(value = "对象元素基础", description = "元素基础表")
public class BfElement extends BaseBean {
+ private static final long serialVersionUID = -3309080566388373068L;
//外键关联数据对象主键
@Column(name = "ELEMENT_INFO_ID")
@ApiParam(value = "对象元素明细ID", example = "-1")
diff --git a/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfElementConstraint.java b/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfElementConstraint.java
index 7a6ee13..e226eaf 100644
--- a/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfElementConstraint.java
+++ b/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfElementConstraint.java
@@ -33,6 +33,7 @@ import javax.persistence.Table;
@Api(value = "元素约束", description = "元素约束")
public class BfElementConstraint extends BaseBean {
+ private static final long serialVersionUID = 6951083749548881908L;
@Column(name = "ELEMENT_ID")
@ApiParam(value = "对象元素ID", example = "-1")
@JsonSerialize(using = ToStringSerializer.class)
diff --git a/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfElementGrid.java b/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfElementGrid.java
index 9656d18..a3675cd 100644
--- a/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfElementGrid.java
+++ b/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfElementGrid.java
@@ -32,6 +32,7 @@ import javax.persistence.Table;
@Api(value = "对象元素表格", description = "对象元素表格")
public class BfElementGrid extends BaseBean {
+ private static final long serialVersionUID = -3730288075103132153L;
//外键关联数据对象主键
@Column(name = "ELEMENT_ID")
@ApiParam(value = "对象元素ID", example = "-1")
diff --git a/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfElementProperty.java b/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfElementProperty.java
index 569c3ed..8cc9ca2 100644
--- a/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfElementProperty.java
+++ b/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfElementProperty.java
@@ -32,6 +32,7 @@ import javax.persistence.Transient;
@Api(value="对象元素属性",description = "对象元素属性 相当于数据对象属性的扩展")
public class BfElementProperty extends BaseBean {
+ private static final long serialVersionUID = 8391877375302721425L;
@Column(name = "ELEMENT_ID")
@ApiParam(value = "对象元素ID", example = "-1")
@JsonSerialize(using = ToStringSerializer.class)
diff --git a/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfElementPropertyVirtual.java b/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfElementPropertyVirtual.java
index 688db18..26ca40e 100644
--- a/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfElementPropertyVirtual.java
+++ b/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfElementPropertyVirtual.java
@@ -30,6 +30,7 @@ import java.util.List;
@Api(value="对象元素虚拟属性",description = "对象元素虚拟属性")
public class BfElementPropertyVirtual extends BaseBean {
+ private static final long serialVersionUID = -8746243539245788738L;
@Column(name = "ELEMENT_ID")
@ApiParam(value = "对象元素ID", example = "-1")
@JsonSerialize(using = ToStringSerializer.class)
diff --git a/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfElementTree.java b/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfElementTree.java
index ef4c996..9fae58a 100644
--- a/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfElementTree.java
+++ b/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfElementTree.java
@@ -31,6 +31,7 @@ import javax.persistence.Transient;
@Api(value = "对象元素基础", description = "元素基础表")
public class BfElementTree extends BaseBean {
+ private static final long serialVersionUID = -6173269177770192337L;
//外键关联数据对象主键
@Column(name = "ELEMENT_ID")
@ApiParam(value = "对象元素ID", example = "-1")
diff --git a/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfIntercept.java b/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfIntercept.java
index 5e67b40..e336296 100644
--- a/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfIntercept.java
+++ b/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfIntercept.java
@@ -1,8 +1,6 @@
package cn.estsh.i3plus.pojo.form.bean;
import cn.estsh.i3plus.pojo.base.bean.BaseBean;
-import com.fasterxml.jackson.databind.annotation.JsonSerialize;
-import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiParam;
import lombok.Data;
@@ -30,6 +28,7 @@ import javax.persistence.Table;
@Api(value="拦截器主体")
public class BfIntercept extends BaseBean {
+ private static final long serialVersionUID = -7880837699871138830L;
@Column(name="INTERCEPT_NAME")
@ApiParam(value ="拦截器名称")
private String interceptName;
diff --git a/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfInterceptDetail.java b/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfInterceptDetail.java
index c4a9495..a0cf303 100644
--- a/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfInterceptDetail.java
+++ b/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfInterceptDetail.java
@@ -31,6 +31,7 @@ import javax.persistence.Transient;
@Api(value="拦截器明细")
public class BfInterceptDetail extends BaseBean {
+ private static final long serialVersionUID = -2813973524088674573L;
@Column(name="INTERCEPT_ID")
@ApiParam(value ="拦截器id")
@JsonSerialize(using = ToStringSerializer.class)
diff --git a/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfLayout.java b/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfLayout.java
index d58c49c..a56d039 100644
--- a/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfLayout.java
+++ b/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfLayout.java
@@ -7,7 +7,6 @@ import lombok.Data;
import lombok.EqualsAndHashCode;
import org.hibernate.annotations.DynamicInsert;
import org.hibernate.annotations.DynamicUpdate;
-import org.hibernate.annotations.Type;
import javax.persistence.*;
import java.util.List;
@@ -28,6 +27,7 @@ import java.util.List;
@Api(value = "自定义表单布局")
public class BfLayout extends BaseBean {
+ private static final long serialVersionUID = 4951428858633293563L;
@Column(name = "LAYOUT_NAME")
@ApiParam(value = "名称")
private String layoutName;
diff --git a/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfLayoutColumn.java b/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfLayoutColumn.java
index bafc0a5..6c4abed 100644
--- a/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfLayoutColumn.java
+++ b/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfLayoutColumn.java
@@ -30,6 +30,7 @@ import javax.persistence.Table;
@Api(value = "自定义表单布局-列")
public class BfLayoutColumn extends BaseBean {
+ private static final long serialVersionUID = -8711414349182712011L;
@Column(name = "LAYOUT_ID")
@ApiParam(value = "布局主键")
@JsonSerialize(using = ToStringSerializer.class)
diff --git a/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfLayoutRow.java b/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfLayoutRow.java
index c9888f1..d96cc02 100644
--- a/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfLayoutRow.java
+++ b/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfLayoutRow.java
@@ -9,7 +9,6 @@ import lombok.Data;
import lombok.EqualsAndHashCode;
import org.hibernate.annotations.DynamicInsert;
import org.hibernate.annotations.DynamicUpdate;
-import org.hibernate.annotations.Type;
import javax.persistence.*;
import java.util.List;
@@ -30,6 +29,7 @@ import java.util.List;
@Api(value = "自定义表单布局-行")
public class BfLayoutRow extends BaseBean {
+ private static final long serialVersionUID = -3327441937912038000L;
@Column(name = "LAYOUT_ID")
@ApiParam(value = "布局主键")
@JsonSerialize(using = ToStringSerializer.class)
diff --git a/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfMenu.java b/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfMenu.java
index 2275dd3..f12fc60 100644
--- a/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfMenu.java
+++ b/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfMenu.java
@@ -32,6 +32,7 @@ import java.util.List;
@Api(value="表单菜单目录",description = "表单菜单目录")
public class BfMenu extends BaseBean {
+ private static final long serialVersionUID = 6559248298739431579L;
@Column(name="MENU_NAME")
@ApiParam(value ="菜单名称")
private String menuName;
diff --git a/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfMethod.java b/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfMethod.java
index 31953ee..661cf28 100644
--- a/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfMethod.java
+++ b/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfMethod.java
@@ -32,6 +32,7 @@ import java.util.List;
@Api(value="表单功能",description = "表单功能")
public class BfMethod extends BaseBean {
+ private static final long serialVersionUID = 6976569600026342045L;
@Column(name="METHOD_NAME")
@ApiParam(value ="功能名称")
private String methodName;
diff --git a/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfMethodDetail.java b/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfMethodDetail.java
index dec8a80..7adc527 100644
--- a/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfMethodDetail.java
+++ b/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfMethodDetail.java
@@ -32,6 +32,7 @@ import java.util.List;
@Api(value="表单功能明细",description = "表单功能明细")
public class BfMethodDetail extends BaseBean {
+ private static final long serialVersionUID = 3982619673130000003L;
@Column(name="METHOD_ID")
@ApiParam(value ="功能id")
@JsonSerialize(using = ToStringSerializer.class)
diff --git a/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfMethodDetailProperty.java b/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfMethodDetailProperty.java
index 373f34e..9f2b83c 100644
--- a/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfMethodDetailProperty.java
+++ b/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfMethodDetailProperty.java
@@ -30,6 +30,7 @@ import javax.persistence.Table;
@Api(value="表单功能明细关联属性",description = "表单功能明细关联属性")
public class BfMethodDetailProperty extends BaseBean {
+ private static final long serialVersionUID = -7541677357317732343L;
@Column(name="METHOD_ID")
@ApiParam(value ="功能id")
@JsonSerialize(using = ToStringSerializer.class)
diff --git a/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfRefButtonMethod.java b/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfRefButtonMethod.java
index 0ca9523..2dda683 100644
--- a/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfRefButtonMethod.java
+++ b/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfRefButtonMethod.java
@@ -31,6 +31,7 @@ import javax.persistence.Transient;
@Api(value="按钮功能关系",description = "按钮功能关系")
public class BfRefButtonMethod extends BaseBean {
+ private static final long serialVersionUID = 1145541515189800147L;
@Column(name="BUTTON_ID")
@ApiParam(value ="按钮id")
@JsonSerialize(using = ToStringSerializer.class)
diff --git a/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfRefElementPropertyVirtualDetail.java b/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfRefElementPropertyVirtualDetail.java
index 4837677..a59f430 100644
--- a/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfRefElementPropertyVirtualDetail.java
+++ b/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfRefElementPropertyVirtualDetail.java
@@ -30,6 +30,7 @@ import javax.persistence.Table;
@Api(value="对象元素虚拟属性",description = "对象元素虚拟属性")
public class BfRefElementPropertyVirtualDetail extends BaseBean {
+ private static final long serialVersionUID = 3315763374468711786L;
@Column(name = "ELEMENT_ID")
@ApiParam(value = "对象元素ID", example = "-1")
@JsonSerialize(using = ToStringSerializer.class)
diff --git a/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfRefMethodRole.java b/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfRefMethodRole.java
index 42eff42..7f6a4b5 100644
--- a/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfRefMethodRole.java
+++ b/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfRefMethodRole.java
@@ -29,6 +29,7 @@ import javax.persistence.Table;
@Api(value = "功能角色关系", description = "功能角色关系")
public class BfRefMethodRole extends BaseBean {
+ private static final long serialVersionUID = 8134565165534099843L;
@Column(name = "METHOD_ID")
@ApiParam(value = "表单功能id")
@JsonSerialize(using = ToStringSerializer.class)
diff --git a/modules/i3plus-pojo-hardswitch/pom.xml b/modules/i3plus-pojo-hardswitch/pom.xml
index 53cfea6..e12eaee 100644
--- a/modules/i3plus-pojo-hardswitch/pom.xml
+++ b/modules/i3plus-pojo-hardswitch/pom.xml
@@ -12,7 +12,6 @@
i3plus-pojo-hardswitch
jar
- 1.0-TEST-SNAPSHOT
diff --git a/modules/i3plus-pojo-ics/pom.xml b/modules/i3plus-pojo-ics/pom.xml
index 5e5ef03..c338f71 100644
--- a/modules/i3plus-pojo-ics/pom.xml
+++ b/modules/i3plus-pojo-ics/pom.xml
@@ -12,7 +12,6 @@
i3plus-pojo-ics
jar
- 1.0-TEST-SNAPSHOT
diff --git a/modules/i3plus-pojo-ics/src/main/java/cn/estsh/i3plus/pojo/ics/bean/IcsActuatorMetrics.java b/modules/i3plus-pojo-ics/src/main/java/cn/estsh/i3plus/pojo/ics/bean/IcsActuatorMetrics.java
index 8921aea..e4aa123 100644
--- a/modules/i3plus-pojo-ics/src/main/java/cn/estsh/i3plus/pojo/ics/bean/IcsActuatorMetrics.java
+++ b/modules/i3plus-pojo-ics/src/main/java/cn/estsh/i3plus/pojo/ics/bean/IcsActuatorMetrics.java
@@ -3,6 +3,7 @@ package cn.estsh.i3plus.pojo.ics.bean;
import lombok.Data;
import lombok.NoArgsConstructor;
+import java.io.Serializable;
import java.util.List;
/**
@@ -13,8 +14,9 @@ import java.util.List;
* @Modify:
**/
@Data
-public class IcsActuatorMetrics {
+public class IcsActuatorMetrics implements Serializable {
+ private static final long serialVersionUID = 4341201186821752353L;
private String name;
private List measurements;
private List availableTags;
diff --git a/modules/i3plus-pojo-ics/src/main/java/cn/estsh/i3plus/pojo/ics/bean/IcsApplication.java b/modules/i3plus-pojo-ics/src/main/java/cn/estsh/i3plus/pojo/ics/bean/IcsApplication.java
index d391222..5575103 100644
--- a/modules/i3plus-pojo-ics/src/main/java/cn/estsh/i3plus/pojo/ics/bean/IcsApplication.java
+++ b/modules/i3plus-pojo-ics/src/main/java/cn/estsh/i3plus/pojo/ics/bean/IcsApplication.java
@@ -5,6 +5,7 @@ import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
+import java.io.Serializable;
import java.util.List;
/**
@@ -16,8 +17,9 @@ import java.util.List;
**/
@Data
@ApiModel("应用信息")
-public class IcsApplication {
+public class IcsApplication implements Serializable {
+ private static final long serialVersionUID = -1923997516217683087L;
@ApiModelProperty("应用名称")
private String appName;
diff --git a/modules/i3plus-pojo-ics/src/main/java/cn/estsh/i3plus/pojo/ics/bean/IcsInstance.java b/modules/i3plus-pojo-ics/src/main/java/cn/estsh/i3plus/pojo/ics/bean/IcsInstance.java
index 086ce01..df2d460 100644
--- a/modules/i3plus-pojo-ics/src/main/java/cn/estsh/i3plus/pojo/ics/bean/IcsInstance.java
+++ b/modules/i3plus-pojo-ics/src/main/java/cn/estsh/i3plus/pojo/ics/bean/IcsInstance.java
@@ -5,6 +5,8 @@ import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
+import java.io.Serializable;
+
/**
* @Description :
* @Reference :
@@ -14,8 +16,9 @@ import lombok.Data;
**/
@Data
@ApiModel("实例信息")
-public class IcsInstance {
+public class IcsInstance implements Serializable {
+ private static final long serialVersionUID = 2648298051066693374L;
@ApiModelProperty("实例id")
private String instanceId;
@@ -31,7 +34,7 @@ public class IcsInstance {
@ApiModelProperty("状态时间")
private String statusTimeStampStr;
- public String getInstanceStatusTxt(){
- return instanceStatus == null ?"无": CommonEnumUtil.CLOUD_APP_STATUS.valueOfDescription(instanceStatus);
+ public String getInstanceStatusTxt() {
+ return instanceStatus == null ? "无" : CommonEnumUtil.CLOUD_APP_STATUS.valueOfDescription(instanceStatus);
}
}
diff --git a/modules/i3plus-pojo-ics/src/main/java/cn/estsh/i3plus/pojo/ics/bean/IcsInstanceDetail.java b/modules/i3plus-pojo-ics/src/main/java/cn/estsh/i3plus/pojo/ics/bean/IcsInstanceDetail.java
index b36168a..f632be5 100644
--- a/modules/i3plus-pojo-ics/src/main/java/cn/estsh/i3plus/pojo/ics/bean/IcsInstanceDetail.java
+++ b/modules/i3plus-pojo-ics/src/main/java/cn/estsh/i3plus/pojo/ics/bean/IcsInstanceDetail.java
@@ -4,6 +4,8 @@ import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
+import java.io.Serializable;
+
/**
* @Description : 实例明细
* @Reference :
@@ -13,8 +15,9 @@ import lombok.Data;
**/
@Data
@ApiModel("实例明细")
-public class IcsInstanceDetail {
+public class IcsInstanceDetail implements Serializable {
+ private static final long serialVersionUID = -348649782622051827L;
@ApiModelProperty("pid")
private String pid;
diff --git a/modules/i3plus-pojo-ics/src/main/java/cn/estsh/i3plus/pojo/ics/bean/IcsInstanceMemoryHeap.java b/modules/i3plus-pojo-ics/src/main/java/cn/estsh/i3plus/pojo/ics/bean/IcsInstanceMemoryHeap.java
index 63b0003..ded6dcc 100644
--- a/modules/i3plus-pojo-ics/src/main/java/cn/estsh/i3plus/pojo/ics/bean/IcsInstanceMemoryHeap.java
+++ b/modules/i3plus-pojo-ics/src/main/java/cn/estsh/i3plus/pojo/ics/bean/IcsInstanceMemoryHeap.java
@@ -4,6 +4,8 @@ import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
+import java.io.Serializable;
+
/**
* @Description : 实例堆内存
* @Reference :
@@ -13,8 +15,9 @@ import lombok.Data;
**/
@Data
@ApiModel("实例堆内存")
-public class IcsInstanceMemoryHeap {
+public class IcsInstanceMemoryHeap implements Serializable {
+ private static final long serialVersionUID = -5982536759101768884L;
@ApiModelProperty("堆使用的内存")
private double heapMemoryUsed;
diff --git a/modules/i3plus-pojo-ics/src/main/java/cn/estsh/i3plus/pojo/ics/bean/IcsInstanceMemoryNonHeap.java b/modules/i3plus-pojo-ics/src/main/java/cn/estsh/i3plus/pojo/ics/bean/IcsInstanceMemoryNonHeap.java
index 15a655c..e767813 100644
--- a/modules/i3plus-pojo-ics/src/main/java/cn/estsh/i3plus/pojo/ics/bean/IcsInstanceMemoryNonHeap.java
+++ b/modules/i3plus-pojo-ics/src/main/java/cn/estsh/i3plus/pojo/ics/bean/IcsInstanceMemoryNonHeap.java
@@ -4,6 +4,8 @@ import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
+import java.io.Serializable;
+
/**
* @Description :实例堆非内存
* @Reference :
@@ -13,8 +15,9 @@ import lombok.Data;
**/
@Data
@ApiModel("实例堆非内存")
-public class IcsInstanceMemoryNonHeap {
+public class IcsInstanceMemoryNonHeap implements Serializable {
+ private static final long serialVersionUID = 5457399972284816473L;
@ApiModelProperty("非堆内存元空间")
private double nonHeapMemoryMetaspace;
diff --git a/modules/i3plus-pojo-ics/src/main/java/cn/estsh/i3plus/pojo/ics/bean/IcsInstanceThread.java b/modules/i3plus-pojo-ics/src/main/java/cn/estsh/i3plus/pojo/ics/bean/IcsInstanceThread.java
index 287aab5..d702cfa 100644
--- a/modules/i3plus-pojo-ics/src/main/java/cn/estsh/i3plus/pojo/ics/bean/IcsInstanceThread.java
+++ b/modules/i3plus-pojo-ics/src/main/java/cn/estsh/i3plus/pojo/ics/bean/IcsInstanceThread.java
@@ -4,6 +4,8 @@ import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
+import java.io.Serializable;
+
/**
* @Description : 实例线程信息
* @Reference :
@@ -13,8 +15,9 @@ import lombok.Data;
**/
@Data
@ApiModel("实例线程信息")
-public class IcsInstanceThread {
+public class IcsInstanceThread implements Serializable {
+ private static final long serialVersionUID = -272358532317411617L;
@ApiModelProperty("实时线程")
private double threadLive;
diff --git a/modules/i3plus-pojo-ics/src/main/java/cn/estsh/i3plus/pojo/ics/bean/IcsRegist.java b/modules/i3plus-pojo-ics/src/main/java/cn/estsh/i3plus/pojo/ics/bean/IcsRegist.java
index ec4f028..4bc3bd5 100644
--- a/modules/i3plus-pojo-ics/src/main/java/cn/estsh/i3plus/pojo/ics/bean/IcsRegist.java
+++ b/modules/i3plus-pojo-ics/src/main/java/cn/estsh/i3plus/pojo/ics/bean/IcsRegist.java
@@ -4,6 +4,7 @@ import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
+import java.io.Serializable;
import java.util.List;
/**
@@ -15,8 +16,9 @@ import java.util.List;
**/
@Data
@ApiModel("注册中心")
-public class IcsRegist {
+public class IcsRegist implements Serializable {
+ private static final long serialVersionUID = -5624347440991960286L;
@ApiModelProperty("环境")
private String environment;
diff --git a/modules/i3plus-pojo-jobflow/pom.xml b/modules/i3plus-pojo-jobflow/pom.xml
index 44c0526..1674a47 100644
--- a/modules/i3plus-pojo-jobflow/pom.xml
+++ b/modules/i3plus-pojo-jobflow/pom.xml
@@ -12,7 +12,6 @@
i3plus-pojo-jobflow
jar
- 1.0-TEST-SNAPSHOT
diff --git a/modules/i3plus-pojo-lac/pom.xml b/modules/i3plus-pojo-lac/pom.xml
index 122cb94..7637865 100644
--- a/modules/i3plus-pojo-lac/pom.xml
+++ b/modules/i3plus-pojo-lac/pom.xml
@@ -12,7 +12,6 @@
i3plus-pojo-lac
jar
- 1.0-TEST-SNAPSHOT
diff --git a/modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/bean/LacCommandOperate.java b/modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/bean/LacCommandOperate.java
index 178579f..dbae345 100644
--- a/modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/bean/LacCommandOperate.java
+++ b/modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/bean/LacCommandOperate.java
@@ -6,6 +6,8 @@ import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiParam;
import lombok.Data;
+import java.io.Serializable;
+
/**
* @Description :
* @Reference :
@@ -15,25 +17,27 @@ import lombok.Data;
**/
@Data
@ApiModel("指令操作")
-public class LacCommandOperate {
+public class LacCommandOperate implements Serializable {
- @ApiParam(value ="指令集记录id" , example = "-1")
+ private static final long serialVersionUID = 2877359322522442241L;
+ @ApiParam(value = "指令集记录id", example = "-1")
private Long operateObjId;
- @ApiParam(value ="操作对象类型" , example = "-1")
+ @ApiParam(value = "操作对象类型", example = "-1")
@AnnoOutputColumn(refClass = LacEnumUtil.OPERATE_OBJ_TYPE.class)
private Integer operateObjType;
- @ApiParam(value ="操作" , example = "-1")
+ @ApiParam(value = "操作", example = "-1")
@AnnoOutputColumn(refClass = LacEnumUtil.OPERATE_COMMAND.class)
private Integer operateCommand;
- public LacCommandOperate(){}
+ public LacCommandOperate() {
+ }
- public LacCommandOperate(Long operateObjId,Integer operate){
+ public LacCommandOperate(Long operateObjId, Integer operate) {
this.operateObjId = operateObjId;
LacEnumUtil.OPERATE_COMMAND operate_command = LacEnumUtil.OPERATE_COMMAND.valueOf(operate);
- if(operate_command!=null) {
+ if (operate_command != null) {
this.operateCommand = operate_command.getValue();
this.operateObjType = operate_command.getOperateObjType().getValue();
}
diff --git a/modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/bean/LacCommandStackStep.java b/modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/bean/LacCommandStackStep.java
index 1caf947..1fa346d 100644
--- a/modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/bean/LacCommandStackStep.java
+++ b/modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/bean/LacCommandStackStep.java
@@ -52,6 +52,7 @@ import java.util.List;
@Api(value="指令集步骤",description = "指令集步骤")
public class LacCommandStackStep extends BaseBean {
+ private static final long serialVersionUID = 4053765920069631323L;
@Column(name="TEMPLATE_ID")
@ApiParam(value ="模板ID")
@JsonSerialize(using = ToStringSerializer.class)
diff --git a/modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/bean/LacCommandStackStepTask.java b/modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/bean/LacCommandStackStepTask.java
index 63154b6..68619ff 100644
--- a/modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/bean/LacCommandStackStepTask.java
+++ b/modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/bean/LacCommandStackStepTask.java
@@ -55,6 +55,7 @@ import javax.persistence.Transient;
@Api(value="步骤任务",description = "步骤任务信息")
public class LacCommandStackStepTask extends BaseBean {
+ private static final long serialVersionUID = 7432247591995852126L;
@Column(name="TEMPLATE_ID")
@ApiParam(value ="模板ID")
@JsonSerialize(using = ToStringSerializer.class)
diff --git a/modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/bean/LacCommandStackTemplate.java b/modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/bean/LacCommandStackTemplate.java
index 7f301fa..09a9a04 100644
--- a/modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/bean/LacCommandStackTemplate.java
+++ b/modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/bean/LacCommandStackTemplate.java
@@ -49,6 +49,7 @@ import java.util.List;
@Api(value="指令集模板",description = "指令集模板信息")
public class LacCommandStackTemplate extends BaseBean {
+ private static final long serialVersionUID = 4884527553767334910L;
@Column(name="TEMPLATE_NAME")
@ApiParam(value ="模板名称")
private String templateName;
diff --git a/modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/bean/LacCommandStackType.java b/modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/bean/LacCommandStackType.java
index c08c908..6978fdf 100644
--- a/modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/bean/LacCommandStackType.java
+++ b/modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/bean/LacCommandStackType.java
@@ -24,21 +24,22 @@ import javax.persistence.Table;
@DynamicInsert
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
-@Table(name="LAC_COMMAND_STACK_TYPE")
-@Api(value="指令集类型",description = "指令集类型")
+@Table(name = "LAC_COMMAND_STACK_TYPE")
+@Api(value = "指令集类型", description = "指令集类型")
public class LacCommandStackType extends BaseBean {
- @Column(name="TYPE_NAME")
- @ApiParam(value ="类型名称")
+ private static final long serialVersionUID = -2699452452325728351L;
+ @Column(name = "TYPE_NAME")
+ @ApiParam(value = "类型名称")
private String typeName;
- @Column(name="TYPE_REF_NUM")
- @ApiParam(value ="适配器使用数量")
+ @Column(name = "TYPE_REF_NUM")
+ @ApiParam(value = "适配器使用数量")
private Integer typeRefNum;
- @Column(name="TYPE_DESCRIPTION")
- @ApiParam(value ="类型描述")
+ @Column(name = "TYPE_DESCRIPTION")
+ @ApiParam(value = "类型描述")
private String typeDescription;
}
diff --git a/modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/bean/LacSuitCase.java b/modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/bean/LacSuitCase.java
index 9caa3b2..22fde54 100644
--- a/modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/bean/LacSuitCase.java
+++ b/modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/bean/LacSuitCase.java
@@ -57,17 +57,18 @@ import javax.persistence.Table;
@Api(value="适配器",description = "适配器信息")
public class LacSuitCase extends BaseBean {
- @Column(name="SUTI_CASE_NAME_RDD")
+ private static final long serialVersionUID = 6325924633917664579L;
+ @Column(name="SUIT_CASE_NAME_RDD")
@ApiParam(value ="适配器名称")
- private String sutiCaseNameRdd;
+ private String suitCaseNameRdd;
@Column(name="SUIT_CASE_CODE_RDD")
@ApiParam(value ="适配器代码")
private String suitCaseCodeRdd;
- @Column(name="SUTI_TYPE")
+ @Column(name="SUIT_TYPE")
@ApiParam(value ="适配器类型")
- private Integer sutiType;
+ private Integer suitType;
@Column(name="HARDWARE_TYPE")
@ApiParam(value ="硬件类型")
diff --git a/modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/bean/LacSuitTask.java b/modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/bean/LacSuitTask.java
index 1c73450..33dfa08 100644
--- a/modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/bean/LacSuitTask.java
+++ b/modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/bean/LacSuitTask.java
@@ -61,6 +61,7 @@ import java.util.List;
@Api(value="调度任务",description = "调度任务信息")
public class LacSuitTask extends BaseBean {
+ private static final long serialVersionUID = -6592851798133225109L;
@Column(name="TASK_NAME")
@ApiParam(value ="适配器名称")
private String taskName;
diff --git a/modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/bean/LacSuitTaskParam.java b/modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/bean/LacSuitTaskParam.java
index 76e34fa..b281b0d 100644
--- a/modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/bean/LacSuitTaskParam.java
+++ b/modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/bean/LacSuitTaskParam.java
@@ -54,6 +54,7 @@ import javax.persistence.Transient;
@Api(value="调度任务参数",description = "调度任务参数信息")
public class LacSuitTaskParam extends BaseBean {
+ private static final long serialVersionUID = 3521650869017242460L;
@Column(name="TASK_ID")
@ApiParam(value ="任务ID")
@JsonSerialize(using = ToStringSerializer.class)
diff --git a/modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/bean/LacSuitTaskParamAdapter.java b/modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/bean/LacSuitTaskParamAdapter.java
index 3ed31a6..05d07be 100644
--- a/modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/bean/LacSuitTaskParamAdapter.java
+++ b/modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/bean/LacSuitTaskParamAdapter.java
@@ -55,6 +55,7 @@ import javax.persistence.Table;
@Api(value="调度任务参数转换",description = "调度任务参数转换信息")
public class LacSuitTaskParamAdapter extends BaseBean {
+ private static final long serialVersionUID = -4049358225863293288L;
@Column(name="TASK_ID")
@ApiParam(value ="任务ID")
@JsonSerialize(using = ToStringSerializer.class)
diff --git a/modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/bean/LacTaskCheck.java b/modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/bean/LacTaskCheck.java
index dd50d24..23f0b4d 100644
--- a/modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/bean/LacTaskCheck.java
+++ b/modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/bean/LacTaskCheck.java
@@ -33,6 +33,7 @@ import javax.persistence.Transient;
@Api(value="任务检查",description = "任务检查")
public class LacTaskCheck extends BaseBean {
+ private static final long serialVersionUID = -4157772560831884634L;
@Column(name="COMMAND_STACK_TEMPLATE_ID")
@ApiParam(value ="指令集模板ID")
@JsonSerialize(using = ToStringSerializer.class)
diff --git a/modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/bean/LacTaskType.java b/modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/bean/LacTaskType.java
index 32a5f3c..32df0a3 100644
--- a/modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/bean/LacTaskType.java
+++ b/modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/bean/LacTaskType.java
@@ -28,6 +28,7 @@ import javax.persistence.Table;
@Api(value="任务类型",description = "任务类型")
public class LacTaskType extends BaseBean {
+ private static final long serialVersionUID = 7596608775083338503L;
@Column(name="TYPE_NAME")
@ApiParam(value ="类型名称")
private String typeName;
diff --git a/modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/sqlpack/LacHqlPack.java b/modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/sqlpack/LacHqlPack.java
index a315c8c..ebfa83f 100644
--- a/modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/sqlpack/LacHqlPack.java
+++ b/modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/sqlpack/LacHqlPack.java
@@ -65,6 +65,7 @@ public class LacHqlPack {
DdlPreparedPack.getNumEqualPack(bean.getCommandStackRecordId(), "commandStackRecordId", ddlPackBean);
DdlPreparedPack.getNumEqualPack(bean.getTaskId(), "taskId", ddlPackBean);
+ DdlPreparedPack.getNumEqualPack(bean.getTaskStatus(), "taskStatus", ddlPackBean);
return ddlPackBean;
}
@@ -165,6 +166,8 @@ public class LacHqlPack {
DdlPackBean ddlPackBean = DdlPackBean.getDdlPackBean();
DdlPreparedPack.getNumEqualPack(bean.getStackStatus(), "stackStatus", ddlPackBean);
+ DdlPreparedPack.getNumEqualPack(bean.getCommandStackId(), "commandStackId", ddlPackBean);
+ DdlPreparedPack.getStringLikerPack(bean.getCommandStackNameRdd(), "commandStackNameRdd", ddlPackBean);
DdlPreparedPack.timeBuilder(bean.getStackStartTime(), "stackStartTime", ddlPackBean,false, true);
@@ -199,9 +202,9 @@ public class LacHqlPack {
public static DdlPackBean packHqlLacSuitCase(LacSuitCase bean) {
DdlPackBean ddlPackBean = DdlPackBean.getDdlPackBean(bean);
- DdlPreparedPack.getStringLikerPack(bean.getSutiCaseNameRdd(),"sutiCaseNameRdd",ddlPackBean);
+ DdlPreparedPack.getStringLikerPack(bean.getSuitCaseNameRdd(),"suitCaseNameRdd",ddlPackBean);
DdlPreparedPack.getStringLikerPack(bean.getSuitCaseCodeRdd(),"suitCaseCodeRdd",ddlPackBean);
- DdlPreparedPack.getNumEqualPack(bean.getSutiType(),"id",ddlPackBean);
+ DdlPreparedPack.getNumEqualPack(bean.getSuitType(),"suitType",ddlPackBean);
return ddlPackBean;
}
diff --git a/modules/i3plus-pojo-mdm/pom.xml b/modules/i3plus-pojo-mdm/pom.xml
new file mode 100644
index 0000000..d98b7d8
--- /dev/null
+++ b/modules/i3plus-pojo-mdm/pom.xml
@@ -0,0 +1,22 @@
+
+
+
+ i3plus-pojo
+ i3plus.pojo
+ 1.0-TEST-SNAPSHOT
+ ../../pom.xml
+
+ 4.0.0
+
+ i3plus-pojo-mdm
+
+
+
+ i3plus.pojo
+ i3plus-pojo-base
+
+
+
+
\ No newline at end of file
diff --git a/modules/i3plus-pojo-mdm/src/main/java/cn/estsh/i3plus/pojo/mdm/bean/base/BaseMdmBean.java b/modules/i3plus-pojo-mdm/src/main/java/cn/estsh/i3plus/pojo/mdm/bean/base/BaseMdmBean.java
new file mode 100644
index 0000000..f220dc7
--- /dev/null
+++ b/modules/i3plus-pojo-mdm/src/main/java/cn/estsh/i3plus/pojo/mdm/bean/base/BaseMdmBean.java
@@ -0,0 +1,46 @@
+package cn.estsh.i3plus.pojo.mdm.bean.base;
+
+import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn;
+import cn.estsh.i3plus.pojo.base.bean.BaseBean;
+import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import javax.persistence.Transient;
+
+/**
+ * @Description : MDM基础bean
+ * @Reference :
+ * @Author : yunhao
+ * @CreateDate : 2020-05-12 17:30
+ * @Modify:
+ **/
+@Data
+@ApiModel("MDM基础bean")
+public class BaseMdmBean extends BaseBean {
+
+ private static final long serialVersionUID = 3957595289035947441L;
+
+ @Transient
+ @ApiModelProperty("是否主数据")
+ @AnnoOutputColumn(refClass = CommonEnumUtil.TRUE_OR_FALSE.class)
+ public static Integer isMdmMaster = CommonEnumUtil.TRUE_OR_FALSE.TRUE.getValue();
+
+ @ApiModelProperty("mdm数据版本")
+ private Long mdmVersion;
+
+ public long getMdmVersion() {
+ return mdmVersion == null ? 0 : mdmVersion;
+ }
+
+ // 版本递增
+ public long nextMdmVersion() {
+ return mdmVersion = getMdmVersion() + 1;
+ }
+
+ @ApiModelProperty("是否发布")
+ @AnnoOutputColumn(refClass = CommonEnumUtil.TRUE_OR_FALSE.class)
+ private Integer isPublished;
+
+}
diff --git a/modules/i3plus-pojo-mdm/src/main/java/cn/estsh/i3plus/pojo/mdm/bean/base/BaseMdmExtdBean.java b/modules/i3plus-pojo-mdm/src/main/java/cn/estsh/i3plus/pojo/mdm/bean/base/BaseMdmExtdBean.java
new file mode 100644
index 0000000..957a91e
--- /dev/null
+++ b/modules/i3plus-pojo-mdm/src/main/java/cn/estsh/i3plus/pojo/mdm/bean/base/BaseMdmExtdBean.java
@@ -0,0 +1,30 @@
+package cn.estsh.i3plus.pojo.mdm.bean.base;
+
+import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn;
+import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import javax.persistence.Transient;
+
+/**
+ * @Description : MDM业务基础bean
+ * @Reference :
+ * @Author : yunhao
+ * @CreateDate : 2020-05-12 17:30
+ * @Modify:
+ **/
+@Data
+@ApiModel("MDM业务基础bean")
+public class BaseMdmExtdBean extends BaseMdmBean {
+
+ private static final long serialVersionUID = 4267453020130810967L;
+
+ @Transient
+ @ApiModelProperty("软件模块")
+ @AnnoOutputColumn(refClass = CommonEnumUtil.TRUE_OR_FALSE.class)
+ public static Integer mdmSoftType;
+
+
+}
diff --git a/modules/i3plus-pojo-mdm/src/main/java/cn/estsh/i3plus/pojo/mdm/bean/busi/core/MdmGearCoreExtd.java b/modules/i3plus-pojo-mdm/src/main/java/cn/estsh/i3plus/pojo/mdm/bean/busi/core/MdmGearCoreExtd.java
new file mode 100644
index 0000000..bbe8b58
--- /dev/null
+++ b/modules/i3plus-pojo-mdm/src/main/java/cn/estsh/i3plus/pojo/mdm/bean/busi/core/MdmGearCoreExtd.java
@@ -0,0 +1,31 @@
+package cn.estsh.i3plus.pojo.mdm.bean.busi.core;
+
+import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil;
+import cn.estsh.i3plus.pojo.mdm.bean.base.BaseMdmExtdBean;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @Description : 主数据齿轮-平台扩展
+ * @Reference :
+ * @Author : yunhao
+ * @CreateDate : 2020-05-12 18:09
+ * @Modify:
+ **/
+@Data
+@ApiModel("主数据齿轮-平台扩展")
+public class MdmGearCoreExtd extends BaseMdmExtdBean {
+
+ private static final long serialVersionUID = -3535174942277452194L;
+
+ // 初始化数据
+ static {
+ isMdmMaster = CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue();
+ mdmSoftType = CommonEnumUtil.SOFT_TYPE.CORE.getValue();
+ }
+
+ @ApiModelProperty("核心数量")
+ public String coreNum;
+
+}
diff --git a/modules/i3plus-pojo-mdm/src/main/java/cn/estsh/i3plus/pojo/mdm/bean/master/MdmGear.java b/modules/i3plus-pojo-mdm/src/main/java/cn/estsh/i3plus/pojo/mdm/bean/master/MdmGear.java
new file mode 100644
index 0000000..e20fec9
--- /dev/null
+++ b/modules/i3plus-pojo-mdm/src/main/java/cn/estsh/i3plus/pojo/mdm/bean/master/MdmGear.java
@@ -0,0 +1,27 @@
+package cn.estsh.i3plus.pojo.mdm.bean.master;
+
+import cn.estsh.i3plus.pojo.mdm.bean.base.BaseMdmBean;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @Description : 主数据齿轮
+ * @Reference :
+ * @Author : yunhao
+ * @CreateDate : 2020-05-12 18:09
+ * @Modify:
+ **/
+@Data
+@ApiModel("主数据齿轮")
+public class MdmGear extends BaseMdmBean {
+
+ private static final long serialVersionUID = -7580444601811207793L;
+
+ @ApiModelProperty("齿轮名称")
+ private String name;
+
+ @ApiModelProperty("齿轮规格")
+ private String gearModel;
+
+}
diff --git a/modules/i3plus-pojo-mdm/src/main/java/cn/estsh/i3plus/pojo/mdm/bean/model/core/MdmGearCoreModel.java b/modules/i3plus-pojo-mdm/src/main/java/cn/estsh/i3plus/pojo/mdm/bean/model/core/MdmGearCoreModel.java
new file mode 100644
index 0000000..46fd862
--- /dev/null
+++ b/modules/i3plus-pojo-mdm/src/main/java/cn/estsh/i3plus/pojo/mdm/bean/model/core/MdmGearCoreModel.java
@@ -0,0 +1,19 @@
+package cn.estsh.i3plus.pojo.mdm.bean.model.core;
+
+import cn.estsh.i3plus.pojo.mdm.bean.busi.core.MdmGearCoreExtd;
+import cn.estsh.i3plus.pojo.mdm.bean.master.MdmGear;
+
+/**
+ * @Description : 主数据齿轮-平台model
+ * @Reference :
+ * @Author : yunhao
+ * @CreateDate : 2020-05-12 18:09
+ * @Modify:
+ **/
+public class MdmGearCoreModel {
+
+ private MdmGear mdmGear;
+
+ private MdmGearCoreExtd mdmGearCoreExtd;
+
+}
diff --git a/modules/i3plus-pojo-mes-pcn/pom.xml b/modules/i3plus-pojo-mes-pcn/pom.xml
index f9957c9..bf96e57 100644
--- a/modules/i3plus-pojo-mes-pcn/pom.xml
+++ b/modules/i3plus-pojo-mes-pcn/pom.xml
@@ -12,7 +12,6 @@
i3plus-pojo-mes-pcn
jar
- 1.0-TEST-SNAPSHOT
diff --git a/modules/i3plus-pojo-mes/pom.xml b/modules/i3plus-pojo-mes/pom.xml
index 409b79a..a758a6a 100644
--- a/modules/i3plus-pojo-mes/pom.xml
+++ b/modules/i3plus-pojo-mes/pom.xml
@@ -12,7 +12,6 @@
i3plus-pojo-mes
jar
- 1.0-TEST-SNAPSHOT
diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/BasVendor.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/BasVendor.java
index 30e8294..eb1c3c2 100644
--- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/BasVendor.java
+++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/BasVendor.java
@@ -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,9 +27,10 @@ import javax.persistence.Table;
@EqualsAndHashCode(callSuper = true)
@Table(name="BAS_VENDOR")
@Api("供应商信息")
-public class BasVendor extends BaseBean{
+public class BasVendor extends BaseBean implements Serializable {
+
+ private static final long serialVersionUID = -8041987864739007553L;
- private static final long serialVersionUID = 9214639813072592779L;
@Column(name="VENDOR_NO")
@ApiParam("供应商编号")
private String vendorNo;
diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfQcOrder.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfQcOrder.java
new file mode 100644
index 0000000..924fc78
--- /dev/null
+++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfQcOrder.java
@@ -0,0 +1,97 @@
+package cn.estsh.i3plus.pojo.mes.bean;
+
+import cn.estsh.i3plus.pojo.base.bean.BaseBean;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.hibernate.annotations.DynamicInsert;
+import org.hibernate.annotations.DynamicUpdate;
+
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.Table;
+import java.io.Serializable;
+
+/**
+ * @Description:
+ * @Reference:
+ * @Author: jessica.chen
+ * @CreateDate: 2019\11\15 10:01
+ * @Modify:
+ **/
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Table(name = "IF_QC_ORDER")
+@Api("IF_质检单")
+public class IfQcOrder extends BaseBean implements Serializable {
+
+ private static final long serialVersionUID = -5412635747424111476L;
+ @Column(name = "ORDER_NO")
+ @ApiParam("质检单号")
+ private String orderNo;
+
+ @Column(name = "PART_NO")
+ @ApiParam("物料号")
+ private String partNo;
+
+ @Column(name = "QTY")
+ @ApiParam("数量")
+ private Double qty = 0D;
+
+ @Column(name = "UNIT")
+ @ApiParam("单位")
+ private String unit;
+
+ @Column(name = "SUPPLIER_CODE")
+ @ApiParam("供应商代码")
+ private String supplierCode;
+
+ @Column(name = "SRC_LOT_NO")
+ @ApiParam("收货批次")
+ private String srcLotNo;
+
+ @Column(name = "FIX_LOT_NO")
+ @ApiParam("特殊批次")
+ private String fixLotNo;
+
+ @Column(name = "RELATION_ORDER_NO")
+ @ApiParam("关联单号")
+ private String relationOrderNo;
+
+ @Column(name = "UUID")
+ @ApiParam("数据唯一编号")
+ private String uuid;
+
+ @Column(name = "ORGANIZTION_CODE")
+ @ApiParam("工厂代码")
+ private String organiztionCode;
+
+ @Column(name = "SYNC_STATUS")
+ @ApiParam("同步状态")
+ private Integer syncStatus;
+
+ @Column(name = "ERROR_MESSAGE")
+ @ApiParam("异常消息")
+ private String errorMessage;
+
+ @Column(name = "ACTION_CODE")
+ @ApiParam("动作代码")
+ private String actionCode;
+
+ @Column(name = "IF_CODE")
+ @ApiParam("接口代码")
+ private String ifCode;
+
+ @Column(name = "CUSTOMER_CODE")
+ @ApiParam("客户代码")
+ private String customerCode;
+
+ @Column(name = "DELIVERY_DATE")
+ @ApiParam("发运时间")
+ private String deliveryDate;
+
+}
diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfQcResult.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfQcResult.java
new file mode 100644
index 0000000..186a0ac
--- /dev/null
+++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfQcResult.java
@@ -0,0 +1,64 @@
+package cn.estsh.i3plus.pojo.mes.bean;
+
+import cn.estsh.i3plus.pojo.base.bean.BaseBean;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.hibernate.annotations.DynamicInsert;
+import org.hibernate.annotations.DynamicUpdate;
+
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.Table;
+import java.io.Serializable;
+
+/**
+ * @Description:
+ * @Reference:
+ * @Author: jessica.chen
+ * @CreateDate: 2019\11\15 10:01
+ * @Modify:
+ **/
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Table(name = "IF_QC_RESULT")
+@Api("IF_质检结果")
+public class IfQcResult extends BaseBean implements Serializable {
+
+ private static final long serialVersionUID = -5412635747424111476L;
+ @Column(name = "ORDER_NO")
+ @ApiParam("质检单号")
+ private String orderNo;
+
+ @Column(name = "UUID")
+ @ApiParam("数据唯一编号")
+ private String uuid;
+
+ @Column(name = "QC_RESULT")
+ @ApiParam("质检结果")
+ private String qcResult;
+
+ @Column(name = "ORGANIZTION_CODE")
+ @ApiParam("工厂代码")
+ private String organiztionCode;
+
+ @Column(name = "SYNC_STATUS")
+ @ApiParam("同步状态")
+ private Integer syncStatus;
+
+ @Column(name = "ERROR_MESSAGE")
+ @ApiParam("异常消息")
+ private String errorMessage;
+
+ @Column(name = "ACTION_CODE")
+ @ApiParam("动作代码")
+ private String actionCode;
+
+ @Column(name = "IF_CODE")
+ @ApiParam("接口代码")
+ private String ifCode;
+}
diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfQueueShipping.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfQueueShipping.java
index f7a2098..b340d1a 100644
--- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfQueueShipping.java
+++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfQueueShipping.java
@@ -30,7 +30,7 @@ import java.io.Serializable;
@Table(name = "if_queue_shipping")
@Api("JIT发运数据同步")
public class IfQueueShipping extends BaseBean implements Serializable {
- private static final long serialVersionUID = -8961182851667690154L;
+ private static final long serialVersionUID = -3385698810529084423L;
@Column(name = "JIT_NO")
@ApiParam("JIT队列编号")
private String jitNo;
diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesLabelTemplate.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesLabelTemplate.java
index f11ae4d..2a23858 100644
--- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesLabelTemplate.java
+++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesLabelTemplate.java
@@ -27,8 +27,8 @@ import java.util.List;
@Table(name = "MES_LABEL_TEMPLATE")
@Api(value = "打印模板", description = "打印模板")
public class MesLabelTemplate extends BaseBean implements Serializable {
- private static final long serialVersionUID = 5371856566557305323L;
+ private static final long serialVersionUID = -7758794366003399222L;
@Column(name = "TEMPLATE_CODE")
@ApiParam(value = "模板代码")
private String templateCode;
diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesLabelTemplateParam.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesLabelTemplateParam.java
index 5b17a07..36fb0a3 100644
--- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesLabelTemplateParam.java
+++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesLabelTemplateParam.java
@@ -28,8 +28,8 @@ import java.io.Serializable;
@Table(name = "MES_LABEL_TEMPLATE_PARAM")
@Api(value = "打印模板参数", description = "打印模板参数")
public class MesLabelTemplateParam extends BaseBean implements Serializable {
- private static final long serialVersionUID = 6476163540527157643L;
+ private static final long serialVersionUID = -6834031991151345038L;
@Column(name = "TEMPLATE_ID")
@ApiParam(value = "模板ID", access = "模板ID", example = "-1")
@JsonSerialize(using = ToStringSerializer.class)
diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesLoopQcGenerateDetail.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesLoopQcGenerateDetail.java
new file mode 100644
index 0000000..6a2d772
--- /dev/null
+++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesLoopQcGenerateDetail.java
@@ -0,0 +1,58 @@
+package cn.estsh.i3plus.pojo.mes.bean;
+
+
+import cn.estsh.i3plus.pojo.base.bean.BaseBean;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.hibernate.annotations.DynamicInsert;
+import org.hibernate.annotations.DynamicUpdate;
+
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.Table;
+import javax.persistence.Transient;
+import java.io.Serializable;
+
+/**
+ * @Description:
+ * @Reference:
+ * @Author: jessica.chen
+ * @CreateDate: 2019\11\15 10:01
+ * @Modify:
+ **/
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Table(name = "MES_LOOP_QC_GENERATE_DETAIL")
+@Api("MES_巡检项生成明细")
+public class MesLoopQcGenerateDetail extends BaseBean implements Serializable {
+
+ private static final long serialVersionUID = -5412635747424111476L;
+ @Column(name = "RELATION_ORDER_NO")
+ @ApiParam("关联单号")
+ private String relationOrderNo;
+
+ @Column(name = "CHECK_TYPE")
+ @ApiParam("检测类型")
+ private Integer checkType;
+
+ @Column(name = "CHECK_ITEM")
+ @ApiParam("检测项")
+ private String checkItem;
+
+ @Column(name = "LASR_TIME")
+ @ApiParam("末次时间")
+ private String lasrTime;
+
+ @ApiParam(value = "物料号")
+ @Transient
+ private String partNo;
+
+ @ApiParam(value = "产线")
+ @Transient
+ private String workCenterCode;
+}
diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesOee.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesOee.java
index d40e746..83c18ad 100644
--- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesOee.java
+++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesOee.java
@@ -68,11 +68,11 @@ public class MesOee extends BaseBean implements Serializable {
@ApiParam("结束时段")
private String endTime;
- @Column(name = "TOTAL_RUN_TIME", columnDefinition = "decimal(18,3)")
+ @Column(name = "TOTAL_RUN_TIME", columnDefinition = "decimal(18,4)")
@ApiParam("总生产时间")
private Double totalRunTime;
- @Column(name = "TOTAL_STOP_TIME", columnDefinition = "decimal(18,3)")
+ @Column(name = "TOTAL_STOP_TIME", columnDefinition = "decimal(18,4)")
@ApiParam("总停机时间")
private Double totalStopTime;
@@ -92,19 +92,19 @@ public class MesOee extends BaseBean implements Serializable {
@ApiParam("实际节拍")
private Integer actualTakt;
- @Column(name = "TIME_RATE", columnDefinition = "decimal(18,3)")
+ @Column(name = "TIME_RATE", columnDefinition = "decimal(18,4)")
@ApiParam("时间开动率")
private Double timeRate;
- @Column(name = "TAKT_RATE", columnDefinition = "decimal(18,3)")
+ @Column(name = "TAKT_RATE", columnDefinition = "decimal(18,4)")
@ApiParam("性能开动率")
private Double taktRate;
- @Column(name = "QUALIFIED_RATE", columnDefinition = "decimal(18,3)")
+ @Column(name = "QUALIFIED_RATE", columnDefinition = "decimal(18,4)")
@ApiParam("良品率")
private Double qualifiedRate;
- @Column(name = "OEE", columnDefinition = "decimal(18,3)")
+ @Column(name = "OEE", columnDefinition = "decimal(18,4)")
@ApiParam("OEE")
private Double oee;
diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPartStockSchedule.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPartStockSchedule.java
new file mode 100644
index 0000000..2d24638
--- /dev/null
+++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPartStockSchedule.java
@@ -0,0 +1,60 @@
+package cn.estsh.i3plus.pojo.mes.bean;
+
+import cn.estsh.i3plus.pojo.base.bean.BaseBean;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.hibernate.annotations.DynamicInsert;
+import org.hibernate.annotations.DynamicUpdate;
+
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.Table;
+import java.io.Serializable;
+
+/**
+ * @Description:
+ * @Author: jokelin
+ * @Date: 2020/5/12 5:53 下午
+ * @Modify:
+ */
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Table(name = "MES_PART_STOCK_SCHEDULE")
+@Api("MES_库存排程配置")
+public class MesPartStockSchedule extends BaseBean implements Serializable {
+
+ private static final long serialVersionUID = -8265586624645977526L;
+
+ @Column(name = "PART_NO")
+ @ApiParam("物料号")
+ private String partNo;
+
+ @Column(name = "MIN_CAPACITY")
+ @ApiParam("最小库存")
+ private Integer minCapacity;
+
+ @Column(name = "TOTAL_CAPACITY")
+ @ApiParam("总容量")
+ private Integer totalCapacity;
+
+ @Column(name = "STANDARD_CAPACITY")
+ @ApiParam("标准值")
+ private Integer standardCapacity;
+
+ @Column(name = "SCHEDULE_CAPACITY")
+ @ApiParam("待生产箱数")
+ private Integer scheduleCapacity;
+
+ @Column(name = "PLAN_QTY")
+ @ApiParam("产品JSP个数")
+ private Integer planQty;
+
+ @Column(name = "TOTAL_PLAN_QTY")
+ @ApiParam("JSP总数")
+ private Integer totalPlanQty;
+}
diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPcnConnectLog.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPcnConnectLog.java
index 94a4da7..2385ff4 100644
--- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPcnConnectLog.java
+++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPcnConnectLog.java
@@ -28,8 +28,8 @@ import java.io.Serializable;
@Table(name = "MES_PCN_CONNECT_LOG")
@Api("PCN节点连接日志")
public class MesPcnConnectLog extends BaseBean implements Serializable {
- private static final long serialVersionUID = 2756240593256441951L;
+ private static final long serialVersionUID = 2756240593256441951L;
@Column(name = "PCN_CODE")
@ApiParam("PCN代码")
private String pcnCode;
diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPcnSysUserOffline.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPcnSysUserOffline.java
index dc26568..b5d583b 100644
--- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPcnSysUserOffline.java
+++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPcnSysUserOffline.java
@@ -31,8 +31,7 @@ import java.io.Serializable;
@Table(name = "MES_PCN_SYS_USER_OFFLINE")
@Api(value = "账号离线登陆表", description = "账号离线登陆表。")
public class MesPcnSysUserOffline extends BaseBean implements Serializable {
-
- private static final long serialVersionUID = 7617353154826718154L;
+ private static final long serialVersionUID = -7483799830588482021L;
@Column(name = "USER_ID")
@ApiParam(value = "人员ID", example = "-1")
@JsonSerialize(using = ToStringSerializer.class)
diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPcnTaskLog.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPcnTaskLog.java
index d483cd6..a9d885f 100644
--- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPcnTaskLog.java
+++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPcnTaskLog.java
@@ -29,8 +29,8 @@ import java.io.Serializable;
@Table(name = "MES_PCN_TASK_LOG")
@Api("mes-pcn定时任务工作清单同步记录")
public class MesPcnTaskLog extends BaseBean implements Serializable {
- private static final long serialVersionUID = -784806389462540310L;
+ private static final long serialVersionUID = 1175730596573636224L;
@Column(name = "SYNC_TIME_START")
@ApiParam("同步数据开始时间")
private String syncTimeStart;
diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPlc.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPlc.java
index 4d2fc73..fc99205 100644
--- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPlc.java
+++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPlc.java
@@ -130,6 +130,10 @@ public class MesPlc extends BaseBean implements Serializable {
@ApiParam("密码")
private String password;
+ @Column(name = "DEFAULT_RULE")
+ @ApiParam("默认赋值属性")
+ private String defaultRule;
+
@Transient
@ApiParam("设备名称")
private String equipmentName;
diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProdScatterCfgBom.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProdScatterCfgBom.java
index 73fae24..0ccadd4 100644
--- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProdScatterCfgBom.java
+++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProdScatterCfgBom.java
@@ -29,6 +29,7 @@ import java.math.BigDecimal;
@Api("散件产品配置明细")
public class MesProdScatterCfgBom extends BaseBean implements Serializable {
+ private static final long serialVersionUID = -6413857842993992190L;
@Column(name = "SP_CFG_CODE")
@ApiParam("散件配置编码")
private String spCfgCode;
diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQcCheckStandard.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQcCheckStandard.java
index 48a7682..c6a3d0a 100644
--- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQcCheckStandard.java
+++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQcCheckStandard.java
@@ -80,6 +80,10 @@ public class MesQcCheckStandard extends BaseBean implements Serializable {
@ApiParam("检测项类型")
private String checkItemType;
+ @Column(name = "CHECK_INTERVAL")
+ @ApiParam("间隔时间")
+ private Integer checkInterval = 0;
+
@Transient
@ApiParam("检测类型名称")
private String checkTypeName;
diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQcOrder.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQcOrder.java
index dcc8eed..26afb75 100644
--- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQcOrder.java
+++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQcOrder.java
@@ -14,13 +14,12 @@ import javax.persistence.Entity;
import javax.persistence.Table;
import javax.persistence.Transient;
import java.io.Serializable;
-import java.math.BigDecimal;
/**
- * @Description :mes系统业务动作
- * @Reference :
- * @Author : jack.jia
- * @CreateDate : 2019-04-12
+ * @Description:
+ * @Reference:
+ * @Author: jessica.chen
+ * @CreateDate: 2019\11\15 10:01
* @Modify:
**/
@Data
@@ -30,8 +29,9 @@ import java.math.BigDecimal;
@EqualsAndHashCode(callSuper = true)
@Table(name = "MES_QC_ORDER")
@Api("MES_检验单")
-public class MesQcOrder extends BaseBean implements Serializable {
- private static final long serialVersionUID = -8961182786427690154L;
+public class MesQcOrder extends BaseBean implements Serializable {
+
+ private static final long serialVersionUID = -5412635747424111476L;
@Column(name = "ORDER_NO")
@ApiParam("质检单号")
private String orderNo;
@@ -48,9 +48,13 @@ public class MesQcOrder extends BaseBean implements Serializable {
@ApiParam("物料名称")
private String partName;
+ @Column(name = "FINISH_QTY")
+ @ApiParam("已检数量")
+ private Double finishQty = 0D;
+
@Column(name = "QTY")
@ApiParam("数量")
- private BigDecimal qty;
+ private Double qty = 0D;
@Column(name = "UNIT")
@ApiParam("单位")
@@ -74,17 +78,42 @@ public class MesQcOrder extends BaseBean implements Serializable {
@Column(name = "UUID")
@ApiParam("数据唯一编号")
- private String uuId;
+ private String uuid;
@Column(name = "STATUS")
@ApiParam("状态")
private Integer status;
- @Column(name = "CHECK_RESULT")
+ @Column(name = "CHECK_REULST")
@ApiParam("检测整体结果")
- private Integer checkResult;
+ private Integer checkReulst = 0;
+
+ @Column(name = "MEMO")
+ @ApiParam("备注")
+ private String memo;
+
+ @Column(name = "CUSTOMER_CODE")
+ @ApiParam("客户代码")
+ private String customerCode;
+
+ @Column(name = "DELIVERY_DATE")
+ @ApiParam("发运时间")
+ private String deliveryDate;
+
+ @ApiParam(value = "检测结果")
+ @Transient
+ private String reulstStatus;
+
+ @ApiParam(value = "产品条码")
+ @Transient
+ private String serialNumber;
+ @ApiParam(value = "产线")
@Transient
- @ApiParam("供应商名称")
- private String supplierName;
+ private String workCenterCode;
+
+ @ApiParam(value = "工单号")
+ @Transient
+ private String mesWorkNo;
+
}
diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQcOrderDetail.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQcOrderDetail.java
index 599196a..e1155c2 100644
--- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQcOrderDetail.java
+++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQcOrderDetail.java
@@ -16,10 +16,10 @@ import javax.persistence.Transient;
import java.io.Serializable;
/**
- * @Description :mes系统业务动作
- * @Reference :
- * @Author : jack.jia
- * @CreateDate : 2019-04-12
+ * @Description:
+ * @Reference:
+ * @Author: jessica.chen
+ * @CreateDate: 2019\11\15 10:01
* @Modify:
**/
@Data
@@ -29,8 +29,9 @@ import java.io.Serializable;
@EqualsAndHashCode(callSuper = true)
@Table(name = "MES_QC_ORDER_DETAIL")
@Api("MES_检验单明细")
-public class MesQcOrderDetail extends BaseBean implements Serializable {
- private static final long serialVersionUID = -8961182786786500154L;
+public class MesQcOrderDetail extends BaseBean implements Serializable {
+
+ private static final long serialVersionUID = -5412635747424111476L;
@Column(name = "ORDER_NO")
@ApiParam("质检单号")
private String orderNo;
@@ -61,25 +62,25 @@ public class MesQcOrderDetail extends BaseBean implements Serializable {
@Column(name = "IS_CONCESSION")
@ApiParam("是否允许让步")
- private String isConcession;
+ private Integer isConcession = 0;
+
+ @Column(name = "CHECK_REULST")
+ @ApiParam("判定结果")
+ private Integer checkReulst = 0;
- @Column(name = "STATUS")
- @ApiParam("状态")
- private Integer status;
+ @Column(name = "ITEM_NO")
+ @ApiParam("检验行号")
+ private Integer itemNo = 0;
- @Column(name = "CHECK_RESULT")
- @ApiParam("检测整体结果")
- private Integer checkResult;
+ @Column(name = "SERIAL_NUMBER")
+ @ApiParam("产品条码")
+ private String serialNumber;
@Column(name = "CHECK_VALUE")
@ApiParam("检测值")
private String checkValue;
+ @ApiParam(value = "已完成数量")
@Transient
- @ApiParam("本批次生产总数")
- private Integer currentLotNoSum;
-
- @Transient
- @ApiParam("收货批次")
- private String srcLotNo;
+ private Integer finishQty;
}
diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueJitActualDetail.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueJitActualDetail.java
index 654cc56..00efaba 100644
--- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueJitActualDetail.java
+++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueJitActualDetail.java
@@ -30,8 +30,7 @@ import java.io.Serializable;
@Api("MES_客户JIT生产队列明细")
public class MesQueueJitActualDetail extends BaseBean implements Serializable {
- private static final long serialVersionUID = 1442091799346314190L;
-
+ private static final long serialVersionUID = 3211496242571643906L;
@Column(name = "JIS_ACTUAL_NO")
@ApiParam("队列编号")
private String jisActualNo;
diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesScatterCfgDetail.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesScatterCfgDetail.java
index cb0457f..44a5022 100644
--- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesScatterCfgDetail.java
+++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesScatterCfgDetail.java
@@ -29,6 +29,7 @@ import java.math.BigDecimal;
@Api("MES_散件配置报文关系")
public class MesScatterCfgDetail extends BaseBean implements Serializable {
+ private static final long serialVersionUID = 1633467451954028328L;
@Column(name = "SP_CFG_CODE")
@ApiParam("散件配置编码")
private String spCfgCode;
diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesStateMachine.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesStateMachine.java
index 1672c91..63d6212 100644
--- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesStateMachine.java
+++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesStateMachine.java
@@ -27,8 +27,8 @@ import java.io.Serializable;
@Table(name = "MES_STATE_MACHINE")
@Api("MES状态机")
public class MesStateMachine extends BaseBean implements Serializable {
- private static final long serialVersionUID = 6093522587973076640L;
+ private static final long serialVersionUID = 4532746282478232478L;
@Column(name = "SM_CODE")
@ApiParam("状态机代码")
private String smCode;
diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesSyncDeadLetter.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesSyncDeadLetter.java
index 3692f51..11a7383 100644
--- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesSyncDeadLetter.java
+++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesSyncDeadLetter.java
@@ -31,8 +31,8 @@ import java.util.List;
})
@Api("数据同步死信")
public class MesSyncDeadLetter extends BaseBean implements Serializable {
- private static final long serialVersionUID = 1151025992437433734L;
+ private static final long serialVersionUID = -6427776318518431855L;
@Column(name = "OBJECT_CODE")
@ApiParam("对象代码")
private String objectCode;
diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesTime.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesTime.java
index 326dafe..11da3c6 100644
--- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesTime.java
+++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesTime.java
@@ -22,8 +22,8 @@ import java.io.Serializable;
@Table(name = "MES_TIME")
@Api("工步参数")
public class MesTime extends BaseBean implements Serializable {
- private static final long serialVersionUID = 1562011791394529076L;
+ private static final long serialVersionUID = 5447356026236056885L;
@Column(name = "MODULE")
@ApiParam("组件")
private String module;
diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesTorqueDetail.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesTorqueDetail.java
index 570ffd1..56743f5 100644
--- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesTorqueDetail.java
+++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesTorqueDetail.java
@@ -29,8 +29,8 @@ import java.io.Serializable;
@Table(name = "MES_TORQUE_DETAIL")
@Api("扭矩信息记录表")
public class MesTorqueDetail extends BaseBean implements Serializable {
- private static final long serialVersionUID = 2900363253333046861L;
+ private static final long serialVersionUID = 8916087884118304236L;
@Column(name = "SN")
@ApiParam("过程条码")
private String serialNumber;
diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkCellPoint.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkCellPoint.java
index cd8463a..ed04956 100644
--- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkCellPoint.java
+++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkCellPoint.java
@@ -32,8 +32,8 @@ import java.util.List;
@Table(name = "MES_WORK_CELL_POINT")
@Api("工站队列")
public class MesWorkCellPoint extends BaseBean implements Serializable {
- private static final long serialVersionUID = -6817903235638554748L;
+ private static final long serialVersionUID = -6817903235638554748L;
@Column(name = "WORK_CENTER_CODE")
@ApiParam("工作中心")
private String workCenterCode;
diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkCellPointGroup.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkCellPointGroup.java
index 9b36072..53ce112 100644
--- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkCellPointGroup.java
+++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkCellPointGroup.java
@@ -29,8 +29,8 @@ import java.io.Serializable;
@Table(name = "MES_WORK_CELL_POINT_GROUP")
@Api("工站分组队列")
public class MesWorkCellPointGroup extends BaseBean implements Serializable {
- private static final long serialVersionUID = -6817903235638554748L;
+ private static final long serialVersionUID = -7544627137183733563L;
@Column(name = "WORK_CENTER_CODE")
@ApiParam("工作中心")
private String workCenterCode;
diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/EsProductDataModule.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/EsProductDataModule.java
index 151b5ef..bc6bb5f 100644
--- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/EsProductDataModule.java
+++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/EsProductDataModule.java
@@ -23,8 +23,7 @@ import java.util.ArrayList;
@ElasticSearch
public class EsProductDataModule extends BaseBean implements Serializable {
- private static final long serialVersionUID = 4514407617515827040L;
-
+ private static final long serialVersionUID = -5907453749571718168L;
@ApiParam("工作中心")
private String workCenterCode;
diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/IfQcOrderDataModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/IfQcOrderDataModel.java
new file mode 100644
index 0000000..c3f6856
--- /dev/null
+++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/IfQcOrderDataModel.java
@@ -0,0 +1,94 @@
+package cn.estsh.i3plus.pojo.mes.model;
+
+import cn.estsh.i3plus.pojo.base.bean.BaseBean;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiParam;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+/**
+ * @Description:
+ * @Reference:
+ * @Author: jessica.chen
+ * @CreateDate: 2019\11\18 9:34
+ * @Modify:
+ **/
+@Data
+@NoArgsConstructor
+@AllArgsConstructor
+@Api("QC质检单model")
+public class IfQcOrderDataModel extends BaseBean {
+
+ @ApiParam("ruid")
+ private Long ruid;
+
+ @ApiParam("收货流水号")
+ private Long uuid;
+
+ @ApiParam("域")
+ private String werks;
+
+ @ApiParam("地点")
+ private String lgort;
+
+ @ApiParam("收货库位")
+ private String wlbrt;
+
+ @ApiParam("单据号")
+ private String refid;
+
+ @ApiParam("行号")
+ private Integer zeile;
+
+ @ApiParam("业务类型")
+ private String action;
+
+ @ApiParam("供应商编码")
+ private String lifnr;
+
+ @ApiParam("物料编码")
+ private String matnr;
+
+ @ApiParam("收货数量")
+ private Double erfmg;
+
+ @ApiParam("计量单位")
+ private String erfme;
+
+ @ApiParam("检验编号")
+ private String chkno;
+
+ @ApiParam("炉批号")
+ private String stono;
+
+ @ApiParam("收货日期")
+ private String zpost;
+
+ @ApiParam("收货时间")
+ private String ztime;
+
+ @ApiParam("添加日期")
+ private String addtimeYmd;
+
+ @ApiParam("添加时间")
+ private String addtimeHms;
+
+ @ApiParam("处理日期")
+ private String finishtimeYmd;
+
+ @ApiParam("处理时间")
+ private String finishtimeHms;
+
+ @ApiParam("删除标记")
+ private Integer deleteFlag;
+
+ @ApiParam("读取标识")
+ private Integer readFlag;
+
+ @ApiParam("错误代码")
+ private String errCode;
+
+ @ApiParam("错误信息")
+ private String errMsg;
+}
diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/IfQcOrderRcCheckModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/IfQcOrderRcCheckModel.java
new file mode 100644
index 0000000..c8c44fe
--- /dev/null
+++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/IfQcOrderRcCheckModel.java
@@ -0,0 +1,73 @@
+package cn.estsh.i3plus.pojo.mes.model;
+
+import cn.estsh.i3plus.pojo.base.bean.BaseBean;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiParam;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+/**
+ * @Description:
+ * @Reference:
+ * @Author: jessica.chen
+ * @CreateDate: 2019\11\18 9:34
+ * @Modify:
+ **/
+@Data
+@NoArgsConstructor
+@AllArgsConstructor
+@Api("QC质检单model（发货检验）")
+public class IfQcOrderRcCheckModel extends BaseBean {
+
+ @ApiParam("Ruid")
+ private Long ruid;
+
+ @ApiParam("单据号")
+ private String orderNo;
+
+ @ApiParam("发运时间")
+ private String deliveryDate;
+
+ @ApiParam("客户代码")
+ private String customerCode;
+
+ @ApiParam("零件号")
+ private String partNo;
+
+ @ApiParam("计划数量")
+ private Double orderQty;
+
+ @ApiParam("工厂代码")
+ private String factoryCode;
+
+ @ApiParam("客户发往地代码")
+ private String customerDeliveryCode;
+
+ @ApiParam("物流供应商")
+ private String option1;
+
+ @ApiParam("业务类型")
+ private String checkType;
+
+ @ApiParam("到达时间")
+ private Double arrivalDate;
+
+ @ApiParam("运输方式")
+ private String transportTypeDesc;
+
+ @ApiParam("发出地")
+ private String srcSite;
+
+ @ApiParam("发往地")
+ private String destSite;
+
+ @ApiParam("运输类型")
+ private String transportClass;
+
+ @ApiParam("同步状态")
+ private Integer syncStatus;
+
+ @ApiParam("错误信息")
+ private String errMsg;
+}
diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesPartFormulaModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesPartFormulaModel.java
index 635c74d..4a4db6e 100644
--- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesPartFormulaModel.java
+++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesPartFormulaModel.java
@@ -18,8 +18,7 @@ import lombok.Data;
@Api(value="生产配方模板",description = "生产配方模板")
public class MesPartFormulaModel extends BaseBean {
- private static final long serialVersionUID = 2167743108452607620L;
-
+ private static final long serialVersionUID = 5790342327875844545L;
@ApiParam(value = "组号")
@AnnoOutputColumn
private String groupNo;
diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/StepParamsModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/StepParamsModel.java
index a2464b7..509e085 100644
--- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/StepParamsModel.java
+++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/StepParamsModel.java
@@ -16,8 +16,8 @@ import java.util.Map;
@Data
@Api("下拉工步参数对象")
public class StepParamsModel implements Serializable {
- private static final long serialVersionUID = -6361645141217616499L;
+ private static final long serialVersionUID = -4418226170535844209L;
@ApiParam("参数代码")
private String paramCode;
diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/IfQcOrderRepository.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/IfQcOrderRepository.java
new file mode 100644
index 0000000..64fe700
--- /dev/null
+++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/IfQcOrderRepository.java
@@ -0,0 +1,15 @@
+package cn.estsh.i3plus.pojo.mes.repository;
+
+import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
+import cn.estsh.i3plus.pojo.mes.bean.IfPackageDetail;
+import cn.estsh.i3plus.pojo.mes.bean.IfQcOrder;
+
+/**
+ * @Description:
+ * @Reference:
+ * @Author: joke.wang
+ * @CreateDate: 2019\11\18 10:34
+ * @Modify:
+ **/
+public interface IfQcOrderRepository extends BaseRepository {
+}
diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/IfQcResultRepository.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/IfQcResultRepository.java
new file mode 100644
index 0000000..1b3b78f
--- /dev/null
+++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/IfQcResultRepository.java
@@ -0,0 +1,14 @@
+package cn.estsh.i3plus.pojo.mes.repository;
+
+import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
+import cn.estsh.i3plus.pojo.mes.bean.IfQcResult;
+
+/**
+ * @Description:
+ * @Reference:
+ * @Author: joke.wang
+ * @CreateDate: 2019\11\18 10:34
+ * @Modify:
+ **/
+public interface IfQcResultRepository extends BaseRepository {
+}
diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesLoopQcGenerateDetailRepository.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesLoopQcGenerateDetailRepository.java
new file mode 100644
index 0000000..adc7e25
--- /dev/null
+++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesLoopQcGenerateDetailRepository.java
@@ -0,0 +1,15 @@
+package cn.estsh.i3plus.pojo.mes.repository;
+
+import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
+import cn.estsh.i3plus.pojo.mes.bean.IfPackageDetail;
+import cn.estsh.i3plus.pojo.mes.bean.MesLoopQcGenerateDetail;
+
+/**
+ * @Description:
+ * @Reference:
+ * @Author: joke.wang
+ * @CreateDate: 2019\11\18 10:34
+ * @Modify:
+ **/
+public interface MesLoopQcGenerateDetailRepository extends BaseRepository {
+}
diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesPartStockScheduleRepository.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesPartStockScheduleRepository.java
new file mode 100644
index 0000000..fc15bd5
--- /dev/null
+++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesPartStockScheduleRepository.java
@@ -0,0 +1,15 @@
+package cn.estsh.i3plus.pojo.mes.repository;
+
+import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
+import cn.estsh.i3plus.pojo.mes.bean.MesPartStockSchedule;
+import org.springframework.stereotype.Repository;
+
+/**
+ * @Description:
+ * @Author: jokelin
+ * @Date: 2020/5/12 5:57 下午
+ * @Modify:
+ */
+@Repository
+public interface MesPartStockScheduleRepository extends BaseRepository {
+}
diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesQcOrderDetailRepository.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesQcOrderDetailRepository.java
new file mode 100644
index 0000000..794d6ff
--- /dev/null
+++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesQcOrderDetailRepository.java
@@ -0,0 +1,16 @@
+package cn.estsh.i3plus.pojo.mes.repository;
+
+import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
+import cn.estsh.i3plus.pojo.mes.bean.MesQcOrderDetail;
+import org.springframework.stereotype.Repository;
+
+/**
+ * @Description:
+ * @Reference:
+ * @Author: wangjie
+ * @CreateDate:2019-09-18-17:13
+ * @Modify:
+ **/
+@Repository
+public interface MesQcOrderDetailRepository extends BaseRepository {
+}
diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesQcOrderRepository.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesQcOrderRepository.java
new file mode 100644
index 0000000..f503196
--- /dev/null
+++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesQcOrderRepository.java
@@ -0,0 +1,16 @@
+package cn.estsh.i3plus.pojo.mes.repository;
+
+import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
+import cn.estsh.i3plus.pojo.mes.bean.MesQcOrder;
+import org.springframework.stereotype.Repository;
+
+/**
+ * @Description:
+ * @Reference:
+ * @Author: wangjie
+ * @CreateDate:2019-09-18-17:13
+ * @Modify:
+ **/
+@Repository
+public interface MesQcOrderRepository extends BaseRepository {
+}
diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java
index de26317..644faba 100644
--- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java
+++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java
@@ -946,6 +946,9 @@ public class MesHqlPack {
if (!StringUtils.isEmpty(qcOrder.getSupplierCode())) {
DdlPreparedPack.getStringEqualPack(qcOrder.getSupplierCode(), "supplierCode", packBean);
}
+ if (!StringUtils.isEmpty(qcOrder.getCheckType())) {
+ DdlPreparedPack.getNumEqualPack(qcOrder.getCheckType(), "checkType", packBean);
+ }
// 时间段查询
if (!StringUtils.isEmpty(qcOrder.getCreateDateTimeStart()) || !StringUtils.isEmpty(qcOrder.getCreateDateTimeEnd())) {
DdlPreparedPack.timeBuilder(
@@ -973,6 +976,9 @@ public class MesHqlPack {
if (!StringUtils.isEmpty(qcOrderDetail.getOrderNo())) {
DdlPreparedPack.getStringEqualPack(qcOrderDetail.getOrderNo(), "orderNo", packBean);
}
+ if (!StringUtils.isEmpty(qcOrderDetail.getCheckType())) {
+ DdlPreparedPack.getNumEqualPack(qcOrderDetail.getCheckType(), "checkType", packBean);
+ }
return packBean;
}
diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesPcnHqlPack.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesPcnHqlPack.java
index da8091d..e54b01b 100644
--- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesPcnHqlPack.java
+++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesPcnHqlPack.java
@@ -3,6 +3,7 @@ package cn.estsh.i3plus.pojo.mes.sqlpack;
import cn.estsh.i3plus.pojo.base.bean.BaseBean;
import cn.estsh.i3plus.pojo.base.bean.DdlPackBean;
import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil;
+import cn.estsh.i3plus.pojo.base.enumutil.ImppEnumUtil;
import cn.estsh.i3plus.pojo.base.enumutil.MesPcnEnumUtil;
import cn.estsh.i3plus.pojo.base.tool.DdlPreparedPack;
import cn.estsh.i3plus.pojo.mes.bean.*;
@@ -437,4 +438,22 @@ public class MesPcnHqlPack {
return packBean;
}
+
+ /**
+ * 获取工作中心下所有的投料数据
+ *
+ * @param mesQcOrderDetail
+ * @param organizeCode
+ * @return
+ */
+ public static DdlPackBean getMesQcOrderDetail(MesQcOrderDetail mesQcOrderDetail, String organizeCode) {
+ DdlPackBean packBean = getAllBaseData(organizeCode);
+ DdlPreparedPack.getStringEqualPack(mesQcOrderDetail.getOrderNo(), "orderNo", packBean);
+ DdlPreparedPack.getNumEqualPack(mesQcOrderDetail.getCheckType(), "checkType", packBean);
+ DdlPreparedPack.getStringEqualPack(mesQcOrderDetail.getCheckItemType(), "checkItemType", packBean);
+ if(mesQcOrderDetail.getCheckType() == MesPcnEnumUtil.MES_QC_CHECK_TYPE.FIRST_CHECK.getValue()){
+ DdlPreparedPack.getNumEqualPack(mesQcOrderDetail.getFinishQty()+1, "itemNo", packBean);
+ }
+ return packBean;
+ }
}
diff --git a/modules/i3plus-pojo-model/pom.xml b/modules/i3plus-pojo-model/pom.xml
index 846c302..efacfd2 100644
--- a/modules/i3plus-pojo-model/pom.xml
+++ b/modules/i3plus-pojo-model/pom.xml
@@ -12,7 +12,6 @@
i3plus-pojo-model
jar
- 1.0-TEST-SNAPSHOT
diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/common/CloudPagerModel.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/common/CloudPagerModel.java
index 29a4dbf..39f66b1 100644
--- a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/common/CloudPagerModel.java
+++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/common/CloudPagerModel.java
@@ -4,6 +4,8 @@ import cn.estsh.i3plus.pojo.base.common.Pager;
import io.swagger.annotations.ApiParam;
import lombok.Data;
+import java.io.Serializable;
+
/**
* @Description :
* @Reference :
@@ -12,8 +14,9 @@ import lombok.Data;
* @Modify:
**/
@Data
-public class CloudPagerModel {
+public class CloudPagerModel implements Serializable {
+ private static final long serialVersionUID = 3091924006138375461L;
@ApiParam("查询对象")
private T obj;
diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/dynamic/table/DynTableCell.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/dynamic/table/DynTableCell.java
index 282c308..e6cc61a 100644
--- a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/dynamic/table/DynTableCell.java
+++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/dynamic/table/DynTableCell.java
@@ -2,19 +2,19 @@ package cn.estsh.i3plus.pojo.model.dynamic.table;
import lombok.Data;
-import java.util.Date;
+import java.io.Serializable;
/**
* @Description :
* @Reference :
* @Author : Adair Peng
* @CreateDate : 2018-12-11 15:37
- * @Modify:
- * 动态 Table 单元格
+ * @Modify: 动态 Table 单元格
**/
@Data
-public class DynTableCell {
+public class DynTableCell implements Serializable {
+ private static final long serialVersionUID = 3798664031371975269L;
// 单元格名称
private String cellKey;
// 排序
diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/dynamic/table/DynTableRow.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/dynamic/table/DynTableRow.java
index 29b1b17..56e1cb7 100644
--- a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/dynamic/table/DynTableRow.java
+++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/dynamic/table/DynTableRow.java
@@ -2,6 +2,7 @@ package cn.estsh.i3plus.pojo.model.dynamic.table;
import lombok.Data;
+import java.io.Serializable;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
@@ -12,12 +13,12 @@ import java.util.Map;
* @Reference :
* @Author : Adair Peng
* @CreateDate : 2018-12-11 15:37
- * @Modify:
- * 动态Table Row
+ * @Modify: 动态Table Row
**/
@Data
-public class DynTableRow {
+public class DynTableRow implements Serializable {
+ private static final long serialVersionUID = 2012638500620164166L;
// 是否选中
private boolean isChecked;
@@ -31,11 +32,11 @@ public class DynTableRow {
private Integer cellSize = 0;
// 行数据
- private Map cellMap = new HashMap<>();
+ private Map cellMap = new HashMap<>();
- public DynTableRow putCell(DynTableCell cell){
- this.cellMap.put(cell.getCellKey(),cell);
+ public DynTableRow putCell(DynTableCell cell) {
+ this.cellMap.put(cell.getCellKey(), cell);
return this;
}
@@ -45,8 +46,10 @@ public class DynTableRow {
/**
* 禁止外部给 Size 赋值
+ *
* @param cellSize
*/
- private void setCellSize(Integer cellSize) { }
+ private void setCellSize(Integer cellSize) {
+ }
}
diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/dynamic/table/ImppDynTable.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/dynamic/table/ImppDynTable.java
index 047823a..91b5885 100644
--- a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/dynamic/table/ImppDynTable.java
+++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/dynamic/table/ImppDynTable.java
@@ -2,9 +2,8 @@ package cn.estsh.i3plus.pojo.model.dynamic.table;
import lombok.Data;
-import java.util.ArrayList;
+import java.io.Serializable;
import java.util.HashMap;
-import java.util.List;
import java.util.Map;
/**
@@ -12,14 +11,14 @@ import java.util.Map;
* @Reference :
* @Author : Adair Peng
* @CreateDate : 2018-12-11 15:37
- * @Modify:
- * 动态Table Row
+ * @Modify: 动态Table Row
**/
@Data
-public class ImppDynTable {
+public class ImppDynTable implements Serializable {
+ private static final long serialVersionUID = 6634878862426951453L;
// 行数据
- private Map table = new HashMap<>();
+ private Map table = new HashMap<>();
// 表单标题
private String tableTitle;
diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/form/BfButtonOperateDataModel.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/form/BfButtonOperateDataModel.java
index 65eebf5..86eba82 100644
--- a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/form/BfButtonOperateDataModel.java
+++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/form/BfButtonOperateDataModel.java
@@ -7,6 +7,7 @@ import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
+import java.io.Serializable;
import java.util.List;
import java.util.Map;
@@ -19,8 +20,9 @@ import java.util.Map;
**/
@Data
@ApiModel("按钮操作数据模型")
-public class BfButtonOperateDataModel {
+public class BfButtonOperateDataModel implements Serializable {
+ private static final long serialVersionUID = 5592739471208814372L;
@ApiModelProperty("按钮id")
private Long buttonId;
@@ -28,7 +30,7 @@ public class BfButtonOperateDataModel {
private Long elementId;
@ApiModelProperty("操作数据")
- private List> operateData;
+ private List> operateData;
@ApiModelProperty("按钮功能关系信息")
private BfRefButtonMethod bfRefButtonMethod;
diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/form/CloudFormModel.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/form/CloudFormModel.java
index 57198b7..74edf0d 100644
--- a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/form/CloudFormModel.java
+++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/form/CloudFormModel.java
@@ -3,10 +3,9 @@ package cn.estsh.i3plus.pojo.model.form;
import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil;
import cn.estsh.i3plus.pojo.form.bean.BfDataObject;
import cn.estsh.i3plus.pojo.form.bean.BfDataObjectProperty;
-import io.swagger.annotations.ApiParam;
import lombok.Data;
-import org.apache.commons.lang3.StringUtils;
+import java.io.Serializable;
import java.util.List;
import java.util.Map;
@@ -18,8 +17,9 @@ import java.util.Map;
* @Modify:
**/
@Data
-public class CloudFormModel {
+public class CloudFormModel implements Serializable {
+ private static final long serialVersionUID = -4880909594223592633L;
private BfDataObject dataObject;
// 数据源编码
@@ -28,38 +28,38 @@ public class CloudFormModel {
private String dataObjectCode; // 任何操作必填 必须真实
// 单条插入
- private Map insert;
+ private Map insert;
// 单条修改
- private Map update;
+ private Map update;
// 新增数据
- private List> insertList;
+ private List> insertList;
// 修改条件
// private List updateConditionList;
// 修改数据
- private List> updateList;
+ private List> updateList;
// 查询数据
private List selectList;
// 删除数据
- private List> deleteList;
+ private List> deleteList;
- private Map delete;
+ private Map delete;
public String orderByParam;
public Integer ascOrDesc = 1;
- public String orderBy(){
+ public String orderBy() {
String result = "";
- if (orderByParam!=null&&orderByParam.trim().length()>0) {
+ if (orderByParam != null && orderByParam.trim().length() > 0) {
result = " order by " + orderByParam;
- if(ascOrDesc == CommonEnumUtil.ASC_OR_DESC.ASC.getValue()) {
+ if (ascOrDesc == CommonEnumUtil.ASC_OR_DESC.ASC.getValue()) {
result += " asc";
- }else{
+ } else {
result += " desc";
}
}
diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/form/ElementFormModel.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/form/ElementFormModel.java
index d39de03..05ca62a 100644
--- a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/form/ElementFormModel.java
+++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/form/ElementFormModel.java
@@ -5,6 +5,8 @@ import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
import io.swagger.annotations.ApiParam;
import lombok.Data;
+import java.io.Serializable;
+
/**
* @Description : 数据操作Model
* @Reference :
@@ -13,8 +15,9 @@ import lombok.Data;
* @Modify:
**/
@Data
-public class ElementFormModel {
+public class ElementFormModel implements Serializable {
+ private static final long serialVersionUID = 3215723235918474591L;
//外键关联数据对象主键
@ApiParam(value = "元素ID", example = "-1")
@JsonSerialize(using = ToStringSerializer.class)
diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/form/ElementModel.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/form/ElementModel.java
index 9954438..b1d2b85 100644
--- a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/form/ElementModel.java
+++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/form/ElementModel.java
@@ -1,6 +1,5 @@
package cn.estsh.i3plus.pojo.model.form;
-import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn;
import cn.estsh.i3plus.pojo.base.common.Pager;
import cn.estsh.i3plus.pojo.form.bean.*;
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
@@ -8,8 +7,7 @@ import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
import io.swagger.annotations.ApiParam;
import lombok.Data;
-import javax.persistence.Column;
-import javax.persistence.Transient;
+import java.io.Serializable;
import java.util.List;
/**
@@ -20,8 +18,9 @@ import java.util.List;
* @Modify:
**/
@Data
-public class ElementModel{
+public class ElementModel implements Serializable {
+ private static final long serialVersionUID = -8009888251366822835L;
//外键关联数据对象主键
@ApiParam(value = "对象元素ID", example = "-1")
@JsonSerialize(using = ToStringSerializer.class)
@@ -64,7 +63,7 @@ public class ElementModel{
public String orderByParam;
//CommonEnumUtil.ASC_OR_DESC 1 asc,2 desc
- @ApiParam(value = "排序类型，1 正序，2 倒序",example = "1")
+ @ApiParam(value = "排序类型，1 正序，2 倒序", example = "1")
public Integer ascOrDesc = 1;
}
diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/form/FormModel.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/form/FormModel.java
index e8cc46b..eb23800 100644
--- a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/form/FormModel.java
+++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/form/FormModel.java
@@ -4,16 +4,17 @@ import cn.estsh.i3plus.pojo.form.bean.*;
import io.swagger.annotations.ApiParam;
import lombok.Data;
+import java.io.Serializable;
import java.util.List;
/**
* @Description : 表单模型
*
- * 表单功能
- * 布局 功能明细
- * 自定义按钮
- * 元素
- * 元素按钮
+ * 表单功能
+ * 布局 功能明细
+ * 自定义按钮
+ * 元素
+ * 元素按钮
*
* @Reference :
* @Author : Adair Peng
@@ -21,8 +22,9 @@ import java.util.List;
* @Modify:
**/
@Data
-public class FormModel {
+public class FormModel implements Serializable {
+ private static final long serialVersionUID = 146034689646326300L;
// 表单功能
@ApiParam(value = "表单功能")
private BfMethod method;
diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/form/FormOperateDataModel.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/form/FormOperateDataModel.java
index 3eb5e7a..d215bb5 100644
--- a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/form/FormOperateDataModel.java
+++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/form/FormOperateDataModel.java
@@ -7,6 +7,7 @@ import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.NoArgsConstructor;
+import java.io.Serializable;
import java.util.List;
import java.util.Map;
@@ -20,8 +21,9 @@ import java.util.Map;
@Data
@ApiModel("表单操作数据模型")
@NoArgsConstructor
-public class FormOperateDataModel {
+public class FormOperateDataModel implements Serializable {
+ private static final long serialVersionUID = 7674678844523192310L;
@ApiModelProperty("关联标识")
private String refId;
@@ -36,6 +38,6 @@ public class FormOperateDataModel {
private String sourceName;
@ApiModelProperty("操作数据集合")
- private List> operateDataList;
+ private List> operateDataList;
}
diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/form/SqlColumnModel.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/form/SqlColumnModel.java
index ae774f8..bc5daaf 100644
--- a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/form/SqlColumnModel.java
+++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/form/SqlColumnModel.java
@@ -1,10 +1,11 @@
package cn.estsh.i3plus.pojo.model.form;
-import cn.estsh.i3plus.pojo.base.enumutil.BlockFormEnumUtil;
import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil;
import io.swagger.annotations.ApiParam;
import lombok.Data;
+import java.io.Serializable;
+
/**
* @Description :
* @Reference :
@@ -13,8 +14,9 @@ import lombok.Data;
* @Modify:
**/
@Data
-public class SqlColumnModel {
-// isAutoIncrement true isNullable 0 isSigned true getColumnDisplaySize 11 getColumnLabel id getColumnName id getSchemaName getPrecision 11 getScale 0 getTableName interceptor getColumnType 4 getColumnTypeName INT getColumnClassName java.lang.Integer
+public class SqlColumnModel implements Serializable {
+ private static final long serialVersionUID = -8437573966195980847L;
+ // isAutoIncrement true isNullable 0 isSigned true getColumnDisplaySize 11 getColumnLabel id getColumnName id getSchemaName getPrecision 11 getScale 0 getTableName interceptor getColumnType 4 getColumnTypeName INT getColumnClassName java.lang.Integer
// isAutoIncrement false isNullable 1 isSigned false getColumnDisplaySize 50 getColumnLabel name getColumnName name getSchemaName getPrecision 50 getScale 0 getTableName interceptor getColumnType 12 getColumnTypeName VARCHAR getColumnClassName java.lang.String
// isAutoIncrement false isNullable 1 isSigned true getColumnDisplaySize 11 getColumnLabel age getColumnName age getSchemaName getPrecision 11 getScale 0 getTableName interceptor getColumnType 4 getColumnTypeName INT getColumnClassName java.lang.Integer
// isAutoIncrement false isNullable 1 isSigned false getColumnDisplaySize 19 getColumnLabel date_time getColumnName date_time getSchemaName getPrecision 19 getScale 0 getTableName interceptor getColumnType 93 getColumnTypeName TIMESTAMP getColumnClassName java.sql.Timestamp
diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/form/SqlCreateDllModel.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/form/SqlCreateDllModel.java
index a518608..5f03036 100644
--- a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/form/SqlCreateDllModel.java
+++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/form/SqlCreateDllModel.java
@@ -1,12 +1,9 @@
package cn.estsh.i3plus.pojo.model.form;
-import cn.estsh.i3plus.pojo.form.bean.BfDataObject;
-import io.swagger.annotations.ApiParam;
import lombok.Data;
-import org.apache.commons.lang3.StringUtils;
+import java.io.Serializable;
import java.util.List;
-import java.util.Objects;
/**
* @Description :
@@ -16,8 +13,9 @@ import java.util.Objects;
* @Modify:
**/
@Data
-public class SqlCreateDllModel {
+public class SqlCreateDllModel implements Serializable {
+ private static final long serialVersionUID = -1294648161172538340L;
private String tableCat;
private String tableSchem;
private String tableName;
@@ -29,6 +27,6 @@ public class SqlCreateDllModel {
private String selfReferencingColName;
private String refGeneration;
- List columnlist ;
+ List columnlist;
}
diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/form/SqlScriptModel.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/form/SqlScriptModel.java
index 90d9313..b3dd987 100644
--- a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/form/SqlScriptModel.java
+++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/form/SqlScriptModel.java
@@ -6,6 +6,7 @@ import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
import io.swagger.annotations.ApiParam;
import lombok.Data;
+import java.io.Serializable;
import java.util.List;
/**
@@ -16,14 +17,15 @@ import java.util.List;
* @Modify:
**/
@Data
-public class SqlScriptModel {
+public class SqlScriptModel implements Serializable {
+ private static final long serialVersionUID = 512077813851983749L;
@ApiParam(value = "对象元素ID")
@JsonSerialize(using = ToStringSerializer.class)
private Long elementId;
@ApiParam(value = "元素内容")
- private String elementContent ;
+ private String elementContent;
@ApiParam(value = "动态对象Class")
private Class dynClass;
diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/form/WmsPackageModel.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/form/WmsPackageModel.java
index c9c9845..9cb7ac3 100644
--- a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/form/WmsPackageModel.java
+++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/form/WmsPackageModel.java
@@ -3,6 +3,7 @@ package cn.estsh.i3plus.pojo.model.form;
import cn.estsh.i3plus.pojo.wms.bean.WmsPackage;
import lombok.Data;
+import java.io.Serializable;
import java.util.List;
/**
@@ -13,8 +14,9 @@ import java.util.List;
* @Modify:
**/
@Data
-public class WmsPackageModel {
+public class WmsPackageModel implements Serializable {
+ private static final long serialVersionUID = -6308064202329492679L;
List wmsPackageList;
}
diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/lac/LacCommandStackModel.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/lac/LacCommandStackModel.java
index ddcfd44..1911043 100644
--- a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/lac/LacCommandStackModel.java
+++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/lac/LacCommandStackModel.java
@@ -5,6 +5,8 @@ import cn.estsh.i3plus.pojo.lac.bean.LacCommandStackStepTask;
import lombok.Data;
import org.slf4j.LoggerFactory;
+import java.io.Serializable;
+
/**
* @Description : lac指令集model
* @Reference :
@@ -13,8 +15,9 @@ import org.slf4j.LoggerFactory;
* @Modify:
**/
@Data
-public class LacCommandStackModel {
+public class LacCommandStackModel implements Serializable {
+ private static final long serialVersionUID = -8453748548383071954L;
/**
* 指令集记录id
*/
@@ -46,17 +49,17 @@ public class LacCommandStackModel {
private Exception exception;
- public void setException(Exception exception){
- LoggerFactory.getLogger("YYYY").error("异常信息：{}",exception);
+ public void setException(Exception exception) {
+ LoggerFactory.getLogger("YYYY").error("异常信息：{}", exception);
this.exception = exception;
}
- public void setCommandStackRecord(LacCommandStackRecord commandStackRecord){
+ public void setCommandStackRecord(LacCommandStackRecord commandStackRecord) {
this.commandStackRecord = commandStackRecord;
this.recordId = commandStackRecord.getId();
}
- public Object getTaskRequestParam(LacCommandStackStepTask stepTask){
+ public Object getTaskRequestParam(LacCommandStackStepTask stepTask) {
for (Task task : this.getRequest().getTaskList()) {
// 步骤代码为空时匹配所有任务参数
if (task.getStepCode() == null && task.getCode().equals(stepTask.getTaskCodeRdd())) {
@@ -69,8 +72,8 @@ public class LacCommandStackModel {
return null;
}
- public Long getRecordId(){
- if(recordId == null &&this.commandStackRecord !=null){
+ public Long getRecordId() {
+ if (recordId == null && this.commandStackRecord != null) {
this.recordId = this.commandStackRecord.getId();
}
return recordId;
diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/lac/LacSuitRequest.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/lac/LacSuitRequest.java
index 005846b..3977d09 100644
--- a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/lac/LacSuitRequest.java
+++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/lac/LacSuitRequest.java
@@ -3,6 +3,8 @@ package cn.estsh.i3plus.pojo.model.lac;
import cn.estsh.i3plus.pojo.base.annotation.XStreamCDATA;
import com.thoughtworks.xstream.annotations.XStreamAlias;
import lombok.Data;
+
+import java.io.Serializable;
import java.util.List;
/**
@@ -14,8 +16,9 @@ import java.util.List;
**/
@Data
@XStreamAlias("request")
-public class LacSuitRequest {
+public class LacSuitRequest implements Serializable {
+ private static final long serialVersionUID = 9078681515190902399L;
/**
* 指令集代码
*/
diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/lac/LacSuitResponse.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/lac/LacSuitResponse.java
index 46a58d5..0a22ea5 100644
--- a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/lac/LacSuitResponse.java
+++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/lac/LacSuitResponse.java
@@ -4,6 +4,8 @@ import cn.estsh.i3plus.pojo.base.enumutil.ResourceEnumUtil;
import com.thoughtworks.xstream.annotations.XStreamAlias;
import lombok.Data;
+import java.io.Serializable;
+
/**
* @Description : lac 适配响应信息
* @Reference :
@@ -13,8 +15,9 @@ import lombok.Data;
**/
@Data
@XStreamAlias("response")
-public class LacSuitResponse {
+public class LacSuitResponse implements Serializable {
+ private static final long serialVersionUID = -4119301611637726729L;
/**
* 是否成功
*/
@@ -35,7 +38,7 @@ public class LacSuitResponse {
*/
private Object result;
- public LacSuitResponse(){
+ public LacSuitResponse() {
this.success = true;
this.code = ResourceEnumUtil.MESSAGE.SUCCESS.getCode();
this.message = ResourceEnumUtil.MESSAGE.SUCCESS.getDescription();
diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/lac/Task.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/lac/Task.java
index ce9d8c2..143d11d 100644
--- a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/lac/Task.java
+++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/lac/Task.java
@@ -4,6 +4,8 @@ import cn.estsh.i3plus.pojo.base.annotation.XStreamCDATA;
import com.thoughtworks.xstream.annotations.XStreamAlias;
import lombok.Data;
+import java.io.Serializable;
+
/**
* @Description :
* @Reference :
@@ -13,8 +15,9 @@ import lombok.Data;
**/
@Data
@XStreamAlias("task")
-public class Task {
+public class Task implements Serializable {
+ private static final long serialVersionUID = 1504165068471696209L;
private String code;
private String stepCode;
diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/lac/TaskParam.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/lac/TaskParam.java
index 40bc9c6..2007630 100644
--- a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/lac/TaskParam.java
+++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/lac/TaskParam.java
@@ -5,6 +5,8 @@ import com.thoughtworks.xstream.annotations.XStreamConverter;
import com.thoughtworks.xstream.converters.extended.ToAttributedValueConverter;
import lombok.Data;
+import java.io.Serializable;
+
/**
* @Description :
* @Reference :
@@ -14,9 +16,10 @@ import lombok.Data;
**/
@Data
@XStreamAlias("param")
-@XStreamConverter(value= ToAttributedValueConverter.class, strings={"value"})
-public class TaskParam {
+@XStreamConverter(value = ToAttributedValueConverter.class, strings = {"value"})
+public class TaskParam implements Serializable {
+ private static final long serialVersionUID = 749532390986966416L;
private String name;
private String value;
diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/license/ImppLicenseSenseshield.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/license/ImppLicenseSenseshield.java
index 4606b0e..d011da9 100644
--- a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/license/ImppLicenseSenseshield.java
+++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/license/ImppLicenseSenseshield.java
@@ -2,6 +2,8 @@ package cn.estsh.i3plus.pojo.model.license;
import lombok.Data;
+import java.io.Serializable;
+
/**
* @Description :
* @Reference :
@@ -10,9 +12,10 @@ import lombok.Data;
* @Modify:
**/
@Data
-public class ImppLicenseSenseshield {
+public class ImppLicenseSenseshield implements Serializable {
+ private static final long serialVersionUID = 3227502901235303725L;
/**
* license_id : 170817
* enable : true
diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/report/BrDataSourceModel.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/report/BrDataSourceModel.java
index e23b1ad..99af036 100644
--- a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/report/BrDataSourceModel.java
+++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/report/BrDataSourceModel.java
@@ -4,36 +4,39 @@ import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil;
import io.swagger.annotations.ApiParam;
import lombok.Data;
+import java.io.Serializable;
+
/**
* @Description :
- * 自定义报表数据源传输对象 ， 单纯数据传输使用并不做保存使用
+ * 自定义报表数据源传输对象 ， 单纯数据传输使用并不做保存使用
* @Reference :
* @Author : wei.peng
* @CreateDate : 19-12-5 下午4:02
* @Modify:
**/
@Data
-public class BrDataSourceModel {
+public class BrDataSourceModel implements Serializable {
/**
* 默认数据源信息
*/
public static final BrDataSourceModel DEFAULT_DATA_SOURCE = new BrDataSourceModel("默认数据源", "DEFAULT",
CommonEnumUtil.DATA_SOURCE_TYPE.SOURCE_MARIA_DB.getValue(), null, "使用默认数据源");
+ private static final long serialVersionUID = -5137576929473857749L;
- @ApiParam(value ="数据源名称")
+ @ApiParam(value = "数据源名称")
private String sourceName;
- @ApiParam(value ="数据源编码")
+ @ApiParam(value = "数据源编码")
private String sourceCode;
- @ApiParam(value ="数据源类型",name = "BlockFormEnumUtil.DATA_SOURCE_TYPE")
+ @ApiParam(value = "数据源类型", name = "BlockFormEnumUtil.DATA_SOURCE_TYPE")
private Integer sourceType;
- @ApiParam(value ="数据库名称")
+ @ApiParam(value = "数据库名称")
private String sourceDataBaseName;
- @ApiParam(value ="数据源描述")
+ @ApiParam(value = "数据源描述")
private String sourceDescription;
public BrDataSourceModel() {
diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/report/BrDynamicPageModel.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/report/BrDynamicPageModel.java
index 9dc5df5..d0fdd09 100644
--- a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/report/BrDynamicPageModel.java
+++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/report/BrDynamicPageModel.java
@@ -7,6 +7,7 @@ import cn.estsh.i3plus.pojo.report.bean.BrReport;
import io.swagger.annotations.ApiParam;
import lombok.Data;
+import java.io.Serializable;
import java.util.List;
/**
@@ -17,21 +18,22 @@ import java.util.List;
* @Modify:
**/
@Data
-public class BrDynamicPageModel {
+public class BrDynamicPageModel implements Serializable {
- @ApiParam(value ="报表信息")
+ private static final long serialVersionUID = -5054183081964783780L;
+ @ApiParam(value = "报表信息")
private BrReport report;
- @ApiParam(value ="布局信息")
+ @ApiParam(value = "布局信息")
private BrLayout layout;
@ApiParam(value = "报表排版关系")
private List refReportList;
- @ApiParam(value ="页面元素内容")
+ @ApiParam(value = "页面元素内容")
private List elementList;
- @ApiParam(value ="页面元素内容")
+ @ApiParam(value = "页面元素内容")
private List templateModelList;
}
diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/report/TemplateModel.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/report/TemplateModel.java
index c29a77b..0df0e9c 100644
--- a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/report/TemplateModel.java
+++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/report/TemplateModel.java
@@ -23,17 +23,17 @@ import java.util.Map;
public class TemplateModel implements Serializable {
private static final long serialVersionUID = -6385070202088819367L;
- @ApiParam(value ="视图ID")
+ @ApiParam(value = "视图ID")
@JsonSerialize(using = ToStringSerializer.class)
private Long viewId;
- @ApiParam(value ="视图类型")
+ @ApiParam(value = "视图类型")
private Integer viewType;
- @ApiParam(value ="视图名称")
+ @ApiParam(value = "视图名称")
private String viewName;
- @ApiParam(value ="返回信息")
+ @ApiParam(value = "返回信息")
private String resultMessage;
@ApiParam(value = "查询对象")
@@ -76,7 +76,7 @@ public class TemplateModel implements Serializable {
private Pager pager;
@ApiParam(value = "页面查询条件")
- private Map findParam;
+ private Map findParam;
@ApiParam("执行 HQL ")
private String selectSql;
diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/softswitch/SoftswitchIocModel.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/softswitch/SoftswitchIocModel.java
index b5c8c0a..0be8fb7 100644
--- a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/softswitch/SoftswitchIocModel.java
+++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/softswitch/SoftswitchIocModel.java
@@ -2,6 +2,8 @@ package cn.estsh.i3plus.pojo.model.softswitch;
import lombok.Data;
+import java.io.Serializable;
+
/**
* @Description :
* @Reference :
@@ -10,7 +12,8 @@ import lombok.Data;
* @Modify:
**/
@Data
-public class SoftswitchIocModel {
+public class SoftswitchIocModel implements Serializable {
+ private static final long serialVersionUID = 8945557825392215914L;
/* Spring Ioc Bean 名称 */
private String beanName;
/* Spring Ioc 需要管理的Bean */
diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/softswitch/SuitClientModel.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/softswitch/SuitClientModel.java
index 806c17b..7241fe9 100644
--- a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/softswitch/SuitClientModel.java
+++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/softswitch/SuitClientModel.java
@@ -11,6 +11,8 @@ import com.thoughtworks.xstream.annotations.XStreamOmitField;
import io.swagger.annotations.ApiParam;
import lombok.Data;
+import java.io.Serializable;
+
/**
* @Description :
* @Reference :
@@ -20,8 +22,9 @@ import lombok.Data;
**/
@Data
@XStreamAlias("client")
-public class SuitClientModel {
+public class SuitClientModel implements Serializable {
+ private static final long serialVersionUID = -1073627855304303961L;
/**
* 适配套件代码
*/
@@ -62,12 +65,13 @@ public class SuitClientModel {
*/
private Integer suitMethodId;
- public int getSuitMethodIdVal(){
- if(suitMethodId == null){
+ public int getSuitMethodIdVal() {
+ if (suitMethodId == null) {
return -1;
}
return suitMethodId.intValue();
}
+
/**
* 适配状态码
*/
@@ -98,7 +102,7 @@ public class SuitClientModel {
public SuitClientModel() {
}
- public SuitClientModel(Integer requestSource,BsSuitCaseModel suitCaseModel) {
+ public SuitClientModel(Integer requestSource, BsSuitCaseModel suitCaseModel) {
this.requestSource = requestSource;
this.caseTypeId = suitCaseModel.getBsSuitCase().getCaseTypeId();
@@ -114,7 +118,7 @@ public class SuitClientModel {
this.suitResult = CommonEnumUtil.TRUE_OR_FALSE.TRUE.getValue();
}
- public SuitClientModel(Integer requestSource,Integer suitMethodId,BsSuitCaseModel suitCaseModel) {
+ public SuitClientModel(Integer requestSource, Integer suitMethodId, BsSuitCaseModel suitCaseModel) {
this.requestSource = requestSource;
this.suitMethodId = suitMethodId;
diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/softswitch/SuitImppCloudModel.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/softswitch/SuitImppCloudModel.java
index 83ac2e0..28de3a4 100644
--- a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/softswitch/SuitImppCloudModel.java
+++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/softswitch/SuitImppCloudModel.java
@@ -3,6 +3,8 @@ package cn.estsh.i3plus.pojo.model.softswitch;
import io.swagger.annotations.ApiParam;
import lombok.Data;
+import java.io.Serializable;
+
/**
* @Description :
* @Reference :
@@ -11,8 +13,9 @@ import lombok.Data;
* @Modify:
**/
@Data
-public class SuitImppCloudModel {
+public class SuitImppCloudModel implements Serializable {
+ private static final long serialVersionUID = -8731173690394189107L;
@ApiParam(value = "适配器信息")
private BsSuitCaseModel model;
diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/softswitch/SuitParamModel.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/softswitch/SuitParamModel.java
index ec7dd0a..9963d36 100644
--- a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/softswitch/SuitParamModel.java
+++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/softswitch/SuitParamModel.java
@@ -2,6 +2,7 @@ package cn.estsh.i3plus.pojo.model.softswitch;
import lombok.Data;
+import java.io.Serializable;
import java.util.List;
import java.util.Map;
@@ -13,8 +14,9 @@ import java.util.Map;
* @Modify:
**/
@Data
-public class SuitParamModel {
+public class SuitParamModel implements Serializable {
+ private static final long serialVersionUID = -1695550139368764444L;
/* 标签名称 */
private String tagName;
/* 标签 Class Path */
@@ -36,7 +38,7 @@ public class SuitParamModel {
private String type;
/* 标签属性 */
- private Map attr;
+ private Map attr;
/* 父节点 */
private SuitParamModel parent;
/* 标签子集 */
diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/softswitch/SuitServerModel.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/softswitch/SuitServerModel.java
index cb371c4..e859e21 100644
--- a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/softswitch/SuitServerModel.java
+++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/softswitch/SuitServerModel.java
@@ -12,6 +12,7 @@ import javax.xml.bind.annotation.XmlAccessType;
import javax.xml.bind.annotation.XmlAccessorType;
import javax.xml.bind.annotation.XmlElement;
import javax.xml.bind.annotation.XmlRootElement;
+import java.io.Serializable;
import java.util.List;
import java.util.Map;
@@ -24,10 +25,11 @@ import java.util.Map;
**/
@Data
@XStreamAlias("server")
-@XmlRootElement(name ="server")
+@XmlRootElement(name = "server")
@XmlAccessorType(XmlAccessType.NONE)
-public class SuitServerModel {
+public class SuitServerModel implements Serializable {
+ private static final long serialVersionUID = 3501193688956575386L;
// 执行方法命令
@XmlElement
@ApiParam(value = "适配器code")
@@ -43,7 +45,7 @@ public class SuitServerModel {
// 传输集合
private List list;
// 传输键值对
- private Map map;
+ private Map map;
// 传输 JSON 数据
private String json;
@@ -91,13 +93,13 @@ public class SuitServerModel {
// @XStreamImplicit
private Integer suitMethodId;
- public int getSuitMethodIdVal(){
- if(suitMethodId == null){
+ public int getSuitMethodIdVal() {
+ if (suitMethodId == null) {
return -1;
}
return suitMethodId.intValue();
}
-// @XStreamImplicit
+ // @XStreamImplicit
private String analyzeMessage;
}
diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/test/TestConstructModel.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/test/TestConstructModel.java
index 8f48c15..6729915 100644
--- a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/test/TestConstructModel.java
+++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/test/TestConstructModel.java
@@ -4,8 +4,8 @@ import cn.estsh.i3plus.pojo.platform.bean.TestTransUser;
import lombok.Getter;
import lombok.Setter;
import lombok.ToString;
-import org.aspectj.weaver.ast.Test;
+import java.io.Serializable;
import java.util.List;
/**
@@ -18,8 +18,9 @@ import java.util.List;
@Getter
@Setter
@ToString
-public class TestConstructModel {
+public class TestConstructModel implements Serializable {
+ private static final long serialVersionUID = 3347578209875237950L;
private long id;
private TestTransUser user;
diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/PrintOrderDataModel.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/PrintOrderDataModel.java
index 417c5f1..57c8ee6 100644
--- a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/PrintOrderDataModel.java
+++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/PrintOrderDataModel.java
@@ -73,6 +73,35 @@ public class PrintOrderDataModel implements Serializable {
@Transient
public String containerNo;
+ @ApiParam("道口")
+ @Transient
+ public String dock;
+
+ @ApiParam("泊位")
+ @Transient
+ public String zdoc;
+
+ @Transient
+ @ApiParam("计划交货日期")
+ private String planDate;
+
+ @Transient
+ @ApiParam("计划交货时间")
+ private String planTime;
+
+ @Transient
+ @ApiParam(value = "创建日期查询用，查询起始日期", example = "2018-01-01 01:00:00")
+ @AnnoOutputColumn(hidden = true)
+ public String createDateTimeStart;
+
+ @Transient
+ @ApiParam(value = "创建日期查询用，查询结束日期", example = "2018-12-31 23:59:59")
+ @AnnoOutputColumn(hidden = true)
+ public String createDateTimeEnd;
+
+ @Transient
+ public String createDateTime;
+
public int getBusiDataType() {
if (busiDataType != null) {
return busiDataType.intValue();
diff --git a/modules/i3plus-pojo-platform/pom.xml b/modules/i3plus-pojo-platform/pom.xml
index c94172f..dba12cc 100644
--- a/modules/i3plus-pojo-platform/pom.xml
+++ b/modules/i3plus-pojo-platform/pom.xml
@@ -12,7 +12,6 @@
i3plus-pojo-platform
jar
- 1.0-TEST-SNAPSHOT
diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/platbean/SysLogConsole.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/platbean/SysLogConsole.java
index fd31e35..2ebfb5c 100644
--- a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/platbean/SysLogConsole.java
+++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/platbean/SysLogConsole.java
@@ -1,7 +1,6 @@
package cn.estsh.i3plus.pojo.platform.platbean;
import cn.estsh.i3plus.pojo.base.bean.BaseBean;
-import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil;
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
import io.swagger.annotations.Api;
@@ -32,6 +31,7 @@ import javax.persistence.Table;
public class SysLogConsole extends BaseBean {
+ private static final long serialVersionUID = -6073378683575266830L;
/******** 服务器信息 ********/
@Column(name="SOFT_TYPE")
@ApiParam(value ="产品名称")
@@ -49,9 +49,9 @@ public class SysLogConsole extends BaseBean {
@ApiParam(value ="应用端口")
private Integer logPort;
- @Column(name="LOG_GORP")
+ @Column(name="LOG_GROUP")
@ApiParam(value ="日志分组(控制台日志,操作日志,系统日志,定任务日志)")
- private String logGorp;
+ private String logGroup;
@Column(name="LOG_LEVEL")
@ApiParam(value ="日志等级(OFF > FATAL > ERROR > WARN > INFO > DEBUG > TRACE > ALL)")
diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/platbean/SysLogException.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/platbean/SysLogException.java
index e4b46a1..e561fa3 100644
--- a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/platbean/SysLogException.java
+++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/platbean/SysLogException.java
@@ -31,6 +31,7 @@ import javax.persistence.Table;
@Api(value="系统异常表",description = "记录系统出现的异常")
public class SysLogException extends BaseBean {
+ private static final long serialVersionUID = -2844455884020022321L;
//CommonEnumUtil.SOFT_TYPE
@Indexed
@Column(name="EXC_MODULE_ID")
diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/platbean/SysLogOperate.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/platbean/SysLogOperate.java
index c9d392c..ed652e4 100644
--- a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/platbean/SysLogOperate.java
+++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/platbean/SysLogOperate.java
@@ -34,6 +34,7 @@ import javax.persistence.Table;
@Api(value="操作日志表",description = "操作日志表")
public class SysLogOperate extends BaseBean {
+ private static final long serialVersionUID = 1515035521283176727L;
@Indexed
@Column(name="OPERATE_MODULE")
@ApiParam(value ="系统模块（枚举）", example = "1")
diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/platbean/SysLogSystem.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/platbean/SysLogSystem.java
index 5d81ed5..8919173 100644
--- a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/platbean/SysLogSystem.java
+++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/platbean/SysLogSystem.java
@@ -34,6 +34,7 @@ import javax.persistence.Table;
@Api(value="系统日志表",description = "系统日志表")
public class SysLogSystem extends BaseBean {
+ private static final long serialVersionUID = -2209777442410263684L;
@Indexed
@Column(name="LOG_LEVEL")
@ApiParam(value ="日志级别" , example ="1")
diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/platbean/SysLogTaskTime.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/platbean/SysLogTaskTime.java
index fedc271..795653a 100644
--- a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/platbean/SysLogTaskTime.java
+++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/platbean/SysLogTaskTime.java
@@ -33,6 +33,7 @@ import javax.persistence.Table;
@Api(value="定时任务执行日志",description = "定时任务执行记录")
public class SysLogTaskTime extends BaseBean {
+ private static final long serialVersionUID = -841008177433745529L;
@Column(name="SCHEDULER_INSTANCE_ID")
@ApiParam(value ="调度器实例id")
private String schedulerInstanceId;
diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/sqlpack/CoreHqlPack.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/sqlpack/CoreHqlPack.java
index 8e68d4d..14fd254 100644
--- a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/sqlpack/CoreHqlPack.java
+++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/sqlpack/CoreHqlPack.java
@@ -67,6 +67,19 @@ public class CoreHqlPack {
return ddlPackBean;
}
+ /**
+ * In 参数封装
+ * @param columnName
+ * @return
+ */
+ public static DdlPackBean packHqlIn(String columnName, List params){
+ DdlPackBean ddlPackBean = new DdlPackBean();
+ DdlPreparedPack.getNumEqualPack(CommonEnumUtil.IS_VAILD.VAILD.getValue(),"isValid",ddlPackBean);
+ DdlPreparedPack.getNumEqualPack(CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue(),"isDeleted",ddlPackBean);
+ DdlPreparedPack.getInPack(params, columnName, ddlPackBean);
+ return ddlPackBean;
+ }
+
/**
* 资源查询
diff --git a/modules/i3plus-pojo-ptl/pom.xml b/modules/i3plus-pojo-ptl/pom.xml
index 4dd7471..81670b2 100644
--- a/modules/i3plus-pojo-ptl/pom.xml
+++ b/modules/i3plus-pojo-ptl/pom.xml
@@ -12,7 +12,6 @@
i3plus-pojo-ptl
jar
- 1.0-TEST-SNAPSHOT
diff --git a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlActionModule.java b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlActionModule.java
index 41f39d8..258296d 100644
--- a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlActionModule.java
+++ b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlActionModule.java
@@ -29,7 +29,8 @@ import java.io.Serializable;
@EqualsAndHashCode(callSuper = true)
@Api("作业组件")
public class PtlActionModule extends BaseBean implements Serializable {
- private static final long serialVersionUID = 4734809867665293289L;
+
+ private static final long serialVersionUID = -4114157018012638259L;
@Column(name = "AM_CODE")
@ApiParam("组件代码")
diff --git a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlActionModuleGroup.java b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlActionModuleGroup.java
index 44fb849..90e4cd7 100644
--- a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlActionModuleGroup.java
+++ b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlActionModuleGroup.java
@@ -28,7 +28,8 @@ import java.io.Serializable;
@EqualsAndHashCode(callSuper = true)
@Api("组件集")
public class PtlActionModuleGroup extends BaseBean implements Serializable {
- private static final long serialVersionUID = 5581772484177493182L;
+
+ private static final long serialVersionUID = 1250324721395561455L;
@Column(name = "AMG_ID")
@ApiParam("组件集编号")
diff --git a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlActionModuleParam.java b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlActionModuleParam.java
index 82ba6c0..e3bd0f0 100644
--- a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlActionModuleParam.java
+++ b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlActionModuleParam.java
@@ -29,7 +29,7 @@ import java.io.Serializable;
@Api("组件参数")
public class PtlActionModuleParam extends BaseBean implements Serializable {
- private static final long serialVersionUID = -1015028092547846989L;
+ private static final long serialVersionUID = 4579868625998473374L;
@Column(name = "AM_CODE")
@ApiParam("组件代码")
diff --git a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlActionRoute.java b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlActionRoute.java
index 3d2f7f7..eac7e13 100644
--- a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlActionRoute.java
+++ b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlActionRoute.java
@@ -28,7 +28,8 @@ import java.io.Serializable;
@EqualsAndHashCode(callSuper = true)
@Api("作业流程")
public class PtlActionRoute extends BaseBean implements Serializable {
- private static final long serialVersionUID = 6246614708550175795L;
+
+ private static final long serialVersionUID = -8864181068138221051L;
@Column(name = "ROUTE_CODE")
@ApiParam("流程代码")
diff --git a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlActor.java b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlActor.java
index 43d20b5..d3bbefe 100644
--- a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlActor.java
+++ b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlActor.java
@@ -28,7 +28,8 @@ import java.io.Serializable;
@EqualsAndHashCode(callSuper = true)
@Api("ACTOR信息")
public class PtlActor extends BaseBean implements Serializable {
- private static final long serialVersionUID = 5647053475810310357L;
+
+ private static final long serialVersionUID = -7339437529064969381L;
@Column(name = "ACTOR_CODE")
@ApiParam("actor代码")
diff --git a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlActorRule.java b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlActorRule.java
index 9324978..f8fa5fb 100644
--- a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlActorRule.java
+++ b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlActorRule.java
@@ -28,7 +28,8 @@ import java.io.Serializable;
@EqualsAndHashCode(callSuper = true)
@Api("ACTOR消息获取规则")
public class PtlActorRule extends BaseBean implements Serializable {
- private static final long serialVersionUID = -1515292442151992142L;
+
+ private static final long serialVersionUID = -963692719400754670L;
@Column(name = "ACTOR_CODE")
@ApiParam("actor代码")
diff --git a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlArea.java b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlArea.java
index 2a779bc..05de822 100644
--- a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlArea.java
+++ b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlArea.java
@@ -31,7 +31,8 @@ import java.util.List;
@EqualsAndHashCode(callSuper = true)
@Api("区域")
public class PtlArea extends BaseBean implements Serializable {
- private static final long serialVersionUID = -1596443841199197995L;
+
+ private static final long serialVersionUID = 2112712129904360675L;
@Column(name = "AREA_NO")
@ApiParam("区域代码")
diff --git a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlAreaActorAction.java b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlAreaActorAction.java
index cae88c8..caf5c46 100644
--- a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlAreaActorAction.java
+++ b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlAreaActorAction.java
@@ -28,7 +28,8 @@ import java.io.Serializable;
@EqualsAndHashCode(callSuper = true)
@Api("PTL_区域观察者事件配置")
public class PtlAreaActorAction extends BaseBean implements Serializable {
- private static final long serialVersionUID = -1596837642283797995L;
+
+ private static final long serialVersionUID = -7531797997172228131L;
@Column(name = "AREA_NO")
@ApiParam("区域代码")
diff --git a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlAreaRoute.java b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlAreaRoute.java
index 9672b1d..c5a58e1 100644
--- a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlAreaRoute.java
+++ b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlAreaRoute.java
@@ -29,7 +29,8 @@ import java.io.Serializable;
@EqualsAndHashCode(callSuper = true)
@Api("区域作业流程")
public class PtlAreaRoute extends BaseBean implements Serializable {
- private static final long serialVersionUID = -9139851888717990905L;
+
+ private static final long serialVersionUID = 2190158227924727752L;
@Column(name = "AREA_NO")
@ApiParam("区域代码")
diff --git a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlAreaRouteModuleParam.java b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlAreaRouteModuleParam.java
index 14bc428..34c5e42 100644
--- a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlAreaRouteModuleParam.java
+++ b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlAreaRouteModuleParam.java
@@ -28,7 +28,8 @@ import java.io.Serializable;
@EqualsAndHashCode(callSuper = true)
@Api("PTL_区域流程组件调用参数")
public class PtlAreaRouteModuleParam extends BaseBean implements Serializable {
- private static final long serialVersionUID = -1596829442283797995L;
+
+ private static final long serialVersionUID = -3322697230578335377L;
@Column(name = "AREA_NO")
@ApiParam("区域代码")
diff --git a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlAreaSectionTask.java b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlAreaSectionTask.java
index eec1146..8bed06c 100644
--- a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlAreaSectionTask.java
+++ b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlAreaSectionTask.java
@@ -30,7 +30,8 @@ import java.util.List;
@EqualsAndHashCode(callSuper = true)
@Api("区段亮灯任务")
public class PtlAreaSectionTask extends BaseBean implements Serializable {
- private static final long serialVersionUID = 1453616567666404664L;
+
+ private static final long serialVersionUID = 3594963385331020252L;
@Column(name = "SECTION_TASK_NO")
@ApiParam("区段任务编号")
diff --git a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlAreaSectionTaskDetail.java b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlAreaSectionTaskDetail.java
index 1d04433..3e14e31 100644
--- a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlAreaSectionTaskDetail.java
+++ b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlAreaSectionTaskDetail.java
@@ -28,7 +28,8 @@ import java.io.Serializable;
@EqualsAndHashCode(callSuper = true)
@Api("区段亮灯任务明细")
public class PtlAreaSectionTaskDetail extends BaseBean implements Serializable {
- private static final long serialVersionUID = -7563431552643393714L;
+
+ private static final long serialVersionUID = 2881889608152445629L;
@Column(name = "SECTION_TASK_NO")
@ApiParam("区段任务编号")
diff --git a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlAreaTask.java b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlAreaTask.java
index b07a2d9..2df3ce2 100644
--- a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlAreaTask.java
+++ b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlAreaTask.java
@@ -27,7 +27,8 @@ import java.io.Serializable;
@EqualsAndHashCode(callSuper = true)
@Api("区域亮灯任务")
public class PtlAreaTask extends BaseBean implements Serializable {
- private static final long serialVersionUID = 1188465976922660834L;
+
+ private static final long serialVersionUID = -3984445969125341848L;
@Column(name = "AREA_TASK_NO")
@ApiParam("区域任务编号")
diff --git a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlAreaTaskSeq.java b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlAreaTaskSeq.java
index 5570ddc..b8a8825 100644
--- a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlAreaTaskSeq.java
+++ b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlAreaTaskSeq.java
@@ -27,7 +27,8 @@ import java.io.Serializable;
@EqualsAndHashCode(callSuper = true)
@Api("区域任务进度")
public class PtlAreaTaskSeq extends BaseBean implements Serializable {
- private static final long serialVersionUID = 7138688457410728493L;
+
+ private static final long serialVersionUID = 8346059210789998285L;
@Column(name = "AREA_NO")
@ApiParam("区域代码")
diff --git a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlBom.java b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlBom.java
index 6c72b19..972e412 100644
--- a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlBom.java
+++ b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlBom.java
@@ -25,7 +25,8 @@ import java.io.Serializable;
@Table(name = "PTL_BOM")
@EqualsAndHashCode(callSuper = true)
public class PtlBom extends BaseBean implements Serializable {
- private static final long serialVersionUID = -4459081803170156825L;
+
+ private static final long serialVersionUID = 2676195473413945030L;
@Column(name = "PART_NO")
@ApiParam("父物料号")
diff --git a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlControl.java b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlControl.java
index 16faab6..fce2d11 100644
--- a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlControl.java
+++ b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlControl.java
@@ -29,7 +29,8 @@ import java.io.Serializable;
@EqualsAndHashCode(callSuper = true)
@Api("控制器")
public class PtlControl extends BaseBean implements Serializable {
- private static final long serialVersionUID = -5371842196308816310L;
+
+ private static final long serialVersionUID = 3118824964768156554L;
@Column(name = "CONTROL_NO")
@ApiParam("控制器编号")
diff --git a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlElement.java b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlElement.java
index f11b596..de26af7 100644
--- a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlElement.java
+++ b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlElement.java
@@ -26,7 +26,8 @@ import java.io.Serializable;
@EqualsAndHashCode(callSuper = true)
@Api("元素")
public class PtlElement extends BaseBean implements Serializable {
- private static final long serialVersionUID = 5562337056340313246L;
+
+ private static final long serialVersionUID = 65129699912359054L;
@Column(name = "ELEMENT_NO")
@ApiParam("元素代码")
diff --git a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlElementAttribute.java b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlElementAttribute.java
index 30025bc..5763636 100644
--- a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlElementAttribute.java
+++ b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlElementAttribute.java
@@ -26,7 +26,8 @@ import java.io.Serializable;
@EqualsAndHashCode(callSuper = true)
@Api("元素属性")
public class PtlElementAttribute extends BaseBean implements Serializable {
- private static final long serialVersionUID = 4591354414381724731L;
+
+ private static final long serialVersionUID = -4734327563828184066L;
@Column(name = "ELEMENT_NO")
@ApiParam("元素代码")
diff --git a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlIf.java b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlIf.java
index c066a91..ab70950 100644
--- a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlIf.java
+++ b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlIf.java
@@ -28,7 +28,8 @@ import java.io.Serializable;
@EqualsAndHashCode(callSuper = true)
@Api("PTL_接口清单")
public class PtlIf extends BaseBean implements Serializable {
- private static final long serialVersionUID = -1596882732758197995L;
+
+ private static final long serialVersionUID = 8056691337038646866L;
@Column(name = "IF_CODE")
@ApiParam("接口代码")
diff --git a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlInterface.java b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlInterface.java
index a74cab7..8bde78c 100644
--- a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlInterface.java
+++ b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlInterface.java
@@ -26,7 +26,8 @@ import java.io.Serializable;
@EqualsAndHashCode(callSuper = true)
@Api("界面")
public class PtlInterface extends BaseBean implements Serializable {
- private static final long serialVersionUID = 5905965593463421411L;
+
+ private static final long serialVersionUID = -380212716030440434L;
@Column(name = "INTERFACE_NO")
@ApiParam("界面代码")
diff --git a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlInterfaceElement.java b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlInterfaceElement.java
index 56c2b50..6412bb4 100644
--- a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlInterfaceElement.java
+++ b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlInterfaceElement.java
@@ -26,7 +26,8 @@ import java.io.Serializable;
@EqualsAndHashCode(callSuper = true)
@Api("界面元素")
public class PtlInterfaceElement extends BaseBean implements Serializable {
- private static final long serialVersionUID = -8436630151033411240L;
+
+ private static final long serialVersionUID = 1583442966822428784L;
@Column(name = "INTERFACE_NO")
@ApiParam("界面代码")
diff --git a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlInterfaceElementAttribute.java b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlInterfaceElementAttribute.java
index 445b8f2..8a7c756 100644
--- a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlInterfaceElementAttribute.java
+++ b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlInterfaceElementAttribute.java
@@ -26,7 +26,8 @@ import java.io.Serializable;
@EqualsAndHashCode(callSuper = true)
@Api("界面元素属性")
public class PtlInterfaceElementAttribute extends BaseBean implements Serializable {
- private static final long serialVersionUID = 6603839514256277172L;
+
+ private static final long serialVersionUID = -6093597374268730218L;
@Column(name = "INTERFACE_NO")
@ApiParam("界面代码")
diff --git a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlLabelTemplate.java b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlLabelTemplate.java
index a14a5a3..eb3e19d 100644
--- a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlLabelTemplate.java
+++ b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlLabelTemplate.java
@@ -29,6 +29,7 @@ import java.util.List;
public class PtlLabelTemplate extends BaseBean implements Serializable {
private static final long serialVersionUID = 8287307324960885418L;
+
@Column(name = "TEMPLATE_CODE")
@ApiParam(value = "模板代码")
private String templateCode;
diff --git a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlLabelTemplateParam.java b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlLabelTemplateParam.java
index 08a100e..de2c8ac 100644
--- a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlLabelTemplateParam.java
+++ b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlLabelTemplateParam.java
@@ -30,6 +30,7 @@ import java.io.Serializable;
public class PtlLabelTemplateParam extends BaseBean implements Serializable {
private static final long serialVersionUID = 7292367173575992422L;
+
@Column(name = "TEMPLATE_ID")
@ApiParam(value = "模板ID", access = "模板ID", example = "-1")
@JsonSerialize(using = ToStringSerializer.class)
diff --git a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlMainTask.java b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlMainTask.java
index 05b54f6..6733022 100644
--- a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlMainTask.java
+++ b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlMainTask.java
@@ -27,7 +27,8 @@ import java.io.Serializable;
@EqualsAndHashCode(callSuper = true)
@Api("主任务")
public class PtlMainTask extends BaseBean implements Serializable {
- private static final long serialVersionUID = 7144785793974319891L;
+
+ private static final long serialVersionUID = 8626414623799663395L;
@Column(name = "TASK_NO")
@ApiParam("主任务编号")
diff --git a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlMainTaskDetail.java b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlMainTaskDetail.java
index a0eb09b..d273e3e 100644
--- a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlMainTaskDetail.java
+++ b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlMainTaskDetail.java
@@ -27,7 +27,8 @@ import java.io.Serializable;
@EqualsAndHashCode(callSuper = true)
@Api("主任务明细")
public class PtlMainTaskDetail extends BaseBean implements Serializable {
- private static final long serialVersionUID = 7144785793974319897L;
+
+ private static final long serialVersionUID = -7380963913791704644L;
@Column(name = "TASK_NO")
@ApiParam("主任务编号")
diff --git a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlMessageType.java b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlMessageType.java
index 70d99c0..cdf49e6 100644
--- a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlMessageType.java
+++ b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlMessageType.java
@@ -28,7 +28,8 @@ import java.io.Serializable;
@EqualsAndHashCode(callSuper = true)
@Api("消息类型")
public class PtlMessageType extends BaseBean implements Serializable {
- private static final long serialVersionUID = -8899362292879155612L;
+
+ private static final long serialVersionUID = -1202110531150781349L;
@Column(name = "MT_CODE")
@ApiParam("消息类型代码")
diff --git a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlMessageTypeFormat.java b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlMessageTypeFormat.java
index 6339bca..3b9f24f 100644
--- a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlMessageTypeFormat.java
+++ b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlMessageTypeFormat.java
@@ -28,7 +28,8 @@ import java.io.Serializable;
@EqualsAndHashCode(callSuper = true)
@Api("消息类型格式")
public class PtlMessageTypeFormat extends BaseBean implements Serializable {
- private static final long serialVersionUID = 3398977445081168030L;
+
+ private static final long serialVersionUID = 1114241840945889678L;
@Column(name = "MT_CODE")
@ApiParam("消息类型代码")
diff --git a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlObjectDao.java b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlObjectDao.java
index d86d1b1..982dcef 100644
--- a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlObjectDao.java
+++ b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlObjectDao.java
@@ -29,7 +29,9 @@ import java.io.Serializable;
@Table(name = "PTL_OBJECT_DAO")
@Api("PTL_对象与dao对应关系")
public class PtlObjectDao extends BaseBean implements Serializable {
- private static final long serialVersionUID = 2286752328499060L;
+
+ private static final long serialVersionUID = 3972627525439997959L;
+
@Column(name = "OBJECT_CODE")
@ApiParam("对象代码")
private String objectCode;
diff --git a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlPart.java b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlPart.java
index 6508012..16331af 100644
--- a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlPart.java
+++ b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlPart.java
@@ -27,7 +27,8 @@ import java.io.Serializable;
@EqualsAndHashCode(callSuper = true)
@Api("物料")
public class PtlPart extends BaseBean implements Serializable {
- private static final long serialVersionUID = -7451758045686558893L;
+
+ private static final long serialVersionUID = -517621136983016210L;
@Column(name = "PART_NO")
@ApiParam("物料编号")
diff --git a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlPcn.java b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlPcn.java
index b9e661b..b822a40 100644
--- a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlPcn.java
+++ b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlPcn.java
@@ -28,7 +28,9 @@ import java.io.Serializable;
@Table(name = "PTL_PCN")
@Api("PCN节点")
public class PtlPcn extends BaseBean implements Serializable {
- private static final long serialVersionUID = -9140094723555406392L;
+
+ private static final long serialVersionUID = -4320051898730968719L;
+
@Column(name = "PCN_CODE")
@ApiParam("PCN代码")
private String pcnCode;
diff --git a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlPcnClear.java b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlPcnClear.java
index 360d748..f7001d4 100644
--- a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlPcnClear.java
+++ b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlPcnClear.java
@@ -29,7 +29,8 @@ import java.util.Date;
@EqualsAndHashCode(callSuper = true)
@Api("PTL_PCN数据清理")
public class PtlPcnClear extends BaseBean implements Serializable {
- private static final long serialVersionUID = -1596443273899197995L;
+
+ private static final long serialVersionUID = 2581206839565766798L;
@Column(name = "PCN_CODE")
@ApiParam("PCN代码")
diff --git a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlPcnConnectLog.java b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlPcnConnectLog.java
index 05d5c88..e966b3e 100644
--- a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlPcnConnectLog.java
+++ b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlPcnConnectLog.java
@@ -28,7 +28,8 @@ import java.io.Serializable;
@Table(name = "PTL_PCN_CONNECT_LOG")
@Api("PCN节点连接日志")
public class PtlPcnConnectLog extends BaseBean implements Serializable {
- private static final long serialVersionUID = 2756240593256441951L;
+
+ private static final long serialVersionUID = 7670515108162521936L;
@Column(name = "PCN_CODE")
@ApiParam("PCN代码")
diff --git a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlPcnSyncCfg.java b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlPcnSyncCfg.java
index 060404d..18a7d10 100644
--- a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlPcnSyncCfg.java
+++ b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlPcnSyncCfg.java
@@ -31,7 +31,7 @@ import java.io.Serializable;
@Api("PTL_PCN_同步配置")
public class PtlPcnSyncCfg extends BaseBean implements Serializable {
- private static final long serialVersionUID = 7270948230576127126L;
+ private static final long serialVersionUID = -5459970792389134485L;
@Column(name = "PCN_CODE")
@ApiParam("PCN代码")
diff --git a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlPcnSyncErrorLog.java b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlPcnSyncErrorLog.java
index 110f4a8..486b07c 100644
--- a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlPcnSyncErrorLog.java
+++ b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlPcnSyncErrorLog.java
@@ -31,6 +31,7 @@ import java.io.Serializable;
public class PtlPcnSyncErrorLog extends BaseBean implements Serializable {
private static final long serialVersionUID = -8285936568677939604L;
+
@Column(name = "PCN_CODE")
@ApiParam("PCN代码")
private String pcnCode;
diff --git a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlPcnTask.java b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlPcnTask.java
index 916a9ce..3f67269 100644
--- a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlPcnTask.java
+++ b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlPcnTask.java
@@ -29,7 +29,8 @@ import java.io.Serializable;
@Table(name = "PTL_PCN_TASK")
@Api("ptl-pcn定时任务工作清单")
public class PtlPcnTask extends BaseBean implements Serializable {
- private static final long serialVersionUID = 4129714382965409395L;
+
+ private static final long serialVersionUID = 2486815585819368941L;
@Column(name = "TASK_CODE")
@ApiParam("任务代码")
diff --git a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlPcnTaskLog.java b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlPcnTaskLog.java
index f10f0e0..58d21b7 100644
--- a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlPcnTaskLog.java
+++ b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlPcnTaskLog.java
@@ -29,7 +29,8 @@ import java.io.Serializable;
@Table(name = "PTL_PCN_TASK_LOG")
@Api("ptl-pcn定时任务工作清单同步记录")
public class PtlPcnTaskLog extends BaseBean implements Serializable {
- private static final long serialVersionUID = -784806174962540310L;
+
+ private static final long serialVersionUID = 932305261648065821L;
@Column(name = "SYNC_TIME_START")
@ApiParam("同步数据开始时间")
diff --git a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlPrinterConfigure.java b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlPrinterConfigure.java
index 8d6bb6b..4bfd0b9 100644
--- a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlPrinterConfigure.java
+++ b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlPrinterConfigure.java
@@ -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,9 +27,10 @@ import javax.persistence.Table;
@EqualsAndHashCode(callSuper = true)
@Table(name="PTL_PRINTER_CONFIGURE")
@Api("打印机配置表")
-public class PtlPrinterConfigure extends BaseBean{
+public class PtlPrinterConfigure extends BaseBean implements Serializable {
+
+ private static final long serialVersionUID = -226395857300082832L;
- private static final long serialVersionUID = 1234639813072592779L;
@Column(name="PRINTER_NO")
@ApiParam("打印机编号")
private String printerNo;
diff --git a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlPrintingQueue.java b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlPrintingQueue.java
index 1d4cb38..22f7119 100644
--- a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlPrintingQueue.java
+++ b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlPrintingQueue.java
@@ -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,9 +28,10 @@ import javax.persistence.Transient;
@EqualsAndHashCode(callSuper = true)
@Table(name="PTL_PRINTING_QUEUE")
@Api("待打印队列表")
-public class PtlPrintingQueue extends BaseBean{
+public class PtlPrintingQueue extends BaseBean implements Serializable {
+
+ private static final long serialVersionUID = 729384890593058720L;
- private static final long serialVersionUID = 1111639813072592779L;
@Column(name="PRINT_IDENTIFICATION")
@ApiParam("打印标识")
private String printIdentification;
diff --git a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlRfid.java b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlRfid.java
index 2194d12..6c57df7 100644
--- a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlRfid.java
+++ b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlRfid.java
@@ -28,7 +28,8 @@ import java.io.Serializable;
@EqualsAndHashCode(callSuper = true)
@Api("PTL_RFID")
public class PtlRfid extends BaseBean implements Serializable {
- private static final long serialVersionUID = -1596837642758197995L;
+
+ private static final long serialVersionUID = 1322725195212837292L;
@Column(name = "RFID_CONTROL_NO")
@ApiParam("RFID读写器代码")
diff --git a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlRouteModuleParam.java b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlRouteModuleParam.java
index 56fdace..9d7dce2 100644
--- a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlRouteModuleParam.java
+++ b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlRouteModuleParam.java
@@ -29,7 +29,7 @@ import java.io.Serializable;
@Api("PTL_流程组件调用参数")
public class PtlRouteModuleParam extends BaseBean implements Serializable {
- private static final long serialVersionUID = -3036415977457877114L;
+ private static final long serialVersionUID = -7330592964296954653L;
@Column(name = "ROUTE_CODE")
@ApiParam("流程代码")
diff --git a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlRouteStatus.java b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlRouteStatus.java
index 6222e0a..77999b7 100644
--- a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlRouteStatus.java
+++ b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlRouteStatus.java
@@ -28,7 +28,8 @@ import java.io.Serializable;
@EqualsAndHashCode(callSuper = true)
@Api("流程状态")
public class PtlRouteStatus extends BaseBean implements Serializable {
- private static final long serialVersionUID = -2862693366302428501L;
+
+ private static final long serialVersionUID = 5555766204635105977L;
@Column(name = "ROUTE_CODE")
@ApiParam("流程代码")
diff --git a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlSection.java b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlSection.java
index 3935303..0faefbd 100644
--- a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlSection.java
+++ b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlSection.java
@@ -29,7 +29,8 @@ import java.io.Serializable;
@EqualsAndHashCode(callSuper = true)
@Api("区段")
public class PtlSection extends BaseBean implements Serializable {
- private static final long serialVersionUID = -7451758045686558883L;
+
+ private static final long serialVersionUID = -1155737119433934849L;
@Column(name = "SECTION_NO")
@ApiParam("区段编号")
diff --git a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlSyncDeadLetter.java b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlSyncDeadLetter.java
index 0de2878..b504674 100644
--- a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlSyncDeadLetter.java
+++ b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlSyncDeadLetter.java
@@ -28,7 +28,8 @@ import java.io.Serializable;
})
@Api("数据同步死信")
public class PtlSyncDeadLetter extends BaseBean implements Serializable {
- private static final long serialVersionUID = 1151025992437433734L;
+
+ private static final long serialVersionUID = -7435143562440979065L;
@Column(name = "OBJECT_CODE")
@ApiParam("对象代码")
diff --git a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlTag.java b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlTag.java
index 8c46173..a897694 100644
--- a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlTag.java
+++ b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlTag.java
@@ -28,7 +28,8 @@ import java.io.Serializable;
@EqualsAndHashCode(callSuper = true)
@Api("标签信息")
public class PtlTag extends BaseBean implements Serializable {
- private static final long serialVersionUID = -949910394508157581L;
+
+ private static final long serialVersionUID = -2431773668822112292L;
@Column(name = "TAG_NO")
@ApiParam("标签代码")
diff --git a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlTestUser.java b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlTestUser.java
index 5f056b7..0f63c84 100644
--- a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlTestUser.java
+++ b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlTestUser.java
@@ -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,11 +29,10 @@ import javax.persistence.Table;
@EqualsAndHashCode(callSuper = true)
@Table(name="PTL_TEST_USER")
@Api(value="PTL 测试用户",description = "测试用户")
-public class PtlTestUser extends BaseBean {
+public class PtlTestUser extends BaseBean implements Serializable {
private static final long serialVersionUID = -130240511327784335L;
-
@Column(name="USER_INFO_ID")
@ApiParam(value ="人员ID" , example = "-1")
@JsonSerialize(using = ToStringSerializer.class)
diff --git a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/model/ActionModuleGroupModel.java b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/model/ActionModuleGroupModel.java
index f08d7da..fc36a47 100644
--- a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/model/ActionModuleGroupModel.java
+++ b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/model/ActionModuleGroupModel.java
@@ -20,7 +20,7 @@ import java.util.List;
@Api("流程明细Model")
public class ActionModuleGroupModel implements Serializable {
- private static final long serialVersionUID = 3569055511035396175L;
+ private static final long serialVersionUID = 3963042613552364928L;
@ApiParam("组件代码")
private String amCode;
diff --git a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/model/ActionModuleModel.java b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/model/ActionModuleModel.java
index e2a1467..41eadd0 100644
--- a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/model/ActionModuleModel.java
+++ b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/model/ActionModuleModel.java
@@ -4,6 +4,8 @@ import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
+import java.io.Serializable;
+
/**
* @author Wynne.Lu
* @date 2020/2/12 18:18
@@ -11,7 +13,9 @@ import lombok.Data;
*/
@Data
@ApiModel("作业组件model")
-public class ActionModuleModel {
+public class ActionModuleModel implements Serializable {
+
+ private static final long serialVersionUID = 4925369056448110395L;
@ApiModelProperty("组件代码")
private String amCode;
diff --git a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/model/ActorMessageModel.java b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/model/ActorMessageModel.java
index 3a1e7fe..cda9485 100644
--- a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/model/ActorMessageModel.java
+++ b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/model/ActorMessageModel.java
@@ -7,6 +7,8 @@ import lombok.Data;
import lombok.NoArgsConstructor;
import lombok.ToString;
+import java.io.Serializable;
+
/**
* @author Wynne.Lu
* @date 2020/2/13 19:31
@@ -17,7 +19,9 @@ import lombok.ToString;
@NoArgsConstructor
@ToString
@ApiModel("actor消息类型及属性")
-public class ActorMessageModel {
+public class ActorMessageModel implements Serializable {
+
+ private static final long serialVersionUID = 4524576023835016971L;
@ApiModelProperty("消息类型代码")
private String mtCode;
diff --git a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/model/AreaSectionTaskDetailModel.java b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/model/AreaSectionTaskDetailModel.java
index cd3cec6..ed49267 100644
--- a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/model/AreaSectionTaskDetailModel.java
+++ b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/model/AreaSectionTaskDetailModel.java
@@ -7,6 +7,8 @@ import lombok.Data;
import lombok.NoArgsConstructor;
import lombok.ToString;
+import java.io.Serializable;
+
/**
* @Description :
* @Reference :
@@ -19,7 +21,9 @@ import lombok.ToString;
@NoArgsConstructor
@ToString
@ApiModel("actor消息类型及属性")
-public class AreaSectionTaskDetailModel {
+public class AreaSectionTaskDetailModel implements Serializable {
+
+ private static final long serialVersionUID = -896587708527024227L;
private Long id;
diff --git a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/model/AttrModel.java b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/model/AttrModel.java
index 1cb36c9..e23dfcf 100644
--- a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/model/AttrModel.java
+++ b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/model/AttrModel.java
@@ -7,7 +7,8 @@ import java.io.Serializable;
@Data
public class AttrModel implements Serializable {
- private static final long serialVersionUID = -4842958192243396773L;
+
+ private static final long serialVersionUID = 7259890069511744335L;
@ApiParam("属性名称")
private String attrName;
diff --git a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/model/BussinessProcessModel.java b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/model/BussinessProcessModel.java
index e533406..c4c0900 100644
--- a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/model/BussinessProcessModel.java
+++ b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/model/BussinessProcessModel.java
@@ -18,7 +18,7 @@ import java.util.List;
@Api("作业流程Model")
public class BussinessProcessModel implements Serializable {
- private static final long serialVersionUID = 148029163662900001L;
+ private static final long serialVersionUID = 1987194216369839465L;
@ApiParam("流程代码")
private String routeCode;
diff --git a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/model/CommonMsgModel.java b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/model/CommonMsgModel.java
index 13576e2..a379b44 100644
--- a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/model/CommonMsgModel.java
+++ b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/model/CommonMsgModel.java
@@ -19,7 +19,8 @@ import java.util.Map;
@Data
@ApiModel("通用数据传输对象")
public class CommonMsgModel implements Serializable {
- private static final long serialVersionUID = 6359899762200319607L;
+
+ private static final long serialVersionUID = 8271636435115494111L;
@ApiModelProperty("工厂")
private String organizeCode;
diff --git a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/model/LightOnModel.java b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/model/LightOnModel.java
index f423f60..92d0c0d 100644
--- a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/model/LightOnModel.java
+++ b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/model/LightOnModel.java
@@ -15,7 +15,8 @@ import java.io.Serializable;
@Data
@ApiModel("亮灯model")
public class LightOnModel implements Serializable {
- private static final long serialVersionUID = -1089361557513425229L;
+
+ private static final long serialVersionUID = 2054373260210137133L;
@ApiParam("标签地址，范围1~250,设置null即为所有标签")
private Integer tagNo;
diff --git a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/model/MesQueueOrder.java b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/model/MesQueueOrder.java
index 167a62d..70bc3cc 100644
--- a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/model/MesQueueOrder.java
+++ b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/model/MesQueueOrder.java
@@ -17,7 +17,7 @@ import java.io.Serializable;
@ApiModel("生产队列主表")
public class MesQueueOrder implements Serializable {
- private static final long serialVersionUID = -3124113504001270712L;
+ private static final long serialVersionUID = -3191808970468979533L;
@ApiParam("主队列编号")
private String orderNo;
diff --git a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/model/MesQueueOrderDetail.java b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/model/MesQueueOrderDetail.java
index 48d66be..b92295c 100644
--- a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/model/MesQueueOrderDetail.java
+++ b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/model/MesQueueOrderDetail.java
@@ -17,7 +17,7 @@ import java.io.Serializable;
@ApiModel("生产队列明细")
public class MesQueueOrderDetail implements Serializable {
- private static final long serialVersionUID = 1945173626511595078L;
+ private static final long serialVersionUID = 806856745031040789L;
@ApiParam("主队列编号")
private String orderNo;
diff --git a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/model/MesStationBom.java b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/model/MesStationBom.java
index fdfb332..444f867 100644
--- a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/model/MesStationBom.java
+++ b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/model/MesStationBom.java
@@ -18,7 +18,7 @@ import java.io.Serializable;
@ApiModel("工位物料清单")
public class MesStationBom implements Serializable {
- private static final long serialVersionUID = -2658812944873600461L;
+ private static final long serialVersionUID = 7398825718819106180L;
@ApiParam("零件号")
private String partNo;
diff --git a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/model/ProcessDetailModel.java b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/model/ProcessDetailModel.java
index 3f42664..916995e 100644
--- a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/model/ProcessDetailModel.java
+++ b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/model/ProcessDetailModel.java
@@ -19,7 +19,7 @@ import java.util.Map;
@Api("流程明细Model")
public class ProcessDetailModel implements Serializable {
- private static final long serialVersionUID = 3569055511035396175L;
+ private static final long serialVersionUID = 4353961796870951797L;
@ApiParam("状态代码")
private String statusCode;
diff --git a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/model/ProductDataModel.java b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/model/ProductDataModel.java
index c4bbcd4..f56a32a 100644
--- a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/model/ProductDataModel.java
+++ b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/model/ProductDataModel.java
@@ -7,11 +7,15 @@ import lombok.AllArgsConstructor;
import lombok.Data;
import lombok.NoArgsConstructor;
+import java.io.Serializable;
+
@Data
@NoArgsConstructor
@AllArgsConstructor
@Api("产品包装model")
-public class ProductDataModel {
+public class ProductDataModel implements Serializable {
+
+ private static final long serialVersionUID = 6946629608590823479L;
@ApiParam("字段代码")
private String fieldCode;
diff --git a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/model/PtlMonitorControlModel.java b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/model/PtlMonitorControlModel.java
index 28b0ed1..5f5d0d4 100644
--- a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/model/PtlMonitorControlModel.java
+++ b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/model/PtlMonitorControlModel.java
@@ -19,6 +19,8 @@ import java.util.List;
@Api("亮灯监听Model")
public class PtlMonitorControlModel implements Serializable {
+ private static final long serialVersionUID = 7446249296664249977L;
+
@ApiParam("刷新频率")
public String refreshTime;
diff --git a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/model/SpecificRuleModel.java b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/model/SpecificRuleModel.java
index 4e83d86..4d89870 100644
--- a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/model/SpecificRuleModel.java
+++ b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/model/SpecificRuleModel.java
@@ -17,7 +17,8 @@ import java.util.Map;
@Data
@ApiModel("特定条件model")
public class SpecificRuleModel implements Serializable {
- private static final long serialVersionUID = -4724747574943605500L;
+
+ private static final long serialVersionUID = 7948646696191723363L;
private List kList=new ArrayList<>();
diff --git a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/model/WsResultBean.java b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/model/WsResultBean.java
index 030a1d9..2f486c0 100644
--- a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/model/WsResultBean.java
+++ b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/model/WsResultBean.java
@@ -19,6 +19,8 @@ import java.util.Map;
@Data
public class WsResultBean implements Serializable {
+ private static final long serialVersionUID = 7807441951231474373L;
+
/**
* 根据客户端所需数据结构，约定不同数据类型,message:信息、stepList:工步列表、stepContent：工步内容、
* moduleContent组件内容,taskComplete整个扫描完成
diff --git a/modules/i3plus-pojo-report/pom.xml b/modules/i3plus-pojo-report/pom.xml
index c45f09e..26a7311 100644
--- a/modules/i3plus-pojo-report/pom.xml
+++ b/modules/i3plus-pojo-report/pom.xml
@@ -12,7 +12,6 @@
i3plus-pojo-report
jar
- 1.0-TEST-SNAPSHOT
diff --git a/modules/i3plus-pojo-softswitch/pom.xml b/modules/i3plus-pojo-softswitch/pom.xml
index 1b72275..eaf2544 100644
--- a/modules/i3plus-pojo-softswitch/pom.xml
+++ b/modules/i3plus-pojo-softswitch/pom.xml
@@ -12,7 +12,6 @@
i3plus-pojo-softswitch
jar
- 1.0-TEST-SNAPSHOT
diff --git a/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsDataSource.java b/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsDataSource.java
index 5881a9c..2f04bc8 100644
--- a/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsDataSource.java
+++ b/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsDataSource.java
@@ -27,6 +27,7 @@ import javax.persistence.Table;
@Api(value = "数据源管理", description = "数据源管理")
public class BsDataSource extends BaseBean {
+ private static final long serialVersionUID = 2763423692635373368L;
@Column(name = "DATA_SOURCE_NAME")
@ApiParam(value = "数据源名称")
private String dataSourceName;
diff --git a/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsMessageQueue.java b/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsMessageQueue.java
index 5dbad2d..9b3baec 100644
--- a/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsMessageQueue.java
+++ b/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsMessageQueue.java
@@ -29,6 +29,7 @@ import javax.persistence.Table;
@Api(value = "MQ管理", description = "MQ管理")
public class BsMessageQueue extends BaseBean {
+ private static final long serialVersionUID = -1130706382023544729L;
@Column(name = "MESSAGE_QUEUE_NAME")
@ApiParam(value = "消息队列名称")
private String messageQueueName;
diff --git a/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsParamAdapter.java b/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsParamAdapter.java
index f449535..b0c8a8a 100644
--- a/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsParamAdapter.java
+++ b/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsParamAdapter.java
@@ -29,6 +29,7 @@ import javax.persistence.Table;
@Api(value = "数据适配转换", description = "数据适配转换")
public class BsParamAdapter extends BaseBean {
+ private static final long serialVersionUID = -6238745304002006776L;
@Column(name = "SUIT_CASE_ID")
@ApiParam(value = "适配套件id")
@JsonSerialize(using = ToStringSerializer.class)
diff --git a/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSocketSuitCase.java b/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSocketSuitCase.java
index 5b9e496..a796248 100644
--- a/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSocketSuitCase.java
+++ b/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSocketSuitCase.java
@@ -7,11 +7,10 @@ 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 javax.persistence.Transient;
-import java.util.List;
/**
* @Description : socket套件
@@ -29,6 +28,7 @@ import java.util.List;
@Api(value = "socket套件", description = "socket套件")
public class BsSocketSuitCase extends BaseBean {
+ private static final long serialVersionUID = -1491505137380808987L;
@Column(name = "SOCKET_TYPE_ID")
@ApiParam(value = "socket类型（枚举）")
private Integer socketTypeId;
diff --git a/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSslKey.java b/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSslKey.java
index dfab548..6ddffe1 100644
--- a/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSslKey.java
+++ b/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSslKey.java
@@ -31,6 +31,7 @@ import java.util.List;
@Api(value = "适配认证", description = "适配认证")
public class BsSslKey extends BaseBean {
+ private static final long serialVersionUID = 3934205467948800784L;
@Column(name = "KEY_NAME")
@ApiParam(value = "证书名称")
private String keyName;
diff --git a/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSslKeyParam.java b/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSslKeyParam.java
index a4c52be..65a2a2b 100644
--- a/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSslKeyParam.java
+++ b/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSslKeyParam.java
@@ -32,6 +32,7 @@ import javax.persistence.Table;
@XStreamAlias("BsSslKeyParam")
public class BsSslKeyParam extends BaseBean {
+ private static final long serialVersionUID = 3521715129533450992L;
@Column(name = "SSL_KEY_ID")
@ApiParam(value = "证书id")
@JsonSerialize(using = ToStringSerializer.class)
diff --git a/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitCase.java b/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitCase.java
index deb2151..b06be17 100644
--- a/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitCase.java
+++ b/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitCase.java
@@ -33,6 +33,7 @@ import java.util.List;
@Api(value = "适配套件", description = "适配套件")
public class BsSuitCase extends BaseBean {
+ private static final long serialVersionUID = -281224716754866835L;
@Column(name = "SUIT_CASE_NAME")
@ApiParam(value = "套件名称")
private String suitCaseName;
diff --git a/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitCaseDataSource.java b/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitCaseDataSource.java
index a4631b7..dc3e426 100644
--- a/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitCaseDataSource.java
+++ b/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitCaseDataSource.java
@@ -31,6 +31,7 @@ import java.util.List;
@Api(value = "数据库套件", description = "数据库套件")
public class BsSuitCaseDataSource extends BaseBean {
+ private static final long serialVersionUID = 5519482989293937465L;
@Column(name = "SUIT_CASE_ID")
@ApiParam(value = "套件id")
@JsonSerialize(using = ToStringSerializer.class)
diff --git a/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitCaseDataSourceTable.java b/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitCaseDataSourceTable.java
index 838514a..decd680 100644
--- a/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitCaseDataSourceTable.java
+++ b/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitCaseDataSourceTable.java
@@ -29,6 +29,7 @@ import javax.persistence.Table;
@Api(value = "数据库表操作", description = "数据库表操作")
public class BsSuitCaseDataSourceTable extends BaseBean {
+ private static final long serialVersionUID = 3674958775373712985L;
@Column(name = "SUIT_CASE_ID")
@ApiParam(value = "套件id")
@JsonSerialize(using = ToStringSerializer.class)
diff --git a/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitCaseFTP.java b/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitCaseFTP.java
index db6e129..ab14d8d 100644
--- a/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitCaseFTP.java
+++ b/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitCaseFTP.java
@@ -32,6 +32,7 @@ import java.util.List;
@Api(value = "FTP适配器", description = "FTP适配器")
public class BsSuitCaseFTP extends BaseBean {
+ private static final long serialVersionUID = 6174265510888236886L;
@Column(name = "SUIT_CASE_ID")
@ApiParam(value = "套件id")
@JsonSerialize(using = ToStringSerializer.class)
diff --git a/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitCaseMq.java b/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitCaseMq.java
index 3d3452b..07007ca 100644
--- a/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitCaseMq.java
+++ b/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitCaseMq.java
@@ -30,6 +30,7 @@ import javax.persistence.Table;
@Api(value = "MQ", description = "MQ 适配套件")
public class BsSuitCaseMq extends BaseBean {
+ private static final long serialVersionUID = 4562973480210332977L;
@Column(name = "SUIT_CASE_ID")
@ApiParam(value = "套件id")
@JsonSerialize(using = ToStringSerializer.class)
diff --git a/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitCaseParam.java b/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitCaseParam.java
index 7a8856c..e6e5251 100644
--- a/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitCaseParam.java
+++ b/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitCaseParam.java
@@ -38,6 +38,7 @@ import java.util.List;
@Api(value = "适配器出入参", description = "适配器出入参")
public class BsSuitCaseParam extends BaseBean {
+ private static final long serialVersionUID = -2186546861255097857L;
@Column(name = "SUIT_CASE_ID")
@ApiParam(value = "套件id")
@JsonSerialize(using = ToStringSerializer.class)
diff --git a/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitCaseREST.java b/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitCaseREST.java
index 051d0c9..5fcea3e 100644
--- a/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitCaseREST.java
+++ b/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitCaseREST.java
@@ -34,6 +34,7 @@ import java.util.List;
@Api(value = "适配器出入参", description = "适配器出入参")
public class BsSuitCaseREST extends BaseBean {
+ private static final long serialVersionUID = 3871469059124604719L;
@Column(name = "SUIT_CASE_ID")
@ApiParam(value = "套件id")
@JsonSerialize(using = ToStringSerializer.class)
diff --git a/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitCaseWebService.java b/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitCaseWebService.java
index c5e2ef6..37a8e11 100644
--- a/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitCaseWebService.java
+++ b/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitCaseWebService.java
@@ -30,6 +30,7 @@ import javax.persistence.Table;
@Api(value = "WebService", description = "WebService 适配套件")
public class BsSuitCaseWebService extends BaseBean {
+ private static final long serialVersionUID = -5473608817496699798L;
@Column(name = "SUIT_CASE_ID")
@ApiParam(value = "套件id")
@JsonSerialize(using = ToStringSerializer.class)
diff --git a/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitDataDetail.java b/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitDataDetail.java
index e01af7b..cde8a74 100644
--- a/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitDataDetail.java
+++ b/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitDataDetail.java
@@ -34,6 +34,7 @@ import java.util.List;
@Api(value = "适配报文详情", description = "适配报文详情")
public class BsSuitDataDetail extends BaseBean {
+ private static final long serialVersionUID = 4086839854444963656L;
@Column(name = "SUIT_CASE_ID")
@ApiParam(value = "适配套件id")
private String suitCaseId;
diff --git a/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitFile.java b/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitFile.java
index 21f5df5..7e2b460 100644
--- a/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitFile.java
+++ b/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitFile.java
@@ -29,6 +29,7 @@ import javax.persistence.Table;
@Api(value = "适配文件信息", description = "适配文件信息")
public class BsSuitFile extends BaseBean {
+ private static final long serialVersionUID = -5476684791619434327L;
@Column(name = "SUIT_CASE_ID")
@ApiParam(value = "套件id")
@JsonSerialize(using = ToStringSerializer.class)
diff --git a/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitRecord.java b/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitRecord.java
index bc9e7b0..6a46fc7 100644
--- a/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitRecord.java
+++ b/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitRecord.java
@@ -36,6 +36,7 @@ import java.util.List;
@Api(value = "适配记录", description = "适配记录")
public class BsSuitRecord extends BaseBean {
+ private static final long serialVersionUID = 174969165955420968L;
@Column(name = "SUIT_CASE_NAME_RDD")
@ApiParam(value = "适配套件名称")
private String suitCaseNameRdd;
diff --git a/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitRecordParam.java b/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitRecordParam.java
index c1d94dc..e255175 100644
--- a/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitRecordParam.java
+++ b/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitRecordParam.java
@@ -28,6 +28,7 @@ import javax.persistence.*;
@Api(value = "适配记录参数", description = "适配记录参数")
public class BsSuitRecordParam extends BaseBean {
+ private static final long serialVersionUID = -5521394058203638651L;
@Column(name = "SUIT_RECORD_ID")
@ApiParam(value = "适配记录id")
private Long suitRecordId;
diff --git a/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitRequestRecord.java b/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitRequestRecord.java
index e89b27e..81ae451 100644
--- a/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitRequestRecord.java
+++ b/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitRequestRecord.java
@@ -30,6 +30,7 @@ import javax.persistence.*;
@Api(value = "请求适配记录", description = "请求适配记录")
public class BsSuitRequestRecord extends BaseBean {
+ private static final long serialVersionUID = -6724051278362565068L;
@Column(name = "SUIT_RECORD_ID")
@ApiParam(value = "适配记录id")
@JsonSerialize(using = ToStringSerializer.class)
diff --git a/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitSchedule.java b/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitSchedule.java
index fc7c6fc..7d201ab 100644
--- a/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitSchedule.java
+++ b/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitSchedule.java
@@ -30,6 +30,7 @@ import javax.persistence.Table;
@Api(value = "定时适配任务", description = "定时适配任务")
public class BsSuitSchedule extends BaseBean {
+ private static final long serialVersionUID = 4814615639892051613L;
@Column(name = "SUIT_CASE_ID")
@ApiParam(value = "适配套件id")
@JsonSerialize(using = ToStringSerializer.class)
diff --git a/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitType.java b/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitType.java
index 1499369..5ef077f 100644
--- a/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitType.java
+++ b/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitType.java
@@ -27,6 +27,7 @@ import javax.persistence.Table;
@Api(value = "适配类型", description = "适配类型")
public class BsSuitType extends BaseBean {
+ private static final long serialVersionUID = 5149466646176647559L;
@Column(name = "SUIT_TYPE_NAME")
@ApiParam(value = "适配类型")
private String suitTypeName;
diff --git a/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/TestDataBase.java b/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/TestDataBase.java
index eaa600d..a8627b1 100644
--- a/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/TestDataBase.java
+++ b/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/TestDataBase.java
@@ -28,6 +28,7 @@ import javax.persistence.Table;
@Api(value="测试数据 DataBase",description = "数据库操作测试")
public class TestDataBase extends BaseBean {
+ private static final long serialVersionUID = -5334113633173923482L;
@Column(name="NAME")
@ApiParam(value ="名称" )
private String name;
diff --git a/modules/i3plus-pojo-sweb/pom.xml b/modules/i3plus-pojo-sweb/pom.xml
index 94fb42a..0f615b6 100644
--- a/modules/i3plus-pojo-sweb/pom.xml
+++ b/modules/i3plus-pojo-sweb/pom.xml
@@ -12,7 +12,6 @@
i3plus-pojo-sweb
jar
- 1.0-TEST-SNAPSHOT
diff --git a/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/bean/SwebConfig.java b/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/bean/SwebConfig.java
index ccfef29..9fa4fcf 100644
--- a/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/bean/SwebConfig.java
+++ b/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/bean/SwebConfig.java
@@ -4,7 +4,6 @@ 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;
@@ -27,6 +26,7 @@ import javax.persistence.Table;
@Api(value = "系统配置", description = "SWEB系统配置")
public class SwebConfig extends BaseBean {
+ private static final long serialVersionUID = -3064110608740977782L;
@Column(name = "NAME")
@ApiParam(value = "名称")
private String name;
diff --git a/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/bean/SwebOrderDeliveryLog.java b/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/bean/SwebOrderDeliveryLog.java
index 2bb1f98..c3d0e27 100644
--- a/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/bean/SwebOrderDeliveryLog.java
+++ b/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/bean/SwebOrderDeliveryLog.java
@@ -28,6 +28,7 @@ import javax.persistence.Table;
@Api("订单发货通知记录表")
public class SwebOrderDeliveryLog extends BaseBean {
+ private static final long serialVersionUID = -5505138833474471710L;
@Column(name = "ORDER_ITEM_NO")
@ApiParam("单据明细编号")
private String orderItemNo;
diff --git a/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/bean/SwebPackage.java b/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/bean/SwebPackage.java
index 83ad7ca..cde67c9 100644
--- a/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/bean/SwebPackage.java
+++ b/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/bean/SwebPackage.java
@@ -29,6 +29,7 @@ import javax.persistence.Table;
@Api("物理包装")
public class SwebPackage extends BaseBean {
+ private static final long serialVersionUID = 4329007629113785744L;
@Column(name="PACKAGE_NO")
@ApiParam("包装编号")
private String packageNo;
diff --git a/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/bean/SwebProcurementPlanOrder.java b/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/bean/SwebProcurementPlanOrder.java
index df34d26..e627eee 100644
--- a/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/bean/SwebProcurementPlanOrder.java
+++ b/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/bean/SwebProcurementPlanOrder.java
@@ -28,6 +28,7 @@ import javax.persistence.Table;
@Api("开口合同主表")
public class SwebProcurementPlanOrder extends BaseBean {
+ private static final long serialVersionUID = -868499874950128043L;
@ApiParam("合同号")
@Column(name = "ORDER_NO")
private String orderNo;
diff --git a/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/bean/SwebProcurementPlanOrderDetails.java b/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/bean/SwebProcurementPlanOrderDetails.java
index f9132ff..6e049d3 100644
--- a/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/bean/SwebProcurementPlanOrderDetails.java
+++ b/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/bean/SwebProcurementPlanOrderDetails.java
@@ -30,6 +30,7 @@ import javax.persistence.Transient;
@Api("开口合同明细表")
public class SwebProcurementPlanOrderDetails extends BaseBean {
+ private static final long serialVersionUID = 6437822344590464188L;
@ApiParam("单据号")
@Column(name = "ORDER_NO")
private String orderNo;
diff --git a/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/bean/SwebPurchaseChangeLog.java b/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/bean/SwebPurchaseChangeLog.java
index 3e86f3d..de0243b 100644
--- a/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/bean/SwebPurchaseChangeLog.java
+++ b/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/bean/SwebPurchaseChangeLog.java
@@ -29,6 +29,7 @@ import javax.persistence.Table;
@Api("订单修改日志记录表")
public class SwebPurchaseChangeLog extends BaseBean {
+ private static final long serialVersionUID = 4565614096003156828L;
@Column(name = "ORDER_NO")
@ApiParam("单据明细编号")
private String orderNo;
diff --git a/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/bean/SwebPurchaseOrder.java b/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/bean/SwebPurchaseOrder.java
index fe4aff9..dde1758 100644
--- a/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/bean/SwebPurchaseOrder.java
+++ b/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/bean/SwebPurchaseOrder.java
@@ -30,6 +30,7 @@ import javax.persistence.Transient;
@Api("采购订单表-主表")
public class SwebPurchaseOrder extends BaseBean {
+ private static final long serialVersionUID = -3748055439346407775L;
@Column(name = "ORDER_NO")
@ApiParam("单据号")
public String orderNo;
diff --git a/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/bean/SwebPurchaseOrderDetails.java b/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/bean/SwebPurchaseOrderDetails.java
index 18df792..7eba5df 100644
--- a/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/bean/SwebPurchaseOrderDetails.java
+++ b/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/bean/SwebPurchaseOrderDetails.java
@@ -30,6 +30,7 @@ import javax.persistence.Transient;
@Api("采购订单表-明细表")
public class SwebPurchaseOrderDetails extends BaseBean {
+ private static final long serialVersionUID = -7410188512201254931L;
@Column(name = "ORDER_NO")
@ApiParam("单据号")
private String orderNo;
diff --git a/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/bean/SwebPurchaseOrderSn.java b/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/bean/SwebPurchaseOrderSn.java
index 3e8eb11..8140da3 100644
--- a/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/bean/SwebPurchaseOrderSn.java
+++ b/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/bean/SwebPurchaseOrderSn.java
@@ -30,6 +30,7 @@ import javax.persistence.Transient;
@Api("采购订单表-条码明细表")
public class SwebPurchaseOrderSn extends BaseBean {
+ private static final long serialVersionUID = 2226619667893717305L;
@Column(name = "ORDER_NO")
@ApiParam("单据明细编号")
private String orderNo;
diff --git a/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/bean/SwebVendorRel.java b/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/bean/SwebVendorRel.java
index ba03cc8..d4afe0c 100644
--- a/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/bean/SwebVendorRel.java
+++ b/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/bean/SwebVendorRel.java
@@ -28,6 +28,7 @@ import javax.persistence.Table;
@Api("供应商关系表")
public class SwebVendorRel extends BaseBean {
+ private static final long serialVersionUID = -283156702431035689L;
@ApiParam("计划员代码")
@Column(name = "PLANNER_CODE")
private String plannerCode;
diff --git a/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/modelbean/SwebLoginUserModel.java b/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/modelbean/SwebLoginUserModel.java
index 1c9cb27..cf8bf64 100644
--- a/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/modelbean/SwebLoginUserModel.java
+++ b/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/modelbean/SwebLoginUserModel.java
@@ -17,6 +17,7 @@ import java.io.Serializable;
@AllArgsConstructor
public class SwebLoginUserModel implements Serializable {
+ private static final long serialVersionUID = -2494619756222719468L;
@ApiParam(value = "用户ID")
private Long id;
diff --git a/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/modelbean/SwebPOBatchInsertEnterModel.java b/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/modelbean/SwebPOBatchInsertEnterModel.java
index 3f5d66b..bad9575 100644
--- a/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/modelbean/SwebPOBatchInsertEnterModel.java
+++ b/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/modelbean/SwebPOBatchInsertEnterModel.java
@@ -18,6 +18,7 @@ import java.util.Map;
@Data
public class SwebPOBatchInsertEnterModel extends BaseBean {
+ private static final long serialVersionUID = -7184098625336146560L;
@ApiParam("单据号")
private String orderNo;
diff --git a/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/modelbean/SwebPOBatchInsertItemEnterModel.java b/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/modelbean/SwebPOBatchInsertItemEnterModel.java
index 5294bcf..03b46e7 100644
--- a/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/modelbean/SwebPOBatchInsertItemEnterModel.java
+++ b/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/modelbean/SwebPOBatchInsertItemEnterModel.java
@@ -16,6 +16,7 @@ import java.io.Serializable;
@Data
public class SwebPOBatchInsertItemEnterModel implements Serializable {
+ private static final long serialVersionUID = 4003058741886494009L;
@ApiParam(value = "零件号")
private String partNo;
diff --git a/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/modelbean/SwebPODetailsUpdateHistoryModel.java b/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/modelbean/SwebPODetailsUpdateHistoryModel.java
index 8cbf146..e0e7a1f 100644
--- a/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/modelbean/SwebPODetailsUpdateHistoryModel.java
+++ b/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/modelbean/SwebPODetailsUpdateHistoryModel.java
@@ -16,6 +16,7 @@ import lombok.Data;
@Data
public class SwebPODetailsUpdateHistoryModel extends BaseBean {
+ private static final long serialVersionUID = -9085820300059480272L;
@ApiParam("单据号")
private String orderNo;
diff --git a/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/modelbean/SwebPOForPubListEnterModel.java b/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/modelbean/SwebPOForPubListEnterModel.java
index 4f50d7f..0f47fc7 100644
--- a/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/modelbean/SwebPOForPubListEnterModel.java
+++ b/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/modelbean/SwebPOForPubListEnterModel.java
@@ -14,6 +14,7 @@ import lombok.Data;
@Data
public class SwebPOForPubListEnterModel extends BaseBean {
+ private static final long serialVersionUID = -2116328977150605750L;
@ApiParam("单据号")
private String orderNo;
diff --git a/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/modelbean/SwebPOForPubListResultItemModel.java b/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/modelbean/SwebPOForPubListResultItemModel.java
index 780d3be..3d2ad2e 100644
--- a/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/modelbean/SwebPOForPubListResultItemModel.java
+++ b/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/modelbean/SwebPOForPubListResultItemModel.java
@@ -18,6 +18,7 @@ import java.util.Map;
@Data
public class SwebPOForPubListResultItemModel extends BaseBean {
+ private static final long serialVersionUID = -6156680045478117732L;
@Column(name = "ORDER_NO")
@ApiParam("单据号")
private String orderNo;
diff --git a/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/modelbean/SwebPOForPubListResultModel.java b/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/modelbean/SwebPOForPubListResultModel.java
index 4c2464f..b5f7507 100644
--- a/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/modelbean/SwebPOForPubListResultModel.java
+++ b/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/modelbean/SwebPOForPubListResultModel.java
@@ -17,6 +17,7 @@ import java.util.List;
@Data
public class SwebPOForPubListResultModel extends BaseBean {
+ private static final long serialVersionUID = 3662427372635980801L;
@ApiParam(value = "拆分请求时间数量列表", example = "1")
private List reqTimeList;
diff --git a/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/modelbean/SwebPOForPubListResultModelV2.java b/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/modelbean/SwebPOForPubListResultModelV2.java
index ee15a2a..99cbd5f 100644
--- a/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/modelbean/SwebPOForPubListResultModelV2.java
+++ b/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/modelbean/SwebPOForPubListResultModelV2.java
@@ -17,6 +17,7 @@ import java.util.List;
@Data
public class SwebPOForPubListResultModelV2 extends BaseBean {
+ private static final long serialVersionUID = -6692335488511053499L;
@ApiParam(value = "拆分请求时间数量列表", example = "1")
private List reqTimeList = Collections.EMPTY_LIST;
diff --git a/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/modelbean/SwebPOUpdatePublishForPublishModel.java b/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/modelbean/SwebPOUpdatePublishForPublishModel.java
index 31ee5c5..38ce2e3 100644
--- a/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/modelbean/SwebPOUpdatePublishForPublishModel.java
+++ b/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/modelbean/SwebPOUpdatePublishForPublishModel.java
@@ -1,7 +1,6 @@
package cn.estsh.i3plus.pojo.sweb.modelbean;
import cn.estsh.i3plus.pojo.base.bean.BaseBean;
-import cn.estsh.i3plus.pojo.base.bean.ListPager;
import io.swagger.annotations.ApiParam;
import lombok.Data;
@@ -17,6 +16,7 @@ import java.util.List;
@Data
public class SwebPOUpdatePublishForPublishModel extends BaseBean {
+ private static final long serialVersionUID = 8456615874926744777L;
@ApiParam(value = "拆分请求时间数量列表", example = "1")
private List reqTimeList;
diff --git a/modules/i3plus-pojo-wms/pom.xml b/modules/i3plus-pojo-wms/pom.xml
index cac0256..9e5f745 100644
--- a/modules/i3plus-pojo-wms/pom.xml
+++ b/modules/i3plus-pojo-wms/pom.xml
@@ -12,7 +12,6 @@
i3plus-pojo-wms
jar
- 1.0-TEST-SNAPSHOT
diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsASNMaster.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsASNMaster.java
index 7ccc46c..0600820 100644
--- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsASNMaster.java
+++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsASNMaster.java
@@ -10,7 +10,11 @@ import lombok.EqualsAndHashCode;
import org.hibernate.annotations.DynamicInsert;
import org.hibernate.annotations.DynamicUpdate;
-import javax.persistence.*;
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.Index;
+import javax.persistence.Table;
+import javax.persistence.Transient;
import java.util.List;
/**
@@ -115,10 +119,14 @@ public class WmsASNMaster extends BaseBean {
@ApiParam("备注")
public String remark;
- @Column(name = "DOCK",columnDefinition = "varchar(50) default '1'")
+ @Column(name = "DOCK", columnDefinition = "varchar(50) default ''")
@ApiParam("道口")
public String dock;
+ @ApiParam("泊位")
+ @Column(name = "ZDOC", columnDefinition = "varchar(50) default ''")
+ public String zdoc;
+
@Transient
@ApiParam("供应商电话")
private String vendorCall;
diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSOrderMaster.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSOrderMaster.java
index c632d9f..f6030f5 100644
--- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSOrderMaster.java
+++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSOrderMaster.java
@@ -43,12 +43,12 @@ public class WmsCSOrderMaster extends BaseBean {
*/
@Column(name = "ORDER_TYPE")
@ApiParam(value = "单据类型", example = "10")
- @AnnoOutputColumn(refClass = WmsEnumUtil.CS_ORDER_TYPE.class,refForeignKey = "value",value = "description")
+ @AnnoOutputColumn(refClass = WmsEnumUtil.CS_ORDER_TYPE.class, refForeignKey = "value", value = "description")
public Integer orderType;
@Column(name = "ORDER_STATUS")
@ApiParam(value = "状态 (10-创建 20-开启盘点 30-盘点中 40-盘点完成 50-已解冻 60-已关闭)", example = "1")
- @AnnoOutputColumn(refClass = WmsEnumUtil.CS_ORDER_STATUS.class,refForeignKey = "value",value = "description")
+ @AnnoOutputColumn(refClass = WmsEnumUtil.CS_ORDER_STATUS.class, refForeignKey = "value", value = "description")
public Integer orderStatus;
@Column(name = "ACTION_PERSENT")
@@ -61,17 +61,17 @@ public class WmsCSOrderMaster extends BaseBean {
@Column(name = "IS_INVENTORY")
@ApiParam(value = "是否允许清点", example = "1")
- @AnnoOutputColumn(refClass = WmsEnumUtil.TRUE_OR_FALSE.class,refForeignKey = "value",value = "description")
+ @AnnoOutputColumn(refClass = WmsEnumUtil.TRUE_OR_FALSE.class, refForeignKey = "value", value = "description")
public Integer isInventory;
@Column(name = "IS_TASK")
@ApiParam(value = "是否生产任务", example = "1")
- @AnnoOutputColumn(refClass = WmsEnumUtil.IS_GENERAL_TASK.class,refForeignKey = "value",value = "description")
+ @AnnoOutputColumn(refClass = WmsEnumUtil.IS_GENERAL_TASK.class, refForeignKey = "value", value = "description")
public Integer isTask;
@Column(name = "IS_PART")
@ApiParam(value = "是否散件")
- @AnnoOutputColumn(refClass = WmsEnumUtil.TRUE_OR_FALSE.class,refForeignKey = "value",value = "description")
+ @AnnoOutputColumn(refClass = WmsEnumUtil.TRUE_OR_FALSE.class, refForeignKey = "value", value = "description")
public Integer isPart;
@Column(name = "YEAR")
@@ -80,7 +80,7 @@ public class WmsCSOrderMaster extends BaseBean {
@Column(name = "IS_SYNC_ERP")
@ApiParam("是否同步ERP")
- @AnnoOutputColumn(refClass = WmsEnumUtil.TRUE_OR_FALSE.class,refForeignKey = "value",value = "description")
+ @AnnoOutputColumn(refClass = WmsEnumUtil.TRUE_OR_FALSE.class, refForeignKey = "value", value = "description")
public Integer isSyncErp;
@Transient
@@ -119,7 +119,7 @@ public class WmsCSOrderMaster extends BaseBean {
@Column(name = "ALLOW_LOCATES")
private String allowLocates;
public Integer getIsInventoryVal() {
- return this.isInventory == null ? 0 :this.isInventory.intValue();
+ return this.isInventory == null ? 0 : this.isInventory.intValue();
}
}
diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsHealthIndicator.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsHealthIndicator.java
new file mode 100644
index 0000000..9b4ac5c
--- /dev/null
+++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsHealthIndicator.java
@@ -0,0 +1,54 @@
+package cn.estsh.i3plus.pojo.wms.bean;
+
+import cn.estsh.i3plus.pojo.base.annotation.DynamicField;
+import cn.estsh.i3plus.pojo.base.bean.BaseBean;
+import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil;
+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;
+
+/**
+ * @Description : 仓库健康度指标
+ * @Reference :
+ * @Author : siliter.yuan
+ * @CreateDate : 2020-05-13 13:54
+ * @Modify:
+ **/
+@Data
+@Entity
+@Table(name="WMS_HEALTH_INDICATOR")
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Api(value="仓库健康度指标",description = "仓库健康度指标")
+public class WmsHealthIndicator extends BaseBean {
+
+ private static final long serialVersionUID = 7332606119041273554L;
+
+ @Column(name = "INDICATOR_CODE")
+ @ApiParam(value = "指标代码")
+ @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT)
+ private String indicatorCode;
+
+ @Column(name = "INDICATOR_NAME")
+ @ApiParam(value = "指标名称")
+ @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT)
+ private String indicatorName;
+
+ @Column(name = "GROUP_NAME")
+ @ApiParam(value = "模块名称")
+ @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT)
+ private String groupName;
+
+ @Column(name = "CALC_FORMULA")
+ @ApiParam(value = "指标测算公式")
+ @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT)
+ private String calcFormula;
+}
diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsHealthIndicatorLevel.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsHealthIndicatorLevel.java
new file mode 100644
index 0000000..fd49a58
--- /dev/null
+++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsHealthIndicatorLevel.java
@@ -0,0 +1,64 @@
+package cn.estsh.i3plus.pojo.wms.bean;
+
+import cn.estsh.i3plus.pojo.base.annotation.DynamicField;
+import cn.estsh.i3plus.pojo.base.bean.BaseBean;
+import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil;
+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;
+
+/**
+ * @Description : 仓库健康度指标
+ * @Reference :
+ * @Author : siliter.yuan
+ * @CreateDate : 2020-05-13 13:54
+ * @Modify:
+ **/
+@Data
+@Entity
+@Table(name="WMS_HEALTH_INDICATOR_LEVEL")
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Api(value="仓库健康度指标分级",description = "仓库健康度指标分级")
+public class WmsHealthIndicatorLevel extends BaseBean {
+
+ private static final long serialVersionUID = 7332606229041273554L;
+
+ @Column(name = "INDICATOR_CODE")
+ @ApiParam(value = "指标代码")
+ @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT)
+ private String indicatorCode;
+
+ @Column(name = "INDICATOR_NAME")
+ @ApiParam(value = "指标名称")
+ @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT)
+ private String indicatorName;
+
+ @Column(name = "INDICATOR_LOWER_LIMIT")
+ @ApiParam(value = "指标下限")
+ @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.NUMBER)
+ private Double indicatorLowerLimit;
+
+ @Column(name = "INDICATOR_UPPER_LIMIT")
+ @ApiParam(value = "指标上限")
+ @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.NUMBER)
+ private Double indicatorUpperLimit;
+
+ @Column(name = "INDICATOR_GRADE")
+ @ApiParam(value = "指标等级")
+ @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT)
+ private String indicatorGrade;
+
+ @Column(name = "INDICATOR_COLOR")
+ @ApiParam(value = "指标颜色")
+ @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT)
+ private String indicatorColor;
+}
diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsHealthIndicatorResult.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsHealthIndicatorResult.java
new file mode 100644
index 0000000..8d051a5
--- /dev/null
+++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsHealthIndicatorResult.java
@@ -0,0 +1,56 @@
+package cn.estsh.i3plus.pojo.wms.bean;
+
+import cn.estsh.i3plus.pojo.base.annotation.DynamicField;
+import cn.estsh.i3plus.pojo.base.bean.BaseBean;
+import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil;
+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.Lob;
+import javax.persistence.Table;
+
+/**
+ * @Description : 仓库健康度指标结果
+ * @Reference :
+ * @Author : siliter.yuan
+ * @CreateDate : 2020-05-13 13:54
+ * @Modify:
+ **/
+@Data
+@Entity
+@Table(name="WMS_HEALTH_INDICATOR_RESULT")
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Api(value="仓库健康度指标结果",description = "仓库健康度指标结果")
+public class WmsHealthIndicatorResult extends BaseBean {
+
+ private static final long serialVersionUID = 7332606339041273554L;
+
+ @Column(name = "INDICATOR_CODE")
+ @ApiParam(value = "指标代码")
+ @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT)
+ private String indicatorCode;
+
+ @Column(name = "INDICATOR_NAME")
+ @ApiParam(value = "指标名称")
+ @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT)
+ private String indicatorName;
+
+ @Column(name = "INDICATOR_VALUE")
+ @ApiParam(value = "指标测算值")
+ @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.NUMBER)
+ private Double indicatorValue;
+
+ @Lob
+ @Column(name = "INDICATOR_DETAILS")
+ @ApiParam(value = "指标测算明细")
+ @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT)
+ private String indicatorDetails;
+}
diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsHealthVariable.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsHealthVariable.java
new file mode 100644
index 0000000..d57680e
--- /dev/null
+++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsHealthVariable.java
@@ -0,0 +1,97 @@
+package cn.estsh.i3plus.pojo.wms.bean;
+
+import cn.estsh.i3plus.pojo.base.annotation.DynamicField;
+import cn.estsh.i3plus.pojo.base.bean.BaseBean;
+import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil;
+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.Lob;
+import javax.persistence.Table;
+
+/**
+ * @Description : 仓库健康度变量
+ * @Reference :
+ * @Author : siliter.yuan
+ * @CreateDate : 2020-05-13 13:54
+ * @Modify:
+ **/
+@Data
+@Entity
+@Table(name="WMS_HEALTH_VARIABLE")
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Api(value="仓库健康度变量",description = "仓库健康度变量")
+public class WmsHealthVariable extends BaseBean {
+
+ private static final long serialVersionUID = 7332606449041273554L;
+
+ @Column(name = "VARIABLE_CODE")
+ @ApiParam(value = "变量代码")
+ @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT)
+ private String variableCode;
+
+ @Column(name = "VARIABLE_NAME")
+ @ApiParam(value = "变量名称")
+ @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT)
+ private String variableName;
+
+ @Column(name = "CYCLE_RANGE")
+ @ApiParam(value = "周期(天)")
+ @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.NUMBER)
+ private Integer cycleRange;
+
+ @Column(name = "CALC_FREQUENCY")
+ @ApiParam(value = "计算频次(天)")
+ @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.NUMBER)
+ private Integer calcFrequency;
+
+ @Column(name = "LAST_CALC_TIME")
+ @ApiParam(value = "末次计算时间")
+ @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT)
+ private String LastCalcTime;
+
+ @Column(name = "NEXT_CALC_TIME")
+ @ApiParam(value = "下次计算时间")
+ @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT)
+ private String nextCalcTime;
+
+ @Column(name = "APPLY_AREA")
+ @ApiParam(value = "适应存储区")
+ @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT)
+ private String applyArea;
+
+ @Column(name = "APPLY_PART_GROUP")
+ @ApiParam(value = "适应物料组")
+ @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT)
+ private String applyPartGroup;
+
+ @Lob
+ @Column(name = "VARIABLE_PARAM")
+ @ApiParam(value = "变量参数")
+ @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT)
+ private String variableParam;
+
+ @Lob
+ @Column(name = "SQL_STATEMENT")
+ @ApiParam(value = "SQL语句")
+ @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT)
+ private String sqlStatement;
+
+ @Column(name = "FUNCTION_NAME")
+ @ApiParam(value = "方法名称")
+ @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT)
+ private String functionName;
+
+ @Column(name = "SCRIPT_NO")
+ @ApiParam(value = "脚本编号")
+ @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT)
+ private String scriptNo;
+}
diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsHealthVariableResult.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsHealthVariableResult.java
new file mode 100644
index 0000000..7820d95
--- /dev/null
+++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsHealthVariableResult.java
@@ -0,0 +1,56 @@
+package cn.estsh.i3plus.pojo.wms.bean;
+
+import cn.estsh.i3plus.pojo.base.annotation.DynamicField;
+import cn.estsh.i3plus.pojo.base.bean.BaseBean;
+import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil;
+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.Lob;
+import javax.persistence.Table;
+
+/**
+ * @Description : 仓库健康度变量测算结果
+ * @Reference :
+ * @Author : siliter.yuan
+ * @CreateDate : 2020-05-13 13:54
+ * @Modify:
+ **/
+@Data
+@Entity
+@Table(name="WMS_HEALTH_VARIABLE_RESULT")
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Api(value="仓库健康度变量测算结果",description = "仓库健康度变量测算结果")
+public class WmsHealthVariableResult extends BaseBean {
+
+ private static final long serialVersionUID = 7332606559041273554L;
+
+ @Column(name = "VARIABLE_CODE")
+ @ApiParam(value = "变量代码")
+ @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT)
+ private String variableCode;
+
+ @Column(name = "VARIABLE_NAME")
+ @ApiParam(value = "变量名称")
+ @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT)
+ private String variableName;
+
+ @Column(name = "VARIABLE_VALUE")
+ @ApiParam(value = "变量测算值")
+ @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.NUMBER)
+ private Double variableValue;
+
+ @Lob
+ @Column(name = "VARIABLE_DETAILS")
+ @ApiParam(value = "变量测算明细")
+ @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT)
+ private String variableDetails;
+}
diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsLogisticsCosts.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsLogisticsCosts.java
new file mode 100644
index 0000000..796f7eb
--- /dev/null
+++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsLogisticsCosts.java
@@ -0,0 +1,81 @@
+package cn.estsh.i3plus.pojo.wms.bean;
+
+import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn;
+import cn.estsh.i3plus.pojo.base.annotation.DynamicField;
+import cn.estsh.i3plus.pojo.base.bean.BaseBean;
+import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil;
+import cn.estsh.i3plus.pojo.base.enumutil.WmsEnumUtil;
+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;
+
+/**
+ * @Description : 物流费用管理(长途运输)
+ * @Reference :
+ * @Author : qianhuasheng
+ * @CreateDate : 2020-05-06 14:50
+ * @Modify:
+ **/
+@Data
+@Entity
+@Table(name = "WMS_LOGISTICS_COSTS")
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Api(value = "物流费用管理", description = "物流费用管理")
+public class WmsLogisticsCosts extends BaseBean {
+
+ private static final long serialVersionUID = -5307311210847854654L;
+ @Column(name = "ORGANIZE_NAME")
+ @ApiParam(value = "工厂名称")
+ @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT)
+ private String organizeName;
+
+ @Column(name = "PLACE_OF_ORIGIN")
+ @ApiParam(value = "发出地")
+ @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT)
+ private String placeOfOrigin;
+
+ @Column(name = "SHIPPING_FLAG")
+ @ApiParam(value = "发往地")
+ @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT)
+ private String shippingFlag;
+
+ @Column(name = "LOGISTICS_VENDOR_NO")
+ @ApiParam(value = "物流供应商")
+ @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT)
+ private String logisticsVendorNo;
+
+ @Column(name = "SALES_UNIT")
+ @ApiParam(value = "计价单位")
+ @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT)
+ private String salesUnit;
+
+ @Column(name = "TRANSPORT_TYPE")
+ @ApiParam(value = "运输方式")
+ @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT)
+ @AnnoOutputColumn(refClass = WmsEnumUtil.TRANSPORT_TYPE.class, refForeignKey = "value", value = "description")
+ private Integer transportType;
+
+ @Column(name = "price")
+ @ApiParam(value = "单价")
+ @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT)
+ private Double price;
+
+ @Column(name = "START_DATE")
+ @ApiParam(value = "生效日期")
+ @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT)
+ private String startDate;
+
+ @Column(name = "END_DATE")
+ @ApiParam(value = "结束日期")
+ @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT)
+ private String endDate;
+}
diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsModeTransport.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsModeTransport.java
new file mode 100644
index 0000000..4816585
--- /dev/null
+++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsModeTransport.java
@@ -0,0 +1,52 @@
+package cn.estsh.i3plus.pojo.wms.bean;
+
+import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn;
+import cn.estsh.i3plus.pojo.base.annotation.DynamicField;
+import cn.estsh.i3plus.pojo.base.bean.BaseBean;
+import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil;
+import cn.estsh.i3plus.pojo.base.enumutil.WmsEnumUtil;
+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;
+
+/**
+ * @Description : 运输方式
+ * @Reference :
+ * @Author : qianhuasheng
+ * @CreateDate : 2020-05-06 14:50
+ * @Modify:
+ **/
+@Data
+@Entity
+@Table(name = "WMS_MODE_TRANSPORT")
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Api(value = "运输方式", description = "运输方式")
+public class WmsModeTransport extends BaseBean {
+
+ private static final long serialVersionUID = 2323715097364547677L;
+ @Column(name = "ORGANIZE_NAME")
+ @ApiParam(value = "工厂名称")
+ @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT)
+ private String organizeName;
+
+ @Column(name = "ORGANIZE_CODE")
+ @ApiParam(value = "工厂代码")
+ @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT)
+ private String organizeCode;
+
+ @Column(name = "TRANSPORT_TYPE")
+ @ApiParam(value = "运输方式")
+ @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT, dataSrc = "TRANSPORT_TYPE")
+ @AnnoOutputColumn(refClass = WmsEnumUtil.TRANSPORT_TYPE.class, refForeignKey = "value", value = "description")
+ private Integer transportType;
+
+}
diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPOMaster.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPOMaster.java
index 681ae56..e18d087 100644
--- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPOMaster.java
+++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPOMaster.java
@@ -10,7 +10,11 @@ import lombok.EqualsAndHashCode;
import org.hibernate.annotations.DynamicInsert;
import org.hibernate.annotations.DynamicUpdate;
-import javax.persistence.*;
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.Index;
+import javax.persistence.Table;
+import javax.persistence.Transient;
import java.util.List;
/**
@@ -159,10 +163,14 @@ public class WmsPOMaster extends BaseBean {
@Transient
private List orderNoList;
- @Column(name = "DOCK",columnDefinition = "varchar(50) default '1'")
+ @Column(name = "DOCK", columnDefinition = "varchar(50) default ''")
@ApiParam("道口")
public String dock;
+ @ApiParam("泊位")
+ @Column(name = "ZDOC", columnDefinition = "varchar(50) default ''")
+ public String zdoc;
+
public int getPoStatusVal() {
return this.poStatus == null ? 0 : this.poStatus;
}
diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsProviderFlag.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsProviderFlag.java
new file mode 100644
index 0000000..34e1394
--- /dev/null
+++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsProviderFlag.java
@@ -0,0 +1,54 @@
+package cn.estsh.i3plus.pojo.wms.bean;
+
+import cn.estsh.i3plus.pojo.base.annotation.DynamicField;
+import cn.estsh.i3plus.pojo.base.bean.BaseBean;
+import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil;
+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;
+
+/**
+ * @Description : 物流供应商
+ * @Reference :
+ * @Author : qianhuasheng
+ * @CreateDate : 2020-05-06 14:50
+ * @Modify:
+ **/
+@Data
+@Entity
+@Table(name = "WMS_PROVIDER_FLAG")
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Api(value = "物流供应商关系", description = "库存物流供应商关系条码信息")
+public class WmsProviderFlag extends BaseBean {
+
+ private static final long serialVersionUID = -4732299479463118555L;
+ @Column(name = "ORGANIZE_NAME")
+ @ApiParam(value = "工厂名称")
+ @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT)
+ private String organizeName;
+
+
+ @Column(name = "VENDOR_NO")
+ @ApiParam(value = "物流供应商")
+ @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT)
+ private String vendorNo;
+
+ @Column(name = "VENDOR_NAME")
+ @ApiParam(value = "物流供应商名称")
+ @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT)
+ private String vendorName;
+
+ @Column(name = "SHIPPING_FLAG")
+ @ApiParam(value = "发往地编号")
+ @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT)
+ private String shippingFlag;
+}
diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsShortLogisticsCosts.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsShortLogisticsCosts.java
new file mode 100644
index 0000000..d58e019
--- /dev/null
+++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsShortLogisticsCosts.java
@@ -0,0 +1,91 @@
+package cn.estsh.i3plus.pojo.wms.bean;
+
+import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn;
+import cn.estsh.i3plus.pojo.base.annotation.DynamicField;
+import cn.estsh.i3plus.pojo.base.bean.BaseBean;
+import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil;
+import cn.estsh.i3plus.pojo.base.enumutil.WmsEnumUtil;
+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;
+
+/**
+ * @Description : 物流费用管理(短途运输)
+ * @Reference :
+ * @Author : qianhuasheng
+ * @CreateDate : 2020-05-06 14:50
+ * @Modify:
+ **/
+@Data
+@Entity
+@Table(name = "WMS_SHORT_LOGISTICS_COSTS")
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Api(value = "物流费用管理", description = "物流费用管理")
+public class WmsShortLogisticsCosts extends BaseBean {
+
+ private static final long serialVersionUID = 733863151632950809L;
+ @Column(name = "ORGANIZE_NAME")
+ @ApiParam(value = "工厂名称")
+ @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT)
+ private String organizeName;
+
+ @Column(name = "part_no")
+ @ApiParam(value = "物料编号")
+ @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT)
+ private String partNo;
+
+ @Column(name = "part_name")
+ @ApiParam(value = "物料名称")
+ @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT)
+ private String partName;
+
+ @Column(name = "PLACE_OF_ORIGIN")
+ @ApiParam(value = "发出地")
+ @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT)
+ private String placeOfOrigin;
+
+ @Column(name = "SHIPPING_FLAG")
+ @ApiParam(value = "发往地")
+ @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT)
+ private String shippingFlag;
+
+ @Column(name = "LOGISTICS_VENDOR_NO")
+ @ApiParam(value = "物流供应商")
+ @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT)
+ private String logisticsVendorNo;
+
+ @Column(name = "TRANSPORT_TYPE")
+ @ApiParam(value = "运输方式")
+ @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT)
+ @AnnoOutputColumn(refClass = WmsEnumUtil.TRANSPORT_TYPE.class, refForeignKey = "value", value = "description")
+ private Integer transportType;
+
+ @Column(name = "SALES_UNIT")
+ @ApiParam(value = "计价单位")
+ @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT)
+ private String salesUnit;
+
+ @Column(name = "price")
+ @ApiParam(value = "单价")
+ @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT)
+ private Double price;
+
+ @Column(name = "START_DATE")
+ @ApiParam(value = "生效日期")
+ @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT)
+ private String startDate;
+
+ @Column(name = "END_DATE")
+ @ApiParam(value = "结束日期")
+ @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT)
+ private String endDate;
+}
diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsThymeleaf.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsThymeleaf.java
index d8b72ec..fdcf3d7 100644
--- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsThymeleaf.java
+++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsThymeleaf.java
@@ -39,6 +39,10 @@ public class WmsThymeleaf extends BaseBean {
@ApiParam("模板描述")
private String tlDesc;
+ @Column(name = "PROMPT_MSG")
+ @ApiParam("引导消息")
+ private String promptMsg;
+
@Lob
@Column(name = "TL_CONTENT", columnDefinition = "TEXT")
@ApiParam(value = "模板内容")
diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsHealthIndicatorLevelRepository.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsHealthIndicatorLevelRepository.java
new file mode 100644
index 0000000..43c28ef
--- /dev/null
+++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsHealthIndicatorLevelRepository.java
@@ -0,0 +1,16 @@
+package cn.estsh.i3plus.pojo.wms.repository;
+
+import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
+import cn.estsh.i3plus.pojo.wms.bean.WmsHealthIndicatorLevel;
+import org.springframework.stereotype.Repository;
+
+/**
+ * @Description :
+ * @Reference :
+ * @Author : siliter.yuan
+ * @CreateDate : 2020-05-13 15:17
+ * @Modify:
+ **/
+@Repository
+public interface WmsHealthIndicatorLevelRepository extends BaseRepository {
+}
diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsHealthIndicatorRepository.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsHealthIndicatorRepository.java
new file mode 100644
index 0000000..c197b34
--- /dev/null
+++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsHealthIndicatorRepository.java
@@ -0,0 +1,16 @@
+package cn.estsh.i3plus.pojo.wms.repository;
+
+import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
+import cn.estsh.i3plus.pojo.wms.bean.WmsHealthIndicator;
+import org.springframework.stereotype.Repository;
+
+/**
+ * @Description :
+ * @Reference :
+ * @Author : siliter.yuan
+ * @CreateDate : 2020-05-13 15:17
+ * @Modify:
+ **/
+@Repository
+public interface WmsHealthIndicatorRepository extends BaseRepository {
+}
diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsHealthIndicatorResultRepository.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsHealthIndicatorResultRepository.java
new file mode 100644
index 0000000..833dfd2
--- /dev/null
+++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsHealthIndicatorResultRepository.java
@@ -0,0 +1,16 @@
+package cn.estsh.i3plus.pojo.wms.repository;
+
+import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
+import cn.estsh.i3plus.pojo.wms.bean.WmsHealthIndicatorResult;
+import org.springframework.stereotype.Repository;
+
+/**
+ * @Description :
+ * @Reference :
+ * @Author : siliter.yuan
+ * @CreateDate : 2020-05-13 15:17
+ * @Modify:
+ **/
+@Repository
+public interface WmsHealthIndicatorResultRepository extends BaseRepository {
+}
diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsHealthVariableRepository.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsHealthVariableRepository.java
new file mode 100644
index 0000000..732a108
--- /dev/null
+++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsHealthVariableRepository.java
@@ -0,0 +1,16 @@
+package cn.estsh.i3plus.pojo.wms.repository;
+
+import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
+import cn.estsh.i3plus.pojo.wms.bean.WmsHealthVariable;
+import org.springframework.stereotype.Repository;
+
+/**
+ * @Description :
+ * @Reference :
+ * @Author : siliter.yuan
+ * @CreateDate : 2020-05-13 15:17
+ * @Modify:
+ **/
+@Repository
+public interface WmsHealthVariableRepository extends BaseRepository {
+}
diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsHealthVariableResultRepository.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsHealthVariableResultRepository.java
new file mode 100644
index 0000000..58f6f6a
--- /dev/null
+++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsHealthVariableResultRepository.java
@@ -0,0 +1,16 @@
+package cn.estsh.i3plus.pojo.wms.repository;
+
+import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
+import cn.estsh.i3plus.pojo.wms.bean.WmsHealthVariableResult;
+import org.springframework.stereotype.Repository;
+
+/**
+ * @Description :
+ * @Reference :
+ * @Author : siliter.yuan
+ * @CreateDate : 2020-05-13 15:17
+ * @Modify:
+ **/
+@Repository
+public interface WmsHealthVariableResultRepository extends BaseRepository {
+}
diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsLogisticsCostsRepository.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsLogisticsCostsRepository.java
new file mode 100644
index 0000000..9fa807f
--- /dev/null
+++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsLogisticsCostsRepository.java
@@ -0,0 +1,16 @@
+package cn.estsh.i3plus.pojo.wms.repository;
+
+import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
+import cn.estsh.i3plus.pojo.wms.bean.WmsLogisticsCosts;
+import org.springframework.stereotype.Repository;
+
+/**
+ * @Description : 物流费用管理
+ * @Reference :
+ * @Author : qianhuasheng
+ * @CreateDate : 2019-06-28 15:17
+ * @Modify:
+ **/
+@Repository
+public interface WmsLogisticsCostsRepository extends BaseRepository {
+}
diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsModeTransportRepository.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsModeTransportRepository.java
new file mode 100644
index 0000000..17df50e
--- /dev/null
+++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsModeTransportRepository.java
@@ -0,0 +1,16 @@
+package cn.estsh.i3plus.pojo.wms.repository;
+
+import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
+import cn.estsh.i3plus.pojo.wms.bean.WmsModeTransport;
+import org.springframework.stereotype.Repository;
+
+/**
+ * @Description : 运输方式
+ * @Reference :
+ * @Author : qianhuasheng
+ * @CreateDate : 2019-06-28 15:17
+ * @Modify:
+ **/
+@Repository
+public interface WmsModeTransportRepository extends BaseRepository {
+}
diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsProviderFlagRepository.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsProviderFlagRepository.java
new file mode 100644
index 0000000..c6446a8
--- /dev/null
+++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsProviderFlagRepository.java
@@ -0,0 +1,16 @@
+package cn.estsh.i3plus.pojo.wms.repository;
+
+import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
+import cn.estsh.i3plus.pojo.wms.bean.WmsProviderFlag;
+import org.springframework.stereotype.Repository;
+
+/**
+ * @Description : 物流供应商与发往地关系
+ * @Reference :
+ * @Author : qianhuasheng
+ * @CreateDate : 2019-06-28 15:17
+ * @Modify:
+ **/
+@Repository
+public interface WmsProviderFlagRepository extends BaseRepository {
+}
diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsShortLogisticsCostsRepository.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsShortLogisticsCostsRepository.java
new file mode 100644
index 0000000..57028b4
--- /dev/null
+++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsShortLogisticsCostsRepository.java
@@ -0,0 +1,16 @@
+package cn.estsh.i3plus.pojo.wms.repository;
+
+import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
+import cn.estsh.i3plus.pojo.wms.bean.WmsShortLogisticsCosts;
+import org.springframework.stereotype.Repository;
+
+/**
+ * @Description : 物流费用管理(短途运输)
+ * @Reference :
+ * @Author : qianhuasheng
+ * @CreateDate : 2019-06-28 15:17
+ * @Modify:
+ **/
+@Repository
+public interface WmsShortLogisticsCostsRepository extends BaseRepository {
+}
diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java
index 5c2dd6d..c81035f 100644
--- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java
+++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java
@@ -21,11 +21,7 @@ import com.alibaba.fastjson.JSONObject;
import com.google.common.base.Strings;
import org.apache.commons.lang3.StringUtils;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
+import java.util.*;
import java.util.stream.Collectors;
/**
@@ -279,6 +275,12 @@ public class WmsHqlPack {
DdlPreparedPack.getInPackList(wmsPOMaster.getOrderNoList(), "orderNo", result);
}
+ //按创建时间查询单据信息
+ if (StringUtils.isNotBlank(wmsPOMaster.getCreateDateTimeStart())) {
+ DdlPreparedPack.timeBuilder(wmsPOMaster.getCreateDateTimeStart(),
+ wmsPOMaster.getCreateDateTimeEnd(), "createDatetime", result, true);
+ }
+
getStringBuilderPack(wmsPOMaster, result);
return result;
@@ -693,6 +695,12 @@ public class WmsHqlPack {
DdlPreparedPack.getInPackList(wmsASNMaster.getOrderNoList(), "orderNo", result);
}
+ //按创建时间查询单据信息
+ if (StringUtils.isNotBlank(wmsASNMaster.getCreateDateTimeStart())) {
+ DdlPreparedPack.timeBuilder(wmsASNMaster.getCreateDateTimeStart(),
+ wmsASNMaster.getCreateDateTimeEnd(), "createDatetime", result, true);
+ }
+
getStringBuilderPack(wmsASNMaster, result);
return result;
@@ -3242,4 +3250,65 @@ public class WmsHqlPack {
getStringBuilderPack(thymeleaf, result);
return result;
}
+
+ /**
+ * 仓库健康指标信息分页查询条件
+ * @param healthIndicator
+ * @return
+ */
+ public static DdlPackBean packHqlWmsHealthIndicator(WmsHealthIndicator healthIndicator) {
+ DdlPackBean result = new DdlPackBean();
+ DdlPreparedPack.getStringEqualPack(healthIndicator.getIndicatorCode(), "indicatorCode", result);
+ DdlPreparedPack.getStringEqualPack(healthIndicator.getGroupName(), "groupName", result);
+ getStringBuilderPack(healthIndicator, result);
+ return result;
+ }
+
+ /**
+ * 仓库健康指标分级信息分页查询条件
+ * @param healthIndicatorLevel
+ * @return
+ */
+ public static DdlPackBean packHqlWmsHealthIndicatorLevel(WmsHealthIndicatorLevel healthIndicatorLevel) {
+ DdlPackBean result = new DdlPackBean();
+ DdlPreparedPack.getStringEqualPack(healthIndicatorLevel.getIndicatorCode(), "indicatorCode", result);
+ getStringBuilderPack(healthIndicatorLevel, result);
+ return result;
+ }
+
+ /**
+ * 仓库健康指标分级信息分页查询条件
+ * @param wmsHealthVariable
+ * @return
+ */
+ public static DdlPackBean packHqlWmsHealthVariable(WmsHealthVariable wmsHealthVariable) {
+ DdlPackBean result = new DdlPackBean();
+ DdlPreparedPack.getStringEqualPack(wmsHealthVariable.getVariableCode(), "variableCode", result);
+ getStringBuilderPack(wmsHealthVariable, result);
+ return result;
+ }
+
+ /**
+ * 仓库健康指标测算结果信息查询条件
+ * @param healthIndicatorResult
+ * @return
+ */
+ public static DdlPackBean packHqlWmsHealthIndicatorResult(WmsHealthIndicatorResult healthIndicatorResult) {
+ DdlPackBean result = new DdlPackBean();
+ DdlPreparedPack.getStringEqualPack(healthIndicatorResult.getIndicatorCode(), "indicatorCode", result);
+ getStringBuilderPack(healthIndicatorResult, result);
+ return result;
+ }
+
+ /**
+ * 仓库健康指标变量测算结果信息查询条件
+ * @param healthVariableResult
+ * @return
+ */
+ public static DdlPackBean packHqlWmsHealthVariableResult(WmsHealthVariableResult healthVariableResult) {
+ DdlPackBean result = new DdlPackBean();
+ DdlPreparedPack.getStringEqualPack(healthVariableResult.getVariableCode(), "variableCode", result);
+ getStringBuilderPack(healthVariableResult, result);
+ return result;
+ }
}
diff --git a/modules/i3plus-pojo-workflow/pom.xml b/modules/i3plus-pojo-workflow/pom.xml
index af52bb4..0fea52b 100644
--- a/modules/i3plus-pojo-workflow/pom.xml
+++ b/modules/i3plus-pojo-workflow/pom.xml
@@ -12,7 +12,6 @@
i3plus-pojo-workflow
jar
- 1.0-TEST-SNAPSHOT
diff --git a/pom.xml b/pom.xml
index fbbe86f..cc8fce6 100644
--- a/pom.xml
+++ b/pom.xml
@@ -35,6 +35,7 @@
modules/i3plus-pojo-lac
modules/i3plus-pojo-ptl
modules/i3plus-pojo-ics
+ modules/i3plus-pojo-mdm