From eb2ac7a40880ba6986239700350ba32580a75fb3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9F=AF=E8=A3=95?= Date: Thu, 15 Nov 2018 10:25:59 +0800 Subject: [PATCH 01/11] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=9F=A5=E8=AF=A2?= =?UTF-8?q?=E6=9D=A1=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java | 19 ++++++++----------- 1 file changed, 8 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 6676ae7..beaa558 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 @@ -488,10 +488,7 @@ public class WmsHqlPack { //客户全称 HqlPack.getStringLikerPack(basCustomer.getCustDesc(), "custDesc", result); - HqlPack.getStringEqualPack(basCustomer.getOrganizeCode(), "organizeCode", result); - HqlPack.getNumEqualPack(basCustomer.getIsValid(), "isValid", result); - HqlPack.getNumEqualPack(CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue(), - "isDeleted", result); + getStringBuilderPack(basCustomer, result); return result.toString(); } @@ -504,15 +501,14 @@ public class WmsHqlPack { public static String packHqlWmsShippingFlag(WmsShippingFlag wmsShippingFlag) { StringBuffer result = new StringBuffer(); - //有效性,删除标记 - HqlPack.getNumEqualPack(wmsShippingFlag.getIsValid(), "isValid", result); - HqlPack.getNumEqualPack(CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue(), "isDeleted", result); //供应商编号 HqlPack.getStringLikerPack(wmsShippingFlag.getFlagNo(), "flagNo", result); //供应商简称 HqlPack.getStringLikerPack(wmsShippingFlag.getFlagName(), "flagName", result); //供应商全称 HqlPack.getStringLikerPack(wmsShippingFlag.getFlagDesc(), "flagDesc", result); + getStringBuilderPack(wmsShippingFlag, result); + return result.toString(); } @@ -656,8 +652,8 @@ public class WmsHqlPack { HqlPack.getStringLikerPack(wmsFGInStock.getCustNo(), "custNo", result); HqlPack.getStringLikerPack(wmsFGInStock.getShippingFlag(), "shippingFlag", result); HqlPack.getStringLikerPack(wmsFGInStock.getMfgLogNo(), "mfgLogNo", result); - HqlPack.getNumEqualPack(wmsFGInStock.getIsValid(), "isValid", result); - HqlPack.getNumEqualPack(CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue(), "isDeleted", result); + getStringBuilderPack(wmsFGInStock, result); + return result.toString(); } @@ -669,13 +665,14 @@ public class WmsHqlPack { */ public static String packHqlWmsTaskInfo(WmsTaskInfo wmsTaskInfo) { StringBuffer result = new StringBuffer(); + HqlPack.getStringLikerPack(wmsTaskInfo.getMoveNo(), "moveNo", result); HqlPack.getStringLikerPack(wmsTaskInfo.getUserNo(), "userNo", result); HqlPack.getStringLikerPack(wmsTaskInfo.getOpTypeCode(), "opTypeCode", result); HqlPack.getStringLikerPack(wmsTaskInfo.getReMark(), "reMark", result); HqlPack.getNumEqualPack(wmsTaskInfo.getTaskStatus(), "taskStatus", result); - HqlPack.getNumEqualPack(wmsTaskInfo.getIsValid(), "isValid", result); - HqlPack.getNumEqualPack(CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue(), "isDeleted", result); + getStringBuilderPack(wmsTaskInfo, result); + return result.toString(); } } From d4f6f639d5c5f6babbc4f2bf67492caa90ba1d7e Mon Sep 17 00:00:00 2001 From: "frin.fei" <123456> Date: Thu, 15 Nov 2018 11:57:02 +0800 Subject: [PATCH 02/11] =?UTF-8?q?eureka=E3=80=81feign=E6=95=B4=E5=90=88?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../estsh/i3plus/pojo/platform/bean/TaskTime.java | 124 --------------------- 1 file changed, 124 deletions(-) diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/TaskTime.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/TaskTime.java index e5dbce2..b771cdf 100644 --- a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/TaskTime.java +++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/TaskTime.java @@ -103,128 +103,4 @@ public class TaskTime extends BaseBean { @Column(name="LAST_RUN_DATE_TIME") @ApiParam(value ="最后运行时间" , access ="最后运行时间") private String lastRunDateTime; - - public String getName() { - return name; - } - - public void setName(String name) { - this.name = name; - } - - public String getGroupName() { - return groupName; - } - - public void setGroupName(String groupName) { - this.groupName = groupName; - } - - public void setTimeExpressionId(Long timeExpressionId) { - this.timeExpressionId = timeExpressionId; - } - - public String getTimeExpressionNameRdd() { - return timeExpressionNameRdd; - } - - public void setTimeExpressionNameRdd(String timeExpressionNameRdd) { - this.timeExpressionNameRdd = timeExpressionNameRdd; - } - - public String getTimeExpressionContentRdd() { - return timeExpressionContentRdd; - } - - public void setTimeExpressionContentRdd(String timeExpressionContentRdd) { - this.timeExpressionContentRdd = timeExpressionContentRdd; - } - - public Integer getTaskNumSum() { - return taskNumSum; - } - - public void setTaskNumSum(Integer taskNumSum) { - this.taskNumSum = taskNumSum; - } - - public Integer getTaskNumRun() { - return taskNumRun; - } - - public void setTaskNumRun(Integer taskNumRun) { - this.taskNumRun = taskNumRun; - } - - public Integer getTaskTypeId() { - return taskTypeId; - } - - public void setTaskTypeId(Integer taskTypeId) { - this.taskTypeId = taskTypeId; - } - - public Integer getTaskMethodTypeId() { - return taskMethodTypeId; - } - - public void setTaskMethodTypeId(Integer taskMethodTypeId) { - this.taskMethodTypeId = taskMethodTypeId; - } - - public String getTaskPackage() { - return taskPackage; - } - - public void setTaskPackage(String taskPackage) { - this.taskPackage = taskPackage; - } - - public String getTaskClass() { - return taskClass; - } - - public void setTaskClass(String taskClass) { - this.taskClass = taskClass; - } - - public String getTaskStartDateTimeRdd() { - return taskStartDateTimeRdd; - } - - public void setTaskStartDateTimeRdd(String taskStartDateTimeRdd) { - this.taskStartDateTimeRdd = taskStartDateTimeRdd; - } - - public String getTaskEndDateTimeRdd() { - return taskEndDateTimeRdd; - } - - public void setTaskEndDateTimeRdd(String taskEndDateTimeRdd) { - this.taskEndDateTimeRdd = taskEndDateTimeRdd; - } - - public String getTaskDescription() { - return taskDescription; - } - - public void setTaskDescription(String taskDescription) { - this.taskDescription = taskDescription; - } - - public Integer getTaskStatus() { - return taskStatus; - } - - public void setTaskStatus(Integer taskStatus) { - this.taskStatus = taskStatus; - } - - public String getLastRunDateTime() { - return lastRunDateTime; - } - - public void setLastRunDateTime(String lastRunDateTime) { - this.lastRunDateTime = lastRunDateTime; - } } From 3a34cfbd6b950ffec3770e23b5996d9c65a4e363 Mon Sep 17 00:00:00 2001 From: "frin.fei" <123456> Date: Thu, 15 Nov 2018 14:55:15 +0800 Subject: [PATCH 03/11] =?UTF-8?q?eureka=E3=80=81feign=E6=95=B4=E5=90=88?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/cn/estsh/i3plus/pojo/base/enumutil/CommonEnumUtil.java | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/CommonEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/CommonEnumUtil.java index b6cf555..dd86d12 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/CommonEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/CommonEnumUtil.java @@ -16,8 +16,11 @@ public class CommonEnumUtil { */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum SOFT_TYPE { - IMPP(1, "IMPP", "IMPP平台"), CORE(2, "CORE", "i3业务平台"), WMS(3, "WMS", "仓库管理软件"), MES(4, "MES", "生产管理软件"), - CENTER(99,"CENTER","注册服务中心"); + IMPP(1, "impp-platform", "IMPP平台"), + CORE(2, "i3core", "i3业务平台"), + WMS(3, "i3wms", "仓库管理软件"), + MES(4, "i3mes", "生产管理软件"), + CENTER(99,"regist-center","注册服务中心"); public int value; public String code; From 88429e342ea1e3adce9416a5a73c1eee870524d0 Mon Sep 17 00:00:00 2001 From: amy <962239776@qq.com> Date: Thu, 15 Nov 2018 15:11:36 +0800 Subject: [PATCH 04/11] =?UTF-8?q?=E6=9E=9A=E4=B8=BE=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/base/enumutil/WmsEnumUtil.java | 154 +++------------------ .../estsh/i3plus/pojo/wms/bean/WmsASNMaster.java | 2 +- 2 files changed, 17 insertions(+), 139 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 30f9b61..1507622 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 @@ -11,7 +11,7 @@ import com.fasterxml.jackson.annotation.JsonFormat; **/ public class WmsEnumUtil { /** - * PO订单明细信息 是否免费 + * 订单明细信息 是否免费 */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum IS_FREE { @@ -20,7 +20,7 @@ public class WmsEnumUtil { private int value; private String description; - private IS_FREE(int value, String description) { + IS_FREE(int value, String description) { this.value = value; this.description = description; } @@ -45,18 +45,19 @@ public class WmsEnumUtil { } /** - * PO订单明细信息 状态 + * 订单明细信息 状态 */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum ORDER_DETAILS_STATUS { NORMAL(10, "N", "正常"), - ANCEL(20, "C", "行取消"); + ANCEL(20, "C", "行取消"), + RECEIPTED(30, "R", "已收货"); private int value; private String code; private String description; - private ORDER_DETAILS_STATUS(int value, String code, String description) { + ORDER_DETAILS_STATUS(int value, String code, String description) { this.value = value; this.code = code; this.description = description; @@ -96,10 +97,10 @@ public class WmsEnumUtil { } /** - * PO主表信息 单据来源 + * 主表信息 单据来源 */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) - public enum PO_ORDER_SRC { + public enum ORDER_SRC { MNU(1, "MNU", "手工"), ERP(2, "ERP", "ERP接口"); @@ -107,7 +108,7 @@ public class WmsEnumUtil { private String code; private String description; - private PO_ORDER_SRC(int value, String code, String description) { + ORDER_SRC(int value, String code, String description) { this.value = value; this.code = code; this.description = description; @@ -146,10 +147,10 @@ public class WmsEnumUtil { } } /** - * PO主表信息 单据类型 + * 主表信息 单据类型 */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) - public enum PO_ORDER_TYPE { + public enum ORDER_TYPE { REG(1, "REG", "原物料采购"), SUB(10, "SUB", "委外采购"), TAR(20, "TAR", "多角贸易采购"), @@ -159,7 +160,7 @@ public class WmsEnumUtil { private String code; private String description; - private PO_ORDER_TYPE(int value, String code, String description) { + ORDER_TYPE(int value, String code, String description) { this.value = value; this.code = code; this.description = description; @@ -199,11 +200,11 @@ public class WmsEnumUtil { } /** - * PO主表信息 状态 + * 主表信息 状态 */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum ORDER_STATUS { - CREATE(0, "新建"), + CREATE(1, "新建"), RECEIPT(10, "收货中"), RECEIPT_FINISH(20, "收货完成"), WAREHOUSING(30, "入库中"), @@ -214,7 +215,7 @@ public class WmsEnumUtil { private int value; private String description; - private ORDER_STATUS(int value, String description) { + ORDER_STATUS(int value, String description) { this.value = value; this.description = description; } @@ -258,7 +259,7 @@ public class WmsEnumUtil { private int value; private String description; - private TRANS_STATUS(int value, String description) { + TRANS_STATUS(int value, String description) { this.value = value; this.description = description; } @@ -297,9 +298,6 @@ public class WmsEnumUtil { private String name; private String description; - QUEUE_NAME() { - } - QUEUE_NAME(int value, String name, String description) { this.value = value; this.name = name; @@ -348,124 +346,4 @@ public class WmsEnumUtil { return tmp; } } - - /** - * ASN单据类型 - */ - public enum ASN_ORDER_TYPE{ - - REG("REG","原物料采购"),SUB("SUB","委外采购"),TAR("TAR","多角贸易采购"),TAP("TAP","多角代采购"); - - private String value; - private String description; - - ASN_ORDER_TYPE(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 (values()[i].value == val) { - tmp = values()[i].description; - } - } - return tmp; - } - } - - /** - * ASN明细表状态 - */ - @JsonFormat(shape = JsonFormat.Shape.OBJECT) - public enum ASN_MASTER_ORDER_STATUS { - NORMAL(1, "N", "正常"), - CANCEL(2, "C", "行取消"), - RECEIPTED(3, "R", "已收货"); - - private int value; - private String code; - private String description; - - private ASN_MASTER_ORDER_STATUS(int value, String code, String description) { - this.value = value; - this.code = code; - this.description = description; - } - - public int getValue() { - return value; - } - - 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; - } - } - - /** - * 是否已删除 - */ - public enum IS_DELETED { - DELETED(1, "已删除"), INDELETED(2, "未删除"); - - private int value; - private String description; - - public int getValue() { - return value; - } - - public String getDescription() { - return description; - } - - IS_DELETED(int value, String description) { - this.value = value; - this.description = 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; - } - } - } diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsASNMaster.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsASNMaster.java index d0f47fa..4da7db6 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsASNMaster.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsASNMaster.java @@ -41,7 +41,7 @@ public class WmsASNMaster extends BaseBean { public String asnType; /** - * 状态:0=新建,10=收货中,20=收货完成, + * 状态:1=新建,10=收货中,20=收货完成, * 30=入库中,40=入库完成,90=已关闭,91=已取消 */ @Column(name="ASN_STATUS") From 0c7eac9025492f3b066faafafd0bd835eae2aed3 Mon Sep 17 00:00:00 2001 From: Silliter Date: Thu, 15 Nov 2018 16:12:43 +0800 Subject: [PATCH 05/11] =?UTF-8?q?=E5=8D=95=E5=85=83=E6=B5=8B=E8=AF=95?= =?UTF-8?q?=E5=BC=80=E5=8F=91=E5=B7=A5=E5=85=B7=E7=B1=BB=E6=96=B0=E5=A2=9E?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 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 53236f0..8feb7dd 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 @@ -24,16 +24,14 @@ public class WmsHqlPack { */ public static String getStringBuilderPack(BaseBean bean, StringBuffer hqlStr) { - if (hqlStr != null && hqlStr.toString().trim().length() > 0) { - if (StringUtils.isNotBlank(bean.getOrganizeCode())) { - hqlStr.append(" and model.organizeCode = " + bean.getOrganizeCode()); - } else if (bean.getIsValid() > 0) { - hqlStr.append(" and model.isValid = " + bean.getIsValid()); - } - - hqlStr.append(" and model.isDeleted = " + CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue()); + if (StringUtils.isNotBlank(bean.getOrganizeCode())) { + hqlStr.append(" and model.organizeCode = " + bean.getOrganizeCode()); + } else if (bean.getIsValid() > 0) { + hqlStr.append(" and model.isValid = " + bean.getIsValid()); } + hqlStr.append(" and model.isDeleted = " + CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue()); + return hqlStr.toString(); } From 2995a1e0574f8c88aa60c94653734434e2def28d Mon Sep 17 00:00:00 2001 From: jimmy <1622218722@qq.com> Date: Thu, 15 Nov 2018 17:29:37 +0800 Subject: [PATCH 06/11] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=9F=A5=E8=AF=A2?= =?UTF-8?q?=E6=9D=A1=E4=BB=B6?= 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 | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java index 53236f0..536d31e 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 @@ -192,6 +192,8 @@ public class WmsHqlPack { //查询参数封装 HqlPack.getStringLikerPack(wmsIbCheckPlan.getPartNo(), "partNo", result); HqlPack.getStringLikerPack(wmsIbCheckPlan.getPartNameRdd(), "partNameRdd", result); + HqlPack.timeBuilder(wmsIbCheckPlan.getStartDate(), null, "startDate", result, true); + HqlPack.timeBuilder(wmsIbCheckPlan.getEndDate(), null, "endDate", result, true); HqlPack.getNumEqualPack(wmsIbCheckPlan.getIsValid(), "isValid", result); HqlPack.getNumEqualPack(CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue(), "isDeleted", result); HqlPack.getStringEqualPack(wmsIbCheckPlan.getOrganizeCode(),"organizeCode",result); @@ -231,7 +233,7 @@ public class WmsHqlPack { //查询参数封装 HqlPack.getStringLikerPack(wmsLocate.getLocateNo(), "locateNo", result); HqlPack.getStringLikerPack(wmsLocate.getLocateName(), "locateName", result); - HqlPack.getStringLikerPack(wmsLocate.getLocateType(), "locateType", result); + HqlPack.getStringEqualPack(wmsLocate.getLocateType(), "locateType", result); HqlPack.getStringLikerPack(wmsLocate.getWhNo(), "whNo", result); HqlPack.getStringLikerPack(wmsLocate.getZoneNo(), "zoneNo", result); HqlPack.getNumEqualPack(wmsLocate.getIsValid(), "isValid", result); From 4ebe75e66c41cfb81458b7c71e7736c413f5869e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9F=AF=E8=A3=95?= Date: Thu, 15 Nov 2018 17:41:45 +0800 Subject: [PATCH 07/11] =?UTF-8?q?=E6=96=B0=E5=BB=BA=E6=9E=9A=E4=B8=BE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/base/enumutil/WmsEnumUtil.java | 34 ++++++++++++++++++++++ 1 file changed, 34 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 1507622..46a95e3 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 @@ -346,4 +346,38 @@ public class WmsEnumUtil { return tmp; } } + + /** + * 产品入库的产品状态 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum PRODUCT_INSTOCK_STATUS { + CREATE(10, "创建"), FINISH(20, "已处理"),FAIL(30,"处理出错"); + + private int value; + private String description; + + PRODUCT_INSTOCK_STATUS(int value, String description) { + this.value = value; + this.description = description; + } + + public int getValue() { + return value; + } + + public String getDescription() { + return description; + } + + public static String valueOf(int val) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].value == val) { + tmp = values()[i].description; + } + } + return tmp; + } + } } From 40b536aa8e7662113fd8e24b1da9e48edc1c195e Mon Sep 17 00:00:00 2001 From: amy <962239776@qq.com> Date: Thu, 15 Nov 2018 17:45:42 +0800 Subject: [PATCH 08/11] =?UTF-8?q?=E5=88=9D=E5=A7=8B=E5=8C=96=E4=BF=AE?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java index 53236f0..4df2dfb 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 @@ -526,7 +526,9 @@ public class WmsHqlPack { HqlPack.getStringLikerPack(wmsASNMaster.getOrderNo(), "orderNo", result); HqlPack.getStringLikerPack(wmsASNMaster.getAsnType(), "type", result); - HqlPack.getStringLikerPack(wmsASNMaster.getAsnStatus().toString(), "status", result); + if (wmsASNMaster.getAsnStatus() != null) { + HqlPack.getStringLikerPack(wmsASNMaster.getAsnStatus().toString(), "status", result); + } HqlPack.getStringLikerPack(wmsASNMaster.getVendorNo(), "vendorNo", result); HqlPack.getStringLikerPack(wmsASNMaster.getVersion(), "version", result); HqlPack.getStringLikerPack(wmsASNMaster.getSrc(), "src", result); @@ -535,6 +537,7 @@ public class WmsHqlPack { HqlPack.getNumEqualPack(wmsASNMaster.getIsValid(), "isValid", result); HqlPack.getNumEqualPack(CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue(), "isDeleted", result); HqlPack.getStringEqualPack(wmsASNMaster.getOrganizeCode(), "organizeCode", result); +// getStringBuilderPack(wmsASNMaster,result); return result.toString(); } From 19e107984e534d0655ce4dcbf300ed7501a8193e Mon Sep 17 00:00:00 2001 From: "wei.peng" Date: Thu, 15 Nov 2018 18:57:37 +0800 Subject: [PATCH 09/11] =?UTF-8?q?=E5=8A=A8=E6=80=81=E5=8A=9F=E8=83=BD?= =?UTF-8?q?=E6=9D=83=E9=99=90=20=E5=8A=9F=E8=83=BD=E5=AE=8C=E6=88=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../estsh/i3plus/pojo/platform/bean/SysMenu.java | 4 +-- .../estsh/i3plus/pojo/platform/bean/SysRole.java | 32 ++++++++++++---------- .../i3plus/pojo/platform/sqlpack/CoreHqlPack.java | 2 +- 3 files changed, 20 insertions(+), 18 deletions(-) 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 9e20f3b..d9e3bb6 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 @@ -58,9 +58,9 @@ public class SysMenu extends BaseBean { } } - @Column(name="RED_PARENT_NAME") + @Column(name="PARENT_NAME_RDD") @ApiParam(value ="父级功能名称" , access ="父级功能名称") - private String redParentName; + private String parentNameRdd; @Column(name="MENU_CLASS_PATH") @ApiParam(value ="资源class path" , access ="资源class path") 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 8809d79..2df17b4 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 @@ -5,10 +5,12 @@ 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 javafx.scene.text.TextBoundsType; import lombok.Data; import lombok.EqualsAndHashCode; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; +import org.hibernate.annotations.Type; import javax.persistence.Column; import javax.persistence.Entity; @@ -55,28 +57,28 @@ public class SysRole extends BaseBean { } } - @Column(name="RED_PARENT_NAME") + @Column(name="PARENT_NAME_RDD") @ApiParam(value ="角色父节点名称" , access ="角色父节点名称") - private String redParentName; + private String parentNameRdd; - @Column(name="RED_MODULE_NAMES") - @ApiParam(value ="权限模块名称" , access ="权限模块名称") - private String redModuleNames; - - @Column(name="RED_MODULE_NUMBER") + @Column(name="MODULE_NUMBER") @ApiParam(value ="权限模块数量" , example ="0" , access ="权限模块数量") - private Integer redModuleNumber; + private Integer moduleNumber; - @Column(name="RED_MENU_NAMES") - @ApiParam(value ="权限功能名称" , access ="权限功能名称") - private String redMenuNames; + @Column(name="MODULE_NAMES_RDD") + @ApiParam(value ="权限模块名称" , access ="权限模块名称") + private String moduleNamesRdd; - @Column(name="RED_MENU_NUMBER") + @Column(name="MENU_NUMBER_RDD") @ApiParam(value ="权限功能数量" , example ="0" , access ="权限功能数量") - private Integer redMenuNumber; + private Integer menuNumber; + + @Column(name="MENU_NAMES_RDD",columnDefinition="TEXT") + @ApiParam(value ="权限功能名称" , access ="权限功能名称") + private String menuNamesRdd; - @Column(name="ROLE_STATUS_ID") + @Column(name="ROLE_STATUS") @ApiParam(value ="角色状态（枚举：1.正常，2.状态）" , example ="-1") - private Integer roleStatusId; + private Integer roleStatus; } 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 94a70b7..8d4cc6e 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 @@ -142,7 +142,7 @@ public class CoreHqlPack { StringBuffer result = new StringBuffer(); // 查询参数封装 - HqlPack.getNumEqualPack(role.getRoleStatusId(),"roleStatusId",result); + HqlPack.getNumEqualPack(role.getRoleStatus(),"roleStatus",result); HqlPack.getStringLikerPack(role.getName(),"name",result); return result.toString(); From be354e6dd3b97453359da6657445932ffa42fcfb Mon Sep 17 00:00:00 2001 From: jimmy <1622218722@qq.com> Date: Thu, 15 Nov 2018 19:11:13 +0800 Subject: [PATCH 10/11] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=9E=9A=E4=B8=BE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/base/enumutil/WmsEnumUtil.java | 55 ++++++++++++++++++++++ 1 file changed, 55 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 1507622..7566c76 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 @@ -346,4 +346,59 @@ public class WmsEnumUtil { return tmp; } } + + /** + * 库位类型 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum LOCATE_TYPE { + COLLECT_LOCATE(10, "I", "收货库"), + BASICS_LOCATE(20, "P", "基础库"), + maneuver_LOCATE(30, "R", "机动库"), + COMBINATION_LOCATE(40, "D", "组合库"), + LINE_LOCATE(50, "L", "线边库"), + NC_LOCATE(60, "N", "NC库"); + + private int value; + private String code; + private String description; + + LOCATE_TYPE(int value, String code, String description) { + this.value = value; + this.code = code; + this.description = description; + } + + public int getValue() { + return value; + } + + 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; + } + } } From d5b71f274fcfd34bf697cf5ade271644ad17088c Mon Sep 17 00:00:00 2001 From: Silliter Date: Thu, 15 Nov 2018 19:42:19 +0800 Subject: [PATCH 11/11] =?UTF-8?q?=E5=8D=95=E5=85=83=E6=B5=8B=E8=AF=95?= =?UTF-8?q?=E5=BC=80=E5=8F=91=E5=B7=A5=E5=85=B7=E7=B1=BB=E6=96=B0=E5=A2=9E?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java | 2 ++ .../java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java | 14 +++++++------- 2 files changed, 9 insertions(+), 7 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 1507622..c1670af 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 @@ -283,6 +283,8 @@ public class WmsEnumUtil { } } + + /** * 消息队列，队列名称 * 1: success_queue 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 8feb7dd..7d57076 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 @@ -4,6 +4,7 @@ import cn.estsh.i3plus.pojo.base.bean.BaseBean; import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil; import cn.estsh.i3plus.pojo.base.enumutil.WmsEnumUtil; import cn.estsh.i3plus.pojo.base.tool.HqlPack; +import cn.estsh.i3plus.pojo.base.tool.SqlPack; import cn.estsh.i3plus.pojo.wms.bean.*; import org.apache.commons.lang3.StringUtils; @@ -24,13 +25,14 @@ public class WmsHqlPack { */ public static String getStringBuilderPack(BaseBean bean, StringBuffer hqlStr) { + // 判断工厂代码是否为空 if (StringUtils.isNotBlank(bean.getOrganizeCode())) { - hqlStr.append(" and model.organizeCode = " + bean.getOrganizeCode()); - } else if (bean.getIsValid() > 0) { - hqlStr.append(" and model.isValid = " + bean.getIsValid()); + SqlPack.getStringEqualPack(bean.getOrganizeCode(), "organizeCode", hqlStr); } - hqlStr.append(" and model.isDeleted = " + CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue()); + // 封装有效状态和删除状态 + SqlPack.getNumEqualPack(bean.getIsValid(), "isValid", hqlStr); + SqlPack.getNumEqualPack(CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue(), "isDeleted", hqlStr); return hqlStr.toString(); } @@ -113,11 +115,9 @@ public class WmsHqlPack { HqlPack.getNumEqualPack(wmsPOMaster.getPoStatus(), "poStatus", result); HqlPack.getStringLikerPack(wmsPOMaster.getVendorNo(), "vendorNo", result); HqlPack.getStringLikerPack(wmsPOMaster.getSrc(), "src", result); -// HqlPack.getNumEqualPack(wmsPOMaster.getIsValid(), "isValid", result); -// HqlPack.getNumEqualPack(wmsPOMaster.getIsDeleted(), "isDeleted", result); + HqlPack.getStringEqualPack(wmsPOMaster.getIsAsn(), "isAsn", result); getStringBuilderPack(wmsPOMaster, result); - return result.toString(); }