From 0ed90485a684a12bce81d67e7b37769ce9ce204b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=B1=AA=E4=BA=91=E6=98=8A?= Date: Mon, 8 Jul 2019 10:25:25 +0800 Subject: [PATCH 01/41] =?UTF-8?q?=E5=AE=89=E7=81=AF=E5=9F=BA=E7=A1=80?= =?UTF-8?q?=E6=95=B0=E6=8D=AE=E5=AF=BC=E5=85=A5=E5=AF=BC=E5=87=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../bean/AndonAlarmCause.java | 3 + .../bean/AndonAlarmDetailType.java | 3 + .../bean/AndonAlarmResponseCfg.java | 6 + .../bean/AndonDisposalCfg.java | 4 + .../bean/AndonEventCause.java | 3 + .../bean/AndonEventMethod.java | 3 + .../bean/AndonEventPhenoMenon.java | 3 + .../bean/AndonHaltCfg.java | 3 + .../cn.estsh.i3plus.pojo.andon/bean/AndonPLC.java | 8 +- .../sqlpack/AndonHqlPack.java | 5 + .../i3plus/pojo/base/enumutil/AndonEnumUtil.java | 182 ++++++++++++++++++++- .../i3plus/pojo/platform/sqlpack/CoreHqlPack.java | 24 +-- 12 files changed, 235 insertions(+), 12 deletions(-) diff --git a/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/bean/AndonAlarmCause.java b/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/bean/AndonAlarmCause.java index b7cb9c1..e674f07 100644 --- a/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/bean/AndonAlarmCause.java +++ b/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/bean/AndonAlarmCause.java @@ -1,6 +1,8 @@ package cn.estsh.i3plus.pojo.andon.bean; +import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn; import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import cn.estsh.i3plus.pojo.base.enumutil.AndonEnumUtil; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; @@ -28,6 +30,7 @@ import javax.persistence.Table; @Api("ANDON_呼叫原因") public class AndonAlarmCause extends BaseBean { + @AnnoOutputColumn(refClass = AndonEnumUtil.ALARM_TYPE.class,refForeignKey = "value",value = "description") @Column(name = "ALARM_CODE") @ApiParam(value = "安灯类型") private String alarmCode; diff --git a/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/bean/AndonAlarmDetailType.java b/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/bean/AndonAlarmDetailType.java index b217ba9..b92a876 100644 --- a/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/bean/AndonAlarmDetailType.java +++ b/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/bean/AndonAlarmDetailType.java @@ -1,6 +1,8 @@ package cn.estsh.i3plus.pojo.andon.bean; +import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn; import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import cn.estsh.i3plus.pojo.base.enumutil.AndonEnumUtil; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; @@ -36,6 +38,7 @@ public class AndonAlarmDetailType extends BaseBean { @ApiParam(value = "安灯类型名称") private String alarmDetailName; + @AnnoOutputColumn(refClass = AndonEnumUtil.ALARM_TYPE.class,refForeignKey = "value",value = "description") @Column(name = "ALARM_CODE") @ApiParam(value = "安灯类型代码") private String alarmCode; diff --git a/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/bean/AndonAlarmResponseCfg.java b/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/bean/AndonAlarmResponseCfg.java index 2a816ce..a6824e0 100644 --- a/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/bean/AndonAlarmResponseCfg.java +++ b/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/bean/AndonAlarmResponseCfg.java @@ -1,6 +1,8 @@ package cn.estsh.i3plus.pojo.andon.bean; +import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn; import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import cn.estsh.i3plus.pojo.base.enumutil.AndonEnumUtil; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; @@ -28,10 +30,12 @@ import javax.persistence.Table; @Api("ANDON_呼叫通知配置") public class AndonAlarmResponseCfg extends BaseBean { + @AnnoOutputColumn(refClass = AndonEnumUtil.ALARM_TYPE.class,refForeignKey = "value",value = "description") @Column(name = "ALARM_CODE") @ApiParam(value = "安灯类型代码") private String alarmCode; + @AnnoOutputColumn(refClass = AndonEnumUtil.ALARM_STATUS.class,refForeignKey = "value",value = "description") @Column(name = "ANDON_STATUS") @ApiParam(value = "安灯状态") private String andonStatus; @@ -40,6 +44,7 @@ public class AndonAlarmResponseCfg extends BaseBean { @ApiParam(value = "通知条件时长") private String rpWhere; + @AnnoOutputColumn(refClass = AndonEnumUtil.NOTICE_MESSAGE_SEND_TYPE.class,refForeignKey = "value",value = "description") @Column(name = "RP_CODE") @ApiParam(value = "通知方式代码") private String rpCode; @@ -48,6 +53,7 @@ public class AndonAlarmResponseCfg extends BaseBean { @ApiParam(value = "通知对象代码") private String rpObjectCode; + @AnnoOutputColumn(refClass = AndonEnumUtil.NOTICE_MESSAGE_SEND_LEVEL.class,refForeignKey = "value",value = "description") @Column(name = "RP_LEVEL") @ApiParam(value = "通知级别") private String rpLevel; diff --git a/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/bean/AndonDisposalCfg.java b/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/bean/AndonDisposalCfg.java index 8991528..126d29e 100644 --- a/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/bean/AndonDisposalCfg.java +++ b/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/bean/AndonDisposalCfg.java @@ -1,6 +1,8 @@ package cn.estsh.i3plus.pojo.andon.bean; +import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn; import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import cn.estsh.i3plus.pojo.base.enumutil.AndonEnumUtil; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; @@ -36,6 +38,7 @@ public class AndonDisposalCfg extends BaseBean { @ApiParam(value = "工作单元代码") private String workCellCode; + @AnnoOutputColumn(refClass = AndonEnumUtil.ALARM_TYPE.class,refForeignKey = "value",value = "description") @Column(name = "ALARM_CODE") @ApiParam(value = "安灯类型代码") private String alarmCode; @@ -44,6 +47,7 @@ public class AndonDisposalCfg extends BaseBean { @ApiParam(value = "呼叫原因代码") private String acCode; + @AnnoOutputColumn(refClass = AndonEnumUtil.APPROVAL_STATUS.class,refForeignKey = "value",value = "description") @Column(name = "APPROVAL_STATUS") @ApiParam(value = "审批状态") private String approvalStatus; diff --git a/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/bean/AndonEventCause.java b/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/bean/AndonEventCause.java index c91b9b9..8e4a816 100644 --- a/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/bean/AndonEventCause.java +++ b/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/bean/AndonEventCause.java @@ -1,6 +1,8 @@ package cn.estsh.i3plus.pojo.andon.bean; +import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn; import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import cn.estsh.i3plus.pojo.base.enumutil.AndonEnumUtil; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; @@ -40,6 +42,7 @@ public class AndonEventCause extends BaseBean { @ApiParam(value = "父阶原因代码") private String parentEcCode; + @AnnoOutputColumn(refClass = AndonEnumUtil.ALARM_TYPE.class,refForeignKey = "value",value = "description") @Column(name = "ALARM_CODE") @ApiParam(value = "安灯类型") private String alarmCode; diff --git a/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/bean/AndonEventMethod.java b/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/bean/AndonEventMethod.java index f214629..ad4611d 100644 --- a/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/bean/AndonEventMethod.java +++ b/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/bean/AndonEventMethod.java @@ -1,6 +1,8 @@ package cn.estsh.i3plus.pojo.andon.bean; +import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn; import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import cn.estsh.i3plus.pojo.base.enumutil.AndonEnumUtil; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; @@ -40,6 +42,7 @@ public class AndonEventMethod extends BaseBean { @ApiParam(value = "父阶方法代码") private String parentEmCode; + @AnnoOutputColumn(refClass = AndonEnumUtil.ALARM_TYPE.class,refForeignKey = "value",value = "description") @Column(name = "ALARM_CODE") @ApiParam(value = "安灯类型") private String alarmCode; diff --git a/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/bean/AndonEventPhenoMenon.java b/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/bean/AndonEventPhenoMenon.java index 1c8726d..c0d4d3a 100644 --- a/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/bean/AndonEventPhenoMenon.java +++ b/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/bean/AndonEventPhenoMenon.java @@ -1,6 +1,8 @@ package cn.estsh.i3plus.pojo.andon.bean; +import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn; import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import cn.estsh.i3plus.pojo.base.enumutil.AndonEnumUtil; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; @@ -36,6 +38,7 @@ public class AndonEventPhenoMenon extends BaseBean { @ApiParam(value = "事件现象描述") private String epmName; + @AnnoOutputColumn(refClass = AndonEnumUtil.ALARM_TYPE.class,refForeignKey = "value",value = "description") @Column(name = "ALARM_CODE") @ApiParam(value = "安灯类型") private String alarmCode; diff --git a/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/bean/AndonHaltCfg.java b/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/bean/AndonHaltCfg.java index b1718d0..95aa421 100644 --- a/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/bean/AndonHaltCfg.java +++ b/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/bean/AndonHaltCfg.java @@ -1,6 +1,8 @@ package cn.estsh.i3plus.pojo.andon.bean; +import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn; import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import cn.estsh.i3plus.pojo.base.enumutil.AndonEnumUtil; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; @@ -34,6 +36,7 @@ import javax.persistence.Table; @Api("安灯队列") public class AndonHaltCfg extends BaseBean { + @AnnoOutputColumn(refClass = AndonEnumUtil.ALARM_TYPE.class,refForeignKey = "value",value = "description") @Column(name = "ALARM_CODE") @ApiParam(value = "安灯类型") private String alarmCode; diff --git a/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/bean/AndonPLC.java b/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/bean/AndonPLC.java index 4d6bca8..748105e 100644 --- a/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/bean/AndonPLC.java +++ b/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/bean/AndonPLC.java @@ -1,6 +1,9 @@ package cn.estsh.i3plus.pojo.andon.bean; +import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn; import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import cn.estsh.i3plus.pojo.base.enumutil.AndonEnumUtil; +import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; @@ -64,14 +67,17 @@ public class AndonPLC extends BaseBean { @ApiParam(value = "分组号") private String groupNo; + @AnnoOutputColumn(refClass = AndonEnumUtil.ALARM_TYPE.class,refForeignKey = "value",value = "description") @Column(name = "ALARM_CODE") - @ApiParam(value = "安灯类型代码") + @ApiParam(value = "安灯类型") private String alarmCode; + @AnnoOutputColumn(refClass = AndonEnumUtil.ALARM_BUSI_FLAG.class,refForeignKey = "value",value = "description") @Column(name = "TAG_BUSINESS_TYPE") @ApiParam(value = "标签业务类型") private String tagBusinessType; + @AnnoOutputColumn(refClass = CommonEnumUtil.TRUE_OR_FALSE.class,refForeignKey = "value",value = "description") @Column(name = "IS_ALARM_STATUS") @ApiParam(value = "是否按灯状态", example = "1") private Integer isAlarmStatus; diff --git a/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/sqlpack/AndonHqlPack.java b/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/sqlpack/AndonHqlPack.java index d21e6d6..42f5639 100644 --- a/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/sqlpack/AndonHqlPack.java +++ b/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/sqlpack/AndonHqlPack.java @@ -501,6 +501,11 @@ public class AndonHqlPack { */ public static DdlPackBean packAndonEventPhenoMenon(AndonEventPhenoMenon eventPhenoMenon) { DdlPackBean result = new DdlPackBean(); + + DdlPreparedPack.getStringLikerPack(eventPhenoMenon.getEpmCode(), "epmCode", result); + DdlPreparedPack.getStringLikerPack(eventPhenoMenon.getEpmName(), "epmName", result); + DdlPreparedPack.getStringEqualPack(eventPhenoMenon.getAlarmCode(), "alarmCode", result); + getStringBuilderPack(eventPhenoMenon, result); return result; 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 9788e06..041554b 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 @@ -45,6 +45,16 @@ public class AndonEnumUtil { } return tmp; } + + public static String descriptionOfValue(String val) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (StringUtils.equalsIgnoreCase(values()[i].description, val)) { + tmp = values()[i].value; + } + } + return tmp; + } } /** @@ -83,6 +93,16 @@ public class AndonEnumUtil { } return tmp; } + + public static String descriptionOfValue(String val) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (StringUtils.equalsIgnoreCase(values()[i].description, val)) { + tmp = values()[i].value; + } + } + return tmp; + } } /** @@ -119,6 +139,16 @@ public class AndonEnumUtil { } return tmp; } + + public static int descriptionOfValue(String val) { + int tmp = -1; + for (int i = 0; i < values().length; i++) { + if (StringUtils.equalsIgnoreCase(values()[i].description, val)) { + tmp = values()[i].value; + } + } + return tmp; + } } /** @@ -149,6 +179,26 @@ public class AndonEnumUtil { public String getDescription() { return description; } + + public static String valueOfDescription(String val) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (StringUtils.equalsIgnoreCase(values()[i].value,val)) { + tmp = values()[i].description; + } + } + return tmp; + } + + public static String descriptionOfValue(String val) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (StringUtils.equalsIgnoreCase(values()[i].description, val)) { + tmp = values()[i].value; + } + } + return tmp; + } } /** @@ -193,6 +243,16 @@ public class AndonEnumUtil { } return tmp; } + + public static int descriptionOfValue(String val) { + int tmp = -1; + for (int i = 0; i < values().length; i++) { + if (StringUtils.equalsIgnoreCase(values()[i].description, val)) { + tmp = values()[i].value; + } + } + return tmp; + } } @@ -232,6 +292,16 @@ public class AndonEnumUtil { } return tmp; } + + public static int descriptionOfValue(String val) { + int tmp = -1; + for (int i = 0; i < values().length; i++) { + if (StringUtils.equalsIgnoreCase(values()[i].description, val)) { + tmp = values()[i].value; + } + } + return tmp; + } } @@ -280,6 +350,16 @@ public class AndonEnumUtil { } return tmp; } + + public static String descriptionOfValue(String val) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (StringUtils.equalsIgnoreCase(values()[i].description, val)) { + tmp = values()[i].value; + } + } + return tmp; + } } /** @@ -311,12 +391,22 @@ public class AndonEnumUtil { public static String valueOfDescription(int val) { String tmp = null; for (int i = 0; i < values().length; i++) { - if (values()[i].value == val ) { + if (values()[i].value == val) { tmp = values()[i].description; } } return tmp; } + + public static int descriptionOfValue(String val) { + int tmp = -1; + for (int i = 0; i < values().length; i++) { + if (StringUtils.equalsIgnoreCase(values()[i].description, val)) { + tmp = values()[i].value; + } + } + return tmp; + } } /** @@ -343,6 +433,26 @@ public class AndonEnumUtil { public String getDescription() { return description; } + + public static String valueOfDescription(String val) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (StringUtils.equalsIgnoreCase(values()[i].value, val)) { + tmp = values()[i].description; + } + } + return tmp; + } + + public static String descriptionOfValue(String val) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (StringUtils.equalsIgnoreCase(values()[i].description, val)) { + tmp = values()[i].value; + } + } + return tmp; + } } /** @@ -369,6 +479,26 @@ public class AndonEnumUtil { public String getDescription() { return description; } + + public static String valueOfDescription(String val) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (StringUtils.equalsIgnoreCase(values()[i].value, val)) { + tmp = values()[i].description; + } + } + return tmp; + } + + public static String descriptionOfValue(String val) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (StringUtils.equalsIgnoreCase(values()[i].description, val)) { + tmp = values()[i].value; + } + } + return tmp; + } } /** @@ -407,6 +537,16 @@ public class AndonEnumUtil { } return tmp; } + + public static int descriptionOfValue(String val) { + int tmp = -1; + for (int i = 0; i < values().length; i++) { + if (StringUtils.equalsIgnoreCase(values()[i].description, val)) { + tmp = values()[i].value; + } + } + return tmp; + } } /** @@ -446,6 +586,26 @@ public class AndonEnumUtil { public String getDescription() { return description; } + + public static String valueOfDescription(String val) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (StringUtils.equalsIgnoreCase(values()[i].value, val)) { + tmp = values()[i].description; + } + } + return tmp; + } + + public static String descriptionOfValue(String val) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (StringUtils.equalsIgnoreCase(values()[i].description, val)) { + tmp = values()[i].value; + } + } + return tmp; + } } /** @@ -479,5 +639,25 @@ public class AndonEnumUtil { public String getDescription() { return description; } + + public static String valueOfDescription(String val) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (StringUtils.equalsIgnoreCase(values()[i].value, val)) { + tmp = values()[i].description; + } + } + return tmp; + } + + public static String descriptionOfValue(String val) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (StringUtils.equalsIgnoreCase(values()[i].description, val)) { + tmp = values()[i].value; + } + } + return tmp; + } } } diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/sqlpack/CoreHqlPack.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/sqlpack/CoreHqlPack.java index 3c28d85..ee41d6d 100644 --- a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/sqlpack/CoreHqlPack.java +++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/sqlpack/CoreHqlPack.java @@ -390,36 +390,38 @@ public class CoreHqlPack { /** * 任务周期复杂查询 - * @param taskTimeExpression + * @param sysTaskCycle * @return */ - public static String packHqlSysTaskCycle(SysTaskCycle taskTimeExpression) { + public static String packHqlSysTaskCycle(SysTaskCycle sysTaskCycle) { StringBuffer result = new StringBuffer(); // hql拼接 - HqlPack.getStringLikerPack(taskTimeExpression.getName(),"name",result); + HqlPack.getStringLikerPack(sysTaskCycle.getName(), "name", result); + HqlPack.getStringEqualPack(sysTaskCycle.getOrganizeCode(), "organizeCode", result); // 添加默认排序 - HqlPack.getOrderDefault(taskTimeExpression); + HqlPack.getOrderDefault(sysTaskCycle); return result.toString(); } /** * 定时任务复杂查询 - * @param taskTime + * @param sysTaskPlan * @return */ - public static String packHqlSysTaskPlan(SysTaskPlan taskTime){ + public static String packHqlSysTaskPlan(SysTaskPlan sysTaskPlan){ StringBuffer result = new StringBuffer(); // hql拼接 - HqlPack.getStringLikerPack(taskTime.getName(),"name",result); - HqlPack.getNumEqualPack(taskTime.getTaskPlanStatus(),"taskPlanStatus",result); - HqlPack.getNumEqualPack(taskTime.getTaskCycleId(),"taskCycleId",result); + HqlPack.getStringLikerPack(sysTaskPlan.getName(),"name",result); + HqlPack.getNumEqualPack(sysTaskPlan.getTaskPlanStatus(),"taskPlanStatus",result); + HqlPack.getNumEqualPack(sysTaskPlan.getTaskCycleId(),"taskCycleId",result); + HqlPack.getStringEqualPack(sysTaskPlan.getOrganizeCode(), "organizeCode", result); // 添加默认排序 - HqlPack.getOrderDefault(taskTime); + HqlPack.getOrderDefault(sysTaskPlan); return result.toString(); } @@ -655,6 +657,7 @@ public class CoreHqlPack { HqlPack.getStringLikerPack(orderNoRule.getName(),"name",result); HqlPack.getStringLikerPack(orderNoRule.getOrderNoRuleCode(),"orderNoRuleCode",result); HqlPack.getNumEqualPack(orderNoRule.getOrderNoRuleStatus(),"orderNoRuleStatus",result); + HqlPack.getNumEqualPack(orderNoRule.getOrganizeCode(),"organizeCode",result); // 添加默认排序 HqlPack.getOrderDefault(orderNoRule); @@ -693,6 +696,7 @@ public class CoreHqlPack { StringBuffer result = new StringBuffer(); HqlPack.getStringLikerPack(sysTask.getName(),"name",result); + HqlPack.getStringEqualPack(sysTask.getOrganizeCode(),"organizeCode",result); return result.toString(); } From 6a3662283b7f3b7ace6f6d4eb635dc57f2cb3956 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E6=80=9D=E6=B4=81?= Date: Mon, 8 Jul 2019 13:31:55 +0800 Subject: [PATCH 02/41] =?UTF-8?q?=E6=9E=9A=E4=B8=BE=E4=BF=AE=E6=94=B9?= =?UTF-8?q?=E8=B5=8B=E5=80=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java | 11 ++++++----- 1 file changed, 6 insertions(+), 5 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 b51bb14..d470278 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 @@ -434,7 +434,8 @@ public class WmsEnumUtil { public enum OUT_MOVEMENT_MOVE_TYPE { IN_STORE(10, "IN", "入库"), OUT_STORE(20, "OUT", "出库"), - MOVE_STORE(30, "MOVE", "移库"); + MOVE_STORE(30, "MOVE", "移库"), + OTHER(40, "OTHER", "其他"); private int value; private String code; @@ -503,10 +504,10 @@ public class WmsEnumUtil { NC_DISMANTLING_PICKING(160, "NC_DISMANTLING_PICKING", "NC拆解领料"), NC_DISMANTLING_RETREAT(170, "NC_DISMANTLING_RETREAT", "NC拆解退料"), LINE_EDGE_SCRAPPING_OUT(180, "LINE_EDGE_SCRAPPING_OUT", "线边报废出库"), - ASN(190, "ASN", "ASN"), - PO(200, "PO", "PO"), - QC(210, "QC", "QC"), - AMPR(220, "AMPR", "AMPR"); + ASN(200, "ASN", "ASN"), + PO(210, "PO", "PO"), + QC(220, "QC", "QC"), + AMPR(230, "AMPR", "AMPR"); private int value; From 2a587524ff9e4b4f28955308427d11b6d4051e0d Mon Sep 17 00:00:00 2001 From: "wei.peng" <123456> Date: Mon, 8 Jul 2019 15:00:30 +0800 Subject: [PATCH 03/41] =?UTF-8?q?=E5=9F=BA=E7=A1=80=E6=93=8D=E4=BD=9C,?= =?UTF-8?q?=E6=95=B0=E6=8D=AE=E8=A1=A5=E5=85=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/platform/sqlpack/CoreHqlPack.java | 36 +++++++++------------- 1 file changed, 15 insertions(+), 21 deletions(-) diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/sqlpack/CoreHqlPack.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/sqlpack/CoreHqlPack.java index c24d5f5..5a5d5f2 100644 --- a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/sqlpack/CoreHqlPack.java +++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/sqlpack/CoreHqlPack.java @@ -121,7 +121,7 @@ public class CoreHqlPack { * @return */ public static DdlPackBean packHqlSysPositionList(SysPosition position){ - DdlPackBean result = new DdlPackBean(); + DdlPackBean result = DdlPackBean.getDdlPackBean(position); // 查询参数封装 DdlPreparedPack.getStringEqualPack(position.getOrganizeCode(),"organizeCode",result); @@ -153,7 +153,7 @@ public class CoreHqlPack { } public static DdlPackBean packHqlSysOrganize(SysOrganize organize,List idList){ - DdlPackBean result = new DdlPackBean(); + DdlPackBean result = DdlPackBean.getDdlPackBean(organize); // String Like DdlPreparedPack.getStringLikerPack(organize.getName(),"name",result); @@ -197,7 +197,7 @@ public class CoreHqlPack { } public static DdlPackBean packDdlBeanSysDepartment(SysDepartment department,List idList){ - DdlPackBean result = DdlPackBean.getDdlPackBean(); + DdlPackBean result = DdlPackBean.getDdlPackBean(department); DdlPreparedPack.getStringLikerPack(department.getName(),"name",result); DdlPreparedPack.getStringLikerPack(department.getName(),"departmentCode",result); @@ -229,7 +229,7 @@ public class CoreHqlPack { } public static DdlPackBean packDdlBeanSysMenu(SysMenu menu,List idList){ - DdlPackBean result = DdlPackBean.getDdlPackBean(); + DdlPackBean result = DdlPackBean.getDdlPackBean(menu); DdlPreparedPack.getInPackList(idList,"id",result); DdlPreparedPack.getNumEqualPack(menu.getParentId(),"parentId",result); @@ -272,7 +272,7 @@ public class CoreHqlPack { } public static DdlPackBean packDdlBeanSysRole(SysRole role,List idList){ - DdlPackBean result = new DdlPackBean(); + DdlPackBean result = DdlPackBean.getDdlPackBean(role); DdlPreparedPack.getNumEqualPack(CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue(),"isDeleted",result); DdlPreparedPack.getNumEqualPack(CommonEnumUtil.TRUE_OR_FALSE.TRUE.getValue(),"isValid",result); @@ -373,7 +373,7 @@ public class CoreHqlPack { * @return */ public static DdlPackBean packHqlSysMessage(SysMessage message){ - DdlPackBean ddlPackBean = new DdlPackBean(); + DdlPackBean ddlPackBean = DdlPackBean.getDdlPackBean(message); // hql拼接 DdlPreparedPack.getStringLikerPack(message.getMessageTitle(), "messageTitle", ddlPackBean); @@ -486,7 +486,7 @@ public class CoreHqlPack { } public static DdlPackBean packDdlBeanSysUser(SysUser user,List idList){ - DdlPackBean result = DdlPackBean.getDdlPackBean(); + DdlPackBean result = DdlPackBean.getDdlPackBean(user); DdlPreparedPack.getNumEqualPack(user.getUserStatus(),"userStatus",result); DdlPreparedPack.getStringLikerPack(user.getUserLoginName(),"userLoginName",result); @@ -506,7 +506,7 @@ public class CoreHqlPack { * @return */ public static DdlPackBean packDdlSysUser(SysUser user){ - DdlPackBean ddlPack = new DdlPackBean(); + DdlPackBean ddlPack = DdlPackBean.getDdlPackBean(user); // And X = X DdlPreparedPack.getNumEqualPack(CommonEnumUtil.IS_VAILD.VAILD.getValue(),"isValid",ddlPack); @@ -608,7 +608,7 @@ public class CoreHqlPack { } public static DdlPackBean packDdlBeanSysUserInfo(SysUserInfo userInfo,List idList){ - DdlPackBean result = DdlPackBean.getDdlPackBean(); + DdlPackBean result = DdlPackBean.getDdlPackBean(userInfo); // And DdlPreparedPack.getNumEqualPack(userInfo.getPositionId(),"positionId",result); @@ -874,22 +874,20 @@ public class CoreHqlPack { * @return DdlPackBean */ public static DdlPackBean packHqlSysFileCode(SysFile sysFile){ - DdlPackBean ddlPackBean = new DdlPackBean(); + DdlPackBean result = DdlPackBean.getDdlPackBean(sysFile); // and - DdlPreparedPack.getStringEqualPack(sysFile.getFileCode(),"fileCode",ddlPackBean); + DdlPreparedPack.getStringEqualPack(sysFile.getFileCode(),"fileCode",result); // not - DdlPreparedPack.getNumNOEqualPack(sysFile.getId(),"id",ddlPackBean); + DdlPreparedPack.getNumNOEqualPack(sysFile.getId(),"id",result); - return ddlPackBean; + return result; } public static DdlPackBean packDdlBeanSysRefUserRole(SysRefUserRole ref){ - DdlPackBean result = new DdlPackBean(); + DdlPackBean result = DdlPackBean.getDdlPackBean(ref); // Number Eq - DdlPreparedPack.getNumEqualPack(CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue(),"isDeleted",result); - DdlPreparedPack.getNumEqualPack(CommonEnumUtil.TRUE_OR_FALSE.TRUE.getValue(),"isValid",result); DdlPreparedPack.getNumEqualPack(ref.getUserId(),"userId",result); // String Eq DdlPreparedPack.getStringEqualPack(ref.getOrganizeCode(),"organizeCode",result); @@ -901,8 +899,6 @@ public class CoreHqlPack { DdlPackBean result = DdlPackBean.getDdlPackBean(); // Number Eq - DdlPreparedPack.getNumEqualPack(CommonEnumUtil.IS_DEAL.NO.getValue(),"isDeleted",result); - DdlPreparedPack.getNumEqualPack(CommonEnumUtil.IS_VAILD.VAILD.getValue(),"isValid",result); DdlPreparedPack.getNumEqualPack(userId,"userId",result); DdlPreparedPack.getNumEqualPack(roleId,"roleId",result); @@ -918,10 +914,8 @@ public class CoreHqlPack { * @return */ public static DdlPackBean packHqlSysOrganize(List sysRefUserDepartments){ - DdlPackBean packBean = new DdlPackBean(); + DdlPackBean packBean = DdlPackBean.getDdlPackBean(); DdlPreparedPack.getInPackList(sysRefUserDepartments.stream().map(d -> d.getOrganizeId()).collect(Collectors.toList()),"id",packBean); - DdlPreparedPack.getNumEqualPack(CommonEnumUtil.IS_VAILD.VAILD.getValue(),"isValid",packBean); - DdlPreparedPack.getNumEqualPack(CommonEnumUtil.IS_DEAL.NO.getValue(),"isDeleted",packBean); return packBean; } From fea0d476a4e7232082865efbb46634502ecb923d Mon Sep 17 00:00:00 2001 From: "wei.peng" <123456> Date: Mon, 8 Jul 2019 15:05:10 +0800 Subject: [PATCH 04/41] =?UTF-8?q?=E5=9F=BA=E7=A1=80=E6=93=8D=E4=BD=9C,?= =?UTF-8?q?=E6=95=B0=E6=8D=AE=E8=A1=A5=E5=85=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/cn/estsh/i3plus/pojo/base/bean/DdlPackBean.java | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/bean/DdlPackBean.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/bean/DdlPackBean.java index 02c6274..ded0d8d 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/bean/DdlPackBean.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/bean/DdlPackBean.java @@ -76,6 +76,18 @@ public class DdlPackBean { return result; } + public static DdlPackBean getDdlPackBean(BaseBean bean){ + DdlPackBean result = new DdlPackBean(); + + DdlPreparedPack.getNumEqualPack(CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue(),"isDeleted",result); + DdlPreparedPack.getNumEqualPack(CommonEnumUtil.TRUE_OR_FALSE.TRUE.getValue(),"isValid",result); + if(bean != null){ + result.setOrderByStr(bean.orderBy()); + } + + return result; + } + public boolean isHql() { return isHql; } From b941354087772a7e38d77d330a7af7ed7c56b7b9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=88=98=E6=95=8F?= <962239776@qq.com> Date: Mon, 8 Jul 2019 16:17:36 +0800 Subject: [PATCH 05/41] =?UTF-8?q?=E7=9B=98=E7=82=B9=E5=AF=BC=E5=85=A5?= =?UTF-8?q?=E9=BB=98=E8=AE=A4=E5=80=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/wms/bean/SapCyco.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 6dfc40a..45c09c7 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 @@ -58,7 +58,7 @@ public class SapCyco extends SapBase{ @ApiParam(value = "删除标识") @AnnoOutputColumn - private String xloek; + private String xloek=""; @ApiParam(value = "年度") @AnnoOutputColumn From 623d17a2ec5086ac09bdff439b75ea79afcf4590 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E6=80=9D=E6=B4=81?= Date: Mon, 8 Jul 2019 17:38:53 +0800 Subject: [PATCH 06/41] =?UTF-8?q?=E5=AD=97=E6=AE=B5=E9=BB=98=E8=AE=A4?= =?UTF-8?q?=E5=80=BC=E8=B5=8B=E5=80=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementDetails.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 9c8029d..c093654 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 @@ -220,6 +220,6 @@ public class WmsDocMovementDetails extends BaseBean { public Integer busiType; @Column(name = "IS_SN") - @ApiParam(value = "条码生成状态", example = "1") + @ApiParam(value = "条码生成状态", example = "20") public Integer isSn; } From 51efe95e86e58f69f87549c8c93c7255e8c35211 Mon Sep 17 00:00:00 2001 From: "peter.pan" Date: Mon, 8 Jul 2019 17:39:39 +0800 Subject: [PATCH 07/41] pojo --- .../estsh/i3plus/pojo/wms/bean/WmsStockQuan.java | 3 ++- .../cn/estsh/i3plus/pojo/wms/bean/esbio/IQ.java | 27 +++++++++++++++++++++ .../cn/estsh/i3plus/pojo/wms/bean/esbio/OQ.java | 27 +++++++++++++++++++++ .../pojo/wms/bean/esbio/PublishTopicData.java | 26 ++++++++++++++++++++ .../cn/estsh/i3plus/pojo/wms/bean/esbio/SI_TP.java | 28 ++++++++++++++++++++++ .../estsh/i3plus/pojo/wms/bean/esbio/SI_TPMAP.java | 17 +++++++++++++ 6 files changed, 127 insertions(+), 1 deletion(-) create mode 100644 modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/esbio/IQ.java create mode 100644 modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/esbio/OQ.java create mode 100644 modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/esbio/PublishTopicData.java create mode 100644 modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/esbio/SI_TP.java create mode 100644 modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/esbio/SI_TPMAP.java 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 c796476..bbce7c7 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 @@ -204,7 +204,7 @@ public class WmsStockQuan extends BaseBean { } public WmsStockQuan(String whNo, String zoneNo, String unit, String partNo, String partName, - Double qty, Double failQty, Double holdQty, Double qcQty, Double rinQty, Double freezeQty, Double consignQty, Double lockQty,String prodCfgTypeCode ,String prodCfgTypeName) { + Double qty, Double failQty, Double holdQty, Double qcQty, Double rinQty, Double freezeQty, Double consignQty, Double lockQty,String prodCfgTypeCode ,String prodCfgTypeName, Double scrapQty) { this.whNo = whNo; this.zoneNo = zoneNo; this.partNo = partNo; @@ -220,6 +220,7 @@ public class WmsStockQuan extends BaseBean { this.lockQty = lockQty; this.prodCfgTypeCode= prodCfgTypeCode; this.prodCfgTypeName = prodCfgTypeName; + this.scrapQty = scrapQty; } public WmsStockQuan(Double qty, Double failQty, Double holdQty, Double qcQty, Double rinQty, Double freezeQty, Double consignQty, Double lockQty, Double scrapQty) { this.qty = qty; 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 new file mode 100644 index 0000000..f2701b2 --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/esbio/IQ.java @@ -0,0 +1,27 @@ +package cn.estsh.i3plus.pojo.wms.bean.esbio; + +import lombok.Data; + +/** + * Created by Administrator on 2019/7/2. + */ +@Data +public class IQ { + + public String SID=""; + + public String TPDESC=""; + + public String RECYMD=""; + + public String RECHMS=""; + + public String XMLCON=""; + + public String ACTFLG=""; + + public String ACTYMD=""; + + public String ACTHMS=""; + +} 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 new file mode 100644 index 0000000..8f8f97c --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/esbio/OQ.java @@ -0,0 +1,27 @@ +package cn.estsh.i3plus.pojo.wms.bean.esbio; + +import lombok.Data; + +/** + * Created by Administrator on 2019/7/2. + */ +@Data +public class OQ { + + public String SID=""; + + public String TPDESC=""; + + public String CREYMD=""; + + public String CREHMS=""; + + public String XMLCON=""; + + public String ACTFLG=""; + + public String ACTYMD=""; + + public String ACTHMS=""; + +} 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 new file mode 100644 index 0000000..7e39983 --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/esbio/PublishTopicData.java @@ -0,0 +1,26 @@ +package cn.estsh.i3plus.pojo.wms.bean.esbio; + +import lombok.Data; + +@Data +public class PublishTopicData { + + public int TPID =0; + + public String PBNO =""; + + public String TPNO =""; + + public String TPDESC =""; + + public String MESTAB =""; + + public String MESGROP =""; + + public String MESORD =""; + + public String MESPK =""; + + public String PBNAME =""; + +} 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 new file mode 100644 index 0000000..8f41909 --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/esbio/SI_TP.java @@ -0,0 +1,28 @@ +package cn.estsh.i3plus.pojo.wms.bean.esbio; + +import lombok.Data; + +@Data +public class SI_TP { + + public String TPTYP=""; + + public String TPNO=""; + + public String TPDESC=""; + + public String MESTAB=""; + + public String MESGROP=""; + + public String MESPK=""; + + public String ACTTYP=""; + + public String ACTDESC=""; + + public String ENAB=""; + + public String WERKS=""; + +} 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 new file mode 100644 index 0000000..da5556e --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/esbio/SI_TPMAP.java @@ -0,0 +1,17 @@ +package cn.estsh.i3plus.pojo.wms.bean.esbio; + +import lombok.Data; +@Data +public class SI_TPMAP { + + public int SEQ=0; + + public String SAPCOL=""; + + public String MESCOL=""; + + public String COLTYP=""; + + public String COLDESC=""; + +} From a3ccb4d449fd29a8fd7c34efb6efdb3bf43b2c18 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E6=80=9D=E6=B4=81?= Date: Mon, 8 Jul 2019 17:55:05 +0800 Subject: [PATCH 08/41] =?UTF-8?q?hql=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) 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 15184c4..8e91752 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 @@ -7,6 +7,7 @@ import cn.estsh.i3plus.pojo.base.enumutil.WmsEnumUtil; import cn.estsh.i3plus.pojo.base.tool.DdlPreparedPack; import cn.estsh.i3plus.pojo.base.tool.HqlPack; import cn.estsh.i3plus.pojo.wms.bean.*; +import cn.estsh.i3plus.pojo.wms.dbinterface.WmsInterfaceDataMapper; import cn.estsh.i3plus.pojo.wms.engine.rule.EngineRulePersistence; import cn.estsh.i3plus.pojo.wms.engine.script.EngineScriptPersistence; import com.alibaba.fastjson.JSONObject; @@ -2109,4 +2110,23 @@ public class WmsHqlPack { return result; } + + /** + * 接口映射分页查询条件 + * + * @param wmsInterfaceDataMapper + * @return + */ + public static DdlPackBean packHqlWmsInterfaceDataMapper(WmsInterfaceDataMapper wmsInterfaceDataMapper) { + DdlPackBean result = new DdlPackBean(); + + DdlPreparedPack.getStringLikerPack(wmsInterfaceDataMapper.getSrcTableName(), "srcTableName", result); + DdlPreparedPack.getStringLikerPack(wmsInterfaceDataMapper.getDestBeanName(), "destBeanName", result); + DdlPreparedPack.getStringLikerPack(wmsInterfaceDataMapper.getBusiRoute(), "busiRoute", result); + DdlPreparedPack.getStringLikerPack(wmsInterfaceDataMapper.getGroupName(), "groupName", result); + + getStringBuilderPack(wmsInterfaceDataMapper, result); + + return result; + } } From df8d0256684e110e63a180076247916b56619049 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E6=80=9D=E6=B4=81?= Date: Mon, 8 Jul 2019 17:56:08 +0800 Subject: [PATCH 09/41] =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E6=98=A0=E5=B0=84?= =?UTF-8?q?=E8=A1=A8=E5=9F=BA=E7=A1=80=E6=95=B0=E6=8D=AE=E7=BB=B4=E6=8A=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../repository/WmsInterfaceDataMapperRepository.java | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) create mode 100644 modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsInterfaceDataMapperRepository.java diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsInterfaceDataMapperRepository.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsInterfaceDataMapperRepository.java new file mode 100644 index 0000000..4b3a5a8 --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsInterfaceDataMapperRepository.java @@ -0,0 +1,17 @@ +package cn.estsh.i3plus.pojo.wms.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.wms.bean.AmpJisRec; +import cn.estsh.i3plus.pojo.wms.dbinterface.WmsInterfaceDataMapper; +import org.springframework.stereotype.Repository; + +/** + * @Description : + * @Reference : + * @Author : jessica.chen + * @CreateDate : 2019-06-28 15:17 + * @Modify: + **/ +@Repository +public interface WmsInterfaceDataMapperRepository extends BaseRepository { +} From 25d8df360d3600fde43daef0d6527c4fcddf8b8b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E6=80=9D=E6=B4=81?= Date: Tue, 9 Jul 2019 11:11:24 +0800 Subject: [PATCH 10/41] =?UTF-8?q?=E5=AE=9E=E4=BD=93=E5=AD=97=E6=AE=B5?= =?UTF-8?q?=E4=BF=AE=E6=94=B9hql?= 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 | 2 +- 1 file changed, 1 insertion(+), 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 8e91752..5996175 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 @@ -2103,7 +2103,7 @@ public class WmsHqlPack { //查询参数封装 DdlPreparedPack.getInPackList(statusList,"asnStatus",result); DdlPreparedPack.getNumEqualPack(WmsEnumUtil.PRODUCT_INSTOCK_STATUS.CREATE.getValue(),"actionStatus",result); - DdlPreparedPack.getStringEqualPack(String.valueOf(WmsEnumUtil.ORDER_TYPE.AMP.getValue()),"asnType",result); + DdlPreparedPack.getNumEqualPack(WmsEnumUtil.ORDER_TYPE.AMP.getValue(),"asnType",result); DdlPreparedPack.getStringEqualPack(organizeCode,"organizeCode",result); DdlPreparedPack.getNumEqualPack(CommonEnumUtil.TRUE_OR_FALSE.TRUE.getValue(), "isValid", result); DdlPreparedPack.getNumEqualPack(CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue(), "isDeleted", result); From 483b93cb9fc5373fb7af4e3f071a271d2853b28c Mon Sep 17 00:00:00 2001 From: "jimmy.zeng" Date: Tue, 9 Jul 2019 11:47:03 +0800 Subject: [PATCH 11/41] bug #4939 #4914 --- .../src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPOMaster.java | 4 ++++ .../src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java | 7 +++++++ 2 files changed, 11 insertions(+) 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 3ba7285..8ef0841 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 @@ -131,4 +131,8 @@ public class WmsPOMaster extends BaseBean { @Transient @ApiParam("手机") private String vendorPhone; + + @Transient + @ApiParam("前端信息") + private String message; } 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 8e91752..56f947c 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 @@ -974,6 +974,13 @@ public class WmsHqlPack { DdlPreparedPack.getStringEqualPack(wmsMoveMaster.getOrderNo(), "orderNo", result); DdlPreparedPack.getNumEqualPack(wmsMoveMaster.getOrderStatus(), "orderStatus", result); DdlPreparedPack.getStringEqualPack(wmsMoveMaster.getTransTypeCode(), "transTypeCode", result); + DdlPreparedPack.getStringEqualPack(wmsMoveMaster.getCreateUser(), "createUser", result); + DdlPreparedPack.getStringEqualPack(wmsMoveMaster.getModifyUser(), "modifyUser", result); + + DdlPreparedPack.timeBuilder(wmsMoveMaster.getCreateDateTimeStart(), + wmsMoveMaster.getCreateDateTimeEnd(),"createDatetime",result,true); + DdlPreparedPack.timeBuilder(wmsMoveMaster.getModifyDateTimeStart(), + wmsMoveMaster.getModifyDateTimeEnd(),"modifyDatetime",result,true); getStringBuilderPack(wmsMoveMaster, result); return result; From 9a60664fb39aa91c29b149ca30c50fbfedb6556b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=AE=B8=E5=BF=83=E6=B4=81?= Date: Tue, 9 Jul 2019 16:00:08 +0800 Subject: [PATCH 12/41] =?UTF-8?q?=E9=9C=80=E6=B1=82=E5=8F=98=E6=9B=B4?= =?UTF-8?q?=EF=BC=9AASN=E8=AE=A2=E5=8D=95=E7=B1=BB=E5=9E=8B=E4=B8=BAAMP?= =?UTF-8?q?=E6=97=B6=E4=BB=BB=E5=8A=A1=E6=98=8E=E7=BB=86=E7=9A=84=E4=B8=9A?= =?UTF-8?q?=E5=8A=A1=E7=B1=BB=E5=9E=8B=E6=8F=8F=E8=BF=B0=E8=A6=81=E7=BB=99?= =?UTF-8?q?AMP=20+BUG:=E4=BA=A4=E6=98=93=E5=A4=84=E7=90=86=E7=BB=84?= =?UTF-8?q?=E4=BB=B6=EF=BC=9A=E4=B8=8B=E7=BA=BF=E6=89=A3=E5=87=8F=EF=BC=9A?= =?UTF-8?q?=E7=89=A9=E6=96=99=E5=8F=AF=E8=83=BD=E6=B2=A1=E6=9C=89=E7=BB=B4?= =?UTF-8?q?=E6=8A=A4=E9=BB=98=E8=AE=A4=E5=85=A5=E5=BA=93=E5=BA=93=E4=BD=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/cn/estsh/i3plus/pojo/wms/bean/WmsPart.java | 17 ----------------- 1 file changed, 17 deletions(-) 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 e25c770..f2b2102 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 @@ -5,7 +5,6 @@ import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; import lombok.EqualsAndHashCode; -import net.bytebuddy.implementation.bind.annotation.Default; import org.hibernate.annotations.ColumnDefault; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; @@ -123,14 +122,6 @@ public class WmsPart extends BaseBean { @ApiParam(value = "默认入库库位") private String inLocateNo; - @Transient - @ApiParam("默认入库存储区") - private String inZoneNo; - - @Transient - @ApiParam("默认入库仓库") - private String inWhNo; - @Column(name = "PROD_CFG_TYPE_CODE") @ApiParam("项目代码") private String prodCfgTypeCode; @@ -169,12 +160,4 @@ public class WmsPart extends BaseBean { this.min = minQty; this.qty = cqty; } - - public WmsPart(String partNo, String vendorNo, String inLocateNo, String inZoneNo, String inWhNo) { - this.partNo = partNo; - this.vendorNo = vendorNo; - this.inLocateNo = inLocateNo; - this.inZoneNo = inZoneNo; - this.inWhNo = inWhNo; - } } From 8461e122488923d43c4605f2e736a36ba87dd9ca Mon Sep 17 00:00:00 2001 From: "wei.peng" <123456> Date: Tue, 9 Jul 2019 16:09:42 +0800 Subject: [PATCH 13/41] =?UTF-8?q?=E7=94=A8=E6=88=B7=E8=8E=B7=E5=8F=96?= =?UTF-8?q?=E8=8F=9C=E5=8D=95=E4=BF=A1=E6=81=AF=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/cn/estsh/i3plus/pojo/platform/sqlpack/CoreHqlPack.java | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/sqlpack/CoreHqlPack.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/sqlpack/CoreHqlPack.java index 5a5d5f2..e31d6e8 100644 --- a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/sqlpack/CoreHqlPack.java +++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/sqlpack/CoreHqlPack.java @@ -243,6 +243,15 @@ public class CoreHqlPack { return result; } + public static DdlPackBean packDdlBeanSysMenu(SysMenu menu){ + + DdlPackBean result = DdlPackBean.getDdlPackBean(menu); + DdlPreparedPack.getNumEqualPack(menu.getMenuStatus(),"menuStatus",result); + result.setOrderByStr(menu.orderBy()); + + return result; + } + /** * 系统角色复杂查询 * @param role From 6a2b19d3e3093a400df2bf439c90c20289e5ffd9 Mon Sep 17 00:00:00 2001 From: "jimmy.zeng" Date: Tue, 9 Jul 2019 17:50:01 +0800 Subject: [PATCH 14/41] bug #4953 --- .../src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java | 6 ++++++ 1 file changed, 6 insertions(+) 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 91a2e34..7803190 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 @@ -809,6 +809,12 @@ public class WmsHqlPack { DdlPreparedPack.getStringEqualPack(wmsStockSn.getRefSrc(), "refSrc", result); DdlPreparedPack.getNumEqualPack(wmsStockSn.getPrinted(), "printed", result); DdlPreparedPack.getNumEqualPack(wmsStockSn.getSnStatus(), "snStatus", result); + if (wmsStockSn.getSnStatus() == null) { + DdlPreparedPack.getInPackArray(new Integer[]{ + WmsEnumUtil.STOCK_SN_STATUS.QUALITY_CONTROL.getValue(),WmsEnumUtil.STOCK_SN_STATUS.PRE_INSTOCK.getValue(), + WmsEnumUtil.STOCK_SN_STATUS.INSTOCKED.getValue(),WmsEnumUtil.STOCK_SN_STATUS.PICKED.getValue(), + WmsEnumUtil.STOCK_SN_STATUS.COMMING.getValue()}, "snStatus", result); + } DdlPreparedPack.getNumEqualPack(wmsStockSn.getQcStatus(), "qcStatus", result); getStringBuilderPack(wmsStockSn, result); From 73b5758dc4c70ff0a38cc44c365d4da2f9e3ca18 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=88=98=E6=95=8F?= <962239776@qq.com> Date: Wed, 10 Jul 2019 18:06:29 +0800 Subject: [PATCH 15/41] =?UTF-8?q?=E7=A7=BB=E5=8A=A8=E5=8D=95=E4=B8=BB?= =?UTF-8?q?=E8=A1=A8=E8=BF=94=E5=9B=9E=E6=95=B0=E6=8D=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveMaster.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) 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 5b4030c..693435d 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 @@ -132,8 +132,10 @@ public class WmsMoveMaster extends BaseBean { public WmsMoveMaster(){}; - public WmsMoveMaster(String organizeCode,String partNo,String partNameRdd,String transTypeCode,String transTypeName,Integer itemStatus, + public WmsMoveMaster(Long id,String orderNo,String organizeCode,String partNo,String partNameRdd,String transTypeCode,String transTypeName,Integer itemStatus, String unit,String srcWhNo,String srcZoneNo,String destWhNo,String destZoneNo,Double transQty, Double rejectQty) { + this.id = id; + this.orderNo = orderNo; this.organizeCode = organizeCode; this.partNo = partNo; this.partNameRdd = partNameRdd; From d7b79c659c53cce6612b06270e3b7565d105ae12 Mon Sep 17 00:00:00 2001 From: "jimmy.zeng" Date: Wed, 10 Jul 2019 20:00:57 +0800 Subject: [PATCH 16/41] =?UTF-8?q?WMS=E8=8E=B7=E5=8F=96=E7=B3=BB=E7=BB=9F?= =?UTF-8?q?=E9=85=8D=E7=BD=AE=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/bean/BaseConstWords.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/bean/BaseConstWords.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/bean/BaseConstWords.java index b376d1c..f5011e7 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/bean/BaseConstWords.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/bean/BaseConstWords.java @@ -28,4 +28,6 @@ public class BaseConstWords { public static final String DICTIONARY_POLITICAL_STATUS ="POLITICAL_STATUS"; // 员工类型 EMPLOYEE_TYPE public static final String DICTIONARY_EMPLOYEE_TYPE ="EMPLOYEE_TYPE"; + // 系统参数配置 PROPERTIES + public static final String DICTIONARY_PROPERTIES ="PROPERTIES"; } From ecd72ed41e4ce882ba8ea6dd645ce17be03f10cd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E6=80=9D=E6=B4=81?= Date: Thu, 11 Jul 2019 11:35:05 +0800 Subject: [PATCH 17/41] =?UTF-8?q?ASN=E8=AE=A2=E5=8D=95=E6=98=8E=E7=BB=86?= =?UTF-8?q?=E6=95=B0=E6=8D=AE=E6=96=B0=E5=A2=9E=E5=88=86=E7=BB=84=E6=9F=A5?= =?UTF-8?q?=E8=AF=A2=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cn/estsh/i3plus/pojo/wms/bean/WmsASNMasterDetails.java | 13 +++++++++++++ 1 file changed, 13 insertions(+) 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 3679498..7ccb14b 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 @@ -138,4 +138,17 @@ public class WmsASNMasterDetails extends BaseBean { @Transient @ApiParam("标准包装") public Double snp; + + public WmsASNMasterDetails(){} + + public WmsASNMasterDetails(Double recQty,String partNo,String orderNo,String partNameRdd,String item,String unit,String erpAreaNo,String organizeCode){ + this.recQty = recQty; + this.partNo = partNo; + this.orderNo = orderNo; + this.partNameRdd = partNameRdd; + this.item = item; + this.unit = unit; + this.erpAreaNo = erpAreaNo; + this.organizeCode = organizeCode; + } } From c1ca7cbcae268de9556083aa71bf6fd68cd7ca8b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=B1=AA=E4=BA=91=E6=98=8A?= Date: Thu, 11 Jul 2019 17:28:19 +0800 Subject: [PATCH 18/41] =?UTF-8?q?Andon=E7=BB=84=E7=BB=87=E6=A8=A1=E5=9E=8B?= =?UTF-8?q?=E6=93=8D=E4=BD=9C=E6=8E=A5=E5=8F=A3=20Andon=E7=8F=AD=E6=AC=A1?= =?UTF-8?q?=E8=AE=A1=E7=AE=97=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cn.estsh.i3plus.pojo.andon/bean/MesArea.java | 4 + .../bean/MesEquipment.java | 6 +- .../bean/MesWorkCell.java | 4 + .../bean/MesWorkCenter.java | 4 + .../sqlpack/AndonHqlPack.java | 118 +++++++++++++++++---- .../i3plus/pojo/base/enumutil/AndonEnumUtil.java | 52 +++++++++ .../i3plus/pojo/base/tool/DdlPreparedPack.java | 12 +++ 7 files changed, 181 insertions(+), 19 deletions(-) diff --git a/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/bean/MesArea.java b/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/bean/MesArea.java index 2241c79..09c6388 100644 --- a/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/bean/MesArea.java +++ b/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/bean/MesArea.java @@ -48,6 +48,10 @@ public class MesArea extends BaseBean { @ApiParam(value ="名称") private String name; + public String getName(){ + return areaName; + } + // 默认值 -1 @Transient @ApiParam(value ="父节点" , access ="父节点" ,example = "-1") diff --git a/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/bean/MesEquipment.java b/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/bean/MesEquipment.java index 7959144..1933b6e 100644 --- a/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/bean/MesEquipment.java +++ b/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/bean/MesEquipment.java @@ -17,7 +17,7 @@ import javax.persistence.Table; import javax.persistence.Transient; /** - * @Description :生产区域 + * @Description :生产设备 * @Reference : * @Author : jack.jia * @CreateDate : 2019-04-02 @@ -59,6 +59,10 @@ public class MesEquipment extends BaseBean { @ApiParam(value ="名称") private String name; + public String getName(){ + return this.equipmentName; + } + // 默认值 -1 @Transient @ApiParam(value ="父节点" , access ="父节点" ,example = "-1") diff --git a/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/bean/MesWorkCell.java b/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/bean/MesWorkCell.java index 112dc97..25f802f 100644 --- a/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/bean/MesWorkCell.java +++ b/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/bean/MesWorkCell.java @@ -55,6 +55,10 @@ public class MesWorkCell extends BaseBean { @ApiParam(value ="名称") private String name; + public String getName(){ + return this.workCellName; + } + // 默认值 -1 @Transient @ApiParam(value ="父节点" , access ="父节点" ,example = "-1") diff --git a/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/bean/MesWorkCenter.java b/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/bean/MesWorkCenter.java index 2fc7aec..575fd1c 100644 --- a/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/bean/MesWorkCenter.java +++ b/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/bean/MesWorkCenter.java @@ -59,6 +59,10 @@ public class MesWorkCenter extends BaseBean { @ApiParam(value ="名称") private String name; + public String getName(){ + return this.workCenterName; + } + // 默认值 -1 @Transient @ApiParam(value ="父节点" , access ="父节点" ,example = "-1") diff --git a/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/sqlpack/AndonHqlPack.java b/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/sqlpack/AndonHqlPack.java index 42f5639..cd7d4e5 100644 --- a/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/sqlpack/AndonHqlPack.java +++ b/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/sqlpack/AndonHqlPack.java @@ -5,6 +5,7 @@ import cn.estsh.i3plus.pojo.base.bean.BaseBean; import cn.estsh.i3plus.pojo.base.bean.DdlPackBean; import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil; import cn.estsh.i3plus.pojo.base.tool.DdlPreparedPack; +import cn.estsh.i3plus.pojo.base.tool.HqlPack; import org.apache.commons.lang3.StringUtils; /** @@ -286,9 +287,8 @@ public class AndonHqlPack { */ public static DdlPackBean getMesArea(MesArea mesArea, String organizeCode) { DdlPackBean packBean = getAllBaseDataByNormalPro(mesArea, organizeCode); - if (StringUtils.isNotEmpty(mesArea.getAreaCode())) { - DdlPreparedPack.getStringEqualPack(mesArea.getAreaCode(), "areaCode", packBean); - } + DdlPreparedPack.getStringEqualPack(mesArea.getAreaCode(), "areaCode", packBean); + packBean.setOrderByStr(mesArea.orderBy()); return packBean; } @@ -300,12 +300,10 @@ public class AndonHqlPack { */ public static DdlPackBean getMesWorkCenter(MesWorkCenter mesWorkCenter, String organizeCode) { DdlPackBean packBean = getAllBaseDataByNormalPro(mesWorkCenter, organizeCode); - if (StringUtils.isNotEmpty(mesWorkCenter.getWorkCenterCode())) { - DdlPreparedPack.getStringEqualPack(mesWorkCenter.getWorkCenterCode(), "workCenterCode", packBean); - } - if (StringUtils.isNotEmpty(mesWorkCenter.getAreaCode())){ - DdlPreparedPack.getStringEqualPack(mesWorkCenter.getAreaCode(), "areaCode", packBean); - } + + DdlPreparedPack.getStringEqualPack(mesWorkCenter.getWorkCenterCode(), "workCenterCode", packBean); + DdlPreparedPack.getStringEqualPack(mesWorkCenter.getAreaCode(), "areaCode", packBean); + packBean.setOrderByStr(mesWorkCenter.orderBy()); return packBean; } @@ -317,15 +315,12 @@ public class AndonHqlPack { */ public static DdlPackBean getMesWorkCell(MesWorkCell mesWorkCell, String organizeCode) { DdlPackBean packBean = getAllBaseDataByNormalPro(mesWorkCell, organizeCode); - if (StringUtils.isNotEmpty(mesWorkCell.getWorkCenterCode())) { - DdlPreparedPack.getStringEqualPack(mesWorkCell.getWorkCenterCode(), "workCenterCode", packBean); - } - if (StringUtils.isNotEmpty(mesWorkCell.getAreaCode())){ - DdlPreparedPack.getStringEqualPack(mesWorkCell.getAreaCode(), "areaCode", packBean); - } - if (StringUtils.isNotEmpty(mesWorkCell.getWorkCellCode())){ - DdlPreparedPack.getStringEqualPack(mesWorkCell.getWorkCellCode(), "workCellCode", packBean); - } + + DdlPreparedPack.getStringEqualPack(mesWorkCell.getWorkCenterCode(), "workCenterCode", packBean); + DdlPreparedPack.getStringEqualPack(mesWorkCell.getAreaCode(), "areaCode", packBean); + DdlPreparedPack.getStringEqualPack(mesWorkCell.getWorkCellCode(), "workCellCode", packBean); + + packBean.setOrderByStr(mesWorkCell.orderBy()); return packBean; } @@ -343,6 +338,7 @@ public class AndonHqlPack { if (StringUtils.isNotEmpty(mesEquipment.getEquipmentCode())){ DdlPreparedPack.getStringEqualPack(mesEquipment.getEquipmentCode(), "equipmentCode", packBean); } + packBean.setOrderByStr(mesEquipment.orderBy()); return packBean; } @@ -555,4 +551,90 @@ public class AndonHqlPack { getStringBuilderPack(andonManageRecord, result); return result; } + + /** + * 区域唯一校验 + * @param mesArea + * @return + */ + public static DdlPackBean packHqlCheckMesAreaOnlyByAreaCode(MesArea mesArea){ + DdlPackBean result = new DdlPackBean(); + if (mesArea != null && mesArea.getId() != null && mesArea.getId().longValue() > 0) { + DdlPreparedPack.getNumNOEqualPack(mesArea.getId(),"id",result); + } + + DdlPreparedPack.getStringEqualPack(mesArea.getAreaCode(),"areaCode",result); + DdlPreparedPack.getNumEqualPack(CommonEnumUtil.IS_DEAL.NO.getValue(),"isDeleted",result); + + return result; + } + + /** + * 工作中心唯一校验 + * @param mesWorkCenter + * @return + */ + public static DdlPackBean packHqlCheckMesWorkCenterOnlyByWorkCenterCode(MesWorkCenter mesWorkCenter){ + DdlPackBean result = new DdlPackBean(); + if (mesWorkCenter != null && mesWorkCenter.getId() != null && mesWorkCenter.getId().longValue() > 0) { + DdlPreparedPack.getNumNOEqualPack(mesWorkCenter.getId(),"id",result); + } + + DdlPreparedPack.getStringEqualPack(mesWorkCenter.getWorkCenterCode(),"workCenterCode",result); + DdlPreparedPack.getNumEqualPack(CommonEnumUtil.IS_DEAL.NO.getValue(),"isDeleted",result); + + return result; + } + + /** + * 工作单元唯一校验 + * @param mesWorkCell + * @return + */ + public static DdlPackBean packHqlCheckMesWorkCellOnlyByWorkCellCode(MesWorkCell mesWorkCell){ + DdlPackBean result = new DdlPackBean(); + if (mesWorkCell != null && mesWorkCell.getId() != null && mesWorkCell.getId().longValue() > 0) { + DdlPreparedPack.getNumNOEqualPack(mesWorkCell.getId(),"id",result); + } + + DdlPreparedPack.getStringEqualPack(mesWorkCell.getWorkCellCode(),"workCellCode",result); + DdlPreparedPack.getNumEqualPack(CommonEnumUtil.IS_DEAL.NO.getValue(),"isDeleted",result); + + return result; + } + + /** + * 设备唯一校验 + * @param mesEquipment + * @return + */ + public static DdlPackBean packHqlCheckMesEquipmentOnlyByEquipmentCode(MesEquipment mesEquipment){ + DdlPackBean result = new DdlPackBean(); + if (mesEquipment != null && mesEquipment.getId() != null && mesEquipment.getId().longValue() > 0) { + DdlPreparedPack.getNumNOEqualPack(mesEquipment.getId(),"id",result); + } + + DdlPreparedPack.getStringEqualPack(mesEquipment.getEquipmentCode(),"equipmentCode",result); + DdlPreparedPack.getNumEqualPack(CommonEnumUtil.IS_DEAL.NO.getValue(),"isDeleted",result); + + return result; + } + + /** + * 班次唯一校验 + * @param mesShift + * @return + */ + public static DdlPackBean packHqlCheckMesShiftOnlyByShiftCode(MesShift mesShift){ + DdlPackBean result = new DdlPackBean(); + if (mesShift != null && mesShift.getId() != null && mesShift.getId().longValue() > 0) { + DdlPreparedPack.getNumNOEqualPack(mesShift.getId(),"id",result); + DdlPreparedPack.getStringNoEqualPack(mesShift.getWorkCenterCode(),"workCenterCode",result); + } + + DdlPreparedPack.getStringEqualPack(mesShift.getShiftCode(),"shiftCode",result); + DdlPreparedPack.getNumEqualPack(CommonEnumUtil.IS_DEAL.NO.getValue(),"isDeleted",result); + + return result; + } } 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 041554b..a00d90e 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 @@ -660,4 +660,56 @@ public class AndonEnumUtil { return tmp; } } + + + /** + * 设备状态： + * 10=备用， + * 20=运行， + * 30=故障， + * 40=检修 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum ANDON_EQUIPMENT_STATUS{ + SPARE("10","备用"), + RUN("20","运行"), + ERROR("30","故障"), + OVERHAUL("40","检修"); + + private String value; + private String description; + + ANDON_EQUIPMENT_STATUS(String value,String description) { + this.value = value; + this.description = description; + } + + public String getValue() { + return value; + } + + public String getDescription() { + return description; + } + + public static String valueOfDescription(String val) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (StringUtils.equalsIgnoreCase(values()[i].value, val)) { + tmp = values()[i].description; + } + } + return tmp; + } + + public static String descriptionOfValue(String val) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (StringUtils.equalsIgnoreCase(values()[i].description, val)) { + tmp = values()[i].value; + } + } + return tmp; + } + } } diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/tool/DdlPreparedPack.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/tool/DdlPreparedPack.java index 1b6d43a..fca7f7d 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/tool/DdlPreparedPack.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/tool/DdlPreparedPack.java @@ -237,6 +237,18 @@ public class DdlPreparedPack { } /** + * 封装String对象成不等于语句 + * + * @param columnName 列名 + * @param packBean + */ + public static void getStringNoEqualPack(String val, String columnName, DdlPackBean packBean) { + if (val != null && val.trim().length() > 0) { + packBean.addColumnQuery(columnName," and model." + columnName + " <> :m_" + columnName, val); + } + } + + /** * 封装String对象成equal语句 * * @param columnName 列名 From 4f553c0857addd220c450e0afa32c227fc462240 Mon Sep 17 00:00:00 2001 From: "wei.peng" <123456> Date: Fri, 12 Jul 2019 09:22:11 +0800 Subject: [PATCH 19/41] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=BA=8F=E5=88=97?= =?UTF-8?q?=E5=8C=96ID=20,=20=E7=94=A8=E6=88=B7=E7=99=BB=E5=BD=95=E5=9C=A8?= =?UTF-8?q?=E7=BA=BF=E6=9C=BA=E5=88=B6=E5=AE=8C=E6=88=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/cn/estsh/i3plus/pojo/model/platform/CommonTreeModel.java | 5 ++++- .../cn/estsh/i3plus/pojo/model/platform/LabelTemplateModel.java | 5 ++++- .../cn/estsh/i3plus/pojo/model/platform/MessagePagerModel.java | 5 ++++- .../i3plus/pojo/model/platform/RefUserMessagePagerModel.java | 5 ++++- .../java/cn/estsh/i3plus/pojo/model/platform/UserDetailModel.java | 2 ++ .../cn/estsh/i3plus/pojo/model/platform/UserDetailPagerModel.java | 6 +++++- .../cn/estsh/i3plus/pojo/model/platform/UserRolePagerModel.java | 5 ++++- .../main/java/cn/estsh/i3plus/pojo/platform/bean/MailConfig.java | 5 ++++- .../main/java/cn/estsh/i3plus/pojo/platform/bean/SessionUser.java | 8 ++++++++ .../java/cn/estsh/i3plus/pojo/platform/bean/SysBarcodeRule.java | 1 + .../main/java/cn/estsh/i3plus/pojo/platform/bean/SysConfig.java | 1 + .../java/cn/estsh/i3plus/pojo/platform/bean/SysDepartment.java | 1 + .../java/cn/estsh/i3plus/pojo/platform/bean/SysDictionary.java | 1 + .../java/cn/estsh/i3plus/pojo/platform/bean/SysEnterprise.java | 1 + .../cn/estsh/i3plus/pojo/platform/bean/SysEnterpriseConfig.java | 1 + .../java/cn/estsh/i3plus/pojo/platform/bean/SysFactoryStore.java | 1 + .../src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysFile.java | 1 + .../java/cn/estsh/i3plus/pojo/platform/bean/SysFileAttach.java | 1 + .../java/cn/estsh/i3plus/pojo/platform/bean/SysLabelTemplate.java | 1 + .../cn/estsh/i3plus/pojo/platform/bean/SysLabelTemplateParam.java | 1 + .../cn/estsh/i3plus/pojo/platform/bean/SysLocaleLanguage.java | 1 + .../cn/estsh/i3plus/pojo/platform/bean/SysLocaleResource.java | 1 + .../java/cn/estsh/i3plus/pojo/platform/bean/SysLogUserLogin.java | 1 + .../src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysMenu.java | 1 + .../main/java/cn/estsh/i3plus/pojo/platform/bean/SysMessage.java | 1 + .../java/cn/estsh/i3plus/pojo/platform/bean/SysOrderNoRule.java | 1 + .../main/java/cn/estsh/i3plus/pojo/platform/bean/SysOrganize.java | 1 + .../main/java/cn/estsh/i3plus/pojo/platform/bean/SysPosition.java | 1 + .../java/cn/estsh/i3plus/pojo/platform/bean/SysRefRoleMenu.java | 1 + .../cn/estsh/i3plus/pojo/platform/bean/SysRefTaskCyclePlan.java | 1 + .../cn/estsh/i3plus/pojo/platform/bean/SysRefUserDepartment.java | 1 + .../estsh/i3plus/pojo/platform/bean/SysRefUserInfoDepartment.java | 1 + .../cn/estsh/i3plus/pojo/platform/bean/SysRefUserMessage.java | 1 + .../cn/estsh/i3plus/pojo/platform/bean/SysRefUserPosition.java | 1 + .../java/cn/estsh/i3plus/pojo/platform/bean/SysRefUserRole.java | 2 +- .../src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysRole.java | 1 + .../src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysTask.java | 1 + .../java/cn/estsh/i3plus/pojo/platform/bean/SysTaskCycle.java | 1 + .../main/java/cn/estsh/i3plus/pojo/platform/bean/SysTaskPlan.java | 1 + .../src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysTool.java | 1 + .../main/java/cn/estsh/i3plus/pojo/platform/bean/SysToolType.java | 1 + .../src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysUser.java | 1 + .../main/java/cn/estsh/i3plus/pojo/platform/bean/SysUserInfo.java | 2 ++ .../java/cn/estsh/i3plus/pojo/platform/bean/TestTransUser.java | 1 + 44 files changed, 75 insertions(+), 8 deletions(-) diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/platform/CommonTreeModel.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/platform/CommonTreeModel.java index 8c963a4..e4b74f9 100644 --- a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/platform/CommonTreeModel.java +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/platform/CommonTreeModel.java @@ -3,6 +3,7 @@ package cn.estsh.i3plus.pojo.model.platform; import cn.estsh.i3plus.pojo.base.bean.BaseBean; import lombok.Data; +import java.io.Serializable; import java.util.ArrayList; import java.util.List; /** @@ -13,7 +14,9 @@ import java.util.List; * @Modify: **/ @Data -public class CommonTreeModel { +public class CommonTreeModel implements Serializable { + + private static final long serialVersionUID = -3612131411549787983L; private BaseBean bean; diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/platform/LabelTemplateModel.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/platform/LabelTemplateModel.java index 0759bd3..ce51116 100644 --- a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/platform/LabelTemplateModel.java +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/platform/LabelTemplateModel.java @@ -4,6 +4,7 @@ import cn.estsh.i3plus.pojo.platform.bean.SysLabelTemplate; import cn.estsh.i3plus.pojo.platform.bean.SysLabelTemplateParam; import lombok.Data; +import java.io.Serializable; import java.util.List; /** @@ -14,7 +15,9 @@ import java.util.List; * @Modify: **/ @Data -public class LabelTemplateModel { +public class LabelTemplateModel implements Serializable { + + private static final long serialVersionUID = 2488615810903387414L; private SysLabelTemplate labelTemplate; diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/platform/MessagePagerModel.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/platform/MessagePagerModel.java index 442e0a2..62546d3 100644 --- a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/platform/MessagePagerModel.java +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/platform/MessagePagerModel.java @@ -4,6 +4,8 @@ import cn.estsh.i3plus.pojo.base.common.Pager; import cn.estsh.i3plus.pojo.platform.bean.SysMessage; import lombok.Data; +import java.io.Serializable; + /** * @Description : * @Reference : @@ -12,8 +14,9 @@ import lombok.Data; * @Modify: **/ @Data -public class MessagePagerModel { +public class MessagePagerModel implements Serializable { + private static final long serialVersionUID = 6236940647561791913L; private SysMessage sysMessage; private Pager pager; diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/platform/RefUserMessagePagerModel.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/platform/RefUserMessagePagerModel.java index 97b20df..4eb0420 100644 --- a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/platform/RefUserMessagePagerModel.java +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/platform/RefUserMessagePagerModel.java @@ -4,6 +4,8 @@ import cn.estsh.i3plus.pojo.base.common.Pager; import cn.estsh.i3plus.pojo.platform.bean.SysRefUserMessage; import lombok.Data; +import java.io.Serializable; + /** * @Description : * @Reference : @@ -12,8 +14,9 @@ import lombok.Data; * @Modify: **/ @Data -public class RefUserMessagePagerModel { +public class RefUserMessagePagerModel implements Serializable { + private static final long serialVersionUID = -4109915131051843577L; private SysRefUserMessage sysRefUserMessage; private Pager pager; diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/platform/UserDetailModel.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/platform/UserDetailModel.java index 5ff8bed..3a35968 100644 --- a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/platform/UserDetailModel.java +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/platform/UserDetailModel.java @@ -22,6 +22,8 @@ import java.util.List; @Data public class UserDetailModel extends BaseBean { + + private static final long serialVersionUID = 4413526491980249893L; @ApiParam(value ="账号ID") private String userId; diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/platform/UserDetailPagerModel.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/platform/UserDetailPagerModel.java index 80c430e..cdc3da2 100644 --- a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/platform/UserDetailPagerModel.java +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/platform/UserDetailPagerModel.java @@ -3,6 +3,8 @@ package cn.estsh.i3plus.pojo.model.platform; import cn.estsh.i3plus.pojo.base.common.Pager; import lombok.Data; +import java.io.Serializable; + /** * @Description : * @Reference : @@ -11,8 +13,10 @@ import lombok.Data; * @Modify: **/ @Data -public class UserDetailPagerModel { +public class UserDetailPagerModel implements Serializable { + + private static final long serialVersionUID = -5347423781211585908L; private UserDetailModel userDetailModel; private Pager pager; diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/platform/UserRolePagerModel.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/platform/UserRolePagerModel.java index 4ca730e..b8c77f1 100644 --- a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/platform/UserRolePagerModel.java +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/platform/UserRolePagerModel.java @@ -4,6 +4,8 @@ import cn.estsh.i3plus.pojo.base.common.Pager; import cn.estsh.i3plus.pojo.platform.bean.SysRole; import lombok.Data; +import java.io.Serializable; + /** * @Description : * @Reference : @@ -12,8 +14,9 @@ import lombok.Data; * @Modify: **/ @Data -public class UserRolePagerModel { +public class UserRolePagerModel implements Serializable { + private static final long serialVersionUID = 6180855492105859082L; private SysRole sysRole; private Pager pager; diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/MailConfig.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/MailConfig.java index d5ffa91..234778b 100644 --- a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/MailConfig.java +++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/MailConfig.java @@ -3,6 +3,8 @@ package cn.estsh.i3plus.pojo.platform.bean; 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 MailConfig { +public class MailConfig implements Serializable { + private static final long serialVersionUID = -6776607385471325344L; @ApiParam(value = "邮箱开关") private int mailSwitch; 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 3ee307d..c2ad1d4 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 @@ -16,6 +16,11 @@ import java.util.List; @Data public class SessionUser implements Serializable { + private static final long serialVersionUID = -6478598185766500419L; + + @ApiParam("会话ID") + private String token; + @ApiParam("用户ID") private Long userId; @@ -32,6 +37,9 @@ public class SessionUser implements Serializable { @ApiParam("用户类型") private String userType; + @ApiParam("用户登录平台") + private Integer loginPlatform; + @ApiParam("用户信息") private SysUser user; diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysBarcodeRule.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysBarcodeRule.java index 61c82cc..a0b2a6a 100644 --- a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysBarcodeRule.java +++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysBarcodeRule.java @@ -29,6 +29,7 @@ import javax.persistence.Table; @Api(value="条码规则",description = "条码规则") public class SysBarcodeRule extends BaseBean { + private static final long serialVersionUID = -2041412527908996307L; @Column(name = "NAME") @ApiParam(value = "规则名称") private String name; diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysConfig.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysConfig.java index 85501de..3ab55af 100644 --- a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysConfig.java +++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysConfig.java @@ -29,6 +29,7 @@ import javax.persistence.Table; @Api(value="系统配置",description = "系统配置") public class SysConfig extends BaseBean { + private static final long serialVersionUID = 2718495807943432629L; @Column(name="NAME") @ApiParam(value ="名称") private String name; diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysDepartment.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysDepartment.java index 69f2625..79daa0f 100644 --- a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysDepartment.java +++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysDepartment.java @@ -32,6 +32,7 @@ import java.util.List; @Api(value="部门",description = "部门") public class SysDepartment extends BaseBean { + private static final long serialVersionUID = -1505054622781210062L; @Column(name="NAME") @ApiParam(value ="名称") private String name; diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysDictionary.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysDictionary.java index 5eaa6c5..32929c7 100644 --- a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysDictionary.java +++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysDictionary.java @@ -31,6 +31,7 @@ import javax.persistence.Table; @Api(value="系统字典",description = "系统字典") public class SysDictionary extends BaseBean { + private static final long serialVersionUID = 593801368328634592L; @Column(name="NAME") @ApiParam(value ="字典名称") private String name; diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysEnterprise.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysEnterprise.java index 626eef0..460bbfe 100644 --- a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysEnterprise.java +++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysEnterprise.java @@ -28,6 +28,7 @@ import javax.persistence.Table; @Api(value="企业信息",description = "企业信息") public class SysEnterprise extends BaseBean { + private static final long serialVersionUID = -2138074947458189045L; @Column(name="NAME") @ApiParam(value ="名称" , access ="名称") private String name; diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysEnterpriseConfig.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysEnterpriseConfig.java index 46d607e..4ae6fa6 100644 --- a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysEnterpriseConfig.java +++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysEnterpriseConfig.java @@ -31,6 +31,7 @@ import java.text.DecimalFormat; @Api(value="企业配置信息",description = "企业配置信息") public class SysEnterpriseConfig extends BaseBean { + private static final long serialVersionUID = -6131429295344210675L; @Column(name="ENTERPRISE_ID") @ApiParam(value ="企业id" , example = "0") @JsonSerialize(using = ToStringSerializer.class) diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysFactoryStore.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysFactoryStore.java index 814ba4f..fefa471 100644 --- a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysFactoryStore.java +++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysFactoryStore.java @@ -27,6 +27,7 @@ import javax.persistence.Table; @Api("工厂仓库") public class SysFactoryStore extends BaseBean { + private static final long serialVersionUID = 6717712070974796221L; @Column(name="store_code") @ApiParam("仓库代码") private String storeCode; diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysFile.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysFile.java index 6da63b3..ff0c38f 100644 --- a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysFile.java +++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysFile.java @@ -31,6 +31,7 @@ import java.text.DecimalFormat; @Api(value="文件",description = "文件") public class SysFile extends BaseBean { + private static final long serialVersionUID = 623700632055475696L; @Column(name="NAME") @ApiParam(value ="文件名称") private String name; diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysFileAttach.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysFileAttach.java index 72f47cc..256ee0a 100644 --- a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysFileAttach.java +++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysFileAttach.java @@ -30,6 +30,7 @@ import javax.persistence.Table; @Api(value="文件附件",description = "文件附件") public class SysFileAttach extends BaseBean { + private static final long serialVersionUID = -6730529794381568890L; @Column(name="ATTACH_SOFT_TYPE") @ApiParam(value ="附件所属模块") private Integer attachSoftType; diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysLabelTemplate.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysLabelTemplate.java index 39eb527..339fb7e 100644 --- a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysLabelTemplate.java +++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysLabelTemplate.java @@ -27,6 +27,7 @@ import javax.persistence.*; @Api(value="打印模板",description = "打印模板") public class SysLabelTemplate extends BaseBean { + private static final long serialVersionUID = 5371856566557305323L; @Column(name="TEMPLATE_CODE") @ApiParam(value ="模板代码") private String templateCode; diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysLabelTemplateParam.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysLabelTemplateParam.java index 4654f76..92e08e2 100644 --- a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysLabelTemplateParam.java +++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysLabelTemplateParam.java @@ -29,6 +29,7 @@ import javax.persistence.*; @Api(value="打印模板参数",description = "打印模板参数") public class SysLabelTemplateParam extends BaseBean { + private static final long serialVersionUID = 6476163540527157643L; @Column(name="TEMPLATE_ID") @ApiParam(value ="模板ID" , access ="模板ID" ,example = "-1") @JsonSerialize(using = ToStringSerializer.class) diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysLocaleLanguage.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysLocaleLanguage.java index 7f4d218..61f5c39 100644 --- a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysLocaleLanguage.java +++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysLocaleLanguage.java @@ -24,6 +24,7 @@ import javax.persistence.Table; @Api(value="系统语言表",description = "对系统语言进行匹配。") public class SysLocaleLanguage extends BaseBean { + private static final long serialVersionUID = -1904007575555304772L; @Column(name="LANGUAGE_NAME") @ApiParam(value = "语言名称",example = "前台显示的名称") private String languageName; diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysLocaleResource.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysLocaleResource.java index 1a6f01a..8289035 100644 --- a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysLocaleResource.java +++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysLocaleResource.java @@ -29,6 +29,7 @@ import javax.persistence.Transient; @Api(value="系统资源",description = "对按钮、功能、信息提示等进行转换。") public class SysLocaleResource extends BaseBean { + private static final long serialVersionUID = -2397207310100672746L; @Column(name="resource_type") @ApiParam(value = "资源类型",example = "1",access = "使用枚举：CommonEnumUtil.SYS_LOCALE_RESOURCE_TYPE") private Integer resourceType; diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysLogUserLogin.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysLogUserLogin.java index 4be79ff..f1a39bf 100644 --- a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysLogUserLogin.java +++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysLogUserLogin.java @@ -28,6 +28,7 @@ import javax.persistence.Table; @Api(value="用户登录记录",description = "用户登录记录") public class SysLogUserLogin extends BaseBean { + private static final long serialVersionUID = 4665598896654312569L; @Column(name="USER_ID") @ApiParam(value ="用户ID" , access ="用户ID") private Long userId; diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysMenu.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysMenu.java index 4c9d314..0e0cbab 100644 --- a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysMenu.java +++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysMenu.java @@ -32,6 +32,7 @@ import java.util.List; @Api(value="系统功能",description = "系统功能") public class SysMenu extends BaseBean { + private static final long serialVersionUID = 6892387964234712323L; @Column(name="NAME") @ApiParam(value ="功能名称") private String name; diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysMessage.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysMessage.java index 695c519..8eacda3 100644 --- a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysMessage.java +++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysMessage.java @@ -31,6 +31,7 @@ import java.util.List; @Api(value = "系统消息", description = "系统消息") public class SysMessage extends BaseBean { + private static final long serialVersionUID = -6090909263221993356L; @Column(name = "MESSAGE_TITLE") @ApiParam(value = "消息标题", access = "消息标题") private String messageTitle; diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysOrderNoRule.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysOrderNoRule.java index 258e35d..6bb092f 100644 --- a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysOrderNoRule.java +++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysOrderNoRule.java @@ -33,6 +33,7 @@ import javax.persistence.Table; @Api(value="单号规则",description = "单号规则") public class SysOrderNoRule extends BaseBean { + private static final long serialVersionUID = -283233170141936426L; @Column(name = "NAME") @ApiParam(value = "规则名称") private String name; diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysOrganize.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysOrganize.java index fbbfbe2..2bb58d7 100644 --- a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysOrganize.java +++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysOrganize.java @@ -33,6 +33,7 @@ import java.util.List; @Api(value="组织",description = "组织") public class SysOrganize extends BaseBean { + private static final long serialVersionUID = 5932340027033720434L; @Column(name="NAME") @ApiParam(value ="名称") private String name; diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysPosition.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysPosition.java index 513f3c2..1479652 100644 --- a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysPosition.java +++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysPosition.java @@ -32,6 +32,7 @@ import java.util.List; @Api(value="岗位",description = "岗位") public class SysPosition extends BaseBean { + private static final long serialVersionUID = -3438901661332705721L; @Column(name="NAME") @ApiParam(value ="名称" , access ="名称") private String name; diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysRefRoleMenu.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysRefRoleMenu.java index 1851937..68dabba 100644 --- a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysRefRoleMenu.java +++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysRefRoleMenu.java @@ -31,6 +31,7 @@ import java.text.DecimalFormat; @Api(value="关系-角色菜单",description = "关系-角色菜单") public class SysRefRoleMenu extends BaseBean { + private static final long serialVersionUID = -2013469818246101184L; @Column(name="MENU_ID") @ApiParam(value ="菜单ID" ,example = "-1") @JsonSerialize(using = ToStringSerializer.class) diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysRefTaskCyclePlan.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysRefTaskCyclePlan.java index 58f2528..272f76c 100644 --- a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysRefTaskCyclePlan.java +++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysRefTaskCyclePlan.java @@ -30,6 +30,7 @@ import javax.persistence.Table; @Api(value="关系-任务周期与计划",description = "关系-任务周期与计划") public class SysRefTaskCyclePlan extends BaseBean { + private static final long serialVersionUID = 5217923903994138624L; @Column(name="TASK_CYCLE_ID") @ApiParam(value ="任务周期id" ,example = "-1") @JsonSerialize(using = ToStringSerializer.class) diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysRefUserDepartment.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysRefUserDepartment.java index 5350620..bcb6a0a 100644 --- a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysRefUserDepartment.java +++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysRefUserDepartment.java @@ -31,6 +31,7 @@ import java.text.DecimalFormat; @Api(value="关系-账号部门",description = "关系-账号部门") public class SysRefUserDepartment extends BaseBean { + private static final long serialVersionUID = -2361062982274833764L; @Column(name="USER_ID") @ApiParam(value ="用户ID" , example = "-1") @JsonSerialize(using = ToStringSerializer.class) diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysRefUserInfoDepartment.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysRefUserInfoDepartment.java index 81dc295..c465eb5 100644 --- a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysRefUserInfoDepartment.java +++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysRefUserInfoDepartment.java @@ -30,6 +30,7 @@ import javax.persistence.Table; @Api(value="关系-用户部门",description = "关系-用户部门") public class SysRefUserInfoDepartment extends BaseBean { + private static final long serialVersionUID = -1023456569329939973L; @Column(name="USER_ID") @ApiParam(value ="用户ID" , example = "-1") @JsonSerialize(using = ToStringSerializer.class) diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysRefUserMessage.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysRefUserMessage.java index 7d02db8..6caccdc 100644 --- a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysRefUserMessage.java +++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysRefUserMessage.java @@ -31,6 +31,7 @@ import javax.persistence.Table; @Api(value="关系-用户消息",description = "关系-用户消息") public class SysRefUserMessage extends BaseBean { + private static final long serialVersionUID = 555705651072659162L; @Column(name="MESSAGE_ID") @ApiParam(value ="消息id" ,example = "-1") @JsonSerialize(using = ToStringSerializer.class) diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysRefUserPosition.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysRefUserPosition.java index b323292..77eff8c 100644 --- a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysRefUserPosition.java +++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysRefUserPosition.java @@ -30,6 +30,7 @@ import javax.persistence.Table; @Api(value="关系-用户岗位",description = "关系-用户岗位") public class SysRefUserPosition extends BaseBean { + private static final long serialVersionUID = 3234085587521697199L; @Column(name="USER_ID") @ApiParam(value ="用户ID" , example = "-1") @JsonSerialize(using = ToStringSerializer.class) diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysRefUserRole.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysRefUserRole.java index 223afa8..b6bdcc9 100644 --- a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysRefUserRole.java +++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysRefUserRole.java @@ -30,7 +30,7 @@ import javax.persistence.Table; @Api(value="关系-用户角色",description = "关系-用户角色") public class SysRefUserRole extends BaseBean { - + private static final long serialVersionUID = -2253689528880200360L; @Column(name="USER_ID") @ApiParam(value ="用户ID" , example = "-1") @JsonSerialize(using = ToStringSerializer.class) diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysRole.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysRole.java index 6e8adc4..9786250 100644 --- a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysRole.java +++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysRole.java @@ -32,6 +32,7 @@ import javax.persistence.Table; @Api(value="用户角色表",description = "用户权限角色。") public class SysRole extends BaseBean { + private static final long serialVersionUID = -869130572226447415L; @Column(name="NAME") @ApiParam(value ="角色名称") private String name; diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysTask.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysTask.java index d861209..2b54d99 100644 --- a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysTask.java +++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysTask.java @@ -29,6 +29,7 @@ import javax.persistence.Table; @Api(value="任务",description = "任务") public class SysTask extends BaseBean { + private static final long serialVersionUID = -4462661508105857312L; @Column(name="NAME") @ApiParam(value ="名称") private String name; diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysTaskCycle.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysTaskCycle.java index e4d43e4..de6575e 100644 --- a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysTaskCycle.java +++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysTaskCycle.java @@ -29,6 +29,7 @@ import javax.persistence.Table; @Api(value="任务周期",description = "任务周期") public class SysTaskCycle extends BaseBean { + private static final long serialVersionUID = 6821425488105955756L; @Column(name="NAME") @ApiParam(value ="名称") private String name; diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysTaskPlan.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysTaskPlan.java index df65a54..6b239f8 100644 --- a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysTaskPlan.java +++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysTaskPlan.java @@ -32,6 +32,7 @@ import javax.persistence.Table; @Api(value = "任务计划", description = "任务计划") public class SysTaskPlan extends BaseBean { + private static final long serialVersionUID = -136675837627794707L; @Column(name = "NAME") @ApiParam(value = "名称") private String name; diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysTool.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysTool.java index 2a03f16..2887e9f 100644 --- a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysTool.java +++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysTool.java @@ -37,6 +37,7 @@ import javax.persistence.Table; @Api(value="硬件设备表",description = "硬件设备表") public class SysTool extends BaseBean { + private static final long serialVersionUID = 100098534186501411L; @Column(name="NAME") @ApiParam(value ="名称" , access ="名称") private String name; diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysToolType.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysToolType.java index bd8eeb0..4765ce2 100644 --- a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysToolType.java +++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysToolType.java @@ -29,6 +29,7 @@ import java.text.DecimalFormat; @Api(value="设备类型",description = "设备类型") public class SysToolType extends BaseBean { + private static final long serialVersionUID = 6736217130492256001L; @Column(name="NAME") @ApiParam(value ="名称" , access ="名称") private String name; diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysUser.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysUser.java index af22709..b607923 100644 --- a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysUser.java +++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysUser.java @@ -32,6 +32,7 @@ import java.util.List; @Api(value="账号登陆表",description = "账号登陆系统账户。") public class SysUser extends BaseBean { + private static final long serialVersionUID = 3721769401146979123L; @Column(name="USER_INFO_ID") @ApiParam(value ="人员ID" , example = "-1") @JsonSerialize(using = ToStringSerializer.class) diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysUserInfo.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysUserInfo.java index 7ac1d95..51d7362 100644 --- a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysUserInfo.java +++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysUserInfo.java @@ -34,6 +34,8 @@ import java.util.List; @Api(value="用户详细",description = "用户详细") public class SysUserInfo extends BaseBean { + private static final long serialVersionUID = 3876318482048754222L; + @Column(name="USER_ID") @ApiParam(value ="账号ID" , example = "-1") @JsonSerialize(using = ToStringSerializer.class) diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/TestTransUser.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/TestTransUser.java index 7f5be42..8751bde 100644 --- a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/TestTransUser.java +++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/TestTransUser.java @@ -32,6 +32,7 @@ import javax.persistence.Version; @Api(value="测试用户类",description = "测试事务信息") public class TestTransUser extends BaseBean { + private static final long serialVersionUID = 3860279685301736213L; @Column(name="NAME") @ApiParam(value ="名称" , access ="名称") private String name; From a064c6b84a359b0d9e935cad64822d468a2647bf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E6=80=9D=E6=B4=81?= Date: Fri, 12 Jul 2019 17:36:10 +0800 Subject: [PATCH 20/41] =?UTF-8?q?=E6=9E=9A=E4=B8=BE=E6=96=B0=E5=A2=9E?= =?UTF-8?q?=E6=9D=A1=E7=A0=81=E7=B1=BB=E5=9E=8B=20=E5=BA=93=E5=AD=98?= =?UTF-8?q?=E6=9D=A1=E7=A0=81=E8=A1=A8=E6=96=B0=E5=A2=9E=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/base/enumutil/WmsEnumUtil.java | 34 ++++++++++++++++++++++ .../cn/estsh/i3plus/pojo/wms/bean/WmsStockSn.java | 7 +++-- 2 files changed, 39 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 aee1f19..633422a 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 @@ -2928,4 +2928,38 @@ public class WmsEnumUtil { return value; } } + + /** + * 条码类型 10=实物条码，20=虚拟条码 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum WMS_STOCK_TYPE { + SOURCE(10, "实物条码"), TARGET(20, "虚拟条码"); + + private int value; + private String description; + + WMS_STOCK_TYPE(int value, String description) { + this.value = value; + this.description = description; + } + + public int getValue() { + return value; + } + + public String getDescription() { + return description; + } + + public static String valueOf(int val) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].value == val) { + tmp = values()[i].description; + } + } + return tmp; + } + } } \ No newline at end of file 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 1fdbf92..2e6e363 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 @@ -109,9 +109,8 @@ public class WmsStockSn extends BaseBean { private String unit; @Column(name = "QTY") - @ColumnDefault("0") @ApiParam(value = "数量", example = "0") - private Double qty; + private Double qty = 0d; /** * 质量状态:10=合格,20=不合格,30=隔离 @@ -155,6 +154,10 @@ public class WmsStockSn extends BaseBean { @ApiParam(value = "工作中心代码") private String workCenterCode; + @Column(name = "SN_TYPE") + @ApiParam(value = "条码类型", example = "10") + private Integer snType = 10; + @ApiParam(value = "仓库名称") @Transient public String whNameRdd; From 7d5ea5bfeceed4ec9ba839f9042ca3caecad4728 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=88=98=E6=95=8F?= <962239776@qq.com> Date: Mon, 15 Jul 2019 16:09:18 +0800 Subject: [PATCH 21/41] =?UTF-8?q?=E5=AE=A2=E6=88=B7=E7=89=A9=E6=96=99?= =?UTF-8?q?=E5=8F=B7=E9=BB=98=E8=AE=A4=E5=80=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/wms/bean/SapDn.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 89cd04f..be5b77c 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 @@ -46,7 +46,7 @@ public class SapDn extends SapBase{ @ApiParam(value = "客户物料号",example = "1") @AnnoOutputColumn - private String kdmat; + private String kdmat = ""; @ApiParam(value = "交货数量",example = "1") @AnnoOutputColumn From 7f1ef0bca7b7adaacfe23bd1c083b8b1cf55e6ce Mon Sep 17 00:00:00 2001 From: "wei.peng" <123456> Date: Tue, 16 Jul 2019 14:51:37 +0800 Subject: [PATCH 22/41] =?UTF-8?q?=E8=87=AA=E5=AE=9A=E4=B9=89=E6=8A=A5?= =?UTF-8?q?=E8=A1=A8=E8=A1=A8=E5=8D=95=E6=89=93=E9=80=9A=EF=BC=8C=20?= =?UTF-8?q?=E7=94=A8=E6=88=B7=E5=9C=A8=E7=BA=BF=E8=AE=BE=E7=BD=AE=E5=8A=9F?= =?UTF-8?q?=E8=83=BD=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/base/jpa/dao/BaseRepository.java | 2 ++ .../i3plus/pojo/base/jpa/daoimpl/BaseRepositoryImpl.java | 15 +++++++++++++++ .../cn/estsh/i3plus/pojo/form/sqlpack/FormHqlPack.java | 2 +- .../cn/estsh/i3plus/pojo/model/report/TemplateModel.java | 2 +- .../java/cn/estsh/i3plus/pojo/report/bean/BrTemplate.java | 7 +++++++ 5 files changed, 26 insertions(+), 2 deletions(-) diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/jpa/dao/BaseRepository.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/jpa/dao/BaseRepository.java index c131da7..1d0e951 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/jpa/dao/BaseRepository.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/jpa/dao/BaseRepository.java @@ -221,6 +221,8 @@ public interface BaseRepository extends JpaReposito List findByProperty(String[] propertyNames, Object[] values,String orderByStuff); + T getByProperty(DdlPackBean packBean); + T getByProperty(String propertyName, Object value); T getByProperty(String[] propertyNames, Object[] values); 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 5477b66..43cbeab 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 @@ -477,6 +477,21 @@ public class BaseRepositoryImpl extends SimpleJpaRep } @Override + public T getByProperty(DdlPackBean packBean) { + + try { + List list = findByHqlWhere(packBean); + return list.size() != 0 ? list.get(0) : null; + }catch(NoResultException ne){ + LOGGER.error("数据不存在，DdlPackBean：{}",packBean); + return null; + }catch(NonUniqueResultException ex){ + LOGGER.error("查询单条记录，但出现多条。packBean：{}",packBean); + throw new RuntimeException("存在多条记录：" + ex.getMessage()); + } + } + + @Override public T getByProperty(String propertyName, Object value) { String queryString = "from " + persistentClass.getSimpleName() + " as model where model." + propertyName + "= :" + propertyName; try { diff --git a/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/sqlpack/FormHqlPack.java b/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/sqlpack/FormHqlPack.java index 90bf557..0e00662 100644 --- a/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/sqlpack/FormHqlPack.java +++ b/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/sqlpack/FormHqlPack.java @@ -321,7 +321,7 @@ public final class FormHqlPack { * @return DdlPackBean */ public static DdlPackBean packHqlBfDataSource(BfDataSource source){ - DdlPackBean ddlPackBean = new DdlPackBean(); + DdlPackBean ddlPackBean = DdlPackBean.getDdlPackBean(); DdlPreparedPack.getStringLikerPack(source.getSourceHost(), "sourceHost", ddlPackBean); DdlPreparedPack.getNumEqualPack(source.getSourceType(), "sourceType", ddlPackBean); diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/report/TemplateModel.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/report/TemplateModel.java index c2b56cf..a78d077 100644 --- a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/report/TemplateModel.java +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/report/TemplateModel.java @@ -15,7 +15,7 @@ import lombok.Data; @Data public class TemplateModel { - @ApiParam("模板ID") + @ApiParam("数据源ID") @JsonSerialize(using = ToStringSerializer.class) private Long sourceId; diff --git a/modules/i3plus-pojo-report/src/main/java/cn/estsh/i3plus/pojo/report/bean/BrTemplate.java b/modules/i3plus-pojo-report/src/main/java/cn/estsh/i3plus/pojo/report/bean/BrTemplate.java index d2f2342..0d7819a 100644 --- a/modules/i3plus-pojo-report/src/main/java/cn/estsh/i3plus/pojo/report/bean/BrTemplate.java +++ b/modules/i3plus-pojo-report/src/main/java/cn/estsh/i3plus/pojo/report/bean/BrTemplate.java @@ -1,6 +1,8 @@ package cn.estsh.i3plus.pojo.report.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; @@ -29,6 +31,11 @@ import java.util.List; @Api(value="报表模板",description = "报表模板") public class BrTemplate extends BaseBean { + @Column(name = "DATA_SOURCE_ID") + @ApiParam(value = "数据源ID", example = "-1") + @JsonSerialize(using = ToStringSerializer.class) + private Long dataSourceId = 0L; + @Column(name="NAME") @ApiParam(value ="模板名称" , access ="模板名称") private String name; From 3f5c28e1af4317930c80b1e321189e1f14aad6ad Mon Sep 17 00:00:00 2001 From: "jimmy.zeng" Date: Tue, 16 Jul 2019 18:10:15 +0800 Subject: [PATCH 23/41] =?UTF-8?q?=E7=9B=98=E7=82=B9=E5=8D=95=20=E4=BC=98?= =?UTF-8?q?=E5=8C=96=E6=8F=90=E4=BA=A4=E7=BB=84=E4=BB=B6=E5=9B=9E=E6=98=BE?= =?UTF-8?q?=E4=BF=A1=E6=81=AF=20=E5=A4=8D=E7=9B=98=E5=BC=80=E5=8F=91=20?= =?UTF-8?q?=E9=83=A8=E5=88=86=E4=B8=9A=E5=8A=A1=E5=A2=9E=E5=8A=A0=E6=A8=A1?= =?UTF-8?q?=E7=B3=8A=E6=9F=A5=E8=AF=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../estsh/i3plus/pojo/wms/bean/WmsCSFactTrans.java | 16 ++++++++++++++++ .../estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java | 22 +++++++++++----------- 2 files changed, 27 insertions(+), 11 deletions(-) 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 efc024e..af44900 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 @@ -103,6 +103,14 @@ public class WmsCSFactTrans extends BaseBean { @ApiParam("是否范围内") public Integer isScope; + @Transient + @ApiParam(value = "实盘箱数", example = "1") + public Long countBoxQty; + + @Transient + @ApiParam(value = "物料数量", example = "1") + public Double sumPartQty; + public WmsCSFactTrans(){} public Integer getIsScopeVal() { @@ -133,4 +141,12 @@ public class WmsCSFactTrans extends BaseBean { this.srcZoneNo = srcZoneNo; this.srcWhNo = srcWhNo; } + + public WmsCSFactTrans(Long countBoxQty,Double sumPartQty,String zoneNo, String partNo, String partNameRdd) { + this.countBoxQty = countBoxQty; + this.sumPartQty = sumPartQty; + this.zoneNo = zoneNo; + this.partNo = partNo; + this.partNameRdd = partNameRdd; + } } 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 7803190..9291e8c 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 @@ -57,9 +57,9 @@ public class WmsHqlPack { DdlPackBean result = new DdlPackBean(); //查询参数封装 - DdlPreparedPack.getStringEqualPack(wmsPOMasterDetails.getOrderNo(), "orderNo", result); - DdlPreparedPack.getStringEqualPack(wmsPOMasterDetails.getPartNo(), "partNo", result); - DdlPreparedPack.getStringRightLikerPack(wmsPOMasterDetails.getPartNameRdd(), "partNameRdd", result); + DdlPreparedPack.getStringRightLikerPack(wmsPOMasterDetails.getOrderNo(), "orderNo", result); + DdlPreparedPack.getStringRightLikerPack(wmsPOMasterDetails.getPartNo(), "partNo", result); + DdlPreparedPack.getStringEqualPack(wmsPOMasterDetails.getPartNameRdd(), "partNameRdd", result); DdlPreparedPack.getStringEqualPack(wmsPOMasterDetails.getPlanTime(), "planTime", result); DdlPreparedPack.getStringEqualPack(wmsPOMasterDetails.getPlanDate(), "planDate", result); @@ -78,9 +78,9 @@ public class WmsHqlPack { DdlPackBean result = new DdlPackBean(); //查询参数封装 - DdlPreparedPack.getStringLikerPack(wmsDocMovementDetails.getOrderNo(), "orderNo", result); + DdlPreparedPack.getStringRightLikerPack(wmsDocMovementDetails.getOrderNo(), "orderNo", result); DdlPreparedPack.getNumEqualPack(wmsDocMovementDetails.getItemStatus(), "itemStatus", result); - DdlPreparedPack.getStringLikerPack(wmsDocMovementDetails.getPartNo(), "partNo", result); + DdlPreparedPack.getStringRightLikerPack(wmsDocMovementDetails.getPartNo(), "partNo", result); DdlPreparedPack.getStringLikerPack(wmsDocMovementDetails.getDestZoneNo(), "destZoneNo", result); DdlPreparedPack.getStringLikerPack(wmsDocMovementDetails.getDestLocateNo(), "destLocateNo", result); @@ -119,7 +119,7 @@ public class WmsHqlPack { DdlPackBean packBean = new DdlPackBean(); //查询参数封装 - DdlPreparedPack.getStringLikerPack(wmsDocMovementMaster.getOrderNo(), "orderNo", packBean); + DdlPreparedPack.getStringRightLikerPack(wmsDocMovementMaster.getOrderNo(), "orderNo", packBean); DdlPreparedPack.getNumEqualPack(wmsDocMovementMaster.getMoveType(), "moveType", packBean); DdlPreparedPack.getNumEqualPack(wmsDocMovementMaster.getBusiType(), "busiType", packBean); DdlPreparedPack.getStringEqualPack(wmsDocMovementMaster.getCustNo(), "custNo", packBean); @@ -139,7 +139,7 @@ public class WmsHqlPack { DdlPackBean result = new DdlPackBean(); //查询参数封装 - DdlPreparedPack.getStringEqualPack(wmsPOMaster.getOrderNo(), "orderNo", result); + DdlPreparedPack.getStringRightLikerPack(wmsPOMaster.getOrderNo(), "orderNo", result); DdlPreparedPack.getStringEqualPack(wmsPOMaster.getPoType(), "poType", result); DdlPreparedPack.getNumEqualPack(wmsPOMaster.getPoStatus(), "poStatus", result); DdlPreparedPack.getStringEqualPack(wmsPOMaster.getVendorNo(), "vendorNo", result); @@ -164,7 +164,7 @@ public class WmsHqlPack { DdlPreparedPack.getInPackArray(new Object[]{WmsEnumUtil.MASTER_ORDER_STATUS.CREATE.getValue(), WmsEnumUtil.MASTER_ORDER_STATUS.RECEIPT.getValue()}, "poStatus", result); DdlPreparedPack.getNumEqualPack(CommonEnumUtil.TRUE_OR_FALSE.TRUE.getValue(), "isPart", result); - DdlPreparedPack.getStringEqualPack(wmsPOMaster.getOrderNo(), "orderNo", result); + DdlPreparedPack.getStringRightLikerPack(wmsPOMaster.getOrderNo(), "orderNo", result); DdlPreparedPack.getStringEqualPack(wmsPOMaster.getPoType(), "poType", result); DdlPreparedPack.getStringEqualPack(wmsPOMaster.getVendorNo(), "vendorNo", result); DdlPreparedPack.getStringEqualPack(wmsPOMaster.getSrc(), "src", result); @@ -245,7 +245,7 @@ public class WmsHqlPack { public static DdlPackBean packHqlWmsPart(WmsPart wmsPart) { DdlPackBean result = new DdlPackBean(); - DdlPreparedPack.getStringLikerPack(wmsPart.getPartNo(), "partNo", result); + DdlPreparedPack.getStringRightLikerPack(wmsPart.getPartNo(), "partNo", result); DdlPreparedPack.getStringLikerPack(wmsPart.getPartName(), "partName", result); DdlPreparedPack.getStringLikerPack(wmsPart.getPartSpec(), "partSpec", result); DdlPreparedPack.getStringEqualPack(wmsPart.getPartType(), "partType", result); @@ -266,7 +266,7 @@ public class WmsHqlPack { DdlPackBean result = new DdlPackBean(); //查询参数封装 - DdlPreparedPack.getStringLikerPack(wmsIbCheckPlan.getPartNo(), "partNo", result); + DdlPreparedPack.getStringRightLikerPack(wmsIbCheckPlan.getPartNo(), "partNo", result); DdlPreparedPack.getStringLikerPack(wmsIbCheckPlan.getPartNameRdd(), "partNameRdd", result); getStringBuilderPack(wmsIbCheckPlan, result); @@ -290,7 +290,7 @@ public class WmsHqlPack { DdlPackBean result = new DdlPackBean(); //查询参数封装 - DdlPreparedPack.getStringEqualPack(wmsTransType.getTransTypeCode(), "transTypeCode", result); + DdlPreparedPack.getStringLikerPack(wmsTransType.getTransTypeCode(), "transTypeCode", result); DdlPreparedPack.getStringLikerPack(wmsTransType.getTransTypeName(), "transTypeName", result); DdlPreparedPack.getNumEqualPack(wmsTransType.getAgId(), "agId", result); From 6e2cf7095181c9a9d6e79ea14d833baff56953e6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=88=98=E6=95=8F?= <962239776@qq.com> Date: Wed, 17 Jul 2019 10:03:55 +0800 Subject: [PATCH 24/41] =?UTF-8?q?=E5=BA=93=E4=BD=8D=E6=A0=A1=E9=AA=8C?= =?UTF-8?q?=E6=9E=9A=E4=B8=BE=E6=B7=BB=E5=8A=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/base/enumutil/WmsEnumUtil.java | 59 ++++++++++++++++++++++ 1 file changed, 59 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 633422a..797e08e 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 @@ -2962,4 +2962,63 @@ public class WmsEnumUtil { return tmp; } } + + /** + * 库位校验源库位目标库位参数 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum SRC_DEST_LOCATE { + SRC(10, "SRC", "源库位"), + DEST(20, "DEST", "目标库位"); + + private int value; + private String code; + private String description; + + SRC_DEST_LOCATE(int value, String code, String description) { + this.value = value; + this.code = code; + this.description = description; + } + + public int getValue() { + return value; + } + + public static SRC_DEST_LOCATE codeOf(int value) { + for (int i = 0; i < values().length; i++) { + if (values()[i].value==(value)) { + return values()[i]; + } + } + return null; + } + public String getDescription() { + return description; + } + + public String getCode() { + return code; + } + + public static String valueOf(int val) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].value == val) { + tmp = values()[i].description; + } + } + return tmp; + } + + public static int descOf(String desc) { + int tmp = 1; + for (int i = 0; i < values().length; i++) { + if (values()[i].description.equals(desc)) { + tmp = values()[i].value; + } + } + return tmp; + } + } } \ No newline at end of file From 2240819defb48dedaa0fd491bfff11955b4bebfb Mon Sep 17 00:00:00 2001 From: "jimmy.zeng" Date: Wed, 17 Jul 2019 14:50:14 +0800 Subject: [PATCH 25/41] =?UTF-8?q?=E5=8F=91=E6=B3=A1=E6=89=93=E7=AE=B1?= =?UTF-8?q?=E5=8C=85=E8=A3=85?= 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 insertion(+) 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 633422a..8722cfe 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 @@ -304,6 +304,7 @@ public class WmsEnumUtil { /** * 产品入库，发运状态 * WMS_产品报工明细信息 ：单据状态 + * WMS_发泡打箱包装 */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum PRODUCT_INSTOCK_STATUS { From 40e20f7054453531a5f8442d0c2d6c79a2546010 Mon Sep 17 00:00:00 2001 From: jenkins Date: Wed, 17 Jul 2019 18:41:26 +0800 Subject: [PATCH 26/41] =?UTF-8?q?=E8=AE=BE=E5=A4=87=E7=BC=96=E5=8F=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveMaster.java | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) 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 693435d..ebf60a2 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 @@ -130,10 +130,14 @@ public class WmsMoveMaster extends BaseBean { @ApiParam("交易类型名称") private String transTypeName; + @Column(name="FIX_ID") + @ApiParam(value = "设备编号") + public String fixId; + public WmsMoveMaster(){}; public WmsMoveMaster(Long id,String orderNo,String organizeCode,String partNo,String partNameRdd,String transTypeCode,String transTypeName,Integer itemStatus, - String unit,String srcWhNo,String srcZoneNo,String destWhNo,String destZoneNo,Double transQty, Double rejectQty) { + String unit,String srcWhNo,String srcZoneNo,String destWhNo,String destZoneNo,Double transQty, Double rejectQty,String fixId) { this.id = id; this.orderNo = orderNo; this.organizeCode = organizeCode; @@ -149,7 +153,7 @@ public class WmsMoveMaster extends BaseBean { this.destZoneNo = destZoneNo; this.transQty = transQty; this.rejectQty = rejectQty; - + this.fixId = fixId; } From 86d3f8de480d3f023ee584918fd2bba30eff361e Mon Sep 17 00:00:00 2001 From: "jimmy.zeng" Date: Wed, 17 Jul 2019 19:16:43 +0800 Subject: [PATCH 27/41] =?UTF-8?q?=E5=BC=80=E5=8F=91=20=E5=8F=91=E6=B3=A1?= =?UTF-8?q?=E6=89=93=E7=AE=B1=E5=8C=85=E8=A3=85job?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cn/estsh/i3plus/pojo/wms/bean/WmsPackSn.java | 76 ++++++++++++++++++++++ .../cn/estsh/i3plus/pojo/wms/bean/WmsStockSn.java | 5 +- .../pojo/wms/repository/WmsPackSnRepository.java | 16 +++++ 3 files changed, 96 insertions(+), 1 deletion(-) create mode 100644 modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPackSn.java create mode 100644 modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsPackSnRepository.java 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 new file mode 100644 index 0000000..362093a --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPackSn.java @@ -0,0 +1,76 @@ +package cn.estsh.i3plus.pojo.wms.bean; + +import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.hibernate.annotations.DynamicInsert; +import org.hibernate.annotations.DynamicUpdate; + +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.Table; + +/** + * @Description : WMS_包装箱条码表 + * @Reference : + * @Author : jimmy.zeng + * @CreateDate : 2019-07-17 11:32 + * @Modify: + **/ +@Data +@Entity +@Table(name="WMS_PACK_SN") +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Api(value="包装箱条码表",description = "包装箱条码表") +public class WmsPackSn extends BaseBean { + + @Column(name = "ORDER_NO") + @ApiParam(value = "订单号") + private String orderNo; + + @Column(name = "PART_NO") + @ApiParam(value = "物料编码") + private String partNo; + + @Column(name = "PART_NAME") + @ApiParam(value = "物料名称") + private String partNameAdd; + + @Column(name = "QTY") + @ApiParam("数量") + private Double qty; + + @Column(name = "SID") + @ApiParam("SID") + private Double sId; + + @Column(name = "COMMIT_DATE") + @ApiParam(value = "提交日期") + private String commitDate; + + @Column(name = "COMMIT_TIME") + @ApiParam(value = "提交时间") + private String commitTime; + + @Column(name = "SN") + @ApiParam(value = "条码") + private String sn; + + /** + * 状态:10=新建,20=已处理,30=处理出错 PRODUCT_INSTOCK_STATUS + */ + @Column(name = "ORDER_STATUS") + @ApiParam(value = "状态") + private Integer orderStatus; + + /** + * 数据来源:ZMMES=知明MES,TBMES=MES接口 SRC_STATUS + */ + @Column(name = "SRC") + @ApiParam(value = "单据来源") + private String src; +} 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 2e6e363..20e8a9e 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 @@ -230,8 +230,11 @@ public class WmsStockSn extends BaseBean { @ApiParam(value = "ERP库存地") public String erpZoneNo; - public WmsStockSn(){} + @Transient + @ApiParam(value = "目标数量") + public Double destQty; + public WmsStockSn(){} public WmsStockSn(String partNo){ this.partNo = partNo; diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsPackSnRepository.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsPackSnRepository.java new file mode 100644 index 0000000..87d61ea --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsPackSnRepository.java @@ -0,0 +1,16 @@ +package cn.estsh.i3plus.pojo.wms.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.wms.bean.WmsPackSn; +import org.springframework.stereotype.Repository; + +/** + * @Description : + * @Reference : + * @Author : jimmy.zeng + * @CreateDate : 2019-07-17 13:36 + * @Modify: + **/ +@Repository +public interface WmsPackSnRepository extends BaseRepository { +} From 4a717ec544ff97a587d3f5521d7570ef960c3562 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=AE=B8=E5=BF=83=E6=B4=81?= Date: Wed, 17 Jul 2019 20:11:55 +0800 Subject: [PATCH 28/41] =?UTF-8?q?=E7=9B=B4=E9=80=81=E5=8F=91=E8=BF=90JOB+?= =?UTF-8?q?=E4=BA=A4=E6=98=93=E5=A4=84=E7=90=86=E7=A8=8B=E5=BA=8F=EF=BC=88?= =?UTF-8?q?=E4=B8=8B=E7=BA=BF=E7=BB=93=E7=AE=97=EF=BC=89=E9=80=BB=E8=BE=91?= =?UTF-8?q?=E5=8F=98=E5=8A=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/base/enumutil/WmsEnumUtil.java | 86 ++++++++++++++++- .../i3plus/pojo/model/wms/WmsJobParamModel.java | 20 ++++ .../cn/estsh/i3plus/pojo/wms/bean/WmsPart.java | 4 + .../estsh/i3plus/pojo/wms/bean/WmsStockQuan.java | 15 ++- .../pojo/wms/repository/WmsShippingRepository.java | 16 ++++ .../estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java | 103 ++++++++++++--------- 6 files changed, 194 insertions(+), 50 deletions(-) create mode 100644 modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsJobParamModel.java create mode 100644 modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsShippingRepository.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 919f1a5..4a79b7c 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 @@ -2700,7 +2700,8 @@ public class WmsEnumUtil { public enum SRC_STATUS { ZMMES("ZMMES", "知明MES"), TBMES("TBMES", "MES接口"), - AMP("AMP", "AMP系统"); + AMP("AMP", "AMP系统"), + ZSLD("ZSLD", "直送拉动"); private String value; private String description; @@ -2988,12 +2989,13 @@ public class WmsEnumUtil { public static SRC_DEST_LOCATE codeOf(int value) { for (int i = 0; i < values().length; i++) { - if (values()[i].value==(value)) { + if (values()[i].value == (value)) { return values()[i]; } } return null; } + public String getDescription() { return description; } @@ -3022,4 +3024,84 @@ public class WmsEnumUtil { return tmp; } } + + /** + * 物料结算标识 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum OUT_CLOSE_FLAG { + INTERNAL_SETTLEMENT("1", "内部结算"), + NOMAL_SETTLEMENT("2", "正常结算"); + + private String value; + private String description; + + OUT_CLOSE_FLAG(String value, String description) { + this.value = value; + this.description = description; + } + + public String getDescription() { + return description; + } + + public String getCode() { + return value; + } + + public String getValue() { + return value; + } + + + public static String getDes(String val) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].value == val) { + tmp = values()[i].description; + } + } + return tmp; + } + } + + /** + * 物料结算方式 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum OUT_CLOSE_TYPE { + OFF_LINE_SETTLEMENT("10", "下线结算"), + PICK_SETTLEMENT("20", "配料结算"); + + private String value; + private String description; + + OUT_CLOSE_TYPE(String value, String description) { + this.value = value; + this.description = description; + } + + public String getDescription() { + return description; + } + + public String getCode() { + return value; + } + + public String getValue() { + return value; + } + + + public static String getDes(String val) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].value == val) { + tmp = values()[i].description; + } + } + return tmp; + } + } } \ No newline at end of file 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 new file mode 100644 index 0000000..91cb071 --- /dev/null +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsJobParamModel.java @@ -0,0 +1,20 @@ +package cn.estsh.i3plus.pojo.model.wms; + +import lombok.Data; + +import java.io.Serializable; +import java.util.List; + +/** + * @Description 定时任务参数解析Model + * @Reference + * @Author dragon + * @CreateDate 2019/7/17 16:25 + * @Modify + */ +@Data +public class WmsJobParamModel implements Serializable { + private String organizeCode; + private List zonesNoList; + private Integer snType; +} 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 f2b2102..ee682ea 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 @@ -134,6 +134,10 @@ public class WmsPart extends BaseBean { @ApiParam("項目结算标识") private String outCloseFlag = "2"; + @Column(name = "OUT_CLOSE_TYPE") + @ApiParam("结算方式") + private String outCloseType; + @Transient @ApiParam("总数量") private Double qty; 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 bbce7c7..7c3fde7 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 @@ -147,6 +147,10 @@ public class WmsStockQuan extends BaseBean { @ApiParam(value = "存储区集合") private List zoneList; + @Transient + @ApiParam(value = "移动单条码集合") + private List wmsMoveSnList; + public String getAreaNo() { return areaNo; @@ -204,7 +208,7 @@ public class WmsStockQuan extends BaseBean { } public WmsStockQuan(String whNo, String zoneNo, String unit, String partNo, String partName, - Double qty, Double failQty, Double holdQty, Double qcQty, Double rinQty, Double freezeQty, Double consignQty, Double lockQty,String prodCfgTypeCode ,String prodCfgTypeName, Double scrapQty) { + Double qty, Double failQty, Double holdQty, Double qcQty, Double rinQty, Double freezeQty, Double consignQty, Double lockQty, String prodCfgTypeCode, String prodCfgTypeName, Double scrapQty) { this.whNo = whNo; this.zoneNo = zoneNo; this.partNo = partNo; @@ -218,10 +222,11 @@ public class WmsStockQuan extends BaseBean { this.freezeQty = freezeQty; this.consignQty = consignQty; this.lockQty = lockQty; - this.prodCfgTypeCode= prodCfgTypeCode; + this.prodCfgTypeCode = prodCfgTypeCode; this.prodCfgTypeName = prodCfgTypeName; this.scrapQty = scrapQty; } + public WmsStockQuan(Double qty, Double failQty, Double holdQty, Double qcQty, Double rinQty, Double freezeQty, Double consignQty, Double lockQty, Double scrapQty) { this.qty = qty; this.failQty = failQty; @@ -234,7 +239,7 @@ public class WmsStockQuan extends BaseBean { this.scrapQty = scrapQty; } - public WmsStockQuan(String locateNo,Integer boxQty,Double partQty,String partNo,String partNameRdd, String unit, + public WmsStockQuan(String locateNo, Integer boxQty, Double partQty, String partNo, String partNameRdd, String unit, Double sumQty, Double qty, Double failQty, Double holdQty, Double qcQty, Double rinQty, Double freezeQty, Double consignQty, Double lockQty, Double scrapQty) { this.locateNo = locateNo; this.boxQty = boxQty; @@ -254,8 +259,8 @@ public class WmsStockQuan extends BaseBean { this.scrapQty = scrapQty; } - public WmsStockQuan(String whNo, String zoneNo, String locateNo,Integer boxQty,Double partQty,String partNo,String partNameRdd, String unit, - Double qty, Double failQty, Double holdQty, Double qcQty, Double rinQty, Double freezeQty, Double consignQty, Double lockQty, Double scrapQty) { + public WmsStockQuan(String whNo, String zoneNo, String locateNo, Integer boxQty, Double partQty, String partNo, String partNameRdd, String unit, + Double qty, Double failQty, Double holdQty, Double qcQty, Double rinQty, Double freezeQty, Double consignQty, Double lockQty, Double scrapQty) { this.whNo = whNo; this.zoneNo = zoneNo; this.locateNo = locateNo; diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsShippingRepository.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsShippingRepository.java new file mode 100644 index 0000000..ba8806c --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsShippingRepository.java @@ -0,0 +1,16 @@ +package cn.estsh.i3plus.pojo.wms.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.wms.bean.WmsShipping; +import org.springframework.stereotype.Repository; + +/** + * @Description 对象持久层仓用方法控制(产品发运表) + * @Reference + * @Author dragon + * @CreateDate 2019/7/17 15:54 + * @Modify + */ +@Repository +public interface WmsShippingRepository 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 9291e8c..60044b8 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 @@ -85,7 +85,7 @@ public class WmsHqlPack { DdlPreparedPack.getStringLikerPack(wmsDocMovementDetails.getDestLocateNo(), "destLocateNo", result); DdlPreparedPack.timeBuilder(wmsDocMovementDetails.getCreateDateTimeStart(), - wmsDocMovementDetails.getCreateDateTimeEnd(),"createDatetime",result,true); + wmsDocMovementDetails.getCreateDateTimeEnd(), "createDatetime", result, true); getStringBuilderPack(wmsDocMovementDetails, result); return result; @@ -177,6 +177,7 @@ public class WmsHqlPack { /** * 物流路线子表查询条件封装 + * * @param wmsRoutingDetail * @return */ @@ -208,6 +209,7 @@ public class WmsHqlPack { /** * 物流路线子表查询条件封装 + * * @param wmsRoutingAssign * @return */ @@ -413,11 +415,11 @@ public class WmsHqlPack { DdlPreparedPack.getStringEqualPack(wmsLocate.getLocateName(), "locateName", result); DdlPreparedPack.getNumEqualPack(wmsLocate.getLocateType(), "locateType", result); DdlPreparedPack.getStringEqualPack(wmsLocate.getWhNo(), "whNo", result); - if(wmsLocate.getZoneNo() != null){ - DdlPreparedPack.getInPack(StringUtils.join(new ArrayList(Arrays.asList(wmsLocate.getZoneNo().split(","))),","),"",result); + if (wmsLocate.getZoneNo() != null) { + DdlPreparedPack.getInPack(StringUtils.join(new ArrayList(Arrays.asList(wmsLocate.getZoneNo().split(","))), ","), "", result); } - // DdlPreparedPack.getStringEqualPack(wmsLocate.getZoneNo(), "zoneNo", result); + // DdlPreparedPack.getStringEqualPack(wmsLocate.getZoneNo(), "zoneNo", result); DdlPreparedPack.getNumEqualPack(wmsLocate.getStatus(), "status", result); getStringBuilderPack(wmsLocate, result); @@ -555,6 +557,8 @@ public class WmsHqlPack { DdlPreparedPack.getNumEqualPack(wmsShipping.getOrderStatus(), "orderStatus", result); //特殊发货标志 DdlPreparedPack.getStringEqualPack(wmsShipping.getShippingFlag(), "shippingFlag", result); + //单据来源 + DdlPreparedPack.getStringEqualPack(wmsShipping.getSrc(), "src", result); getStringBuilderPack(wmsShipping, result); @@ -811,8 +815,8 @@ public class WmsHqlPack { DdlPreparedPack.getNumEqualPack(wmsStockSn.getSnStatus(), "snStatus", result); if (wmsStockSn.getSnStatus() == null) { DdlPreparedPack.getInPackArray(new Integer[]{ - WmsEnumUtil.STOCK_SN_STATUS.QUALITY_CONTROL.getValue(),WmsEnumUtil.STOCK_SN_STATUS.PRE_INSTOCK.getValue(), - WmsEnumUtil.STOCK_SN_STATUS.INSTOCKED.getValue(),WmsEnumUtil.STOCK_SN_STATUS.PICKED.getValue(), + WmsEnumUtil.STOCK_SN_STATUS.QUALITY_CONTROL.getValue(), WmsEnumUtil.STOCK_SN_STATUS.PRE_INSTOCK.getValue(), + WmsEnumUtil.STOCK_SN_STATUS.INSTOCKED.getValue(), WmsEnumUtil.STOCK_SN_STATUS.PICKED.getValue(), WmsEnumUtil.STOCK_SN_STATUS.COMMING.getValue()}, "snStatus", result); } DdlPreparedPack.getNumEqualPack(wmsStockSn.getQcStatus(), "qcStatus", result); @@ -831,7 +835,7 @@ public class WmsHqlPack { public static DdlPackBean packWmsStockQuan(WmsStockQuan wmsStockQuan) { DdlPackBean result = new DdlPackBean(); - DdlPreparedPack.getInPackList(wmsStockQuan.getZoneList(),"zoneNo",result); + DdlPreparedPack.getInPackList(wmsStockQuan.getZoneList(), "zoneNo", result); //查询参数封装 DdlPreparedPack.getStringEqualPack(wmsStockQuan.getWhNo(), "whNo", result); DdlPreparedPack.getStringEqualPack(wmsStockQuan.getLocateNo(), "locateNo", result); @@ -879,6 +883,7 @@ public class WmsHqlPack { return result; } + /** * 业务：库存表报查询封装 * @@ -891,14 +896,14 @@ public class WmsHqlPack { HqlPack.getStringEqualPack(wmsStockQuan.getWhNo(), "whNo", findWhere); HqlPack.getStringEqualPack(wmsStockQuan.getProdCfgTypeCode(), "prodCfgTypeCode", findWhere); HqlPack.getStringEqualPack(wmsStockQuan.getLocateNo(), "locateNo", findWhere); - if(wmsStockQuan.getZoneNo() != null){ - HqlPack.getInPack(StringUtils.join(new ArrayList(Arrays.asList(wmsStockQuan.getZoneNo().split(","))),","),"",findWhere); + if (wmsStockQuan.getZoneNo() != null) { + HqlPack.getInPack(StringUtils.join(new ArrayList(Arrays.asList(wmsStockQuan.getZoneNo().split(","))), ","), "", findWhere); //DdlPreparedPack.getInPackArray(wmsStockQuan.getZoneNo().split(","), "zoneNo", result); } - if(wmsStockQuan.getPartNo() != null){ - HqlPack.getInPack(StringUtils.join(new ArrayList(Arrays.asList(wmsStockQuan.getPartNo().split(","))),","),"partNo",findWhere); + if (wmsStockQuan.getPartNo() != null) { + HqlPack.getInPack(StringUtils.join(new ArrayList(Arrays.asList(wmsStockQuan.getPartNo().split(","))), ","), "partNo", findWhere); } - if(!wmsStockQuan.getIncludeZeroStock()){ + if (!wmsStockQuan.getIncludeZeroStock()) { //含0库存显示，默认为否 //自定义条件，各汇总数量相加。为否时添加>0的条件判断 findWhere.append(" and (qty + failQty + holdQty + qcQty + rinQty + freezeQty + consignQty + lockQty) > 0 "); @@ -914,22 +919,23 @@ public class WmsHqlPack { DdlPreparedPack.getStringEqualPack(wmsStockQuan.getProdCfgTypeCode(), "prodCfgTypeCode", result); DdlPreparedPack.getStringEqualPack(wmsStockQuan.getLocateNo(), "locateNo", result); - if(wmsStockQuan.getZoneNo() != null){ + if (wmsStockQuan.getZoneNo() != null) { DdlPreparedPack.getInPackList(Arrays.asList(wmsStockQuan.getZoneNo().split(",")), "zoneNo", result); } - if(wmsStockQuan.getPartNo() != null){ + if (wmsStockQuan.getPartNo() != null) { DdlPreparedPack.getInPackList(Arrays.asList(wmsStockQuan.getPartNo().split(",")), "partNo", result); } - if(!wmsStockQuan.getIncludeZeroStock()){ + if (!wmsStockQuan.getIncludeZeroStock()) { //含0库存显示，默认为否 //自定义条件，各汇总数量相加。为否时添加>0的条件判断 - result.setWhereAppend(result.getWhereAppend()+" and (qty + failQty + holdQty + qcQty + rinQty + freezeQty + consignQty + lockQty) > 0 "); + result.setWhereAppend(result.getWhereAppend() + " and (qty + failQty + holdQty + qcQty + rinQty + freezeQty + consignQty + lockQty) > 0 "); } getStringBuilderPack(wmsStockQuan, result); return result; } + /** * 业务：物料包装查询封装 * @@ -984,9 +990,9 @@ public class WmsHqlPack { DdlPreparedPack.getStringEqualPack(wmsMoveMaster.getModifyUser(), "modifyUser", result); DdlPreparedPack.timeBuilder(wmsMoveMaster.getCreateDateTimeStart(), - wmsMoveMaster.getCreateDateTimeEnd(),"createDatetime",result,true); + wmsMoveMaster.getCreateDateTimeEnd(), "createDatetime", result, true); DdlPreparedPack.timeBuilder(wmsMoveMaster.getModifyDateTimeStart(), - wmsMoveMaster.getModifyDateTimeEnd(),"modifyDatetime",result,true); + wmsMoveMaster.getModifyDateTimeEnd(), "modifyDatetime", result, true); getStringBuilderPack(wmsMoveMaster, result); return result; @@ -1132,6 +1138,7 @@ public class WmsHqlPack { /** * 条码状态查询报表查询条件 + * * @param wmsStockSn * @return */ @@ -1152,7 +1159,7 @@ public class WmsHqlPack { DdlPreparedPack.getStringLikerPack(wmsStockSn.getSn(), "sn", result); DdlPreparedPack.getStringEqualPack(wmsStockSn.getDateCode(), "dateCode", result); DdlPreparedPack.getStringEqualPack(wmsStockSn.getLotNo(), "lotNo", result); - if(wmsStockSn.getIsValid()!= null){ + if (wmsStockSn.getIsValid() != null) { DdlPreparedPack.getNumEqualPack(wmsStockSn.getIsValid(), "isValid", result); } getStringBuilderPack(wmsStockSn, result); @@ -1165,7 +1172,7 @@ public class WmsHqlPack { DdlPreparedPack.getStringEqualPack(wmsStockQuan.getLocateNo(), "locateNo", result); - result.setWhereAppend(result.getWhereAppend()+" and qty > 0 "); + result.setWhereAppend(result.getWhereAppend() + " and qty > 0 "); getStringBuilderPack(wmsStockQuan, result); return result; @@ -1445,6 +1452,13 @@ public class WmsHqlPack { DdlPreparedPack.getNumEqualPack(wmsStockSn.getQcStatus(), "qcStatus", result); DdlPreparedPack.getStringEqualPack(wmsStockSn.getRefSrc(), "refSrc", result); DdlPreparedPack.getNumEqualPack(wmsStockSn.getPrinted(), "printed", result); + + DdlPreparedPack.getInPackList(wmsStockSn.getErpZoneNoList(), "zones", result); + DdlPreparedPack.getNumEqualPack(wmsStockSn.getSnType(), "snType", result); + DdlPreparedPack.getNumberBiggerPack(wmsStockSn.getQty(), "qty", result); + if (StringUtils.isNotBlank(wmsStockSn.getOrderByParam())) { + result.setOrderByStr(wmsStockSn.getOrderByParam()); + } getStringBuilderPack(wmsStockSn, result); return result; } @@ -1561,13 +1575,14 @@ public class WmsHqlPack { /** * 把 List 中的一组数据重新封装到List中 + * * @param mapList * @param keyName */ - private static List cyclicTraversal(List mapList,String keyName) { + private static List cyclicTraversal(List mapList, String keyName) { List list = new ArrayList(); - for(int i=0;i map = mapList.get(i); + for (int i = 0; i < mapList.size(); i++) { + Map map = mapList.get(i); list.add(map.get(keyName)); } return list; @@ -1575,13 +1590,14 @@ public class WmsHqlPack { /** * 把 List 中的一组查询条件封装成 HQL + * * @param mapList * @param keyName * @param columnName * @param packBean */ - private static void packMutilConditionHql(List mapList, String keyName,String columnName, DdlPackBean packBean) { - int index = 1; + private static void packMutilConditionHql(List mapList, String keyName, String columnName, DdlPackBean packBean) { + int index = 1; String columnParam = null; for (Map item : mapList) { columnParam = columnName + String.valueOf(index); @@ -1600,7 +1616,7 @@ public class WmsHqlPack { * @param orderList * @return */ - public static DdlPackBean packHqlAndIn(WmsTaskInfo bean, String columnName, List orderList,Map> groupDataAuth) { + public static DdlPackBean packHqlAndIn(WmsTaskInfo bean, String columnName, List orderList, Map> groupDataAuth) { DdlPackBean packBean = new DdlPackBean(); Set>> entries = groupDataAuth.entrySet(); //拼sql @@ -1613,7 +1629,7 @@ public class WmsHqlPack { if (StringUtils.isNotBlank(data)) { List mapList = JSONObject.parseArray(data, Map.class); if (StringUtils.equalsIgnoreCase(WmsEnumUtil.DATA_OBJ_TYPE.TRANS_TYPE.getValue() + "", key)) { - DdlPreparedPack.getInPackList(cyclicTraversal(mapList,"TRANS_TYPE_CODE"), "transTypeCode", packBean); + DdlPreparedPack.getInPackList(cyclicTraversal(mapList, "TRANS_TYPE_CODE"), "transTypeCode", packBean); //packMutilConditionHql(mapList, "TRANS_TYPE_CODE", "transTypeCode", packBean); break; } @@ -1868,7 +1884,7 @@ public class WmsHqlPack { DdlPreparedPack.getNumEqualPack(wmsStockSn.getSnStatus(), "snStatus", result); DdlPreparedPack.getNumEqualPack(wmsStockSn.getQcStatus(), "qcStatus", result); DdlPreparedPack.getStringNotNullPack("locateNo", result); - result.setWhereAppend(result.getWhereAppend()+" and locateNo != ''"); + result.setWhereAppend(result.getWhereAppend() + " and locateNo != ''"); getStringBuilderPack(wmsStockSn, result); @@ -1882,7 +1898,7 @@ public class WmsHqlPack { DdlPreparedPack.getStringEqualPack(wmsStockQuan.getWhNo(), "whNo", result); DdlPreparedPack.getStringEqualPack(wmsStockQuan.getPartNo(), "partNo", result); DdlPreparedPack.getStringEqualPack(wmsStockQuan.getZoneNo(), "zoneNo", result); - result.setWhereAppend(result.getWhereAppend()+" and (qty + failQty + holdQty + qcQty + rinQty + freezeQty + consignQty + lockQty) > 0 "); + result.setWhereAppend(result.getWhereAppend() + " and (qty + failQty + holdQty + qcQty + rinQty + freezeQty + consignQty + lockQty) > 0 "); getStringBuilderPack(wmsStockQuan, result); return result; @@ -1956,6 +1972,7 @@ public class WmsHqlPack { getStringBuilderPack(wmsVendorPart, result); return result; } + /** * 主数据信息 分页查询 * @@ -1965,12 +1982,12 @@ public class WmsHqlPack { public static DdlPackBean packHqlWmsProdCfgType(WmsProdCfgType wmsProdCfgType) { DdlPackBean result = new DdlPackBean(); //查询参数封装 - if(wmsProdCfgType != null){ + if (wmsProdCfgType != null) { DdlPreparedPack.getStringLikerPack(wmsProdCfgType.getProdCfgTypeName(), "prodCfgTypeName", result); DdlPreparedPack.getStringLikerPack(wmsProdCfgType.getProdCfgTypeCode(), "prodCfgTypeCode", result); } - DdlPreparedPack.getNumEqualPack(wmsProdCfgType.getIsValid(),"isValid",result); - DdlPreparedPack.getNumEqualPack(CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue(),"isDeleted",result); + DdlPreparedPack.getNumEqualPack(wmsProdCfgType.getIsValid(), "isValid", result); + DdlPreparedPack.getNumEqualPack(CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue(), "isDeleted", result); // getStringBuilderPack(wmsProdCfgType, result); return result; } @@ -2000,11 +2017,11 @@ public class WmsHqlPack { * @param wmsPart * @return */ - public static DdlPackBean packHqlWmsPartByList(WmsPart wmsPart,String[] parts) { + public static DdlPackBean packHqlWmsPartByList(WmsPart wmsPart, String[] parts) { DdlPackBean packBean = new DdlPackBean(); - DdlPreparedPack.getInPackArray(parts,"partNo",packBean); - DdlPreparedPack.getStringEqualPack(wmsPart.getOrganizeCode(),"organizeCode",packBean); + DdlPreparedPack.getInPackArray(parts, "partNo", packBean); + DdlPreparedPack.getStringEqualPack(wmsPart.getOrganizeCode(), "organizeCode", packBean); getStringBuilderPack(wmsPart, packBean); return packBean; @@ -2073,11 +2090,11 @@ public class WmsHqlPack { * 根据存储区编号集合、库位类型查询库位信息 * * @param zoneNoList - *@param wmsZones + * @param wmsZones * @param locateType * @return */ - public static DdlPackBean packLocateNoByZoneNo(List zoneNoList , WmsZones wmsZones , Integer locateType) { + public static DdlPackBean packLocateNoByZoneNo(List zoneNoList, WmsZones wmsZones, Integer locateType) { DdlPackBean result = new DdlPackBean(); //查询参数封装 @@ -2098,7 +2115,7 @@ public class WmsHqlPack { DdlPackBean result = new DdlPackBean(); //查询参数封装 - DdlPreparedPack.getInPackList(ids,"id",result); + DdlPreparedPack.getInPackList(ids, "id", result); return result; } @@ -2110,14 +2127,14 @@ public class WmsHqlPack { * @param organizeCode * @return */ - public static DdlPackBean packHqlWmsASNMasterByStatus(List statusList,String organizeCode) { + public static DdlPackBean packHqlWmsASNMasterByStatus(List statusList, String organizeCode) { DdlPackBean result = new DdlPackBean(); //查询参数封装 - DdlPreparedPack.getInPackList(statusList,"asnStatus",result); - DdlPreparedPack.getNumEqualPack(WmsEnumUtil.PRODUCT_INSTOCK_STATUS.CREATE.getValue(),"actionStatus",result); - DdlPreparedPack.getNumEqualPack(WmsEnumUtil.ORDER_TYPE.AMP.getValue(),"asnType",result); - DdlPreparedPack.getStringEqualPack(organizeCode,"organizeCode",result); + DdlPreparedPack.getInPackList(statusList, "asnStatus", result); + DdlPreparedPack.getNumEqualPack(WmsEnumUtil.PRODUCT_INSTOCK_STATUS.CREATE.getValue(), "actionStatus", result); + DdlPreparedPack.getNumEqualPack(WmsEnumUtil.ORDER_TYPE.AMP.getValue(), "asnType", result); + DdlPreparedPack.getStringEqualPack(organizeCode, "organizeCode", result); DdlPreparedPack.getNumEqualPack(CommonEnumUtil.TRUE_OR_FALSE.TRUE.getValue(), "isValid", result); DdlPreparedPack.getNumEqualPack(CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue(), "isDeleted", result); From 1716628563fb798a23289a4fabb5594e1fb2db9e Mon Sep 17 00:00:00 2001 From: "jimmy.zeng" Date: Thu, 18 Jul 2019 11:28:39 +0800 Subject: [PATCH 29/41] =?UTF-8?q?=E5=BC=80=E5=8F=91=20=E5=8F=91=E6=B3=A1?= =?UTF-8?q?=E6=89=93=E7=AE=B1=E5=8C=85=E8=A3=85job?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) 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 60044b8..87a2dfa 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 @@ -57,8 +57,8 @@ public class WmsHqlPack { DdlPackBean result = new DdlPackBean(); //查询参数封装 - DdlPreparedPack.getStringRightLikerPack(wmsPOMasterDetails.getOrderNo(), "orderNo", result); - DdlPreparedPack.getStringRightLikerPack(wmsPOMasterDetails.getPartNo(), "partNo", result); + DdlPreparedPack.getStringEqualPack(wmsPOMasterDetails.getOrderNo(), "orderNo", result); + DdlPreparedPack.getStringEqualPack(wmsPOMasterDetails.getPartNo(), "partNo", result); DdlPreparedPack.getStringEqualPack(wmsPOMasterDetails.getPartNameRdd(), "partNameRdd", result); DdlPreparedPack.getStringEqualPack(wmsPOMasterDetails.getPlanTime(), "planTime", result); DdlPreparedPack.getStringEqualPack(wmsPOMasterDetails.getPlanDate(), "planDate", result); @@ -78,9 +78,9 @@ public class WmsHqlPack { DdlPackBean result = new DdlPackBean(); //查询参数封装 - DdlPreparedPack.getStringRightLikerPack(wmsDocMovementDetails.getOrderNo(), "orderNo", result); + DdlPreparedPack.getStringLikerPack(wmsDocMovementDetails.getOrderNo(), "orderNo", result); DdlPreparedPack.getNumEqualPack(wmsDocMovementDetails.getItemStatus(), "itemStatus", result); - DdlPreparedPack.getStringRightLikerPack(wmsDocMovementDetails.getPartNo(), "partNo", result); + DdlPreparedPack.getStringEqualPack(wmsDocMovementDetails.getPartNo(), "partNo", result); DdlPreparedPack.getStringLikerPack(wmsDocMovementDetails.getDestZoneNo(), "destZoneNo", result); DdlPreparedPack.getStringLikerPack(wmsDocMovementDetails.getDestLocateNo(), "destLocateNo", result); @@ -164,7 +164,7 @@ public class WmsHqlPack { DdlPreparedPack.getInPackArray(new Object[]{WmsEnumUtil.MASTER_ORDER_STATUS.CREATE.getValue(), WmsEnumUtil.MASTER_ORDER_STATUS.RECEIPT.getValue()}, "poStatus", result); DdlPreparedPack.getNumEqualPack(CommonEnumUtil.TRUE_OR_FALSE.TRUE.getValue(), "isPart", result); - DdlPreparedPack.getStringRightLikerPack(wmsPOMaster.getOrderNo(), "orderNo", result); + DdlPreparedPack.getStringEqualPack(wmsPOMaster.getOrderNo(), "orderNo", result); DdlPreparedPack.getStringEqualPack(wmsPOMaster.getPoType(), "poType", result); DdlPreparedPack.getStringEqualPack(wmsPOMaster.getVendorNo(), "vendorNo", result); DdlPreparedPack.getStringEqualPack(wmsPOMaster.getSrc(), "src", result); From 5d7a44cec3dfc6bd7cc0ed1cd418c2fe21bd4685 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=88=98=E6=95=8F?= <962239776@qq.com> Date: Thu, 18 Jul 2019 14:20:26 +0800 Subject: [PATCH 30/41] =?UTF-8?q?=E5=BA=93=E5=AD=98=E6=9D=A1=E7=A0=81?= =?UTF-8?q?=E7=AE=A1=E7=90=86=E6=9F=A5=E8=AF=A2=E6=9D=A1=E4=BB=B6=E5=B0=81?= =?UTF-8?q?=E8=A3=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java | 36 ++++++++++++++++++++++ 1 file changed, 36 insertions(+) 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 60044b8..7cc071b 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 @@ -2159,4 +2159,40 @@ public class WmsHqlPack { return result; } + + /** + * 库存条码管理查询条件 + * + * @param wmsStockSn + * @return + */ + public static DdlPackBean packHqlWmsStockSnManageByPager(WmsStockSn wmsStockSn) { + DdlPackBean result = new DdlPackBean(); + + // 物料编码支持多选 + DdlPreparedPack.getInPackList(wmsStockSn.getPartNoList(), "partNo", result); + DdlPreparedPack.getStringEqualPack(wmsStockSn.getWhNo(), "whNo", result); + // 存储区 + DdlPreparedPack.getStringEqualPack(wmsStockSn.getZoneNo(), "zoneNo", result); + + DdlPreparedPack.getStringEqualPack(wmsStockSn.getVendorNo(), "vendorNo", result); + // 库位不为空 + DdlPreparedPack.getStringNotNullPack( "locateNo", result); + // 排除创建及出库状态条码 + if(wmsStockSn.getSnStatus() != null){ + DdlPreparedPack.getNumEqualPack(wmsStockSn.getSnStatus(), "snStatus", result); + } + DdlPreparedPack.getNumNOEqualPack(WmsEnumUtil.STOCK_SN_STATUS.CREATE.getValue(),"snStatus",result); + DdlPreparedPack.getNumNOEqualPack(WmsEnumUtil.STOCK_SN_STATUS.OUT_STOCK.getValue(),"snStatus",result); + + //数量大于0 + DdlPreparedPack.getNumberBiggerPack(0,"qty",result); + DdlPreparedPack.getStringRightLikerPack(wmsStockSn.getSn(), "sn", result); + DdlPreparedPack.getStringEqualPack(wmsStockSn.getDateCode(), "dateCode", result); + DdlPreparedPack.getStringEqualPack(wmsStockSn.getLotNo(), "lotNo", result); + DdlPreparedPack.getOrderByPack(new Object[]{2}, new String[]{"createDatetime"}, result); + + getStringBuilderPack(wmsStockSn, result); + return result; + } } From 471aec30fe572925109d2159cd789c1562b064f4 Mon Sep 17 00:00:00 2001 From: "jimmy.zeng" Date: Thu, 18 Jul 2019 20:06:07 +0800 Subject: [PATCH 31/41] =?UTF-8?q?=E5=BC=80=E5=8F=91=20WIP=E6=8A=A5?= =?UTF-8?q?=E5=BA=9F=E5=87=BA=E5=BA=93?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPackSn.java | 2 +- .../src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) 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 362093a..b092690 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 @@ -36,7 +36,7 @@ public class WmsPackSn extends BaseBean { @ApiParam(value = "物料编码") private String partNo; - @Column(name = "PART_NAME") + @Column(name = "PART_NAME_ADD") @ApiParam(value = "物料名称") private String partNameAdd; 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 87a2dfa..c4af34a 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 @@ -122,6 +122,7 @@ public class WmsHqlPack { DdlPreparedPack.getStringRightLikerPack(wmsDocMovementMaster.getOrderNo(), "orderNo", packBean); DdlPreparedPack.getNumEqualPack(wmsDocMovementMaster.getMoveType(), "moveType", packBean); DdlPreparedPack.getNumEqualPack(wmsDocMovementMaster.getBusiType(), "busiType", packBean); + DdlPreparedPack.getNumEqualPack(wmsDocMovementMaster.getOrderStatus(), "orderStatus", packBean); DdlPreparedPack.getStringEqualPack(wmsDocMovementMaster.getCustNo(), "custNo", packBean); getStringBuilderPack(wmsDocMovementMaster, packBean); @@ -875,7 +876,7 @@ public class WmsHqlPack { //查询参数封装 DdlPreparedPack.getStringEqualPack(wmsTransQuan.getWhNo(), "whNo", result); DdlPreparedPack.getStringEqualPack(wmsTransQuan.getZoneNo(), "zoneNo", result); - DdlPreparedPack.getStringEqualPack(wmsTransQuan.getMoveNo(), "moveNo", result); + DdlPreparedPack.getStringLikerPack(wmsTransQuan.getMoveNo(), "moveNo", result); DdlPreparedPack.getStringEqualPack(wmsTransQuan.getPartNo(), "partNo", result); DdlPreparedPack.getStringEqualPack(wmsTransQuan.getLocateNo(), "locateNo", result); From fb743ebafca6bbe7ec2b7b0015bace98df60274d Mon Sep 17 00:00:00 2001 From: "wei.peng" <123456> Date: Thu, 18 Jul 2019 14:52:02 +0800 Subject: [PATCH 32/41] =?UTF-8?q?=E7=99=BB=E5=BD=95=E4=BC=9A=E8=AF=9D?= =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E8=AE=BE=E5=A4=87ID=20=E8=87=AA=E5=AE=9A?= =?UTF-8?q?=E4=B9=89=E8=A1=A8=E5=8D=95=E6=B7=BB=E5=8A=A0=E6=95=B0=E6=8D=AE?= =?UTF-8?q?=E8=A1=A8=E5=94=AF=E4=B8=80=E6=95=99=E7=A0=94=20=E8=87=AA?= =?UTF-8?q?=E5=AE=9A=E4=B9=89=E8=A1=A8=E5=8D=95=E6=B7=BB=E5=8A=A0=E6=98=A0?= =?UTF-8?q?=E5=B0=84=E7=B1=BB=E5=9E=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/cn/estsh/i3plus/pojo/base/enumutil/BlockFormEnumUtil.java | 1 + .../src/main/java/cn/estsh/i3plus/pojo/platform/bean/SessionUser.java | 3 +++ 2 files changed, 4 insertions(+) diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/BlockFormEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/BlockFormEnumUtil.java index b790007..97d6198 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/BlockFormEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/BlockFormEnumUtil.java @@ -1168,6 +1168,7 @@ public class BlockFormEnumUtil { LONG(21, "Long", "长整型", "java.lang.Long", Long.class,PROPERTY_CONTROL_TYPE.NUMBER,SQL_WHERE.EQUAL,null), DOUBLE(30, "Double", "大浮点型", "java.lang.Double", Double.class,PROPERTY_CONTROL_TYPE.NUMBER,SQL_WHERE.EQUAL,null), FLOAT(31, "Float", "小浮点型", "java.lang.Float", Float.class,PROPERTY_CONTROL_TYPE.NUMBER,SQL_WHERE.EQUAL,null), + BIG_DECIMAL(32, "Double", "大浮点型", "java.math.BigDecimal", Boolean.class,PROPERTY_CONTROL_TYPE.RADIO,SQL_WHERE.EQUAL,null), BOOLEAN(40, "Boolean", "布尔值", "java.lang.Boolean", Boolean.class,PROPERTY_CONTROL_TYPE.RADIO,SQL_WHERE.EQUAL,null), BYTE(50, "Byte", "字节", "java.lang.Byte", Byte.class,PROPERTY_CONTROL_TYPE.TEXT,SQL_WHERE.EQUAL,null); // DATE(60, "Date", "日期", "java.lang.String", String.class,PROPERTY_CONTROL_TYPE.DATE_TIME,null); 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 c2ad1d4..f86330b 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 @@ -24,6 +24,9 @@ public class SessionUser implements Serializable { @ApiParam("用户ID") private Long userId; + @ApiParam("设备ID") + private String deviceId; + @ApiParam("用户工号") private String userCode; From 90fb9d3190f39a3c23a883e646ef152cba28d294 Mon Sep 17 00:00:00 2001 From: "wei.peng" <123456> Date: Thu, 18 Jul 2019 14:55:01 +0800 Subject: [PATCH 33/41] =?UTF-8?q?=E7=99=BB=E5=BD=95=E4=BC=9A=E8=AF=9D?= =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E8=AE=BE=E5=A4=87ID=20=E8=87=AA=E5=AE=9A?= =?UTF-8?q?=E4=B9=89=E8=A1=A8=E5=8D=95=E6=B7=BB=E5=8A=A0=E6=95=B0=E6=8D=AE?= =?UTF-8?q?=E8=A1=A8=E5=94=AF=E4=B8=80=E6=95=99=E7=A0=94=20=E8=87=AA?= =?UTF-8?q?=E5=AE=9A=E4=B9=89=E8=A1=A8=E5=8D=95=E6=B7=BB=E5=8A=A0=E6=98=A0?= =?UTF-8?q?=E5=B0=84=E7=B1=BB=E5=9E=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/cn/estsh/i3plus/pojo/base/enumutil/BlockFormEnumUtil.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/BlockFormEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/BlockFormEnumUtil.java index 97d6198..f865993 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/BlockFormEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/BlockFormEnumUtil.java @@ -1168,7 +1168,7 @@ public class BlockFormEnumUtil { LONG(21, "Long", "长整型", "java.lang.Long", Long.class,PROPERTY_CONTROL_TYPE.NUMBER,SQL_WHERE.EQUAL,null), DOUBLE(30, "Double", "大浮点型", "java.lang.Double", Double.class,PROPERTY_CONTROL_TYPE.NUMBER,SQL_WHERE.EQUAL,null), FLOAT(31, "Float", "小浮点型", "java.lang.Float", Float.class,PROPERTY_CONTROL_TYPE.NUMBER,SQL_WHERE.EQUAL,null), - BIG_DECIMAL(32, "Double", "大浮点型", "java.math.BigDecimal", Boolean.class,PROPERTY_CONTROL_TYPE.RADIO,SQL_WHERE.EQUAL,null), + BIG_DECIMAL(32, "Double", "大浮点型", "java.lang.BigDecimal", Double.class,PROPERTY_CONTROL_TYPE.NUMBER,SQL_WHERE.EQUAL,null), BOOLEAN(40, "Boolean", "布尔值", "java.lang.Boolean", Boolean.class,PROPERTY_CONTROL_TYPE.RADIO,SQL_WHERE.EQUAL,null), BYTE(50, "Byte", "字节", "java.lang.Byte", Byte.class,PROPERTY_CONTROL_TYPE.TEXT,SQL_WHERE.EQUAL,null); // DATE(60, "Date", "日期", "java.lang.String", String.class,PROPERTY_CONTROL_TYPE.DATE_TIME,null); From 7f35883b08f843b280b7f2d18029d5bb58502fe6 Mon Sep 17 00:00:00 2001 From: "wei.peng" <123456> Date: Thu, 18 Jul 2019 16:27:38 +0800 Subject: [PATCH 34/41] =?UTF-8?q?=E7=99=BB=E5=BD=95=E4=BC=9A=E8=AF=9D?= =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E8=AE=BE=E5=A4=87ID=20=E8=87=AA=E5=AE=9A?= =?UTF-8?q?=E4=B9=89=E8=A1=A8=E5=8D=95=E6=B7=BB=E5=8A=A0=E6=95=B0=E6=8D=AE?= =?UTF-8?q?=E8=A1=A8=E5=94=AF=E4=B8=80=E6=95=99=E7=A0=94=20=E8=87=AA?= =?UTF-8?q?=E5=AE=9A=E4=B9=89=E8=A1=A8=E5=8D=95=E6=B7=BB=E5=8A=A0=E6=98=A0?= =?UTF-8?q?=E5=B0=84=E7=B1=BB=E5=9E=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/cn/estsh/i3plus/pojo/base/enumutil/BlockFormEnumUtil.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/BlockFormEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/BlockFormEnumUtil.java index f865993..98616cf 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/BlockFormEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/BlockFormEnumUtil.java @@ -1168,7 +1168,7 @@ public class BlockFormEnumUtil { LONG(21, "Long", "长整型", "java.lang.Long", Long.class,PROPERTY_CONTROL_TYPE.NUMBER,SQL_WHERE.EQUAL,null), DOUBLE(30, "Double", "大浮点型", "java.lang.Double", Double.class,PROPERTY_CONTROL_TYPE.NUMBER,SQL_WHERE.EQUAL,null), FLOAT(31, "Float", "小浮点型", "java.lang.Float", Float.class,PROPERTY_CONTROL_TYPE.NUMBER,SQL_WHERE.EQUAL,null), - BIG_DECIMAL(32, "Double", "大浮点型", "java.lang.BigDecimal", Double.class,PROPERTY_CONTROL_TYPE.NUMBER,SQL_WHERE.EQUAL,null), + BIG_DECIMAL(32, "Double", "大浮点型", "java.math.BigDecimal", Double.class,PROPERTY_CONTROL_TYPE.NUMBER,SQL_WHERE.EQUAL,null), BOOLEAN(40, "Boolean", "布尔值", "java.lang.Boolean", Boolean.class,PROPERTY_CONTROL_TYPE.RADIO,SQL_WHERE.EQUAL,null), BYTE(50, "Byte", "字节", "java.lang.Byte", Byte.class,PROPERTY_CONTROL_TYPE.TEXT,SQL_WHERE.EQUAL,null); // DATE(60, "Date", "日期", "java.lang.String", String.class,PROPERTY_CONTROL_TYPE.DATE_TIME,null); @@ -1321,7 +1321,7 @@ public class BlockFormEnumUtil { public static PROPERTY_TYPE valueOfClassPath(String classPath) { PROPERTY_TYPE tmp = null; for (int i = 0; i < values().length; i++) { - if (values()[i].classPath == classPath) { + if (values()[i].classPath.equals(classPath)) { tmp = values()[i]; } } From 9a61249756d77f530efd5f7a8b26f2c0d340128e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=88=98=E6=95=8F?= <962239776@qq.com> Date: Fri, 19 Jul 2019 13:19:15 +0800 Subject: [PATCH 35/41] =?UTF-8?q?=E5=BA=93=E5=AD=98=E6=9D=A1=E7=A0=81?= =?UTF-8?q?=E7=AE=A1=E7=90=86=E6=9F=A5=E8=AF=A2=E6=9D=A1=E4=BB=B6=E5=B0=81?= =?UTF-8?q?=E8=A3=85?= 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, 3 insertions(+) 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 f795d89..1d507ac 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 @@ -2173,6 +2173,7 @@ public class WmsHqlPack { // 物料编码支持多选 DdlPreparedPack.getInPackList(wmsStockSn.getPartNoList(), "partNo", result); DdlPreparedPack.getStringEqualPack(wmsStockSn.getWhNo(), "whNo", result); + DdlPreparedPack.getStringEqualPack(wmsStockSn.getLocateNo(), "locateNo", result); // 存储区 DdlPreparedPack.getStringEqualPack(wmsStockSn.getZoneNo(), "zoneNo", result); @@ -2186,6 +2187,8 @@ public class WmsHqlPack { DdlPreparedPack.getNumNOEqualPack(WmsEnumUtil.STOCK_SN_STATUS.CREATE.getValue(),"snStatus",result); DdlPreparedPack.getNumNOEqualPack(WmsEnumUtil.STOCK_SN_STATUS.OUT_STOCK.getValue(),"snStatus",result); + DdlPreparedPack.getNumEqualPack(wmsStockSn.getSnType(),"snType",result); + //数量大于0 DdlPreparedPack.getNumberBiggerPack(0,"qty",result); DdlPreparedPack.getStringRightLikerPack(wmsStockSn.getSn(), "sn", result); From 0fc49d5b2a8f8c3f7060d46531a56728e1a40ed7 Mon Sep 17 00:00:00 2001 From: jenkins Date: Fri, 19 Jul 2019 13:19:27 +0800 Subject: [PATCH 36/41] =?UTF-8?q?IQ=E3=80=81OQ=E5=A2=9E=E5=8A=A0=E5=B7=A5?= =?UTF-8?q?=E5=8E=82=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/wms/bean/esbio/IQ.java | 2 ++ .../src/main/java/cn/estsh/i3plus/pojo/wms/bean/esbio/OQ.java | 2 ++ 2 files changed, 4 insertions(+) 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 f2701b2..303f0cb 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 @@ -24,4 +24,6 @@ public class IQ { public String ACTHMS=""; + public String WERKS=""; + } 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 8f8f97c..89b7bb3 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 @@ -24,4 +24,6 @@ public class OQ { public String ACTHMS=""; + public String WERKS=""; + } From 8c5f7906afd1272e23a3a78e5dd66de9a6b8a0e0 Mon Sep 17 00:00:00 2001 From: "jimmy.zeng" Date: Fri, 19 Jul 2019 13:37:21 +0800 Subject: [PATCH 37/41] bug #5038 bug #5045 --- .../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 f795d89..ba54f8f 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 @@ -821,6 +821,7 @@ public class WmsHqlPack { WmsEnumUtil.STOCK_SN_STATUS.COMMING.getValue()}, "snStatus", result); } DdlPreparedPack.getNumEqualPack(wmsStockSn.getQcStatus(), "qcStatus", result); + result.setWhereAppend(result.getWhereAppend() + " and qty > 0"); getStringBuilderPack(wmsStockSn, result); From 23c4b0742d2a5add4ab9bac37b175a49c02fb83b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=88=98=E6=95=8F?= <962239776@qq.com> Date: Fri, 19 Jul 2019 18:53:21 +0800 Subject: [PATCH 38/41] =?UTF-8?q?=E5=BA=93=E5=AD=98=E6=9D=A1=E7=A0=81?= =?UTF-8?q?=E7=AE=A1=E7=90=86=E6=9F=A5=E8=AF=A2=E6=9D=A1=E4=BB=B6=E5=B0=81?= =?UTF-8?q?=E8=A3=85?= 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 1d507ac..594326e 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 @@ -2180,6 +2180,7 @@ public class WmsHqlPack { DdlPreparedPack.getStringEqualPack(wmsStockSn.getVendorNo(), "vendorNo", result); // 库位不为空 DdlPreparedPack.getStringNotNullPack( "locateNo", result); + DdlPreparedPack.getStringNoEqualPack("","locateNo", result); // 排除创建及出库状态条码 if(wmsStockSn.getSnStatus() != null){ DdlPreparedPack.getNumEqualPack(wmsStockSn.getSnStatus(), "snStatus", result); From 63d7c2c6b896f17c45d5be502bfbb9344417c2e7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E4=BA=8E=E5=AD=A6=E6=9D=B0?= Date: Sat, 20 Jul 2019 17:02:15 +0800 Subject: [PATCH 39/41] =?UTF-8?q?1.=20=E5=A2=9E=E5=8A=A0=E8=84=9A=E6=9C=AC?= =?UTF-8?q?=E5=BC=95=E6=93=8E=E7=9A=84POJO=E6=B3=A8=E9=87=8A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../wms/repository/IEngineScriptPersistenceRepository.java | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/IEngineScriptPersistenceRepository.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/IEngineScriptPersistenceRepository.java index 8a02ab0..de8bf6d 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/IEngineScriptPersistenceRepository.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/IEngineScriptPersistenceRepository.java @@ -17,18 +17,24 @@ import java.util.List; @Repository public interface IEngineScriptPersistenceRepository extends BaseRepository { /** - * 按照脚本编号查询脚本实体对象 + * 按照工厂代码和脚本编号查询脚本实体对象 + * @param organizeCode 工厂代码 * @param scriptNo 脚本编号 * @return 脚本实体对象 */ EngineScriptPersistence findByOrganizeCodeAndScriptNo(String organizeCode, String scriptNo); /** + * 按照脚本编号查询脚本实体对象 + * @param scriptNo 脚本编号 + * @return 脚本实体对象 + */ + EngineScriptPersistence findByScriptNo(String scriptNo); + + /** * 查找所有的脚本语言类型 * @return 数据库中已经存在的脚本语言类型 */ @Query("select t.languageType from EngineScriptPersistence t group by t.organizeCode, t.languageType") List findGroupByLanguageType(); - - EngineScriptPersistence findByScriptNo(String scriptNo); } From 0341dd2f5ee810ae9fd6aada65d2c0af2e15100c Mon Sep 17 00:00:00 2001 From: "jimmy.zeng" Date: Mon, 22 Jul 2019 13:49:31 +0800 Subject: [PATCH 40/41] bug #5030 --- .../estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) 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 6116e44..f8c6f5c 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 @@ -685,9 +685,9 @@ public class WmsHqlPack { // 来源单据类型 DdlPreparedPack.getStringEqualPack(wmsSnPrint.getRefType(), "refType", result); // 来源单据号 - DdlPreparedPack.getStringEqualPack(wmsSnPrint.getRefNo(), "refNo", result); + DdlPreparedPack.getStringLikerPack(wmsSnPrint.getRefNo(), "refNo", result); // 打印机 - DdlPreparedPack.getStringEqualPack(wmsSnPrint.getPrinter(), "printer", result); + DdlPreparedPack.getStringLikerPack(wmsSnPrint.getPrinter(), "printer", result); // 打印机状态 DdlPreparedPack.getNumEqualPack(wmsSnPrint.getPrintStatus(), "printStatus", result); @@ -948,8 +948,8 @@ public class WmsHqlPack { DdlPackBean result = new DdlPackBean(); //查询参数封装 - DdlPreparedPack.getStringEqualPack(wmsPackage.getPackageNo(), "packageNo", result); - DdlPreparedPack.getStringEqualPack(wmsPackage.getParentPackageNo(), "parentPackageNo", result); + DdlPreparedPack.getStringLikerPack(wmsPackage.getPackageNo(), "packageNo", result); + DdlPreparedPack.getStringLikerPack(wmsPackage.getParentPackageNo(), "parentPackageNo", result); DdlPreparedPack.getNumEqualPack(wmsPackage.getPackTypeId(), "packTypeId", result); getStringBuilderPack(wmsPackage, result); @@ -985,11 +985,11 @@ public class WmsHqlPack { public static DdlPackBean packHqlWmsMoveMaster(WmsMoveMaster wmsMoveMaster) { DdlPackBean result = new DdlPackBean(); - DdlPreparedPack.getStringEqualPack(wmsMoveMaster.getOrderNo(), "orderNo", result); + DdlPreparedPack.getStringLikerPack(wmsMoveMaster.getOrderNo(), "orderNo", result); DdlPreparedPack.getNumEqualPack(wmsMoveMaster.getOrderStatus(), "orderStatus", result); DdlPreparedPack.getStringEqualPack(wmsMoveMaster.getTransTypeCode(), "transTypeCode", result); - DdlPreparedPack.getStringEqualPack(wmsMoveMaster.getCreateUser(), "createUser", result); - DdlPreparedPack.getStringEqualPack(wmsMoveMaster.getModifyUser(), "modifyUser", result); + DdlPreparedPack.getStringLikerPack(wmsMoveMaster.getCreateUser(), "createUser", result); + DdlPreparedPack.getStringLikerPack(wmsMoveMaster.getModifyUser(), "modifyUser", result); DdlPreparedPack.timeBuilder(wmsMoveMaster.getCreateDateTimeStart(), wmsMoveMaster.getCreateDateTimeEnd(), "createDatetime", result, true); @@ -1085,13 +1085,13 @@ public class WmsHqlPack { DdlPackBean result = new DdlPackBean(); //单号 - DdlPreparedPack.getStringEqualPack(wmsQCMaster.getOrderNo(), "orderNo", result); + DdlPreparedPack.getStringLikerPack(wmsQCMaster.getOrderNo(), "orderNo", result); //业务类型 DdlPreparedPack.getNumEqualPack(wmsQCMaster.getOrderType(), "orderType", result); //关联单据类型 DdlPreparedPack.getStringEqualPack(wmsQCMaster.getRefType(), "refType", result); //关联单据号 - DdlPreparedPack.getStringEqualPack(wmsQCMaster.getRefSrc(), "refSrc", result); + DdlPreparedPack.getStringLikerPack(wmsQCMaster.getRefSrc(), "refSrc", result); getStringBuilderPack(wmsQCMaster, result); @@ -1712,10 +1712,10 @@ public class WmsHqlPack { public static DdlPackBean packHqlWmsTransModule(WmsTransModule wmsTransModule) { DdlPackBean packBean = new DdlPackBean(); if (!Strings.isNullOrEmpty(wmsTransModule.getTmName())) { - DdlPreparedPack.getStringEqualPack(wmsTransModule.getTmName(), "tmName", packBean); + DdlPreparedPack.getStringLikerPack(wmsTransModule.getTmName(), "tmName", packBean); } if (!Strings.isNullOrEmpty(wmsTransModule.getCallClass())) { - DdlPreparedPack.getStringEqualPack(wmsTransModule.getCallClass(), "callClass", packBean); + DdlPreparedPack.getStringLikerPack(wmsTransModule.getCallClass(), "callClass", packBean); } if (!Strings.isNullOrEmpty(wmsTransModule.getTmDesc())) { DdlPreparedPack.getStringLikerPack(wmsTransModule.getTmDesc(), "tmDesc", packBean); From b4a538ebb58009a544448b37e941f0d589432648 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=88=98=E6=95=8F?= <962239776@qq.com> Date: Mon, 22 Jul 2019 17:26:48 +0800 Subject: [PATCH 41/41] =?UTF-8?q?=E5=8D=95=E4=BD=8D=E6=8D=A2=E7=AE=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) 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 6116e44..6571144 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 @@ -48,6 +48,23 @@ public class WmsHqlPack { } /** + * 单位换算 分页查询 + * @return + */ + public static DdlPackBean packHqlWmsUnitConvertByPager(WmsUnitConvert wmsUnitConvert){ + DdlPackBean result = new DdlPackBean(); + + //查询参数封装 + DdlPreparedPack.getStringEqualPack(wmsUnitConvert.getUnitCode(), "unitCode", result); + DdlPreparedPack.getStringEqualPack(wmsUnitConvert.getDestUnitCode(), "destUnitCode", result); + + getStringBuilderPack(wmsUnitConvert, result); + + return result; + } + + + /** * PO订单明细表 分页查询 * * @param wmsPOMasterDetails