From 035a8b59249ff694ccf0849a1a6093d9f79fd8c7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=B1=AA=E4=BA=91=E6=98=8A?= Date: Wed, 24 Jul 2019 20:36:56 +0800 Subject: [PATCH 01/15] =?UTF-8?q?=E5=AE=9A=E6=97=B6=E4=BB=BB=E5=8A=A1?= =?UTF-8?q?=E6=97=A5=E5=BF=97=E4=BF=A1=E6=81=AF=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/base/enumutil/AndonEnumUtil.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/AndonEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/AndonEnumUtil.java index b99bad0..b068420 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/AndonEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/AndonEnumUtil.java @@ -570,7 +570,7 @@ public class AndonEnumUtil { CANCEL_ACTION("40", "撤销动作"), COMMIT_ACTION("50","提交动作"), PASS_ACTION("60","审批动作"), - SHIFG_CALL_ACTION("70", "转呼动作"); + REJECT_ACTION("70", "驳回动作"); private String value; private String description; From 341994c3261c92d653ceb9bfdf4a299b242c303f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=B1=AA=E4=BA=91=E6=98=8A?= Date: Fri, 26 Jul 2019 14:41:45 +0800 Subject: [PATCH 02/15] =?UTF-8?q?=E5=AE=89=E7=81=AF=E6=8A=A5=E8=A1=A8?= =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cn.estsh.i3plus.pojo.andon/bean/AndonManageQueue.java | 11 ++--------- .../cn.estsh.i3plus.pojo.andon/bean/AndonManageRecord.java | 8 ++++++++ 2 files changed, 10 insertions(+), 9 deletions(-) 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 9f3a6ea..8f43576 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 @@ -301,16 +301,9 @@ public class AndonManageQueue extends BaseBean { @ApiParam(value = "组织名称") private String organizeNameRdd; - /** - * 1 = 是，2 = 否 - */ - @Column(name = "IS_RESOLVE") - @ApiParam(value = "是否驳回", example = "2") - private Integer isResolve; - - @Column(name = "RESOLVE_OPINION") + @Column(name = "REJECT_OPINION") @ApiParam(value = "驳回意见") - private String resolveOpinion; + private String rejectOpinion; @Transient @ApiParam(value = "安灯状态集合") 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 2ddb970..f1fa3f0 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 @@ -256,6 +256,14 @@ public class AndonManageRecord extends BaseBean { @ApiParam(value = "重要等级名称") private String importanceNameRdd; + @Column(name = "ORGANIZE_NAME_RDD") + @ApiParam(value = "组织名称") + private String organizeNameRdd; + + @Column(name = "REJECT_OPINION") + @ApiParam(value = "驳回意见") + private String rejectOpinion; + // 是否转呼 public Integer getIsShiftCall() { return this.isShiftCall == null ? 0 : this.isShiftCall; From 60e6d51d357173050c65c962db6f1648128f9ff0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=AE=B8=E5=BF=83=E6=B4=81?= Date: Sun, 28 Jul 2019 18:44:33 +0800 Subject: [PATCH 03/15] =?UTF-8?q?=E6=B5=81=E7=A8=8B=E7=AE=A1=E5=AE=B62.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/base/enumutil/WmsEnumUtil.java | 30 +++++++++++----- .../i3plus/pojo/model/wms/WmsAgCacheModel.java | 27 ++++++++++++++ .../i3plus/pojo/model/wms/WmsAgdCacheModel.java | 26 ++++++++++++++ .../i3plus/pojo/model/wms/WmsAmCacheModel.java | 23 ++++++++++++ .../i3plus/pojo/model/wms/WmsMoveDetailsModel.java | 2 +- .../estsh/i3plus/pojo/wms/bean/WmsActionGroup.java | 35 +++++++++--------- .../pojo/wms/bean/WmsActionGroupDetails.java | 41 ++++++++++++++++++++++ .../estsh/i3plus/pojo/wms/bean/WmsActionLog.java | 35 ++++++------------ .../i3plus/pojo/wms/bean/WmsActionLogData.java | 6 ++-- .../i3plus/pojo/wms/bean/WmsActionLogDetails.java | 17 +++++---- .../i3plus/pojo/wms/bean/WmsActionStepCall.java | 26 +++++++++----- .../i3plus/pojo/wms/bean/WmsOperationBean.java | 9 +++-- .../estsh/i3plus/pojo/wms/bean/WmsTransType.java | 2 +- .../estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java | 4 +-- 14 files changed, 206 insertions(+), 77 deletions(-) create mode 100644 modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsAgCacheModel.java create mode 100644 modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsAgdCacheModel.java create mode 100644 modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsAmCacheModel.java 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 8ad590e..830cb97 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 @@ -724,6 +724,19 @@ public class WmsEnumUtil { public String getValue() { return value; } + + public static MODULE_METHOD_NAME codeOf(String value) { + if (value == null) { + return null; + } else { + for (int i = 0; i < values().length; i++) { + if (values()[i].value == value) { + return values()[i]; + } + } + } + return null; + } } @@ -1471,14 +1484,13 @@ public class WmsEnumUtil { return description; } - public static String valueOf(int val) { - String tmp = null; + public static ACTION_BUTLER_SOURCE valueOf(Integer val) { for (int i = 0; i < values().length; i++) { if (values()[i].value == val) { - tmp = values()[i].description; + return values()[i]; } } - return tmp; + return null; } } @@ -1487,7 +1499,7 @@ public class WmsEnumUtil { * 组件类型 */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) - public enum COMPONENT_TYPE { + public enum AM_TYPE { PROCESS_HANDLING(10, "流程处理组件"), PROCESS_INITIALIZATION(20, "流程初始化组件"), @@ -1499,7 +1511,7 @@ public class WmsEnumUtil { private int value; private String description; - COMPONENT_TYPE(int value, String description) { + AM_TYPE(int value, String description) { this.value = value; this.description = description; } @@ -1522,7 +1534,7 @@ public class WmsEnumUtil { return tmp; } - public static COMPONENT_TYPE switchGetValue(int val) { + public static AM_TYPE switchGetValue(int val) { int tmp = 1; for (int i = 0; i < values().length; i++) { if (values()[i].value == val) { @@ -1574,7 +1586,7 @@ public class WmsEnumUtil { * 10=交互动作,20=后台动作,30=提交动作 */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) - public enum GROUP_VALUE_TYPE { + public enum AGD_VALUE_TYPE { INTERACTIVE_ACTION(10, "交互动作"), BACKSTAGE_ACTION(20, "后台动作"), @@ -1584,7 +1596,7 @@ public class WmsEnumUtil { private int value; private String description; - GROUP_VALUE_TYPE(int value, String description) { + AGD_VALUE_TYPE(int value, String description) { this.value = value; this.description = description; } diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsAgCacheModel.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsAgCacheModel.java new file mode 100644 index 0000000..78ba929 --- /dev/null +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsAgCacheModel.java @@ -0,0 +1,27 @@ +package cn.estsh.i3plus.pojo.model.wms; + +import cn.estsh.i3plus.pojo.wms.bean.WmsActionGroup; +import cn.estsh.i3plus.pojo.wms.bean.WmsOptionModel; +import io.swagger.annotations.ApiParam; +import lombok.Data; + +import java.util.List; +import java.util.Map; + +/** + * @Description 作业流程缓存Model + * @Reference + * @Author dragon + * @CreateDate 2019/7/24 22:16 + * @Modify + */ +@Data +public class WmsAgCacheModel { + + @ApiParam("作业流程") + public WmsActionGroup wmsActionGroup; + @ApiParam("流程初始化自定义组件") + public List options; + @ApiParam("作业流程明细Model集合") + public Map wmsAgdCacheModelMap; +} diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsAgdCacheModel.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsAgdCacheModel.java new file mode 100644 index 0000000..b9cf218 --- /dev/null +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsAgdCacheModel.java @@ -0,0 +1,26 @@ +package cn.estsh.i3plus.pojo.model.wms; + +import cn.estsh.i3plus.pojo.wms.bean.WmsActionGroupDetails; +import cn.estsh.i3plus.pojo.wms.bean.WmsActionStepCall; +import io.swagger.annotations.ApiParam; +import lombok.Data; + +import java.util.List; +import java.util.Map; + +/** + * @Description 作业流程明细缓存Model + * @Reference + * @Author dragon + * @CreateDate 2019/7/24 22:16 + * @Modify + */ +@Data +public class WmsAgdCacheModel { + @ApiParam("作业流程明细") + public WmsActionGroupDetails wmsActionGroupDetails; + @ApiParam("作业步骤调用") + public List wmsActionStepCallList; + @ApiParam("作业步骤调用参数") + public Map wmsActionStepCallParamsMap; +} diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsAmCacheModel.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsAmCacheModel.java new file mode 100644 index 0000000..5ba47c0 --- /dev/null +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsAmCacheModel.java @@ -0,0 +1,23 @@ +package cn.estsh.i3plus.pojo.model.wms; + +import cn.estsh.i3plus.pojo.wms.bean.WmsActionModule; +import cn.estsh.i3plus.pojo.wms.bean.WmsActionModuleParam; +import io.swagger.annotations.ApiParam; +import lombok.Data; + +import java.util.List; + +/** + * @Description 作业处理组件缓存Model + * @Reference + * @Author dragon + * @CreateDate 2019/7/24 22:17 + * @Modify + */ +@Data +public class WmsAmCacheModel { + @ApiParam("作业处理组件") + public WmsActionModule wmsActionModule; + @ApiParam("作业处理组件参数集合") + public List wmsActionModuleParamList; +} diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsMoveDetailsModel.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsMoveDetailsModel.java index 30fe13b..25ed168 100644 --- a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsMoveDetailsModel.java +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsMoveDetailsModel.java @@ -17,5 +17,5 @@ import java.util.List; @Data public class WmsMoveDetailsModel implements Serializable { private WmsMoveDetails details; - private List moveSn; + private List moveSnList; } diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionGroup.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionGroup.java index 48c1efe..9ac398e 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionGroup.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionGroup.java @@ -69,30 +69,27 @@ public class WmsActionGroup extends BaseBean { @ApiParam(value = "GOJS位置") private String position; - public Long getInitAmId() { - if (initAmId != null) { - return initAmId.longValue(); - } else { - return initAmId; - } + @Transient + @ApiParam(value = "提交步骤序号") + private Integer submitStepSeq; + + public long getInitAmIdVal() { + return this.initAmId == null ? 0 : this.initAmId.intValue(); + } + + public long getDetailsAmIdVal() { + return this.detailsAmId == null ? 0 : this.detailsAmId.intValue(); } - public Long getDetailsAmId() { - if (detailsAmId != null) { - return detailsAmId.longValue(); - } else { - return detailsAmId; - } + public long getEndAmIdVal() { + return this.endAmId == null ? 0 : this.endAmId.intValue(); } - public Long getEndAmId() { - if (endAmId != null) { - return endAmId.longValue(); - } else { - return endAmId; - } + public int getAutoInitVal() { + return this.autoInit == null ? 0 : this.autoInit.intValue(); } - public WmsActionGroup() { + public int geSubmitStepSeqVal() { + return this.submitStepSeq == null ? 0 : this.submitStepSeq.intValue(); } } diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionGroupDetails.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionGroupDetails.java index beb6129..81183f2 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionGroupDetails.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionGroupDetails.java @@ -65,6 +65,11 @@ public class WmsActionGroupDetails extends BaseBean { @JsonSerialize(using = ToStringSerializer.class) private Long asId; + @Column(name = "AT_ID") + @ApiParam(value = "步骤类型编号", example = "0") + @JsonSerialize(using = ToStringSerializer.class) + private Long atId; + @Transient @ApiParam(value = "作业步骤名称") private String asName; @@ -89,4 +94,40 @@ public class WmsActionGroupDetails extends BaseBean { @ApiParam(value = "回显组件方法ID", example = "1") @JsonSerialize(using = ToStringSerializer.class) private Long showAmId; + + @Column(name = "IS_COMMIT_ABLE") + @ApiParam(value = "是否可提交", example = "2") + private Integer isCommitAble; + + public int getSeqVal() { + return this.seq == null ? 0 : this.seq; + } + + public int getNgSeqVal() { + return this.ngSeq == null ? 0 : this.ngSeq; + } + + public int getOkSeqVal() { + return this.okSeq == null ? 0 : this.okSeq; + } + + public int getPreShowVal() { + return this.preShow == null ? 0 : this.preShow; + } + + public int getIsCommitAbleVal() { + return this.isCommitAble == null ? 0 : this.isCommitAble; + } + + public int getValueTypeVal() { + return this.valueType == null ? 0 : this.valueType; + } + + public int getToUpperVal() { + return this.toUpper == null ? 0 : this.toUpper; + } + + public int getLenCheckVal() { + return this.lenCheck == null ? 0 : this.lenCheck; + } } diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionLog.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionLog.java index dffe9b6..18113af 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionLog.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionLog.java @@ -29,30 +29,21 @@ import javax.persistence.Transient; @DynamicUpdate @EqualsAndHashCode(callSuper = true) @Table(name="WMS_ACTION_LOG") -@Api(value="作业记录表",description = "作业记录表") +@Api(value="作业记录表") public class WmsActionLog extends BaseBean { - @Column(name="TASK_ID") + @Column(name="TASK_NO") @ApiParam(value = "作业任务编号", example = "1") @JsonSerialize(using = ToStringSerializer.class) - public Long taskId; - - //get单独处理 - public Long getTaskId() { - if(taskId != null) { - return taskId.longValue(); - }else{ - return taskId; - } - } + public String taskNo; @Column(name="TRANS_TYPE_CODE") @ApiParam(value = "交易类型编号") public String transTypeCode; - @Column(name="TRANS_TYPE_NAME") - @ApiParam(value = "交易类型名称") - public String transTypeName; + @Column(name="MOVE_NO") + @ApiParam(value = "移动单单号") + public String moveNo; @Column(name="AG_ID") @ApiParam(value = "作业流程编号", example = "1") @@ -76,13 +67,9 @@ public class WmsActionLog extends BaseBean { @ApiParam(value = "作业人员") public String actionUserName; - @Column(name="FIX_ID") + @Column(name="FIX_NO") @ApiParam(value = "设备编号") - public String fixId; - - @Column(name="ORDER_NO") - @ApiParam(value = "单据编号") - public String orderNo; + public String fixNo; @Column(name="START_TIME") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") @@ -129,15 +116,15 @@ public class WmsActionLog extends BaseBean { @Column(name="INIT_AM_ID") @ApiParam(value = "初始化组件编号", example = "0") - private Long initAmId; + public Long initAmId; @Column(name="DETAILS_AM_ID") @ApiParam(value = "明细处理组件编号", example = "0") - private Long detailsAmId; + public Long detailsAmId; @Column(name="END_AM_ID") @ApiParam(value = "结束组件编号", example = "0") - private Long endAmId; + public Long endAmId; public Long getInitAmId() { if (initAmId != null) { diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionLogData.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionLogData.java index e507653..183b936 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionLogData.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionLogData.java @@ -74,7 +74,7 @@ public class WmsActionLogData extends BaseBean { private String outParams; @Lob - @Column(name = "OUT_RESULT") - @ApiParam(value = "执行结果") - private String outResult; + @Column(name = "ERROR_MSG") + @ApiParam(value = "异常信息") + private String errorMsg; } diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionLogDetails.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionLogDetails.java index f6cc610..7715e02 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionLogDetails.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionLogDetails.java @@ -31,7 +31,7 @@ import javax.persistence.Table; public class WmsActionLogDetails extends BaseBean { @Column(name = "AL_ID") - @ApiParam(value = "作业流程ID", example = "1") + @ApiParam(value = "作业记录ID", example = "1") @JsonSerialize(using = ToStringSerializer.class) public Long alId; @@ -75,6 +75,11 @@ public class WmsActionLogDetails extends BaseBean { @JsonSerialize(using = ToStringSerializer.class) public Long asId; + @Column(name = "AT_ID") + @ApiParam(value = "步骤类型编号", example = "0") + @JsonSerialize(using = ToStringSerializer.class) + public Long atId; + @Column(name = "ALD_STATUS") @ApiParam(value = "执行状态", example = "1") public Integer aldStatus; @@ -89,23 +94,23 @@ public class WmsActionLogDetails extends BaseBean { @Column(name = "GOTO_BTN_CODE") @ApiParam(value = "跳转按钮代码") - private String goToBtnCode; + public String goToBtnCode; @Column(name = "GOTO_BTN_NAME") @ApiParam(value = "跳转按钮名称") - private String goToBtnName; + public String goToBtnName; @Column(name = "PRE_SHOW") @ApiParam(value = "是否预显示", example = "1") - private Integer preShow; + public Integer preShow; @Column(name = "SHOW_AM_ID") @ApiParam(value = "回显组件方法ID", example = "1") - private Long showAmId; + public Long showAmId; @Column(name = "AGD_ID") @ApiParam(value = "作业流程明细ID", example = "1") - private Long agdId; + public Long agdId; public Long getAsId() { if (asId != null) { diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionStepCall.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionStepCall.java index c9e8915..e41964f 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionStepCall.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionStepCall.java @@ -24,7 +24,7 @@ import javax.persistence.*; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) -@Table(name="WMS_ACTION_STEP_CALL", indexes = { +@Table(name = "WMS_ACTION_STEP_CALL", indexes = { @Index(columnList = "ORGANIZE_CODE"), @Index(columnList = "AS_ID"), @Index(columnList = "AM_ID") @@ -32,17 +32,17 @@ import javax.persistence.*; @Api("作业步骤调用信息") public class WmsActionStepCall extends BaseBean { - @Column(name="AS_ID") - @ApiParam(value = "作业步骤ID",example = "0") + @Column(name = "AS_ID") + @ApiParam(value = "作业步骤ID", example = "0") @JsonSerialize(using = ToStringSerializer.class) public Long asId; - @Column(name="SEQ") - @ApiParam(value = "序号",example = "0") + @Column(name = "SEQ") + @ApiParam(value = "序号", example = "0") public Integer seq; - @Column(name="AM_ID") - @ApiParam(value = "处理组件ID",example = "0") + @Column(name = "AM_ID") + @ApiParam(value = "处理组件ID", example = "0") @JsonSerialize(using = ToStringSerializer.class) public Long amId; @@ -54,11 +54,19 @@ public class WmsActionStepCall extends BaseBean { @ApiParam(value = "组件描述") public String amDesc; - @Column(name="AM_TYPE") + @Column(name = "AM_TYPE") @ApiParam(value = "组件类型", example = "0") public Integer amType; - @Column(name="OK_VALUE") + @Column(name = "OK_VALUE") @ApiParam(value = "成功标志", example = "10") public Integer okValue; + + public int getAmTypeVal() { + return this.amType == null ? 0 : this.amType; + } + + public int getOkValueVal() { + return this.okValue == null ? 0 : this.okValue; + } } diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsOperationBean.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsOperationBean.java index b572de7..1c1f95c 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsOperationBean.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsOperationBean.java @@ -22,13 +22,16 @@ public class WmsOperationBean extends BaseBean { public String barCode; @ApiParam("可选项的值") - public List options; + public List options; @ApiParam("设备编号") public String fixNo; - @ApiParam("作业记录编号") - public String alId; + @ApiParam("交易类型") + public String transTypeCode; + + @ApiParam("任务单号") + public String taskNo; /** * 触发源: diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTransType.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTransType.java index c095d84..cc5984b 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTransType.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTransType.java @@ -70,6 +70,6 @@ public class WmsTransType extends BaseBean { private String menuUrl; public String getMenuUrl() { - return "/handle?transCode=" + this.transTypeCode; + return "/handle?transTypeCode=" + this.transTypeCode; } } 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 6f65d60..1bfbfe1 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 @@ -2188,9 +2188,9 @@ public class WmsHqlPack { public static DdlPackBean packHqlWmsActionLogByActionLog(WmsActionLog actionLog) { DdlPackBean packBean = new DdlPackBean(); DdlPreparedPack.timeBuilder(actionLog.getCreateDatetime(), "createDatetime", packBean, false, false); - DdlPreparedPack.getStringEqualPack(actionLog.getOrderNo(), "orderNo", packBean); + DdlPreparedPack.getStringEqualPack(actionLog.getMoveNo(), "moveNo", packBean); DdlPreparedPack.getStringEqualPack(actionLog.getTransTypeCode(), "transTypeCode", packBean); - DdlPreparedPack.getStringEqualPack(actionLog.getFixId(), "fixId", packBean); + DdlPreparedPack.getStringEqualPack(actionLog.getFixNo(), "fixNo", packBean); DdlPreparedPack.getNumEqualPack(actionLog.getAgId(), "agId", packBean); DdlPreparedPack.getNumEqualPack(actionLog.getActionStatus(), "actionStatus", packBean); DdlPreparedPack.getStringEqualPack(actionLog.getAgNameRdd(), "agNameRdd", packBean); From 7f3d902a300d755e29cb2e7d0492a57eb74ef052 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=AE=B8=E5=BF=83=E6=B4=81?= Date: Tue, 30 Jul 2019 09:22:00 +0800 Subject: [PATCH 04/15] =?UTF-8?q?=E6=B5=81=E7=A8=8B=E7=AE=A1=E5=AE=B6?= =?UTF-8?q?=EF=BC=9A=E6=8F=90=E4=BA=A4=E6=A3=80=E9=AA=8C+=E9=A2=84?= =?UTF-8?q?=E5=9B=9E=E6=98=BE=E4=BC=98=E5=8C=96=EF=BC=9B=20=E7=9B=B4?= =?UTF-8?q?=E9=80=81=E5=8F=91=E8=BF=90JOB:#5132?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/base/enumutil/WmsEnumUtil.java | 33 ++++++++++++++++++++++ 1 file changed, 33 insertions(+) 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 830cb97..abc04b5 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 @@ -19,6 +19,39 @@ public class WmsEnumUtil { /** + * 流程提交校验 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum GROUP_COMMIT_CHECK { + DISABLE(1, "禁止提交"), CHECK_MOVE(2, "校验移动单"), NO_CHECK(3, "不校验"); + + private int value; + private String description; + + GROUP_COMMIT_CHECK(int value, String description) { + this.value = value; + this.description = description; + } + + public int getValue() { + return value; + } + + public String getDescription() { + return description; + } + + public static GROUP_COMMIT_CHECK codeOf(int value) { + for (int i = 0; i < values().length; i++) { + if (values()[i].value == value) { + return values()[i]; + } + } + return null; + } + } + + /** * 订单明细信息 是否免费 */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) From 3dca11a963f31d3b33f4e88d4579f34473ef1359 Mon Sep 17 00:00:00 2001 From: WYnneaoapc Date: Tue, 30 Jul 2019 19:39:35 +0800 Subject: [PATCH 05/15] add a hql --- .../cn/estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) 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 f3b9ffa..6ca0761 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 @@ -346,6 +346,23 @@ public class MesHqlPack { } /** + * MES 上传文件FastDfs封装 + * @param mesESOP + * @return + */ + public static DdlPackBean getMesESOP(MesESOP mesESOP, String organizeCode) { + DdlPackBean packBean = getAllBaseDataByNormalPro(mesESOP, organizeCode); + if (StringUtils.isNotEmpty(mesESOP.getWorkCenterCode())){ + DdlPreparedPack.getStringEqualPack(mesESOP.getWorkCenterCode(), "workCenterCode", packBean); + } + if (StringUtils.isNotEmpty(mesESOP.getPartNo())){ + DdlPreparedPack.getStringEqualPack(mesESOP.getPartNo(), "partNo", packBean); + } + + return packBean; + } + + /** * MES工序信息查询条件封装 * @param process * @return From 6431417462137ebeb3615660a6d9798aca9bfdf4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=AE=B8=E5=BF=83=E6=B4=81?= Date: Wed, 31 Jul 2019 10:37:57 +0800 Subject: [PATCH 06/15] dragon --- .../java/cn/estsh/i3plus/pojo/wms/bean/WmsActionGroupDetails.java | 4 ++++ .../java/cn/estsh/i3plus/pojo/wms/bean/WmsActionModuleParam.java | 5 +++++ 2 files changed, 9 insertions(+) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionGroupDetails.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionGroupDetails.java index 81183f2..34291f9 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionGroupDetails.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionGroupDetails.java @@ -115,6 +115,10 @@ public class WmsActionGroupDetails extends BaseBean { return this.preShow == null ? 0 : this.preShow; } + public long getShowAmIdVal() { + return this.showAmId == null ? 0 : this.showAmId; + } + public int getIsCommitAbleVal() { return this.isCommitAble == null ? 0 : this.isCommitAble; } diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionModuleParam.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionModuleParam.java index c60aad8..9f066d9 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionModuleParam.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionModuleParam.java @@ -54,4 +54,9 @@ public class WmsActionModuleParam extends BaseBean { @Column(name = "PARAM_TYPE") @ApiParam(value = "参数类型【1=可选列表,10=数字,20=字符串,30=出参】", example = "0") public Integer paramType; + + public int getParamTypeVal() { + return this.paramType == null ? 0 : this.paramType; + } + } From a4f2a7c84820a680e5c9d2ea8ecd95a92622ff69 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E6=80=9D=E6=B4=81?= Date: Thu, 1 Aug 2019 09:51:13 +0800 Subject: [PATCH 07/15] =?UTF-8?q?hql=E4=BF=AE=E6=94=B9asn=E8=AE=A2?= =?UTF-8?q?=E5=8D=95=E6=98=8E=E7=BB=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java | 1 + 1 file changed, 1 insertion(+) 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 c9fe1f4..1abcdb7 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 @@ -658,6 +658,7 @@ public class WmsHqlPack { getStringBuilderPack(wmsASNMasterDetails, result); + DdlPreparedPack.getOrderByPack(new Object[]{1}, new String[]{"snOneBarCode"}, result); return result; } From 40fc36ef187efd2f81ea9561729954bf539d357e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=AE=B8=E5=BF=83=E6=B4=81?= Date: Thu, 1 Aug 2019 12:35:02 +0800 Subject: [PATCH 08/15] =?UTF-8?q?=E6=B5=81=E7=A8=8B=E7=AE=A1=E5=AE=B6?= =?UTF-8?q?=E4=BC=98=E5=8C=96=EF=BC=9A=E5=BF=AB=E9=80=9F=E6=8F=90=E4=BA=A4?= =?UTF-8?q?=E6=B5=81=E7=A8=8B=E6=89=8B=E5=8A=A8=E6=8F=90=E4=BA=A4=E6=A0=A1?= =?UTF-8?q?=E9=AA=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) 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 118f073..d9fd4e6 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 @@ -23,7 +23,8 @@ public class WmsEnumUtil { */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum GROUP_COMMIT_CHECK { - DISABLE(1, "禁止提交"), CHECK_MOVE(2, "校验移动单"), NO_CHECK(3, "不校验"); + DISABLE(1, "禁止提交"), CHECK_MOVE(2, "校验移动单"), + NO_CHECK(3, "不校验"),CHECK_OLD_MOVE_NO(4, "校验是否已产生移动单"); private int value; private String description; From 5a6cd405b64b05a2f0f7d26b53619a600271fb20 Mon Sep 17 00:00:00 2001 From: "wei.peng" <123456> Date: Fri, 2 Aug 2019 14:02:13 +0800 Subject: [PATCH 09/15] =?UTF-8?q?=E7=94=A8=E6=88=B7=E7=AE=A1=E7=90=86?= =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=AF=86=E7=A0=81=20Bug=20=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/cn/estsh/i3plus/pojo/platform/bean/SessionUser.java | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SessionUser.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SessionUser.java index 9be97bc..e871a03 100644 --- a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SessionUser.java +++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SessionUser.java @@ -65,4 +65,13 @@ public class SessionUser implements Serializable { this.languageCode = languageCode; this.userType = userTypeId; } + + /** + * 不建议使用， 推荐使用 AuthUtil.getDeviceId(); 方法 + * @return + */ + @Deprecated + public String getDeviceId() { + return deviceId; + } } From 476d943a696e260bfc534f5c79edeef2a8bf8f95 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=AE=B8=E5=BF=83=E6=B4=81?= Date: Fri, 2 Aug 2019 14:31:18 +0800 Subject: [PATCH 10/15] =?UTF-8?q?=E6=B5=81=E7=A8=8B=E7=AE=A1=E5=AE=B6?= =?UTF-8?q?=EF=BC=9A=E8=87=AA=E5=AE=9A=E4=B9=89=E6=8C=89=E9=92=AE=E8=A7=A6?= =?UTF-8?q?=E5=8F=91=E7=9A=84=E6=97=B6=E5=80=99=E4=B8=8D=E9=9C=80=E8=A6=81?= =?UTF-8?q?=E9=A2=84=E5=85=88=E8=B0=83=E7=94=A8=E5=BD=93=E5=89=8D=E6=AD=A5?= =?UTF-8?q?=E9=AA=A4=E7=9A=84=E5=9B=9E=E6=98=BE=E4=BF=A1=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java | 1 - 1 file changed, 1 deletion(-) 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 d9fd4e6..74e9354 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 @@ -1625,7 +1625,6 @@ public class WmsEnumUtil { */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum AGD_VALUE_TYPE { - INTERACTIVE_ACTION(10, "交互动作"), BACKSTAGE_ACTION(20, "后台动作"), SUBMIT_ACTION(30, "提交动作"), From b3a0a710653703a198bfbbe95528c0597d25b869 Mon Sep 17 00:00:00 2001 From: "jimmy.zeng" Date: Fri, 2 Aug 2019 15:15:03 +0800 Subject: [PATCH 11/15] =?UTF-8?q?=E5=BA=93=E5=AD=98=E5=88=9D=E5=A7=8B?= =?UTF-8?q?=E5=8C=96=E4=BF=A1=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/base/enumutil/WmsEnumUtil.java | 38 +++++++++- .../i3plus/pojo/wms/bean/WmsStockInitialize.java | 81 ++++++++++++++++++++++ .../repository/WmsStockInitializeRepository.java | 14 ++++ .../estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java | 19 +++++ 4 files changed, 151 insertions(+), 1 deletion(-) create mode 100644 modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockInitialize.java create mode 100644 modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsStockInitializeRepository.java 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 8caa32b..8fa67c2 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 @@ -1657,7 +1657,8 @@ public class WmsEnumUtil { STEP_SEQ("STEP_SEQ", "步骤调用序号"), MOVE_ORDER_NO("MOVE_ORDER_NO", "移库单单号"), QC_ORDER_NO("QC_ORDER_NO", "质检单单号"), - CHECK_ORDER_NO("CHECK_ORDER_NO", "盘点主表序号"); + CHECK_ORDER_NO("CHECK_ORDER_NO", "盘点主表序号"), + INITIALIZE_SN("INITIALIZE_SN", "库存初始化"); private String code; private String description; @@ -3108,4 +3109,39 @@ public class WmsEnumUtil { return tmp; } } + + /** + * 库存初始化 状态 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum STOCK_INITIALIZE_STATUS { + CREATE(10, "创建"), + FINISH(20, "完成"); + + private int value; + private String description; + + STOCK_INITIALIZE_STATUS(int value, String description) { + this.value = value; + this.description = description; + } + + public int getValue() { + return value; + } + + public String getDescription() { + return description; + } + + public static String valueOf(int val) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].value == val) { + tmp = values()[i].description; + } + } + return tmp; + } + } } \ No newline at end of file diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockInitialize.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockInitialize.java new file mode 100644 index 0000000..a26d449 --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockInitialize.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.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; + +/** + * @Description : 库存初始化表 + * @Reference : + * @Author : jimmy.zeng + * @CreateDate : 2019-08-01 11:44 + * @Modify: + **/ + +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name="WMS_STOCK_INITIALIZE") +@Api("库存初始化信息") +public class WmsStockInitialize extends BaseBean { + + @Column(name = "WH_NO") + @ApiParam(value = "仓库代码") + @AnnoOutputColumn + private String whNo; + + @Column(name = "ZONE_NO") + @ApiParam(value = "存储区代码") + @AnnoOutputColumn + private String zoneNo; + + @Column(name = "LOCATE_NO") + @ApiParam(value = "库位代码") + @AnnoOutputColumn + private String locateNo; + + @Column(name = "PART_NO") + @ApiParam(value = "物料编号") + @AnnoOutputColumn + private String partNo; + + @Column(name = "PART_NAME_RDD") + @ApiParam(value = "物料名称") + @AnnoOutputColumn + private String partNameRdd; + + @Column(name = "UNIT") + @ApiParam(value = "单位") + @AnnoOutputColumn + private String unit; + + @Column(name = "QTY") + @ApiParam(value = "可用数量", example = "0") + @AnnoOutputColumn + private Double qty = 0d; + + @Column(name = "SNP") + @ApiParam(value = "标准包装", example = "1") + @AnnoOutputColumn + private Double snp; + + @Column(name = "STATUS") + @ApiParam(value = "状态", example = "0") + private Integer status; + + @ApiParam(value ="工厂代码") + @AnnoOutputColumn + private String currentOrganizeCode; + +} diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsStockInitializeRepository.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsStockInitializeRepository.java new file mode 100644 index 0000000..d17aa9b --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsStockInitializeRepository.java @@ -0,0 +1,14 @@ +package cn.estsh.i3plus.pojo.wms.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.wms.bean.WmsStockInitialize; + +/** + * @Description : 库存初始化信息 + * @Reference : + * @Author : jimmy.zeng + * @CreateDate : 2019-08-01 14:38 + * @Modify: + **/ +public interface WmsStockInitializeRepository 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 c9fe1f4..225aea8 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 @@ -2309,4 +2309,23 @@ public class WmsHqlPack { /******************************************作业记录日志HQLPACK结束************************************************/ + + /** + * 单位换算 分页查询 + * @return + */ + public static DdlPackBean packHqlWmsStockInitializeByPager(WmsStockInitialize wmsStockInitialize){ + DdlPackBean result = new DdlPackBean(); + + //查询参数封装 + DdlPreparedPack.getNumEqualPack(wmsStockInitialize.getStatus(), "status", result); + DdlPreparedPack.getStringEqualPack(wmsStockInitialize.getPartNo(), "partNo", result); + DdlPreparedPack.getStringEqualPack(wmsStockInitialize.getLocateNo(), "locateNo", result); + DdlPreparedPack.getStringEqualPack(wmsStockInitialize.getWhNo(), "whNo", result); + DdlPreparedPack.getStringEqualPack(wmsStockInitialize.getZoneNo(), "zoneNo", result); + + getStringBuilderPack(wmsStockInitialize, result); + + return result; + } } From f6c425c649afc5020f141186aa74fdd9ea655b11 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=AE=B8=E5=BF=83=E6=B4=81?= Date: Fri, 2 Aug 2019 15:15:23 +0800 Subject: [PATCH 12/15] =?UTF-8?q?=E5=B9=B3=E5=8F=B0=E8=8E=B7=E5=8F=96?= =?UTF-8?q?=E8=AE=BE=E5=A4=87ID=E6=96=B9=E5=BC=8F=E6=94=B9=E5=8F=98+?= =?UTF-8?q?=E6=89=80=E6=9C=89pojo=E5=8A=A0=E4=B8=8A=E5=BA=8F=E5=88=97?= =?UTF-8?q?=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/cn/estsh/i3plus/pojo/model/wms/BaseComponetsParam.java | 1 + .../main/java/cn/estsh/i3plus/pojo/model/wms/CheckPointModel.java | 5 ++++- .../java/cn/estsh/i3plus/pojo/model/wms/InStockCOInfoModel.java | 5 ++++- .../src/main/java/cn/estsh/i3plus/pojo/model/wms/InputSnModel.java | 5 ++++- .../main/java/cn/estsh/i3plus/pojo/model/wms/OperationDbModle.java | 5 ++++- .../java/cn/estsh/i3plus/pojo/model/wms/PrintOrderDataModel.java | 5 ++++- .../src/main/java/cn/estsh/i3plus/pojo/model/wms/TransSnModle.java | 5 ++++- .../cn/estsh/i3plus/pojo/model/wms/WmsActionGroupDetailsModel.java | 5 +++-- .../java/cn/estsh/i3plus/pojo/model/wms/WmsActionGroupModel.java | 5 +---- .../main/java/cn/estsh/i3plus/pojo/model/wms/WmsAgCacheModel.java | 4 +++- .../main/java/cn/estsh/i3plus/pojo/model/wms/WmsAgdCacheModel.java | 4 +++- .../main/java/cn/estsh/i3plus/pojo/model/wms/WmsAmCacheModel.java | 4 +++- .../src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsJOBModel.java | 2 +- .../main/java/cn/estsh/i3plus/pojo/model/wms/WmsJobParamModel.java | 1 + .../java/cn/estsh/i3plus/pojo/model/wms/WmsLotQCTransModel.java | 1 + .../java/cn/estsh/i3plus/pojo/model/wms/WmsMoveDetailsModel.java | 1 + .../java/cn/estsh/i3plus/pojo/model/wms/WmsMoveMasterModel.java | 1 + .../java/cn/estsh/i3plus/pojo/model/wms/WmsOrderMasterModel.java | 1 + .../main/java/cn/estsh/i3plus/pojo/model/wms/WmsTaskInfoModel.java | 1 + .../src/main/java/cn/estsh/i3plus/pojo/wms/bean/AmpJisRec.java | 1 + .../src/main/java/cn/estsh/i3plus/pojo/wms/bean/AmpPart.java | 1 + .../main/java/cn/estsh/i3plus/pojo/wms/bean/AmpStockCurrent.java | 1 + .../src/main/java/cn/estsh/i3plus/pojo/wms/bean/BasCustomer.java | 1 + .../src/main/java/cn/estsh/i3plus/pojo/wms/bean/BasVendor.java | 1 + .../src/main/java/cn/estsh/i3plus/pojo/wms/bean/SapAsn.java | 1 + .../src/main/java/cn/estsh/i3plus/pojo/wms/bean/SapBase.java | 5 +++-- .../src/main/java/cn/estsh/i3plus/pojo/wms/bean/SapCgio.java | 1 + .../src/main/java/cn/estsh/i3plus/pojo/wms/bean/SapCyco.java | 1 + .../src/main/java/cn/estsh/i3plus/pojo/wms/bean/SapDifo.java | 1 + .../src/main/java/cn/estsh/i3plus/pojo/wms/bean/SapDn.java | 1 + .../src/main/java/cn/estsh/i3plus/pojo/wms/bean/SapDocFgSum.java | 2 +- .../src/main/java/cn/estsh/i3plus/pojo/wms/bean/SapDspo.java | 1 + .../src/main/java/cn/estsh/i3plus/pojo/wms/bean/SapMiscr.java | 1 + .../src/main/java/cn/estsh/i3plus/pojo/wms/bean/SapMovo.java | 1 + .../src/main/java/cn/estsh/i3plus/pojo/wms/bean/SapRdn.java | 1 + .../src/main/java/cn/estsh/i3plus/pojo/wms/bean/SapReto.java | 1 + .../src/main/java/cn/estsh/i3plus/pojo/wms/bean/WareHouse.java | 1 + .../src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsASNMaster.java | 1 + .../java/cn/estsh/i3plus/pojo/wms/bean/WmsASNMasterDetails.java | 1 + .../src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionGroup.java | 1 + .../java/cn/estsh/i3plus/pojo/wms/bean/WmsActionGroupDetails.java | 1 + .../src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionLog.java | 1 + .../main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionLogData.java | 1 + .../java/cn/estsh/i3plus/pojo/wms/bean/WmsActionLogDetails.java | 1 + .../main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionModule.java | 1 + .../java/cn/estsh/i3plus/pojo/wms/bean/WmsActionModuleParam.java | 1 + .../java/cn/estsh/i3plus/pojo/wms/bean/WmsActionResponseBean.java | 1 + .../src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionStep.java | 1 + .../main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionStepCall.java | 1 + .../java/cn/estsh/i3plus/pojo/wms/bean/WmsActionStepCallParam.java | 1 + .../main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionStepType.java | 1 + .../src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsAreaOwner.java | 1 + .../src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsBom.java | 1 + .../src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsBomTotal.java | 1 + .../src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsBusiType.java | 1 + .../main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSAdjustRange.java | 1 + .../src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSFactTrans.java | 1 + .../src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSLocate.java | 1 + .../main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSOrderDetails.java | 1 + .../main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSOrderMaster.java | 1 + .../src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSPart.java | 1 + .../src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSRange.java | 1 + .../src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSZone.java | 1 + .../main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCheckFactRecord.java | 1 + .../src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsConfig.java | 1 + .../main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCustomerPart.java | 1 + .../src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDataAuth.java | 1 + .../src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocFgDetail.java | 1 + .../java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementDetails.java | 1 + .../java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementMaster.java | 1 + .../main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementSn.java | 1 + .../src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsFGInStock.java | 1 + .../src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsFix.java | 2 +- .../src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsIbCheckPlan.java | 2 +- .../main/java/cn/estsh/i3plus/pojo/wms/bean/WmsLineLocatePart.java | 1 + .../src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsLocate.java | 1 + .../src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsLocatePart.java | 1 + .../src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveDetails.java | 1 + .../src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveMaster.java | 1 + .../src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveSn.java | 1 + .../src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveToERP.java | 1 + .../src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsOpType.java | 1 + .../main/java/cn/estsh/i3plus/pojo/wms/bean/WmsOperationBean.java | 1 + .../src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsOptionModel.java | 5 ++++- .../src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPOMaster.java | 1 + .../src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPackSn.java | 1 + .../src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPackage.java | 1 + .../src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPart.java | 1 + .../src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPoSn.java | 1 + .../src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsProdCfgType.java | 3 +-- .../main/java/cn/estsh/i3plus/pojo/wms/bean/WmsProductVersion.java | 1 + .../src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsQCDetails.java | 1 + .../src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsQCMaster.java | 1 + .../src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsQCTrans.java | 1 + .../main/java/cn/estsh/i3plus/pojo/wms/bean/WmsRoutingAssign.java | 1 + .../main/java/cn/estsh/i3plus/pojo/wms/bean/WmsRoutingDetail.java | 1 + .../main/java/cn/estsh/i3plus/pojo/wms/bean/WmsRoutingMaster.java | 1 + .../main/java/cn/estsh/i3plus/pojo/wms/bean/WmsSapOrderLock.java | 1 + .../src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsShipping.java | 1 + .../main/java/cn/estsh/i3plus/pojo/wms/bean/WmsShippingFlag.java | 2 +- .../src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsSnPrint.java | 1 + .../src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsSnPrintRcd.java | 1 + .../src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockQuan.java | 1 + .../src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockSn.java | 3 +-- .../main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTaskCreateLog.java | 1 + .../src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTaskDetails.java | 1 + .../src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTaskInfo.java | 1 + .../src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTaskSrc.java | 1 + .../main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTempOrderLock.java | 1 + .../src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTrans.java | 1 + .../src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTransCode.java | 1 + .../src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTransModule.java | 4 +--- .../src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTransQuan.java | 1 + .../src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTransRcd.java | 1 + .../src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTransSn.java | 1 + .../src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTransType.java | 1 + .../src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsUnit.java | 1 + .../src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsUnitConvert.java | 1 + .../src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsVendorPart.java | 1 + .../src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsWorkCenter.java | 1 + .../main/java/cn/estsh/i3plus/pojo/wms/bean/WmsWorkCenterZone.java | 1 + .../src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsZones.java | 1 + .../src/main/java/cn/estsh/i3plus/pojo/wms/bean/esbio/IQ.java | 5 ++++- .../src/main/java/cn/estsh/i3plus/pojo/wms/bean/esbio/OQ.java | 5 ++++- .../java/cn/estsh/i3plus/pojo/wms/bean/esbio/PublishTopicData.java | 5 ++++- .../src/main/java/cn/estsh/i3plus/pojo/wms/bean/esbio/SI_TP.java | 5 ++++- .../src/main/java/cn/estsh/i3plus/pojo/wms/bean/esbio/SI_TPMAP.java | 6 +++++- 127 files changed, 174 insertions(+), 35 deletions(-) diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/BaseComponetsParam.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/BaseComponetsParam.java index 62715bd..c0bf451 100644 --- a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/BaseComponetsParam.java +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/BaseComponetsParam.java @@ -15,6 +15,7 @@ import java.io.Serializable; @Data public abstract class BaseComponetsParam implements Serializable { + private static final long serialVersionUID = -3100983729388764245L; @ApiParam(value = "单据号") public String orderNo; diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/CheckPointModel.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/CheckPointModel.java index 494586d..da0349d 100644 --- a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/CheckPointModel.java +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/CheckPointModel.java @@ -2,6 +2,8 @@ package cn.estsh.i3plus.pojo.model.wms; import lombok.Data; +import java.io.Serializable; + /** * @Description : 抽点接收数据model * @Reference : @@ -10,8 +12,9 @@ import lombok.Data; * @Modify: **/ @Data -public class CheckPointModel { +public class CheckPointModel implements Serializable { + private static final long serialVersionUID = -563591587968433245L; /** * 单据类型 */ diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/InStockCOInfoModel.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/InStockCOInfoModel.java index b4838d1..5e41bcb 100644 --- a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/InStockCOInfoModel.java +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/InStockCOInfoModel.java @@ -2,6 +2,8 @@ package cn.estsh.i3plus.pojo.model.wms; import lombok.Data; +import java.io.Serializable; + /** * @Description : 入库上架任务回显模型 * @Reference : @@ -10,8 +12,9 @@ import lombok.Data; * @Modify: **/ @Data -public class InStockCOInfoModel { +public class InStockCOInfoModel implements Serializable { + private static final long serialVersionUID = 8262969076279883816L; // 物料编码 private String partNo; diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/InputSnModel.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/InputSnModel.java index 8d32f13..20037f4 100644 --- a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/InputSnModel.java +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/InputSnModel.java @@ -3,6 +3,8 @@ package cn.estsh.i3plus.pojo.model.wms; 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 InputSnModel { +public class InputSnModel implements Serializable { + private static final long serialVersionUID = -6376845639646427435L; @ApiParam(value = "单号") public String orderNo; diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/OperationDbModle.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/OperationDbModle.java index 93d7698..ab3855d 100644 --- a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/OperationDbModle.java +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/OperationDbModle.java @@ -3,6 +3,8 @@ package cn.estsh.i3plus.pojo.model.wms; 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 OperationDbModle{ +public class OperationDbModle implements Serializable { + private static final long serialVersionUID = 4017643923322935222L; @ApiParam(value = "DAO名称") public String daoName; 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 329b391..ce22558 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 @@ -6,6 +6,8 @@ import cn.estsh.i3plus.pojo.wms.bean.WmsPOMaster; import io.swagger.annotations.ApiParam; import lombok.Data; +import java.io.Serializable; + /** * @Description : 订单打印数据封装model * @Reference : @@ -14,8 +16,9 @@ import lombok.Data; * @Modify: **/ @Data -public class PrintOrderDataModel { +public class PrintOrderDataModel implements Serializable { + private static final long serialVersionUID = 7658636310926230309L; @ApiParam("业务数据类型") public Integer busiDataType; diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/TransSnModle.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/TransSnModle.java index ac49208..c23700e 100644 --- a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/TransSnModle.java +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/TransSnModle.java @@ -3,6 +3,8 @@ package cn.estsh.i3plus.pojo.model.wms; 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 TransSnModle extends BaseComponetsParam{ +public class TransSnModle extends BaseComponetsParam implements Serializable { + private static final long serialVersionUID = -7655276570647348180L; @ApiParam(value = "移动单号") public String moveNo; diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsActionGroupDetailsModel.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsActionGroupDetailsModel.java index f62516b..2d4ab83 100644 --- a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsActionGroupDetailsModel.java +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsActionGroupDetailsModel.java @@ -1,11 +1,11 @@ package cn.estsh.i3plus.pojo.model.wms; -import cn.estsh.i3plus.pojo.base.bean.BaseBean; import cn.estsh.i3plus.pojo.wms.bean.*; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; +import java.io.Serializable; import java.util.List; /** @@ -17,7 +17,8 @@ import java.util.List; **/ @Data @Api("作业流程明细Model") -public class WmsActionGroupDetailsModel { +public class WmsActionGroupDetailsModel implements Serializable { + private static final long serialVersionUID = -5079293791052814745L; @ApiParam("作业流程明细") public WmsActionGroupDetails wmsActionGroupDetails; @ApiParam("作业步骤") diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsActionGroupModel.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsActionGroupModel.java index c9abef2..8fcd065 100644 --- a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsActionGroupModel.java +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsActionGroupModel.java @@ -1,13 +1,9 @@ package cn.estsh.i3plus.pojo.model.wms; -import cn.estsh.i3plus.pojo.base.bean.BaseBean; -import cn.estsh.i3plus.pojo.wms.bean.WmsActionGroup; -import cn.estsh.i3plus.pojo.wms.bean.WmsActionGroupDetails; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; -import javax.persistence.Transient; import java.io.Serializable; import java.util.List; @@ -21,6 +17,7 @@ import java.util.List; @Data @Api("作业流程Model") public class WmsActionGroupModel implements Serializable { + private static final long serialVersionUID = 5322363872992177667L; @ApiParam("流程") public String agId; @ApiParam("工厂代码") diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsAgCacheModel.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsAgCacheModel.java index 78ba929..4a59bba 100644 --- a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsAgCacheModel.java +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsAgCacheModel.java @@ -5,6 +5,7 @@ import cn.estsh.i3plus.pojo.wms.bean.WmsOptionModel; import io.swagger.annotations.ApiParam; import lombok.Data; +import java.io.Serializable; import java.util.List; import java.util.Map; @@ -16,8 +17,9 @@ import java.util.Map; * @Modify */ @Data -public class WmsAgCacheModel { +public class WmsAgCacheModel implements Serializable { + private static final long serialVersionUID = -330934023509433493L; @ApiParam("作业流程") public WmsActionGroup wmsActionGroup; @ApiParam("流程初始化自定义组件") diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsAgdCacheModel.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsAgdCacheModel.java index b9cf218..5f4503d 100644 --- a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsAgdCacheModel.java +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsAgdCacheModel.java @@ -5,6 +5,7 @@ import cn.estsh.i3plus.pojo.wms.bean.WmsActionStepCall; import io.swagger.annotations.ApiParam; import lombok.Data; +import java.io.Serializable; import java.util.List; import java.util.Map; @@ -16,7 +17,8 @@ import java.util.Map; * @Modify */ @Data -public class WmsAgdCacheModel { +public class WmsAgdCacheModel implements Serializable { + private static final long serialVersionUID = -3299805919552300963L; @ApiParam("作业流程明细") public WmsActionGroupDetails wmsActionGroupDetails; @ApiParam("作业步骤调用") diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsAmCacheModel.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsAmCacheModel.java index 5ba47c0..c7cde96 100644 --- a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsAmCacheModel.java +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsAmCacheModel.java @@ -5,6 +5,7 @@ import cn.estsh.i3plus.pojo.wms.bean.WmsActionModuleParam; import io.swagger.annotations.ApiParam; import lombok.Data; +import java.io.Serializable; import java.util.List; /** @@ -15,7 +16,8 @@ import java.util.List; * @Modify */ @Data -public class WmsAmCacheModel { +public class WmsAmCacheModel implements Serializable { + private static final long serialVersionUID = 8940535584156105748L; @ApiParam("作业处理组件") public WmsActionModule wmsActionModule; @ApiParam("作业处理组件参数集合") diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsJOBModel.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsJOBModel.java index 1e7a8cc..44f0e78 100644 --- a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsJOBModel.java +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsJOBModel.java @@ -1,6 +1,5 @@ package cn.estsh.i3plus.pojo.model.wms; -import cn.estsh.i3plus.pojo.wms.bean.WmsMoveMaster; import lombok.Data; import java.io.Serializable; @@ -15,6 +14,7 @@ import java.util.List; **/ @Data public class WmsJOBModel implements Serializable { + private static final long serialVersionUID = -3121529122274741330L; private List wmsMoveMasterModelList; private String errorMessage; } diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsJobParamModel.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsJobParamModel.java index 91cb071..a0f8726 100644 --- a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsJobParamModel.java +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsJobParamModel.java @@ -14,6 +14,7 @@ import java.util.List; */ @Data public class WmsJobParamModel implements Serializable { + private static final long serialVersionUID = 5784492509251527816L; private String organizeCode; private List zonesNoList; private Integer snType; diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsLotQCTransModel.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsLotQCTransModel.java index e6a8165..d39f4e5 100644 --- a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsLotQCTransModel.java +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsLotQCTransModel.java @@ -15,6 +15,7 @@ import java.util.List; **/ @Data public class WmsLotQCTransModel implements Serializable { + private static final long serialVersionUID = -2995643152400039273L; private String orderNo; private List wmsStockSnList; } diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsMoveDetailsModel.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsMoveDetailsModel.java index 25ed168..a718377 100644 --- a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsMoveDetailsModel.java +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsMoveDetailsModel.java @@ -16,6 +16,7 @@ import java.util.List; **/ @Data public class WmsMoveDetailsModel implements Serializable { + private static final long serialVersionUID = -6968143574442339454L; private WmsMoveDetails details; private List moveSnList; } diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsMoveMasterModel.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsMoveMasterModel.java index a4b54c4..0e1e684 100644 --- a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsMoveMasterModel.java +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsMoveMasterModel.java @@ -15,6 +15,7 @@ import java.util.List; **/ @Data public class WmsMoveMasterModel implements Serializable { + private static final long serialVersionUID = -5490167040159056107L; private WmsMoveMaster moveMaster; private List moveDetails; } diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsOrderMasterModel.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsOrderMasterModel.java index 89047cc..f886213 100644 --- a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsOrderMasterModel.java +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsOrderMasterModel.java @@ -15,6 +15,7 @@ import lombok.Data; @Data @Api("单据Model") public class WmsOrderMasterModel extends BaseBean { + private static final long serialVersionUID = -3048991897871809517L; @ApiParam("状态") public Integer orderStatus; diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsTaskInfoModel.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsTaskInfoModel.java index 268bedd..7d034c6 100644 --- a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsTaskInfoModel.java +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsTaskInfoModel.java @@ -15,6 +15,7 @@ import java.io.Serializable; **/ @Data public class WmsTaskInfoModel implements Serializable { + private static final long serialVersionUID = 8755413052807531167L; @ApiParam("任务单号") public String orderNo; @Column(name = "TRANS_TYPE_CODE") diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/AmpJisRec.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/AmpJisRec.java index 7d342f9..b236374 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/AmpJisRec.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/AmpJisRec.java @@ -29,6 +29,7 @@ import javax.persistence.Table; @Api(value="AMP_JIS收货",description = "AMP_JIS收货") public class AmpJisRec extends BaseBean{ + private static final long serialVersionUID = 4460727160153551089L; @Column(name="ORDER_NO") @ApiParam("JIS单号") public String orderNo; diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/AmpPart.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/AmpPart.java index 680a7bb..97aaabd 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/AmpPart.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/AmpPart.java @@ -28,6 +28,7 @@ import javax.persistence.Table; @Api("AMP_物料") public class AmpPart extends BaseBean { + private static final long serialVersionUID = -4332932784803175933L; @Column(name = "PART_NO") @ApiParam(value = "物料编号") private String partNo; diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/AmpStockCurrent.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/AmpStockCurrent.java index 8a365e0..fd7a488 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/AmpStockCurrent.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/AmpStockCurrent.java @@ -29,6 +29,7 @@ import javax.persistence.Table; @Api("AMP_实时库存表") public class AmpStockCurrent extends BaseBean { + private static final long serialVersionUID = 4717329530669998842L; @Column(name = "PART_NO") @ApiParam(value = "物料编号") private String partNo; diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/BasCustomer.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/BasCustomer.java index 36dc698..f2a841b 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/BasCustomer.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/BasCustomer.java @@ -28,6 +28,7 @@ import javax.persistence.Table; @Api(value="客户信息表",description = "客户信息表") public class BasCustomer extends BaseBean { + private static final long serialVersionUID = -1980207700343546396L; @Column(name = "CUST_NO") @ApiParam(value = "客户编号") private String custNo; diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/BasVendor.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/BasVendor.java index 9046594..ed3f142 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/BasVendor.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/BasVendor.java @@ -28,6 +28,7 @@ import javax.persistence.Table; @Api("供应商") public class BasVendor extends BaseBean{ + private static final long serialVersionUID = 9214639813072592779L; @Column(name="VENDOR_NO") @ApiParam("供应商编号") private String vendorNo; diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/SapAsn.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/SapAsn.java index 0f5cb72..b3e9a6f 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/SapAsn.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/SapAsn.java @@ -16,6 +16,7 @@ import lombok.Data; @Api(value = "ASN计划", description = "ASN计划") public class SapAsn extends SapBase { + private static final long serialVersionUID = -5985369634793872765L; @ApiParam(value = "ASN号") @AnnoOutputColumn private String zasnno; diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/SapBase.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/SapBase.java index aa4d0b8..df4e9a8 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/SapBase.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/SapBase.java @@ -4,9 +4,9 @@ import com.fasterxml.jackson.annotation.JsonFormat; import io.swagger.annotations.ApiParam; import lombok.Data; +import java.io.Serializable; import java.text.SimpleDateFormat; import java.util.Date; -import java.util.Random; import java.util.UUID; /** @@ -17,8 +17,9 @@ import java.util.UUID; * @Modify: **/ @Data -public class SapBase { +public class SapBase implements Serializable { + private static final long serialVersionUID = -3373467948186161102L; @ApiParam(value = "处理人", example = "-1") private String actusr = "导入"; diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/SapCgio.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/SapCgio.java index 5fc931c..1595ed2 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/SapCgio.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/SapCgio.java @@ -16,6 +16,7 @@ import lombok.Data; @Api(value = "委外材料发运", description = "委外材料发运") public class SapCgio extends SapBase{ + private static final long serialVersionUID = 6325127966003720947L; @ApiParam(value = "编号") @AnnoOutputColumn private String zinstno; diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/SapCyco.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/SapCyco.java index 45c09c7..0fd9098 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/SapCyco.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/SapCyco.java @@ -16,6 +16,7 @@ import lombok.Data; @Api(value="盘点",description = "盘点") public class SapCyco extends SapBase{ + private static final long serialVersionUID = 2167743108452607620L; @ApiParam(value = "盘点凭证号") @AnnoOutputColumn private String iblnr; diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/SapDifo.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/SapDifo.java index ab258ac..122c505 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/SapDifo.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/SapDifo.java @@ -16,6 +16,7 @@ import lombok.Data; @Api(value="盘点调差",description = "盘点调差") public class SapDifo extends SapBase{ + private static final long serialVersionUID = -7537399948526067205L; @ApiParam(value = "工厂") @AnnoOutputColumn private String werks; diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/SapDn.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/SapDn.java index be5b77c..dc2f04e 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/SapDn.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/SapDn.java @@ -16,6 +16,7 @@ import lombok.Data; @Api(value="非JIS发运",description = "非JIS发运") public class SapDn extends SapBase{ + private static final long serialVersionUID = -1205193829054736341L; @ApiParam(value = "销售交货单号",example = "1") @AnnoOutputColumn private String vbeln; diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/SapDocFgSum.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/SapDocFgSum.java index 8641e46..612276b 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/SapDocFgSum.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/SapDocFgSum.java @@ -1,6 +1,5 @@ package cn.estsh.i3plus.pojo.wms.bean; -import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn; import cn.estsh.i3plus.pojo.base.bean.BaseBean; import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.databind.annotation.JsonSerialize; @@ -34,6 +33,7 @@ import javax.persistence.Transient; @Api("SAP_产品报工汇总表") public class SapDocFgSum extends BaseBean { + private static final long serialVersionUID = 6550731177315159003L; @Column(name="ORDER_NO") @ApiParam("订单号") public String orderNo; diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/SapDspo.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/SapDspo.java index 5d35061..001adcf 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/SapDspo.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/SapDspo.java @@ -16,6 +16,7 @@ import lombok.Data; @Api(value="要货计划",description = "要货计划") public class SapDspo extends SapBase{ + private static final long serialVersionUID = -4512641994504027062L; @ApiParam(value = "SA_PO编号",example = "1") @AnnoOutputColumn private String ebeln; diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/SapMiscr.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/SapMiscr.java index e0819a3..1e16875 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/SapMiscr.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/SapMiscr.java @@ -16,6 +16,7 @@ import lombok.Data; @Api(value="零星领料(退)料结果",description = "零星领料(退)料结果") public class SapMiscr extends SapBase{ + private static final long serialVersionUID = -1374809598755138268L; @ApiParam(value = "编号",example = "1") @AnnoOutputColumn private String zinstno; diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/SapMovo.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/SapMovo.java index 56f38e1..83b9d34 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/SapMovo.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/SapMovo.java @@ -16,6 +16,7 @@ import lombok.Data; @Api(value="库存转储",description = "库存转储") public class SapMovo extends SapBase{ + private static final long serialVersionUID = 4494664666984619727L; @ApiParam(value = "编号",example = "1") @AnnoOutputColumn private String refid; diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/SapRdn.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/SapRdn.java index 67c87da..43aa9ed 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/SapRdn.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/SapRdn.java @@ -16,6 +16,7 @@ import lombok.Data; @Api(value="销售退货",description = "销售退货") public class SapRdn extends SapBase{ + private static final long serialVersionUID = -3529901573586946954L; @ApiParam(value = "退货交货单",example = "1") @AnnoOutputColumn private String vbeln; diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/SapReto.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/SapReto.java index 4cd4408..99d2e30 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/SapReto.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/SapReto.java @@ -16,6 +16,7 @@ import lombok.Data; @Api(value="供应商退货",description = "供应商退货") public class SapReto extends SapBase{ + private static final long serialVersionUID = -2090891348793738914L; @ApiParam(value = "业务类型",example = "1") @AnnoOutputColumn private String zaction; diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WareHouse.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WareHouse.java index 13b8429..98a40b3 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WareHouse.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WareHouse.java @@ -30,6 +30,7 @@ import java.util.List; @Api("工厂仓库信息") public class WareHouse extends BaseBean { + private static final long serialVersionUID = 7914396535326597148L; @Column(name="CODE") @ApiParam("仓库代码") public String code; 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 d7c0a9d..897f091 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 @@ -30,6 +30,7 @@ import java.util.List; @Api("ASN主表信息") public class WmsASNMaster extends BaseBean { + private static final long serialVersionUID = 652057416776991025L; @Column(name = "ORDER_NO") @ApiParam("订单号") public String orderNo; diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsASNMasterDetails.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsASNMasterDetails.java index 116c383..85dc1d4 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsASNMasterDetails.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsASNMasterDetails.java @@ -32,6 +32,7 @@ import javax.persistence.*; }) @Api("ASN订单明细信息") public class WmsASNMasterDetails extends BaseBean { + private static final long serialVersionUID = -9174994369307078375L; @Column(name = "PART_NO") @ApiParam("物料编码") public String partNo; diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionGroup.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionGroup.java index 9ac398e..319e6d5 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionGroup.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionGroup.java @@ -28,6 +28,7 @@ import javax.persistence.*; @Api("作业流程") public class WmsActionGroup extends BaseBean { + private static final long serialVersionUID = -4169996695337717755L; @Column(name = "AG_NAME_E") @ApiParam("英文流程名称") private String agNameE; diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionGroupDetails.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionGroupDetails.java index 34291f9..5062bec 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionGroupDetails.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionGroupDetails.java @@ -31,6 +31,7 @@ import javax.persistence.Transient; @Api("作业流程明细") public class WmsActionGroupDetails extends BaseBean { + private static final long serialVersionUID = 544189352378073377L; @Column(name = "AG_ID") @ApiParam(value = "作业流程ID", example = "0") @JsonSerialize(using = ToStringSerializer.class) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionLog.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionLog.java index 18113af..bc01da3 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionLog.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionLog.java @@ -32,6 +32,7 @@ import javax.persistence.Transient; @Api(value="作业记录表") public class WmsActionLog extends BaseBean { + private static final long serialVersionUID = 8664373854844368861L; @Column(name="TASK_NO") @ApiParam(value = "作业任务编号", example = "1") @JsonSerialize(using = ToStringSerializer.class) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionLogData.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionLogData.java index 183b936..f3bb5e0 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionLogData.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionLogData.java @@ -32,6 +32,7 @@ import javax.persistence.Table; @Api(value="作业记录参数表",description = "作业记录参数表") public class WmsActionLogData extends BaseBean { + private static final long serialVersionUID = -8150713013135101134L; @Column(name = "ALD_ID") @ApiParam(value = "记录明细编号") @JsonSerialize(using = ToStringSerializer.class) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionLogDetails.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionLogDetails.java index 7715e02..66ea3df 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionLogDetails.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionLogDetails.java @@ -30,6 +30,7 @@ import javax.persistence.Table; @Api(value = "作业记录明细表", description = "作业记录表") public class WmsActionLogDetails extends BaseBean { + private static final long serialVersionUID = 680681221361042296L; @Column(name = "AL_ID") @ApiParam(value = "作业记录ID", example = "1") @JsonSerialize(using = ToStringSerializer.class) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionModule.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionModule.java index 8a714bc..4e7b56e 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionModule.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionModule.java @@ -28,6 +28,7 @@ import javax.persistence.Table; @Api("作业步骤处理组件") public class WmsActionModule extends BaseBean { + private static final long serialVersionUID = 9117362998863937579L; @Column(name = "AM_NAME") @ApiParam("组件名称") public String amName; diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionModuleParam.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionModuleParam.java index 9f066d9..a87c559 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionModuleParam.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionModuleParam.java @@ -30,6 +30,7 @@ import javax.persistence.Table; @Api("作业步骤处理组参数") public class WmsActionModuleParam extends BaseBean { + private static final long serialVersionUID = 8099621042858629818L; @Column(name = "AM_ID") @ApiParam(value = "组件ID", example = "0") @JsonSerialize(using = ToStringSerializer.class) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionResponseBean.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionResponseBean.java index ad81aec..11a2cf3 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionResponseBean.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionResponseBean.java @@ -26,6 +26,7 @@ import java.util.Map; @Api("返回前端数据实体") public class WmsActionResponseBean implements Serializable { + private static final long serialVersionUID = 201974065997991407L; @ApiParam("回显BARCODE值") public Map barCode; diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionStep.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionStep.java index 68c98d6..265272b 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionStep.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionStep.java @@ -30,6 +30,7 @@ import javax.persistence.Table; @Api(value="作业步骤信息",description = "作业步骤信息") public class WmsActionStep extends BaseBean { + private static final long serialVersionUID = 6460096995982059959L; @Column(name = "AS_NAME_E") @ApiParam(value = "英文类型名称") private String asNameE; diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionStepCall.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionStepCall.java index e41964f..4b8388f 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionStepCall.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionStepCall.java @@ -32,6 +32,7 @@ import javax.persistence.*; @Api("作业步骤调用信息") public class WmsActionStepCall extends BaseBean { + private static final long serialVersionUID = -6013283534745803464L; @Column(name = "AS_ID") @ApiParam(value = "作业步骤ID", example = "0") @JsonSerialize(using = ToStringSerializer.class) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionStepCallParam.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionStepCallParam.java index 778a86d..ceff079 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionStepCallParam.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionStepCallParam.java @@ -31,6 +31,7 @@ import javax.persistence.Transient; @Api(value="作业步骤调用参数表",description = "作业步骤调用参数表") public class WmsActionStepCallParam extends BaseBean { + private static final long serialVersionUID = -2813779192436803301L; @Column(name = "AGD_ID") @ApiParam(value = "流程明细编号") @JsonSerialize(using = ToStringSerializer.class) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionStepType.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionStepType.java index cb08f18..926e108 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionStepType.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionStepType.java @@ -28,6 +28,7 @@ import javax.persistence.Table; @Api(value="作业步骤类型信息",description = "作业步骤类型信息") public class WmsActionStepType extends BaseBean { + private static final long serialVersionUID = -8019644718382990603L; @Column(name = "AT_NAME_E") @ApiParam(value = "英文类型名称") private String atNameE; diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsAreaOwner.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsAreaOwner.java index 0014c6d..153aeff 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsAreaOwner.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsAreaOwner.java @@ -29,6 +29,7 @@ import javax.persistence.Transient; @Api(value="责任区域分配信息",description = "责任区域分配信息") public class WmsAreaOwner extends BaseBean { + private static final long serialVersionUID = -5772266802563087135L; @Column(name = "WH_NO") @ApiParam(value = "仓库代码") private String whNo; diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsBom.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsBom.java index 536be05..82a84e2 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsBom.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsBom.java @@ -30,6 +30,7 @@ import javax.persistence.Table; @Api(value = "物料清单", description = "物料清单") public class WmsBom extends BaseBean { + private static final long serialVersionUID = 5555657644784074446L; @Column(name = "PART_NO") @ApiParam(value = "父物料号") private String partNo; diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsBomTotal.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsBomTotal.java index 6197600..6ecb5c0 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsBomTotal.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsBomTotal.java @@ -27,6 +27,7 @@ import javax.persistence.Table; @Table(name = "WMS_BOM_TOTAL") @Api("全量BOM") public class WmsBomTotal extends BaseBean { + private static final long serialVersionUID = 8196235268344152723L; @Column(name = "PART_NO") @ApiParam("父物料号") private String partNo; diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsBusiType.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsBusiType.java index 68f5355..781c348 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsBusiType.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsBusiType.java @@ -28,6 +28,7 @@ import javax.persistence.Table; @Api("业务类型信息") public class WmsBusiType extends BaseBean { + private static final long serialVersionUID = -5401677317639542934L; @Column(name = "BUSI_TYPE_CODE") @ApiParam(value = "类型编号") private Integer busiTypeCode; diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSAdjustRange.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSAdjustRange.java index 7fb224c..f8b58d3 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSAdjustRange.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSAdjustRange.java @@ -29,6 +29,7 @@ import javax.persistence.Transient; @Api("盘点调差范围信息") public class WmsCSAdjustRange extends BaseBean { + private static final long serialVersionUID = 5841868297132948238L; @Column(name="ORDER_NO") @ApiParam("单号") public String orderNo; diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSFactTrans.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSFactTrans.java index af44900..a6bc5f9 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSFactTrans.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSFactTrans.java @@ -30,6 +30,7 @@ import javax.persistence.Transient; @Api("盘点实盘信息") public class WmsCSFactTrans extends BaseBean { + private static final long serialVersionUID = 4187069750607177519L; @Column(name="ORDER_NO") @ApiParam("单号") public String orderNo; diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSLocate.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSLocate.java index 9d84577..02314f0 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSLocate.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSLocate.java @@ -28,6 +28,7 @@ import javax.persistence.Table; @Api("盘点库位信息") public class WmsCSLocate extends BaseBean { + private static final long serialVersionUID = 438495180402632954L; @Column(name="ORDER_NO") @ApiParam("单号") public String orderNo; diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSOrderDetails.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSOrderDetails.java index ca2a416..ee10f50 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSOrderDetails.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSOrderDetails.java @@ -29,6 +29,7 @@ import javax.persistence.Transient; @Table(name = "WMS_DOC_CS_DETAILS") @Api("盘点单冻结信息") public class WmsCSOrderDetails extends BaseBean { + private static final long serialVersionUID = 1054153436116196360L; @Column(name = "PART_NO") @ApiParam("物料编码") public String partNo; 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 34a617c..cc70d2e 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 @@ -30,6 +30,7 @@ import java.util.List; @Api("盘点单主表信息") public class WmsCSOrderMaster extends BaseBean { + private static final long serialVersionUID = 3685205378778986296L; @Column(name = "ORDER_NO") @ApiParam("单号") public String orderNo; diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSPart.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSPart.java index 4005feb..1873977 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSPart.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSPart.java @@ -28,6 +28,7 @@ import javax.persistence.Table; @Api("盘点区物料信息") public class WmsCSPart extends BaseBean { + private static final long serialVersionUID = 7094084677645492387L; @Column(name="ORDER_NO") @ApiParam("单号") public String orderNo; diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSRange.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSRange.java index 970a44f..e16c3bd 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSRange.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSRange.java @@ -28,6 +28,7 @@ import javax.persistence.Table; @Api("盘点范围信息") public class WmsCSRange extends BaseBean { + private static final long serialVersionUID = 7429676886975711828L; @Column(name="ORDER_NO") @ApiParam("单号") public String orderNo; diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSZone.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSZone.java index 72049d0..42e1250 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSZone.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSZone.java @@ -29,6 +29,7 @@ import javax.persistence.Transient; @Api("盘点存储区信息") public class WmsCSZone extends BaseBean { + private static final long serialVersionUID = -900178775079668694L; @Column(name="ORDER_NO") @ApiParam("单号") public String orderNo; diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCheckFactRecord.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCheckFactRecord.java index 3aeca7d..d4a9c99 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCheckFactRecord.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCheckFactRecord.java @@ -29,6 +29,7 @@ import javax.persistence.Transient; @Api("抽点记录信息") public class WmsCheckFactRecord extends BaseBean { + private static final long serialVersionUID = 1580654885527050552L; @Column(name = "REF_TYPE") @ApiParam(value = "关联单据类型") private String refType; diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsConfig.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsConfig.java index dc3dbd3..a3f4148 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsConfig.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsConfig.java @@ -28,6 +28,7 @@ import javax.persistence.Table; @Api(value="系统配置",description = "WMS系统配置") public class WmsConfig extends BaseBean { + private static final long serialVersionUID = 8998024716940590623L; @Column(name="NAME") @ApiParam(value ="名称") private String name; diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCustomerPart.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCustomerPart.java index 61a3346..6e25a2b 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCustomerPart.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCustomerPart.java @@ -29,6 +29,7 @@ import javax.persistence.Transient; @Api(value="客户零件关系表",description = "客户零件关系表") public class WmsCustomerPart extends BaseBean { + private static final long serialVersionUID = 3903166651913139058L; @Column(name = "CUSTOMER_CODE") @ApiParam(value = "客户代码") private String customerCode; diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDataAuth.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDataAuth.java index f6e5a8e..348bb18 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDataAuth.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDataAuth.java @@ -28,6 +28,7 @@ import javax.persistence.Table; @Api(value="数据权限信息",description = "数据权限信息") public class WmsDataAuth extends BaseBean { + private static final long serialVersionUID = -6695149147049055125L; @Column(name = "ROLE_CODE") @ApiParam(value = "角色编号") private String roleCode; diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocFgDetail.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocFgDetail.java index 57b0c74..f2c20af 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocFgDetail.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocFgDetail.java @@ -29,6 +29,7 @@ import javax.persistence.Table; @Api("WMS_产品报工明细信息") public class WmsDocFgDetail extends BaseBean { + private static final long serialVersionUID = -7720818516623685424L; @Column(name="ORDER_NO") @ApiParam("订单号") public String orderNo; diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementDetails.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementDetails.java index c093654..ec06fce 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementDetails.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementDetails.java @@ -31,6 +31,7 @@ import javax.persistence.*; }) @Api("移库单明细表") public class WmsDocMovementDetails extends BaseBean { + private static final long serialVersionUID = -4800308354250386102L; @Column(name = "PART_NO") @ApiParam("物料编码") public String partNo; diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementMaster.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementMaster.java index 1314953..b4b8c3b 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementMaster.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementMaster.java @@ -34,6 +34,7 @@ import java.util.List; @Api("移库单表") @ToString public class WmsDocMovementMaster extends BaseBean { + private static final long serialVersionUID = -4459803926536024325L; @Column(name = "ORDER_NO") @ApiParam(value = "移库单单号") private String orderNo; diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementSn.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementSn.java index 9181e8a..e111ab6 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementSn.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementSn.java @@ -33,6 +33,7 @@ import javax.persistence.*; @Api("移库条码信息") public class WmsDocMovementSn extends BaseBean { + private static final long serialVersionUID = 5704546384179442907L; @Column(name="ORDER_NO") @ApiParam("订单号") public String orderNo; diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsFGInStock.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsFGInStock.java index 6cdfd53..301b0ad 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsFGInStock.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsFGInStock.java @@ -29,6 +29,7 @@ import javax.persistence.Table; @Api("产品入库信息") public class WmsFGInStock extends BaseBean { + private static final long serialVersionUID = 5337952801731230326L; @Column(name="ORDER_NO") @ApiParam("订单号") public String orderNo; diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsFix.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsFix.java index ee108bf..c8fa3f5 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsFix.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsFix.java @@ -10,7 +10,6 @@ import org.hibernate.annotations.DynamicUpdate; import javax.persistence.Column; import javax.persistence.Entity; -import javax.persistence.Index; import javax.persistence.Table; /** @@ -29,6 +28,7 @@ import javax.persistence.Table; @Api("WMS设备信息") public class WmsFix extends BaseBean{ + private static final long serialVersionUID = 740758621658888395L; @Column(name = "FIX_ID") @ApiParam("设备编号") public String fixId; diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsIbCheckPlan.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsIbCheckPlan.java index 4ec45d7..9b7661f 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsIbCheckPlan.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsIbCheckPlan.java @@ -4,7 +4,6 @@ import cn.estsh.i3plus.pojo.base.bean.BaseBean; import com.fasterxml.jackson.annotation.JsonFormat; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; -import io.swagger.models.auth.In; import lombok.Data; import lombok.EqualsAndHashCode; import org.hibernate.annotations.DynamicInsert; @@ -31,6 +30,7 @@ import javax.persistence.Transient; @Api(value="抽点比例表",description = "抽点比例表") public class WmsIbCheckPlan extends BaseBean{ + private static final long serialVersionUID = 3557978060450659460L; @Column(name="PART_NO") @ApiParam(value ="物料编码") private String partNo; diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsLineLocatePart.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsLineLocatePart.java index 92b472e..8db0703 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsLineLocatePart.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsLineLocatePart.java @@ -30,6 +30,7 @@ import javax.persistence.Table; @Deprecated public class WmsLineLocatePart extends BaseBean { + private static final long serialVersionUID = -3234516001954145902L; @Column(name="LOCATE_NO") @ApiParam(value ="库位代码") private String locateNo; diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsLocate.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsLocate.java index a650262..4c288f4 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsLocate.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsLocate.java @@ -28,6 +28,7 @@ import javax.persistence.Table; @Api(value = "库位表", description = "库位表") public class WmsLocate extends BaseBean { + private static final long serialVersionUID = -8425904594036746967L; @Column(name = "LOCATE_NO") @ApiParam(value = "库位代码") private String locateNo; diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsLocatePart.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsLocatePart.java index 24e000d..7c10ba8 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsLocatePart.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsLocatePart.java @@ -29,6 +29,7 @@ import javax.persistence.Transient; @Api(value = "库位物料表", description = "库位物料表") public class WmsLocatePart extends BaseBean { + private static final long serialVersionUID = 9134745988014340144L; @Column(name = "LOCATE_NO") @ApiParam(value = "库位代码") private String locateNo; diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveDetails.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveDetails.java index c6b6444..c52ce23 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveDetails.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveDetails.java @@ -30,6 +30,7 @@ import javax.persistence.*; @Api("库存移动单明细信息") public class WmsMoveDetails extends BaseBean { + private static final long serialVersionUID = -5898637337319011710L; @Column(name="ORDER_NO") @ApiParam("单号") public String orderNo; diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveMaster.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveMaster.java index ad849e5..2cb9cb4 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveMaster.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveMaster.java @@ -30,6 +30,7 @@ import javax.persistence.*; @Api("库存移动单主表信息") public class WmsMoveMaster extends BaseBean { + private static final long serialVersionUID = 6007513013224444498L; @Column(name = "ORDER_NO") @ApiParam("单号") public String orderNo; diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveSn.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveSn.java index 06a15a7..43edf65 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveSn.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveSn.java @@ -32,6 +32,7 @@ import javax.persistence.*; @Api("库存移动单条码信息") public class WmsMoveSn extends BaseBean { + private static final long serialVersionUID = 1490715681910614399L; @Column(name="ORDER_NO") @ApiParam("单号") public String orderNo; diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveToERP.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveToERP.java index a779b28..eaee583 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveToERP.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveToERP.java @@ -32,6 +32,7 @@ import javax.persistence.*; @Api("库存移动单主表信息") public class WmsMoveToERP extends BaseBean { + private static final long serialVersionUID = -6223527594941733060L; @Column(name = "ORDER_NO") @ApiParam("单号") public String orderNo; diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsOpType.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsOpType.java index 382f824..aa73f97 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsOpType.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsOpType.java @@ -31,6 +31,7 @@ import javax.persistence.Transient; @Api("作业类型") public class WmsOpType extends BaseBean { + private static final long serialVersionUID = -5751852067398288165L; @Column(name = "OP_TYPE_CODE") @ApiParam("类型编号") private String opTypeCode; diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsOperationBean.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsOperationBean.java index 1c1f95c..2a37527 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsOperationBean.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsOperationBean.java @@ -18,6 +18,7 @@ import java.util.List; @Api("接受前端数据实体") public class WmsOperationBean extends BaseBean { + private static final long serialVersionUID = -7387560917258478191L; @ApiParam("扫描内容") public String barCode; diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsOptionModel.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsOptionModel.java index e8e2b89..2260cd7 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsOptionModel.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsOptionModel.java @@ -5,6 +5,8 @@ import lombok.Builder; import lombok.Data; import lombok.NoArgsConstructor; +import java.io.Serializable; + /** * @Description : 可选项模型 * @Reference : @@ -18,8 +20,9 @@ import lombok.NoArgsConstructor; @NoArgsConstructor @AllArgsConstructor @Builder -public class WmsOptionModel { +public class WmsOptionModel implements Serializable { + private static final long serialVersionUID = -4282021744536667534L; private String code; private String name; 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 8ef0841..10d7ec4 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 @@ -30,6 +30,7 @@ import java.util.List; @Api("PO主表信息") public class WmsPOMaster extends BaseBean { + private static final long serialVersionUID = -5439534283717671648L; @Column(name = "ORDER_NO") @ApiParam("订单号") public String orderNo; diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPackSn.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPackSn.java index b092690..bf51127 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPackSn.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPackSn.java @@ -28,6 +28,7 @@ import javax.persistence.Table; @Api(value="包装箱条码表",description = "包装箱条码表") public class WmsPackSn extends BaseBean { + private static final long serialVersionUID = -4768071470722776160L; @Column(name = "ORDER_NO") @ApiParam(value = "订单号") private String orderNo; diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPackage.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPackage.java index d15f505..e474fc7 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPackage.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPackage.java @@ -28,6 +28,7 @@ import javax.persistence.Table; @Api("物理包装信息") public class WmsPackage extends BaseBean { + private static final long serialVersionUID = -8009404275658985601L; @Column(name="PACKAGE_NO") @ApiParam("包装编号") public String packageNo; diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPart.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPart.java index c78fa6e..b2e283c 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPart.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPart.java @@ -29,6 +29,7 @@ import javax.persistence.Transient; @Table(name = "WMS_PART") @Api("物料表") public class WmsPart extends BaseBean { + private static final long serialVersionUID = 4849044986767609346L; @Column(name = "PART_NO") @ApiParam(value = "物料编码") private String partNo; diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPoSn.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPoSn.java index e51bbaa..53a91f8 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPoSn.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPoSn.java @@ -34,6 +34,7 @@ import javax.persistence.*; @Api("PO条码信息") public class WmsPoSn extends BaseBean { + private static final long serialVersionUID = -5493787929463992199L; @Column(name="ORDER_NO") @ApiParam("订单号") public String orderNo; diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsProdCfgType.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsProdCfgType.java index e89962c..4539336 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsProdCfgType.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsProdCfgType.java @@ -11,8 +11,6 @@ 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 : 产品项目 @@ -30,6 +28,7 @@ import java.util.List; @Api("项目信息") public class WmsProdCfgType extends BaseBean { + private static final long serialVersionUID = -131043081244530896L; @Column(name="PROD_CFG_TYPE_CODE") @ApiParam("项目代码") public String prodCfgTypeCode; diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsProductVersion.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsProductVersion.java index 1b034fd..3baae85 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsProductVersion.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsProductVersion.java @@ -28,6 +28,7 @@ import javax.persistence.Table; @Api("生产版本") public class WmsProductVersion extends BaseBean { + private static final long serialVersionUID = -1708833666516164791L; @Column(name = "ERP_WORK_CENTER") @ApiParam("ERP工作中心") private String erpWorkCenter; diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsQCDetails.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsQCDetails.java index 5204005..d58d624 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsQCDetails.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsQCDetails.java @@ -29,6 +29,7 @@ import javax.persistence.Version; @Table(name = "WMS_QC_DETAILS") @Api("质检单明细信息") public class WmsQCDetails extends BaseBean { + private static final long serialVersionUID = 7442224593652923072L; @Column(name = "PART_NO") @ApiParam("物料编码") public String partNo; diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsQCMaster.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsQCMaster.java index 198fd32..974933f 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsQCMaster.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsQCMaster.java @@ -29,6 +29,7 @@ import javax.persistence.Transient; @Api("质检单主表信息") public class WmsQCMaster extends BaseBean { + private static final long serialVersionUID = 2701710669030092148L; @Column(name = "ORDER_NO") @ApiParam("单号") public String orderNo; diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsQCTrans.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsQCTrans.java index b8f29c2..0796d27 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsQCTrans.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsQCTrans.java @@ -29,6 +29,7 @@ import javax.persistence.Table; @Api("质检单操作明细信息") public class WmsQCTrans extends BaseBean { + private static final long serialVersionUID = 7779401323803118985L; @Column(name="ORDER_NO") @ApiParam("单号") public String orderNo; diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsRoutingAssign.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsRoutingAssign.java index d6418d1..c4f0157 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsRoutingAssign.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsRoutingAssign.java @@ -28,6 +28,7 @@ import javax.persistence.Table; @Api("物流路线分配表") public class WmsRoutingAssign extends BaseBean { + private static final long serialVersionUID = -1503043687498339115L; @Column(name = "WH_NO") @ApiParam(value = "仓库代码") private String whNo; diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsRoutingDetail.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsRoutingDetail.java index 53e733a..25e42ae 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsRoutingDetail.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsRoutingDetail.java @@ -27,6 +27,7 @@ import javax.persistence.Table; @Table(name = "WMS_ROUTING_DETAIL") @Api("物流路线明细表") public class WmsRoutingDetail extends BaseBean { + private static final long serialVersionUID = -7554592685484684522L; @Column(name = "ROUTING_CODE") @ApiParam(value = "路线编码") private String routingCode; diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsRoutingMaster.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsRoutingMaster.java index b942cf0..b7c6c2b 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsRoutingMaster.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsRoutingMaster.java @@ -27,6 +27,7 @@ import javax.persistence.Table; @Table(name = "WMS_ROUTING_MASTER") @Api("物流路线主表") public class WmsRoutingMaster extends BaseBean { + private static final long serialVersionUID = 366756079392004681L; @Column(name = "ROUTING_CODE") @ApiParam(value = "路线编码") private String routingCode; diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsSapOrderLock.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsSapOrderLock.java index 645df63..71b81f7 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsSapOrderLock.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsSapOrderLock.java @@ -28,6 +28,7 @@ import javax.persistence.Table; @Api("SAP_单据锁定") public class WmsSapOrderLock extends BaseBean { + private static final long serialVersionUID = -2469224478566017898L; @Column(name = "ORDER_NO") @ApiParam("订单号") public String orderNo; diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsShipping.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsShipping.java index 559b83e..50c04d5 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsShipping.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsShipping.java @@ -30,6 +30,7 @@ import javax.persistence.Transient; @Api("产品发运信息") public class WmsShipping extends BaseBean { + private static final long serialVersionUID = 5760351204320621363L; @Column(name="ORDER_NO") @ApiParam("发运单号") public String orderNo; diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsShippingFlag.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsShippingFlag.java index 9513d3f..a401b2e 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsShippingFlag.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsShippingFlag.java @@ -2,7 +2,6 @@ package cn.estsh.i3plus.pojo.wms.bean; import cn.estsh.i3plus.pojo.base.bean.BaseBean; import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiParam; import lombok.Data; import lombok.EqualsAndHashCode; @@ -29,6 +28,7 @@ import javax.persistence.Table; @Api(value="客户发往地信息表",description = "客户发往地信息表") public class WmsShippingFlag extends BaseBean { + private static final long serialVersionUID = 8034283413609254479L; @Column(name = "FLAG_NO") @ApiParam(value = "编号") private String flagNo; diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsSnPrint.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsSnPrint.java index 5f426e0..0b7ae2f 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsSnPrint.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsSnPrint.java @@ -28,6 +28,7 @@ import javax.persistence.Table; @Api("打印队列信息") public class WmsSnPrint extends BaseBean { + private static final long serialVersionUID = -1688979447974410727L; @Column(name="REF_TYPE") @ApiParam("来源单据类型") public String refType; diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsSnPrintRcd.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsSnPrintRcd.java index 0ab7b22..5fa795e 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsSnPrintRcd.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsSnPrintRcd.java @@ -32,6 +32,7 @@ import java.util.Date; @Api(value = "条码补打印记录表", description = "条码补打印记录表") public class WmsSnPrintRcd extends BaseBean { + private static final long serialVersionUID = 5818946818048942479L; @Column(name = "WH_NO") @ApiParam(value = "仓库代码") private String whNo; diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockQuan.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockQuan.java index 7c3fde7..e28650d 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockQuan.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockQuan.java @@ -32,6 +32,7 @@ import java.util.List; @Api(value = "库存信息", description = "库存信息") public class WmsStockQuan extends BaseBean { + private static final long serialVersionUID = -1761371963373124790L; @Column(name = "WH_NO") @ApiParam(value = "仓库代码") private String whNo; diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockSn.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockSn.java index c9f016b..d2a7d27 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockSn.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockSn.java @@ -5,13 +5,11 @@ import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; import lombok.EqualsAndHashCode; -import org.hibernate.annotations.ColumnDefault; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; import org.springframework.format.annotation.DateTimeFormat; import javax.persistence.*; -import java.math.BigDecimal; import java.util.Date; import java.util.List; @@ -44,6 +42,7 @@ import java.util.List; @Api(value = "库存条码信息", description = "库存条码信息") public class WmsStockSn extends BaseBean { + private static final long serialVersionUID = 4869307400585363697L; @Column(name = "WH_NO") @ApiParam(value = "仓库代码") private String whNo; diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTaskCreateLog.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTaskCreateLog.java index 695e9ad..95e23ab 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTaskCreateLog.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTaskCreateLog.java @@ -30,6 +30,7 @@ import java.util.Date; @Api("作业任务生成日志表") public class WmsTaskCreateLog extends BaseBean { + private static final long serialVersionUID = 7453656891534121600L; @Column(name = "TASK_NO") @ApiParam("任务单号") public String taskNo; diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTaskDetails.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTaskDetails.java index 4afeabe..0a7ff59 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTaskDetails.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTaskDetails.java @@ -35,6 +35,7 @@ import java.math.BigDecimal; @Api("作业任务明细信息") public class WmsTaskDetails extends BaseBean { + private static final long serialVersionUID = 2938720878619662102L; @Column(name = "ORDER_NO") @ApiParam(value = "单号") private String orderNo; diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTaskInfo.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTaskInfo.java index 0bf3187..e33b3b1 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTaskInfo.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTaskInfo.java @@ -30,6 +30,7 @@ import java.util.List; @Api("作业任务表") public class WmsTaskInfo extends BaseBean { + private static final long serialVersionUID = -5462013707601937183L; @Column(name = "ORDER_NO") @ApiParam("单号") public String orderNo; diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTaskSrc.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTaskSrc.java index 5f5c023..4b798fd 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTaskSrc.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTaskSrc.java @@ -28,6 +28,7 @@ import javax.persistence.Table; @Api("作业任务数据来源表") public class WmsTaskSrc extends BaseBean { + private static final long serialVersionUID = 4353350310105262081L; @Column(name = "OP_TYPE_CODE") @ApiParam("作业类型编号") public String opTypeCode; diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTempOrderLock.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTempOrderLock.java index 4e75005..d35daea 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTempOrderLock.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTempOrderLock.java @@ -28,6 +28,7 @@ import javax.persistence.Table; @Api("单据操作并发锁定信息") public class WmsTempOrderLock extends BaseBean { + private static final long serialVersionUID = -4799375554116657576L; /** * 业务类型:RC=收货,QC=质检,IN=入库,ZI=杂收,ZO=杂发, * VJ=供应商退货,CJ=客户退货,WP=工单领料,WJ=工单退料, diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTrans.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTrans.java index 52e7883..5812f39 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTrans.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTrans.java @@ -32,6 +32,7 @@ import javax.persistence.Transient; @Api(value="库存交易记录表",description = "库存交易记录表") public class WmsTrans extends BaseBean{ + private static final long serialVersionUID = 3448281966527172546L; @Column(name="ORDER_NO") @ApiParam(value ="单据编号") private String orderNo; diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTransCode.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTransCode.java index aaee2e1..026c7ab 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTransCode.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTransCode.java @@ -28,6 +28,7 @@ import javax.persistence.Table; @Api(value="交易代码方法表",description = "交易代码方法表") public class WmsTransCode extends BaseBean{ + private static final long serialVersionUID = 578731019818455680L; @Column(name="TRANS_CODE") @ApiParam(value ="交易代码") private String transCode; diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTransModule.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTransModule.java index ca773a2..be80316 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTransModule.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTransModule.java @@ -1,8 +1,6 @@ package cn.estsh.i3plus.pojo.wms.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; @@ -13,7 +11,6 @@ import org.hibernate.annotations.DynamicUpdate; import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Table; -import javax.persistence.Transient; /** * @Description : 交易处理组件表 @@ -31,6 +28,7 @@ import javax.persistence.Transient; @Api(value = "交易处理组件表", description = "交易处理组件表") public class WmsTransModule extends BaseBean { + private static final long serialVersionUID = 5329077579052808553L; @Column(name = "TM_NAME") @ApiParam(value = "组件名称") private String tmName; diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTransQuan.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTransQuan.java index 329b3a0..610d8e5 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTransQuan.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTransQuan.java @@ -33,6 +33,7 @@ import javax.persistence.*; @Api("库存交易信息") public class WmsTransQuan extends BaseBean { + private static final long serialVersionUID = -7379945456037422449L; @Column(name = "TRANS_NO") @ApiParam(value = "事务编号") private String transNo; diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTransRcd.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTransRcd.java index c74b56c..45d366a 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTransRcd.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTransRcd.java @@ -32,6 +32,7 @@ import javax.persistence.Transient; @Api(value="仓库交易归档表",description = "仓库交易归档表") public class WmsTransRcd extends BaseBean{ + private static final long serialVersionUID = 5996005499842022226L; @Column(name="ORDER_NO") @ApiParam(value ="单据编号") private String orderNo; diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTransSn.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTransSn.java index 3adc50e..7e066dd 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTransSn.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTransSn.java @@ -29,6 +29,7 @@ import javax.persistence.Table; @Api("库存交易条码信息") public class WmsTransSn extends BaseBean { + private static final long serialVersionUID = -5303085479813153054L; @Column(name="WH_NO") @ApiParam("仓库代码") public String whNo; diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTransType.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTransType.java index cc5984b..aef6850 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTransType.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTransType.java @@ -31,6 +31,7 @@ import javax.persistence.Transient; @Api(value = "交易类型表", description = "交易类型表") public class WmsTransType extends BaseBean { + private static final long serialVersionUID = -4309264918740295355L; @Column(name = "TRANS_TYPE_CODE") @ApiParam(value = "类型编号") private String transTypeCode; diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsUnit.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsUnit.java index b86e93b..290f7c0 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsUnit.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsUnit.java @@ -28,6 +28,7 @@ import javax.persistence.Table; @Api(value="单位定义",description = "单位定义") public class WmsUnit extends BaseBean { + private static final long serialVersionUID = 7332606009041273554L; @Column(name = "UNIT_CODE") @ApiParam(value = "单位代码") private String unitCode; diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsUnitConvert.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsUnitConvert.java index 2e4b9bd..30bc5e6 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsUnitConvert.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsUnitConvert.java @@ -28,6 +28,7 @@ import javax.persistence.Table; @Api(value="单位换算",description = "单位换算") public class WmsUnitConvert extends BaseBean { + private static final long serialVersionUID = -466720560879335877L; @Column(name = "UNIT_CODE") @ApiParam(value = "单位代码") private String unitCode; diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsVendorPart.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsVendorPart.java index fd123b1..82a5a73 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsVendorPart.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsVendorPart.java @@ -29,6 +29,7 @@ import javax.persistence.Transient; @Api(value="供应商零件关系",description = "供应商零件关系") public class WmsVendorPart extends BaseBean { + private static final long serialVersionUID = 7339520734918140529L; @Column(name = "VENDOR_NO") @ApiParam(value = "供应商编号") private String vendorNo; diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsWorkCenter.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsWorkCenter.java index b2b42f9..6da587b 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsWorkCenter.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsWorkCenter.java @@ -28,6 +28,7 @@ import javax.persistence.Table; @Api(value="工作中心",description = "工作中心") public class WmsWorkCenter extends BaseBean { + private static final long serialVersionUID = 415180808859365167L; @Column(name = "WORK_CENTER_CODE") @ApiParam(value = "工作中心代码") private String workCenterCode; diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsWorkCenterZone.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsWorkCenterZone.java index 87ad548..9175316 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsWorkCenterZone.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsWorkCenterZone.java @@ -29,6 +29,7 @@ import javax.persistence.Transient; @Api(value="工作中心线边库区关系",description = "工作中心线边库区关系") public class WmsWorkCenterZone extends BaseBean { + private static final long serialVersionUID = 950689993212839817L; @Column(name = "WORK_CENTER_CODE") @ApiParam(value = "工作中心代码") private String workCenterCode; diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsZones.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsZones.java index 06e69ff..16a7ce9 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsZones.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsZones.java @@ -30,6 +30,7 @@ import java.util.List; @Api(value="存储区信息表",description = "存储区信息表") public class WmsZones extends BaseBean { + private static final long serialVersionUID = 7759454799191378612L; @Column(name = "WH_NO") @ApiParam(value = "仓库代码") private String whNo; diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/esbio/IQ.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/esbio/IQ.java index 303f0cb..3d2fa68 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/esbio/IQ.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/esbio/IQ.java @@ -2,12 +2,15 @@ package cn.estsh.i3plus.pojo.wms.bean.esbio; import lombok.Data; +import java.io.Serializable; + /** * Created by Administrator on 2019/7/2. */ @Data -public class IQ { +public class IQ implements Serializable { + private static final long serialVersionUID = 3988797003289430387L; public String SID=""; public String TPDESC=""; diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/esbio/OQ.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/esbio/OQ.java index 89b7bb3..182c42d 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/esbio/OQ.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/esbio/OQ.java @@ -2,12 +2,15 @@ package cn.estsh.i3plus.pojo.wms.bean.esbio; import lombok.Data; +import java.io.Serializable; + /** * Created by Administrator on 2019/7/2. */ @Data -public class OQ { +public class OQ implements Serializable { + private static final long serialVersionUID = 7014499382086153789L; public String SID=""; public String TPDESC=""; diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/esbio/PublishTopicData.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/esbio/PublishTopicData.java index 7e39983..92b010e 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/esbio/PublishTopicData.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/esbio/PublishTopicData.java @@ -2,9 +2,12 @@ package cn.estsh.i3plus.pojo.wms.bean.esbio; import lombok.Data; +import java.io.Serializable; + @Data -public class PublishTopicData { +public class PublishTopicData implements Serializable { + private static final long serialVersionUID = -4298258124509098362L; public int TPID =0; public String PBNO =""; diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/esbio/SI_TP.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/esbio/SI_TP.java index 8f41909..b0a9cc5 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/esbio/SI_TP.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/esbio/SI_TP.java @@ -2,9 +2,12 @@ package cn.estsh.i3plus.pojo.wms.bean.esbio; import lombok.Data; +import java.io.Serializable; + @Data -public class SI_TP { +public class SI_TP implements Serializable { + private static final long serialVersionUID = -689718438318099642L; public String TPTYP=""; public String TPNO=""; diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/esbio/SI_TPMAP.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/esbio/SI_TPMAP.java index da5556e..6a811af 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/esbio/SI_TPMAP.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/esbio/SI_TPMAP.java @@ -1,9 +1,13 @@ package cn.estsh.i3plus.pojo.wms.bean.esbio; import lombok.Data; + +import java.io.Serializable; + @Data -public class SI_TPMAP { +public class SI_TPMAP implements Serializable { + private static final long serialVersionUID = 1256855084006982298L; public int SEQ=0; public String SAPCOL=""; From 145600a5d0432352098569826a8ff6f1c6758e82 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=88=98=E6=95=8F?= <962239776@qq.com> Date: Fri, 2 Aug 2019 18:23:11 +0800 Subject: [PATCH 13/15] =?UTF-8?q?=E5=8D=95=E6=8D=AE=E6=9F=A5=E8=AF=A2?= =?UTF-8?q?=E7=B2=BE=E5=87=86=E6=9F=A5=E8=AF=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) 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 1abcdb7..06516fd 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 @@ -118,7 +118,8 @@ public class WmsHqlPack { DdlPackBean result = new DdlPackBean(); //查询参数封装 - DdlPreparedPack.getStringLikerPack(wmsDocMovementDetails.getOrderNo(), "orderNo", result); + // 该查询封装用于单据主表查询明细使用equal 精准查询 + DdlPreparedPack.getStringEqualPack(wmsDocMovementDetails.getOrderNo(), "orderNo", result); DdlPreparedPack.getNumEqualPack(wmsDocMovementDetails.getItemStatus(), "itemStatus", result); DdlPreparedPack.getStringEqualPack(wmsDocMovementDetails.getPartNo(), "partNo", result); DdlPreparedPack.getStringLikerPack(wmsDocMovementDetails.getDestZoneNo(), "destZoneNo", result); From e7913cfb263094dbbe704276713588a59116543a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E4=BA=8E=E5=AD=A6=E6=9D=B0?= Date: Mon, 5 Aug 2019 10:53:02 +0800 Subject: [PATCH 14/15] =?UTF-8?q?1.=20=E4=BB=8E=20TEST=20=E5=90=88?= =?UTF-8?q?=E5=B9=B6=E4=BB=A3=E7=A0=81=E5=90=8E=20POM=20=E6=96=87=E4=BB=B6?= =?UTF-8?q?=E4=B8=AD=E5=BC=95=E7=94=A8=E7=9A=84=E7=89=88=E6=9C=AC=E4=B8=8D?= =?UTF-8?q?=E6=AD=A3=E7=A1=AE=EF=BC=8C=E4=BF=AE=E6=94=B9=E4=B8=BA=20DEV?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- modules/i3plus-pojo-andon/pom.xml | 2 +- modules/i3plus-pojo-base/pom.xml | 2 +- modules/i3plus-pojo-form/pom.xml | 2 +- modules/i3plus-pojo-hardswitch/pom.xml | 2 +- modules/i3plus-pojo-jobflow/pom.xml | 2 +- modules/i3plus-pojo-lac/pom.xml | 2 +- modules/i3plus-pojo-mes-pcn/pom.xml | 2 +- modules/i3plus-pojo-mes/pom.xml | 2 +- modules/i3plus-pojo-model/pom.xml | 2 +- modules/i3plus-pojo-platform/pom.xml | 2 +- modules/i3plus-pojo-report/pom.xml | 2 +- modules/i3plus-pojo-softswitch/pom.xml | 2 +- modules/i3plus-pojo-sweb/pom.xml | 2 +- modules/i3plus-pojo-wms/pom.xml | 2 +- modules/i3plus-pojo-workflow/pom.xml | 2 +- pom.xml | 2 +- 16 files changed, 16 insertions(+), 16 deletions(-) diff --git a/modules/i3plus-pojo-andon/pom.xml b/modules/i3plus-pojo-andon/pom.xml index f8fa98e..ebd53c3 100644 --- a/modules/i3plus-pojo-andon/pom.xml +++ b/modules/i3plus-pojo-andon/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-base/pom.xml b/modules/i3plus-pojo-base/pom.xml index d790ef1..e97c0bb 100644 --- a/modules/i3plus-pojo-base/pom.xml +++ b/modules/i3plus-pojo-base/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-form/pom.xml b/modules/i3plus-pojo-form/pom.xml index c6141da..90e744d 100644 --- a/modules/i3plus-pojo-form/pom.xml +++ b/modules/i3plus-pojo-form/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-hardswitch/pom.xml b/modules/i3plus-pojo-hardswitch/pom.xml index 23e5bee..0ba3645 100644 --- a/modules/i3plus-pojo-hardswitch/pom.xml +++ b/modules/i3plus-pojo-hardswitch/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-jobflow/pom.xml b/modules/i3plus-pojo-jobflow/pom.xml index c1e2cb9..6706323 100644 --- a/modules/i3plus-pojo-jobflow/pom.xml +++ b/modules/i3plus-pojo-jobflow/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-lac/pom.xml b/modules/i3plus-pojo-lac/pom.xml index 86d7736..3681eb6 100644 --- a/modules/i3plus-pojo-lac/pom.xml +++ b/modules/i3plus-pojo-lac/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-mes-pcn/pom.xml b/modules/i3plus-pojo-mes-pcn/pom.xml index 09f2c4a..e388a1d 100644 --- a/modules/i3plus-pojo-mes-pcn/pom.xml +++ b/modules/i3plus-pojo-mes-pcn/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-mes/pom.xml b/modules/i3plus-pojo-mes/pom.xml index 82fdbe8..62ebe64 100644 --- a/modules/i3plus-pojo-mes/pom.xml +++ b/modules/i3plus-pojo-mes/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-model/pom.xml b/modules/i3plus-pojo-model/pom.xml index 3185eca..642c9a6 100644 --- a/modules/i3plus-pojo-model/pom.xml +++ b/modules/i3plus-pojo-model/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-platform/pom.xml b/modules/i3plus-pojo-platform/pom.xml index ec9e100..e310bfd 100644 --- a/modules/i3plus-pojo-platform/pom.xml +++ b/modules/i3plus-pojo-platform/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-report/pom.xml b/modules/i3plus-pojo-report/pom.xml index bd09726..e36fcf7 100644 --- a/modules/i3plus-pojo-report/pom.xml +++ b/modules/i3plus-pojo-report/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-softswitch/pom.xml b/modules/i3plus-pojo-softswitch/pom.xml index 4c96781..81fb02b 100644 --- a/modules/i3plus-pojo-softswitch/pom.xml +++ b/modules/i3plus-pojo-softswitch/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-sweb/pom.xml b/modules/i3plus-pojo-sweb/pom.xml index 2c24e41..1f622d9 100644 --- a/modules/i3plus-pojo-sweb/pom.xml +++ b/modules/i3plus-pojo-sweb/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-wms/pom.xml b/modules/i3plus-pojo-wms/pom.xml index 18c811c..bc41914 100644 --- a/modules/i3plus-pojo-wms/pom.xml +++ b/modules/i3plus-pojo-wms/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-workflow/pom.xml b/modules/i3plus-pojo-workflow/pom.xml index 1171f4e..93f9732 100644 --- a/modules/i3plus-pojo-workflow/pom.xml +++ b/modules/i3plus-pojo-workflow/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/pom.xml b/pom.xml index 71b6632..9e20085 100644 --- a/pom.xml +++ b/pom.xml @@ -15,7 +15,7 @@ i3plus.pojo i3plus-pojo pom - 1.0-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT modules/i3plus-pojo-base modules/i3plus-pojo-platform From d826c47d5afd1006c90fb743987fb1a010dd2bc9 Mon Sep 17 00:00:00 2001 From: WYnneaoapc Date: Mon, 5 Aug 2019 13:47:17 +0800 Subject: [PATCH 15/15] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=BA=86mesEvent=20poj?= =?UTF-8?q?o?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEvent.java | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEvent.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEvent.java index c442bb9..9fe1a36 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEvent.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEvent.java @@ -40,6 +40,10 @@ public class MesEvent extends BaseBean { @ApiParam("事件类型") private Integer eventType; + @Column(name="BUTTON_CODE") + @ApiParam("按钮代码") + private String buttonCode; + public int getEventTypeVal() { return this.eventType == null ? 0 : this.eventType; }