From cafd923d3acbed6b96cdf9a2df16a444e6a3358e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=AE=B8=E5=BF=83=E6=B4=81?= Date: Mon, 2 Sep 2019 21:53:13 +0800 Subject: [PATCH 01/15] =?UTF-8?q?=E6=B5=81=E7=A8=8B=E7=AE=A1=E5=AE=B6?= =?UTF-8?q?=EF=BC=9A=E6=B7=BB=E5=8A=A0=E4=BD=9C=E4=B8=9A=E8=AE=B0=E5=BD=95?= =?UTF-8?q?=E6=98=8E=E7=BB=86=EF=BC=88=E4=BD=9C=E4=B8=9A=E8=AE=B0=E5=BD=95?= =?UTF-8?q?=E4=B8=8D=E5=86=8D=E6=9B=B4=E6=96=B0=E7=A7=BB=E5=8A=A8=E5=8D=95?= =?UTF-8?q?=E5=8F=B7=EF=BC=9A=E4=B8=80=E4=B8=AA=E6=AD=A5=E9=AA=A4=E8=AE=B0?= =?UTF-8?q?=E5=BD=95=E4=B8=80=E4=B8=AA=E4=BD=9C=E4=B8=9A=E8=AE=B0=E5=BD=95?= =?UTF-8?q?=E6=98=8E=E7=BB=86=EF=BC=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../estsh/i3plus/pojo/wms/bean/WmsActionLog.java | 49 ++++++++++------------ .../i3plus/pojo/wms/bean/WmsActionLogDetails.java | 9 ++-- .../estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java | 2 +- 3 files changed, 30 insertions(+), 30 deletions(-) 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 bc01da3..4b8e558 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 @@ -28,102 +28,99 @@ import javax.persistence.Transient; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) -@Table(name="WMS_ACTION_LOG") -@Api(value="作业记录表") +@Table(name = "WMS_ACTION_LOG") +@Api(value = "作业记录表") public class WmsActionLog extends BaseBean { private static final long serialVersionUID = 8664373854844368861L; - @Column(name="TASK_NO") + @Column(name = "TASK_NO") @ApiParam(value = "作业任务编号", example = "1") @JsonSerialize(using = ToStringSerializer.class) public String taskNo; - @Column(name="TRANS_TYPE_CODE") + @Column(name = "TRANS_TYPE_CODE") @ApiParam(value = "交易类型编号") public String transTypeCode; - @Column(name="MOVE_NO") + @Transient + @Column(name = "MOVE_NO") @ApiParam(value = "移动单单号") public String moveNo; - @Column(name="AG_ID") + @Column(name = "AG_ID") @ApiParam(value = "作业流程编号", example = "1") @JsonSerialize(using = ToStringSerializer.class) public Long agId; //get单独处理 - public Long getAgId() { - if(agId != null) { - return agId.longValue(); - }else{ - return agId; - } + public long getAgIdVal() { + return agId == null ? 0 : agId.longValue(); } @Column(name = "AL_NAME_RDD") @ApiParam(value = "流程名称") public String agNameRdd; - @Column(name="ACTION_USER_NAME") + @Column(name = "ACTION_USER_NAME") @ApiParam(value = "作业人员") public String actionUserName; - @Column(name="FIX_NO") + @Column(name = "FIX_NO") @ApiParam(value = "设备编号") public String fixNo; - @Column(name="START_TIME") + @Column(name = "START_TIME") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") @ApiParam(value = "开始作业时间") public String startTime; - @Column(name="END_TIME") + @Column(name = "END_TIME") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") @ApiParam(value = "结束作业时间") public String endTime; @Transient @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") - @ApiParam(value="开始作业时间查询用，查询起始日期",example = "2018-01-01 01:00:00") + @ApiParam(value = "开始作业时间查询用，查询起始日期", example = "2018-01-01 01:00:00") public String startTimeStart; @Transient @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") - @ApiParam(value="开始作业时间查询用，查询结束日期",example = "2018-12-31 23:59:59") + @ApiParam(value = "开始作业时间查询用，查询结束日期", example = "2018-12-31 23:59:59") public String startTimeEnd; @Transient @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") - @ApiParam(value="结束作业时间查询用，查询起始日期",example = "2018-01-01 01:00:00") + @ApiParam(value = "结束作业时间查询用，查询起始日期", example = "2018-01-01 01:00:00") public String endTimeStart; @Transient @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") - @ApiParam(value="结束作业时间查询用，查询结束日期",example = "2018-12-31 23:59:59") + @ApiParam(value = "结束作业时间查询用，查询结束日期", example = "2018-12-31 23:59:59") public String endTimeEnd; // 状态:1=创建,10=处理中,20=已完成 - @Column(name="ACTION_STATUS") + @Column(name = "ACTION_STATUS") @ApiParam(value = "作业状态", example = "1") public Integer actionStatus; - @Column(name="TOTAL_STEP") + @Column(name = "TOTAL_STEP") @ApiParam(value = "总步数", example = "1") public Integer totalStep; - @Column(name="CURRENT_STEP") + @Column(name = "CURRENT_STEP") @ApiParam(value = "当前步骤", example = "1") public Integer currentStep; - @Column(name="INIT_AM_ID") + @Column(name = "INIT_AM_ID") @ApiParam(value = "初始化组件编号", example = "0") public Long initAmId; - @Column(name="DETAILS_AM_ID") + @Column(name = "DETAILS_AM_ID") @ApiParam(value = "明细处理组件编号", example = "0") public Long detailsAmId; - @Column(name="END_AM_ID") + @Column(name = "END_AM_ID") @ApiParam(value = "结束组件编号", example = "0") public Long endAmId; 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 66ea3df..facb1fc 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 @@ -36,9 +36,9 @@ public class WmsActionLogDetails extends BaseBean { @JsonSerialize(using = ToStringSerializer.class) public Long alId; - @Column(name = "AL_NAME_RDD") - @ApiParam(value = "流程名称") - public String agNameRdd; + @Column(name = "AG_ID") + @ApiParam(value = "流程ID") + public Long agId; @Column(name = "SEQ") @ApiParam(value = "序号", example = "1") @@ -113,6 +113,9 @@ public class WmsActionLogDetails extends BaseBean { @ApiParam(value = "作业流程明细ID", example = "1") public Long agdId; + @Column(name="MOVE_NO") + @ApiParam(value = "移动单单号") + public String moveNo; public Long getAsId() { if (asId != null) { return asId.longValue(); diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java index 8398302..4f0ca46 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 @@ -2272,7 +2272,7 @@ public class WmsHqlPack { public static DdlPackBean packHqlWmsActionLogByActionLog(WmsActionLog actionLog) { DdlPackBean packBean = new DdlPackBean(); DdlPreparedPack.timeBuilder(actionLog.getCreateDatetime(), "createDatetime", packBean, false, false); - DdlPreparedPack.getStringEqualPack(actionLog.getMoveNo(), "moveNo", packBean); +// DdlPreparedPack.getStringEqualPack(actionLog.getMoveNo(), "moveNo", packBean); DdlPreparedPack.getStringEqualPack(actionLog.getTransTypeCode(), "transTypeCode", packBean); DdlPreparedPack.getStringEqualPack(actionLog.getFixNo(), "fixNo", packBean); DdlPreparedPack.getNumEqualPack(actionLog.getAgId(), "agId", packBean); From 503b68a0a5a4178ecf924d07f2d13e86c08b7c0f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=AE=B8=E5=BF=83=E6=B4=81?= Date: Mon, 2 Sep 2019 22:12:35 +0800 Subject: [PATCH 02/15] =?UTF-8?q?=E6=8B=89=E4=BA=86=E6=B5=8B=E8=AF=95?= =?UTF-8?q?=E7=9A=84=E4=BB=A3=E7=A0=81POM=E6=96=87=E4=BB=B6=E9=94=99?= =?UTF-8?q?=E4=B9=B1?= 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 0798953..39a7704 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 f220aa1..f355cca 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 84ace781a303a74522e4ca27275d63615745c75d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=AE=B8=E5=BF=83=E6=B4=81?= Date: Mon, 2 Sep 2019 22:30:25 +0800 Subject: [PATCH 03/15] =?UTF-8?q?=E6=B5=81=E7=A8=8B=E6=B7=BB=E5=8A=A0?= =?UTF-8?q?=E9=BB=98=E8=AE=A4=E5=80=BC=E6=96=B9=E5=BC=8F=E9=94=99=E8=AF=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionGroup.java | 8 -------- 1 file changed, 8 deletions(-) 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 2bdc67f..1ea54c2 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 @@ -74,14 +74,6 @@ public class WmsActionGroup extends BaseBean { @ApiParam(value = "提交步骤序号") private Integer submitStepSeq; - public void setInitAmId(Long initAmId) { - this.initAmId = initAmId == null ? 0 : this.initAmId.longValue(); - } - - public void setDetailsAmId(Long detailsAmId) { - this.detailsAmId = detailsAmId == null ? 0 : this.detailsAmId.longValue(); - } - public long getInitAmIdVal() { return this.initAmId == null ? 0 : this.initAmId.longValue(); } From 46d220f3ec5d90507c742212bda02a7d2c8ab245 Mon Sep 17 00:00:00 2001 From: wangjie Date: Tue, 3 Sep 2019 10:56:52 +0800 Subject: [PATCH 04/15] =?UTF-8?q?mes=E6=9D=A1=E7=A0=81=E8=A7=84=E5=88=99?= =?UTF-8?q?=E6=A0=A1=E9=AA=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pojo/mes/pcn/bean/MesPcnSysUserOffline.java | 57 ++++++++++++++++++++++ .../repository/MesPcnSysUserOfflineRepository.java | 16 ++++++ .../estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java | 17 +++++++ 3 files changed, 90 insertions(+) create mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPcnSysUserOffline.java create mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesPcnSysUserOfflineRepository.java diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPcnSysUserOffline.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPcnSysUserOffline.java new file mode 100644 index 0000000..684fe5e --- /dev/null +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPcnSysUserOffline.java @@ -0,0 +1,57 @@ +package cn.estsh.i3plus.pojo.mes.pcn.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; +import lombok.EqualsAndHashCode; +import org.hibernate.annotations.DynamicInsert; +import org.hibernate.annotations.DynamicUpdate; + +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.Table; +import javax.persistence.Transient; +import java.util.List; + +/** + * @Description : 账号离线登陆表 + * @Reference : + * @Author : wangjie + * @CreateDate : 2019-09-01 11:02 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name="MES_PCN_SYS_USER_OFFLINE") +@Api(value="账号离线登陆表",description = "账号离线登陆表。") +public class MesPcnSysUserOffline extends BaseBean { + + @Column(name = "USER_ID") + @ApiParam(value = "人员ID", example = "-1") + @JsonSerialize(using = ToStringSerializer.class) + private Long userId; + + @Column(name = "USER_NAME") + @ApiParam(value = "用户名称", access = "账号名称") + private String userName; + + @Column(name = "LOGIN_NAME") + @ApiParam(value = "登陆名称", access = "登陆名称") + private String loginName; + + @Column(name="ORGANIZE_ID") + @ApiParam(value ="部门ID" , example ="-1") + @JsonSerialize(using = ToStringSerializer.class) + private Long organizeId; + + @Column(name="ORGANIZE_NAME") + @ApiParam(value ="部门名称" , access ="部门名称") + private String organizeName; + +} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesPcnSysUserOfflineRepository.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesPcnSysUserOfflineRepository.java new file mode 100644 index 0000000..111a055 --- /dev/null +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesPcnSysUserOfflineRepository.java @@ -0,0 +1,16 @@ +package cn.estsh.i3plus.pojo.mes.pcn.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.mes.pcn.bean.MesPcnSysUserOffline; +import org.springframework.stereotype.Repository; + +/** + * @Description : + * @Reference : + * @Author : wangjie + * @CreateDate : 2019-09-02 + * @Modify: + **/ +@Repository +public interface MesPcnSysUserOfflineRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java index fa0f89f..3f16e63 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 @@ -1170,4 +1170,21 @@ public class MesHqlPack { packBean.setOrderByStr(mesPcnTask.orderBy()); return packBean; } + + /** + * 条码生成规则校验同一机构下条码规则唯一性 + * @param numberRule + * @param id + * @param organizeCode + * @return + */ + public static DdlPackBean getMesNumberRuleCheck(String numberRule, Long id, String organizeCode) { + DdlPackBean packBean = new DdlPackBean(); + DdlPreparedPack.getStringEqualPack(organizeCode, "organizeCode", packBean); + DdlPreparedPack.getStringEqualPack(numberRule, "numberRule", packBean); + if (null != id) { + DdlPreparedPack.getNumNOEqualPack(id, "id", packBean); + } + return packBean; + } } From 32502582c185b1cd1eeb04f86b2405ccd86f6ad4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=B1=AA=E4=BA=91=E6=98=8A?= Date: Tue, 3 Sep 2019 10:56:56 +0800 Subject: [PATCH 05/15] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E5=B1=9E=E6=80=A7?= =?UTF-8?q?=E5=88=9D=E5=A7=8B=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cn/estsh/i3plus/pojo/base/jpa/daoimpl/BaseRepositoryImpl.java | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/jpa/daoimpl/BaseRepositoryImpl.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/jpa/daoimpl/BaseRepositoryImpl.java index 0eb845c..68b5190 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/jpa/daoimpl/BaseRepositoryImpl.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/jpa/daoimpl/BaseRepositoryImpl.java @@ -1196,6 +1196,12 @@ public class BaseRepositoryImpl extends SimpleJpaRep fieldSetInitParam(item, checkField); } } + for(Field checkField : clazz.getDeclaredFields()){ + if(checkField.get(item) == null){ + // 未赋值的属性，进行初始化赋值 + fieldSetInitParam(item, checkField); + } + } } entityManager.merge(item); From d5cfe77ac553b134eb0e3b92dd9d9f5f42ef1714 Mon Sep 17 00:00:00 2001 From: wangjie Date: Tue, 3 Sep 2019 11:13:47 +0800 Subject: [PATCH 06/15] =?UTF-8?q?mes=E5=AE=9A=E6=97=B6=E4=BB=BB=E5=8A=A1?= =?UTF-8?q?=E6=9E=9A=E4=B8=BE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/base/enumutil/MesEnumUtil.java | 37 ++++++++++++++++++++++ 1 file changed, 37 insertions(+) diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java index cc709a5..5148235 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java @@ -12,6 +12,43 @@ import com.fasterxml.jackson.annotation.JsonFormat; public class MesEnumUtil { /** + * mes-pcn定时任务状态 + * + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum MES_PCN_TASK_STATUS { + + OPEN(1, "OPEN"), + CLOSE(2, "CLOSE"); + + private int value; + private String description; + + MES_PCN_TASK_STATUS(int value, String description) { + this.value = value; + this.description = description; + } + + public int getValue() { + return value; + } + + public String getDescription() { + return description; + } + + public static String valueOfDescription(int val) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].value == val) { + tmp = values()[i].description; + } + } + return tmp; + } + } + + /** * mes工步类型 */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) From b4b095c970dd663873fd568b1415dfad8e62bcf9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=B1=AA=E4=BA=91=E6=98=8A?= Date: Tue, 3 Sep 2019 11:35:23 +0800 Subject: [PATCH 07/15] =?UTF-8?q?=E5=88=A4=E6=96=AD=E5=B1=9E=E6=80=A7?= =?UTF-8?q?=E6=98=AF=E5=90=A6=E6=9C=89final=E4=BF=AE=E9=A5=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cn/estsh/i3plus/pojo/base/jpa/daoimpl/BaseRepositoryImpl.java | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/jpa/daoimpl/BaseRepositoryImpl.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/jpa/daoimpl/BaseRepositoryImpl.java index 68b5190..8e5a7a0 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/jpa/daoimpl/BaseRepositoryImpl.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/jpa/daoimpl/BaseRepositoryImpl.java @@ -14,6 +14,7 @@ import org.springframework.data.jpa.repository.support.SimpleJpaRepository; import javax.persistence.*; import java.io.Serializable; import java.lang.reflect.Field; +import java.lang.reflect.Modifier; import java.text.SimpleDateFormat; import java.util.*; @@ -1223,6 +1224,9 @@ public class BaseRepositoryImpl extends SimpleJpaRep */ private void fieldSetInitParam(T item,Field field) { try { + if (Modifier.isFinal(field.getModifiers())) { + return; + } if (field.getType() == String.class) { field.set(item, ""); } else if (field.getType() == Byte.class || field.getType() == Character.class || field.getType() == Integer.class) { From 3a1cf7a2b75386054cac4c2298809ec85672ce83 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=B1=AA=E4=BA=91=E6=98=8A?= Date: Tue, 3 Sep 2019 11:38:58 +0800 Subject: [PATCH 08/15] =?UTF-8?q?=E5=88=A4=E6=96=AD=E5=B1=9E=E6=80=A7?= =?UTF-8?q?=E6=98=AF=E5=90=A6=E6=9C=89final=E4=BF=AE=E9=A5=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/base/jpa/daoimpl/BaseRepositoryImpl.java | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/jpa/daoimpl/BaseRepositoryImpl.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/jpa/daoimpl/BaseRepositoryImpl.java index 8e5a7a0..4d1d04f 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/jpa/daoimpl/BaseRepositoryImpl.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/jpa/daoimpl/BaseRepositoryImpl.java @@ -1191,14 +1191,14 @@ public class BaseRepositoryImpl extends SimpleJpaRep //属性值过滤，避免null值 if(initParam){ - for(Field checkField : clazz.getFields()){ - if(checkField.get(item) == null){ + for (Field checkField : clazz.getFields()) { + if (!Modifier.isFinal(checkField.getModifiers()) && checkField.get(item) == null) { // 未赋值的属性，进行初始化赋值 fieldSetInitParam(item, checkField); } } - for(Field checkField : clazz.getDeclaredFields()){ - if(checkField.get(item) == null){ + for (Field checkField : clazz.getDeclaredFields()) { + if (!Modifier.isFinal(checkField.getModifiers()) && checkField.get(item) == null) { // 未赋值的属性，进行初始化赋值 fieldSetInitParam(item, checkField); } @@ -1224,9 +1224,6 @@ public class BaseRepositoryImpl extends SimpleJpaRep */ private void fieldSetInitParam(T item,Field field) { try { - if (Modifier.isFinal(field.getModifiers())) { - return; - } if (field.getType() == String.class) { field.set(item, ""); } else if (field.getType() == Byte.class || field.getType() == Character.class || field.getType() == Integer.class) { From 69d2932ca496548d6c88e826e8da28914e70634a Mon Sep 17 00:00:00 2001 From: crish <570360737@qq.com> Date: Tue, 3 Sep 2019 11:44:04 +0800 Subject: [PATCH 09/15] =?UTF-8?q?http=E8=AF=B7=E6=B1=82=E5=A2=9E=E5=8A=A0?= =?UTF-8?q?=E4=B8=8D=E9=9C=80=E8=A6=81=E8=AE=BE=E7=BD=AE=E8=AF=B7=E6=B1=82?= =?UTF-8?q?=E5=86=85=E5=AE=B9=E6=9E=9A=E4=B8=BE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: crish <570360737@qq.com> --- .../java/cn/estsh/i3plus/pojo/base/enumutil/CommonEnumUtil.java | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/CommonEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/CommonEnumUtil.java index a549eee..3756ccf 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/CommonEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/CommonEnumUtil.java @@ -910,9 +910,10 @@ public class CommonEnumUtil { @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum CONTENT_TYPE { FORM("x-www-form-urlencoded", "表单"), - FILE(" multipart/form-data", "文件"), - JSON(" application/json", "JSON"), - XML(" application/xml ", "XML"); + FILE("multipart/form-data", "文件"), + JSON("application/json", "JSON"), + NONE("default", "默认不需要设置Content-Type"), + XML("application/xml", "XML"); private String value; private String description; From b760543b3b6fa17187925e927bd09b9dd5f548c0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=B1=AA=E4=BA=91=E6=98=8A?= Date: Tue, 3 Sep 2019 16:18:12 +0800 Subject: [PATCH 10/15] =?UTF-8?q?excel=E9=80=9A=E7=94=A8=E5=AF=BC=E5=85=A5?= =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/cn/estsh/i3plus/pojo/base/jpa/daoimpl/BaseRepositoryImpl.java | 1 + 1 file changed, 1 insertion(+) diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/jpa/daoimpl/BaseRepositoryImpl.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/jpa/daoimpl/BaseRepositoryImpl.java index 4d1d04f..71184ef 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/jpa/daoimpl/BaseRepositoryImpl.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/jpa/daoimpl/BaseRepositoryImpl.java @@ -1198,6 +1198,7 @@ public class BaseRepositoryImpl extends SimpleJpaRep } } for (Field checkField : clazz.getDeclaredFields()) { + checkField.setAccessible(true); if (!Modifier.isFinal(checkField.getModifiers()) && checkField.get(item) == null) { // 未赋值的属性，进行初始化赋值 fieldSetInitParam(item, checkField); From db4f6bcdb12aa99ce2c0f04fe0995d37f0a4bb8d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=AE=B8=E5=BF=83=E6=B4=81?= Date: Tue, 3 Sep 2019 17:44:33 +0800 Subject: [PATCH 11/15] =?UTF-8?q?=E6=B5=81=E7=A8=8B=E7=AE=A1=E5=AE=B6?= =?UTF-8?q?=EF=BC=9A=E6=B7=BB=E5=8A=A0=E4=BD=9C=E4=B8=9A=E8=AE=B0=E5=BD=95?= =?UTF-8?q?=E6=98=8E=E7=BB=86=EF=BC=88=E5=BF=AB=E9=80=9F=E6=B5=81=E7=A8=8B?= =?UTF-8?q?=E6=AF=8F=E4=B8=80=E6=AC=A1=E6=89=AB=E6=9D=A1=E7=A0=81=E9=83=BD?= =?UTF-8?q?=E4=BC=9A=E7=94=9F=E6=88=90=E4=B8=80=E4=B8=AA=E6=96=B0=E7=9A=84?= =?UTF-8?q?=E7=A7=BB=E5=8A=A8=E5=8D=95=EF=BC=89?= 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 | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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 1d4ade8..d710147 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 @@ -1320,7 +1320,7 @@ public class WmsEnumUtil { */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum ALD_EXECUTE_STATUS { - NORMAL(10, "创建"), + CREATE(10, "创建"), PROCESSING(20, "处理中"), COMPLETED(30, "已完成"); private int value; @@ -2759,7 +2759,7 @@ public class WmsEnumUtil { public enum STOCK_LEVEL_STATUS { LOW("LOW", "低于最低库存"), HIGH("HIGH", "高于最高库存"), - NORMAL("NORMAL", "安全库存"); + NORMAL("CREATE", "安全库存"); private String value; private String description; From 5f539afd6d0bf5180cb3eb18373cbcab1eb26829 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=88=98=E6=95=8F?= <962239776@qq.com> Date: Tue, 3 Sep 2019 17:47:04 +0800 Subject: [PATCH 12/15] =?UTF-8?q?=E7=A7=BB=E5=8A=A8=E5=8D=95=E6=98=8E?= =?UTF-8?q?=E7=BB=86=E6=B3=A8=E8=A7=A3=E6=B7=BB=E5=8A=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveDetails.java | 5 +++++ 1 file changed, 5 insertions(+) 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 3dfa9a1..fb5cd36 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 @@ -150,18 +150,23 @@ public class WmsMoveDetails extends BaseBean { private Integer busiTypeCode; @Transient + @ApiParam("生产线") private String workCenterCode; @Transient + @ApiParam("父物料编码") private String fPartNo; @Transient + @ApiParam("父物料名称") private String fPartName; @Transient + @ApiParam("数量") private Double qty; @Transient + @ApiParam("创建时间") private String createDateTime; public WmsMoveDetails(){} From 5b735fe3a28fbe81780c5de4a075264dcdffee7e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=88=98=E6=95=8F?= <962239776@qq.com> Date: Tue, 3 Sep 2019 18:48:29 +0800 Subject: [PATCH 13/15] =?UTF-8?q?=E7=A7=BB=E5=8A=A8=E5=8D=95=E6=9E=9A?= =?UTF-8?q?=E4=B8=BE=E5=AF=BC=E5=87=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveDetails.java | 3 +++ .../src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveMaster.java | 5 +++++ 2 files changed, 8 insertions(+) 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 fb5cd36..61fb891 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 @@ -1,6 +1,8 @@ package cn.estsh.i3plus.pojo.wms.bean; +import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn; import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import cn.estsh.i3plus.pojo.base.enumutil.WmsEnumUtil; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; @@ -104,6 +106,7 @@ public class WmsMoveDetails extends BaseBean { */ @Column(name="ITEM_STATUS") @ApiParam(value = "状态", example = "0") + @AnnoOutputColumn(refClass = WmsEnumUtil.MOVE_ORDER_STATUS.class,refForeignKey = "value",value = "description") public Integer itemStatus; @Column(name="REF_ITEM") 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 8a6324a..05347ae 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 @@ -1,6 +1,8 @@ package cn.estsh.i3plus.pojo.wms.bean; +import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn; import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import cn.estsh.i3plus.pojo.base.enumutil.WmsEnumUtil; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; @@ -40,6 +42,7 @@ public class WmsMoveMaster extends BaseBean { */ @Column(name = "ORDER_STATUS") @ApiParam(value = "状态", example = "0") + @AnnoOutputColumn(refClass = WmsEnumUtil.MOVE_ORDER_STATUS.class,refForeignKey = "value",value = "description") public Integer orderStatus; @Column(name = "REMARK") @@ -65,6 +68,7 @@ public class WmsMoveMaster extends BaseBean { @Column(name = "BUSI_TYPE_CODE") @ApiParam(value = "业务类型编码") + @AnnoOutputColumn(refClass = WmsEnumUtil.OUT_MOVEMENT_BUSI_TYPE.class,refForeignKey = "value",value = "description") private Integer busiTypeCode; @Column(name = "REF_ORDER_NO") @@ -77,6 +81,7 @@ public class WmsMoveMaster extends BaseBean { @Transient @ApiParam("状态") + @AnnoOutputColumn(refClass = WmsEnumUtil.MOVE_ORDER_STATUS.class,refForeignKey = "value",value = "description") private Integer itemStatus; @Transient From 482159b322a95894fefc43be17db45ac9b0582df Mon Sep 17 00:00:00 2001 From: wangjie Date: Wed, 4 Sep 2019 10:26:15 +0800 Subject: [PATCH 14/15] =?UTF-8?q?mes-pcn=E5=AE=9A=E6=97=B6=E4=BB=BB?= =?UTF-8?q?=E5=8A=A1=E6=9E=9A=E4=B8=BE=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java index 5148235..7ebba6f 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java @@ -18,8 +18,8 @@ public class MesEnumUtil { @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum MES_PCN_TASK_STATUS { - OPEN(1, "OPEN"), - CLOSE(2, "CLOSE"); + OPEN(1, "开启"), + CLOSE(2, "关闭"); private int value; private String description; From 0faeaa60479bedf77864c83f7ae991400c7aaafa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=88=98=E6=95=8F?= <962239776@qq.com> Date: Wed, 4 Sep 2019 11:06:18 +0800 Subject: [PATCH 15/15] =?UTF-8?q?=E5=AF=BC=E5=87=BA=E6=9E=9A=E4=B8=BE?= =?UTF-8?q?=E6=B7=BB=E5=8A=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveSn.java | 7 +++++++ 1 file changed, 7 insertions(+) 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 90f380b..34efda9 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 @@ -1,6 +1,8 @@ package cn.estsh.i3plus.pojo.wms.bean; +import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn; import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import cn.estsh.i3plus.pojo.base.enumutil.WmsEnumUtil; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; @@ -66,6 +68,7 @@ public class WmsMoveSn extends BaseBean { */ @Column(name="ITEM_STATUS") @ApiParam(value = "状态", example = "1") + @AnnoOutputColumn(refClass = WmsEnumUtil.MOVE_ORDER_STATUS.class,refForeignKey = "value",value = "description") public Integer itemStatus; @Column(name="REMARK") @@ -129,18 +132,22 @@ public class WmsMoveSn extends BaseBean { @Column(name="SRC_QC_STATUS") @ApiParam(value = "源质量状态", example = "1") + @AnnoOutputColumn(refClass = WmsEnumUtil.STOCK_SN_QC_STATUS.class,refForeignKey = "value",value = "description") public Integer srcQcStatus; @Column(name="SRC_SN_STATUS") @ApiParam(value = "源条码状态", example = "1") + @AnnoOutputColumn(refClass = WmsEnumUtil.STOCK_SN_STATUS.class,refForeignKey = "value",value = "description") public Integer srcSnStatus; @Column(name="DEST_QC_STATUS") @ApiParam(value = "目的质量状态", example = "1") + @AnnoOutputColumn(refClass = WmsEnumUtil.STOCK_SN_QC_STATUS.class,refForeignKey = "value",value = "description") public Integer descQcStatus; @Column(name="DEST_SN_STATUS") @ApiParam(value = "目的条码状态", example = "1") + @AnnoOutputColumn(refClass = WmsEnumUtil.STOCK_SN_STATUS.class,refForeignKey = "value",value = "description") public Integer destSnStatus; @Column(name="DATE_CODE")