From fca198486090637af53d768a532bfbdf47511681 Mon Sep 17 00:00:00 2001 From: amy <962239776@qq.com> Date: Tue, 27 Nov 2018 18:38:49 +0800 Subject: [PATCH 01/19] =?UTF-8?q?=E8=BF=94=E5=9B=9E=E5=AE=9E=E4=BD=93?= =?UTF-8?q?=E4=BB=A3=E7=A0=81=E5=AD=97=E6=AE=B5=E6=B7=BB=E5=8A=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionResponseBean.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionResponseBean.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionResponseBean.java index 9972172..11db5e5 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionResponseBean.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionResponseBean.java @@ -38,5 +38,7 @@ public class WmsActionResponseBean { @ApiParam("选中的明细数据") public String details; + @ApiParam("返回代码 10-正确 20-失败 30-不跳转") + public String code; } From e67151271b983aeb4d180f27b0b9ef5501e8cb39 Mon Sep 17 00:00:00 2001 From: "jessica.chen" Date: Tue, 27 Nov 2018 19:39:26 +0800 Subject: [PATCH 02/19] =?UTF-8?q?=E7=BB=84=E4=BB=B6=E4=B8=AD=E5=8D=95?= =?UTF-8?q?=E6=8D=AE=E7=B1=BB=E5=9E=8B=E6=9E=9A=E4=B8=BE=E6=96=B0=E5=A2=9E?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/base/enumutil/WmsEnumUtil.java | 35 ++++++++++++++++++++++ 1 file changed, 35 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 59423a3..f35085e 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 @@ -1472,4 +1472,39 @@ public class WmsEnumUtil { return tmp; } } + + /** + * 组件扫描单号 单据类型 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum RC_ORDER_TYPE { + PO(10, "PO"), + ASN(20, "ASN"); + + private int value; + private String description; + + RC_ORDER_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; + } + } } From 95826a1846907b5582229dfbfcc655037b38bf7d Mon Sep 17 00:00:00 2001 From: Silliter Date: Tue, 27 Nov 2018 19:55:20 +0800 Subject: [PATCH 03/19] =?UTF-8?q?=E4=BC=98=E5=8C=96=E4=BB=A3=E7=A0=81?= =?UTF-8?q?=E9=80=BB=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionResponseBean.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionResponseBean.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionResponseBean.java index 9972172..5b8eb5a 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionResponseBean.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionResponseBean.java @@ -38,5 +38,6 @@ public class WmsActionResponseBean { @ApiParam("选中的明细数据") public String details; - + @ApiParam("信息代码") + public Integer code; } From 442ec7cb5fada2d01aaa9bdfa72e8a56e717762b Mon Sep 17 00:00:00 2001 From: Silliter Date: Tue, 27 Nov 2018 20:00:48 +0800 Subject: [PATCH 04/19] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E5=86=B2=E7=AA=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/base/enumutil/WmsEnumUtil.java | 37 ++++++++++++++++++++++ 1 file changed, 37 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 f35085e..0612ef5 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 @@ -1507,4 +1507,41 @@ public class WmsEnumUtil { return tmp; } } + + /** + * 组件统一返回提示 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum RC_RESPONSE_TIPS { + + OK(10, "正确"), + FAIL(20, "失败"), + NO_SKIP(30, "不跳转"); + + private int value; + private String description; + + RC_RESPONSE_TIPS(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 43ed6deb6c1591549fd8210cf2add2e96eb36dcb Mon Sep 17 00:00:00 2001 From: Silliter Date: Wed, 28 Nov 2018 14:59:57 +0800 Subject: [PATCH 05/19] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E5=86=B2=E7=AA=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/base/enumutil/WmsEnumUtil.java | 37 +++++++++++++++++++--- .../pojo/wms/bean/WmsActionResponseBean.java | 7 ++-- .../i3plus/pojo/wms/bean/WmsOperationBean.java | 3 +- 3 files changed, 39 insertions(+), 8 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 0612ef5..7813c0f 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 @@ -1514,14 +1514,43 @@ public class WmsEnumUtil { @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum RC_RESPONSE_TIPS { - OK(10, "正确"), - FAIL(20, "失败"), - NO_SKIP(30, "不跳转"); + OK(true, "正确"), + NG(false, "失败"); + + private boolean codeStatus; + private String description; + + RC_RESPONSE_TIPS(boolean codeStatus, String description) { + this.codeStatus = codeStatus; + this.description = description; + } + + public boolean getCodeStatus() { + return codeStatus; + } + + public String getDescription() { + return description; + } + } + + /** + * 流程管家中触发源 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum ACTION_BUTLER_SOURCE { + + SCANNER(10, "扫描枪"), + SUBMIT(20, "提交按钮"), + RESET(30, "重置按钮"), + CHECK_DETAILS(40, "查看明细"), + DELETE_DETAILS(50, "明细(删除)"), + CLEAR_DETAILS(60, "明细（清空）"); private int value; private String description; - RC_RESPONSE_TIPS(int value, String description) { + ACTION_BUTLER_SOURCE(int value, String description) { this.value = value; this.description = description; } diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionResponseBean.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionResponseBean.java index 5b8eb5a..8de5899 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionResponseBean.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionResponseBean.java @@ -5,6 +5,7 @@ import io.swagger.annotations.ApiParam; import lombok.Data; import java.util.List; +import java.util.Map; /** * @Description : PDA传输到后台的实体bean对象 @@ -36,8 +37,8 @@ public class WmsActionResponseBean { public List options; @ApiParam("选中的明细数据") - public String details; + public List> details; - @ApiParam("信息代码") - public Integer code; + @ApiParam(value = "结果代码") + public Boolean codeStatus; } diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsOperationBean.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsOperationBean.java index eeb7643..7367bd0 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsOperationBean.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsOperationBean.java @@ -5,6 +5,7 @@ import io.swagger.annotations.ApiParam; import lombok.Data; import java.util.List; +import java.util.Map; /** * @Description : PDA传输到后台的实体bean对象 @@ -32,5 +33,5 @@ public class WmsOperationBean { public int sourceOwner; @ApiParam("选中的明细数据") - public String details; + public List> details; } From 433705589843f97471c6d05ceb78467ae7205c38 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9F=AF=E8=A3=95?= Date: Wed, 28 Nov 2018 15:48:29 +0800 Subject: [PATCH 06/19] =?UTF-8?q?PO=E6=9D=A1=E7=A0=81=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cn/estsh/i3plus/pojo/wms/bean/WmsPoSn.java | 78 ++++++++++++++++++++++ .../pojo/wms/repository/WmsPoSnRepository.java | 16 +++++ 2 files changed, 94 insertions(+) create mode 100644 modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPoSn.java create mode 100644 modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsPoSnRepository.java diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPoSn.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPoSn.java new file mode 100644 index 0000000..48b189c --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPoSn.java @@ -0,0 +1,78 @@ +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 : PO条码表 + * @Reference : + * @Author : hansen.ke + * @CreateDate : 2018-11-28 15:20 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name="WMS_DOC_PO_SN") +@Api("PO条码信息") +public class WmsPoSn extends BaseBean { + + @Column(name="ORDER_NO") + @ApiParam("订单号") + public String orderNo; + + @Column(name="ITEM") + @ApiParam("行号") + public String item; + + @Column(name="PART_NO") + @ApiParam("物料编码") + public String partNo; + + @Column(name="PART_NAME_RDD") + @ApiParam("物料名称") + public String partNameRdd; + + @Column(name="QTY") + @ApiParam(value = "数量", example = "0") + public Double qty; + + + @Column(name="UNIT") + @ApiParam("单位") + public String unit; + + /** + * 状态:10 = 创建，20 = 已打印，30 = 已收货 + */ + @Column(name="SN_STATUS") + @ApiParam(value = "状态", example = "10") + public Integer snStatus; + + @Column(name="PACKAGE") + @ApiParam("包装名称") + public String packAge; + + @Column(name="SN_1D") + @ApiParam("一维条码") + public String snOneBarCode; + + @Column(name="SN_2D") + @ApiParam("二维条码") + public String snTwoBarCode; + + @Column(name="GROUP_NO") + @ApiParam("组条码") + public String groupNo; +} diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsPoSnRepository.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsPoSnRepository.java new file mode 100644 index 0000000..2835f45 --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsPoSnRepository.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.WmsPoSn; +import org.springframework.stereotype.Repository; + +/** + * @Description : PO条码 + * @Reference : + * @Author : hansen.ke + * @CreateDate : 2018-11-28 15:29 + * @Modify: + **/ +@Repository +public interface WmsPoSnRepository extends BaseRepository { +} From b0d191ceaadce9330c2ddf1e8f58fb713f5d5b56 Mon Sep 17 00:00:00 2001 From: Silliter Date: Wed, 28 Nov 2018 16:19:14 +0800 Subject: [PATCH 07/19] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E5=86=B2=E7=AA=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/cn/estsh/i3plus/pojo/wms/bean/WmsActionResponseBean.java | 8 +++++++- .../main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java | 2 -- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionResponseBean.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionResponseBean.java index 8de5899..9a7aca3 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionResponseBean.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionResponseBean.java @@ -3,6 +3,7 @@ package cn.estsh.i3plus.pojo.wms.bean; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; +import lombok.RequiredArgsConstructor; import java.util.List; import java.util.Map; @@ -40,5 +41,10 @@ public class WmsActionResponseBean { public List> details; @ApiParam(value = "结果代码") - public Boolean codeStatus; + public boolean codeStatus; + + private WmsActionResponseBean(boolean codeStatus, String message) { + this.codeStatus = codeStatus; + this.message = 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 c597eff..2e8af6e 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 @@ -1156,6 +1156,4 @@ public class WmsHqlPack { return result.toString(); } - - } From 804008410e5e2d57fab64c945a12a62d41b5522f Mon Sep 17 00:00:00 2001 From: "wei.peng" Date: Wed, 28 Nov 2018 16:23:14 +0800 Subject: [PATCH 08/19] =?UTF-8?q?=E5=8A=9F=E8=83=BD=E4=BB=A3=E7=A0=81?= =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/base/tool/HqlPack.java | 4 ++-- .../cn/estsh/i3plus/pojo/platform/sqlpack/CoreHqlPack.java | 11 ++++++++++- 2 files changed, 12 insertions(+), 3 deletions(-) diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/tool/HqlPack.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/tool/HqlPack.java index ca6bba6..a108879 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/tool/HqlPack.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/tool/HqlPack.java @@ -215,7 +215,7 @@ public class HqlPack { * @param result */ public static void getNumEqualPack(Object data,String columnName, StringBuffer result) { - if(data!=null&&Long.parseLong(data.toString()) > 0){ + if (data != null) { data = getSafeParam(data); result.append(" and model."+columnName+" = " + data + ""); } @@ -239,7 +239,7 @@ public class HqlPack { * @param result */ public static void getNumEqualPackForZero(Object data,String columnName, StringBuffer result) { - if(data!=null&&Long.parseLong(data.toString()) >= 0){ + if (data != null && Long.parseLong(data.toString()) >= 0) { data = getSafeParam(data); result.append(" and model."+columnName+" = " + data + ""); } 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 519c5f0..7e2a33c 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,12 +121,21 @@ public class CoreHqlPack { public static String packHqlSysDepartment(SysDepartment department){ StringBuffer result = new StringBuffer(); - // 查询参数封装 + if(department.getOrganizeId() != null && department.getOrganizeId() > 0){ + department.setParentId(CommonEnumUtil.PARENT.DEFAULT.getValue()); + } + HqlPack.getNumEqualPack(department.getParentId(),"parentId",result); HqlPack.getNumEqualPack(department.getOrganizeId(),"organizeId",result); HqlPack.getStringLikerPack(department.getName(),"name",result); HqlPack.getStringLikerPack(department.getDepartmentCode(),"departmentCode",result); + // 默认排序 + if(department.getOrderByParam().isEmpty()){ + department.setOrderByParam("departmentSort"); + department.setAscOrDesc(CommonEnumUtil.ASC_OR_DESC.DESC.getValue()); + } + return result.toString(); } From b77406b1e0b065dfcdaee1e3128dd17e62cd54a6 Mon Sep 17 00:00:00 2001 From: Silliter Date: Wed, 28 Nov 2018 16:26:04 +0800 Subject: [PATCH 09/19] Merge branch 'master' of http://git.estsh.com/i3-IMPP/i3plus-wms # Conflicts: # modules/i3plus-wms-apiservice/src/main/java/cn/estsh/i3plus/wms/apiservice/serviceimpl/components/ScanOrderNoService.java --- .../java/cn/estsh/i3plus/pojo/wms/bean/WmsActionResponseBean.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/WmsActionResponseBean.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionResponseBean.java index 9a7aca3..3e6c163 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionResponseBean.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionResponseBean.java @@ -3,6 +3,7 @@ package cn.estsh.i3plus.pojo.wms.bean; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; +import lombok.NoArgsConstructor; import lombok.RequiredArgsConstructor; import java.util.List; @@ -16,6 +17,7 @@ import java.util.Map; * @Modify: **/ @Data +@NoArgsConstructor @Api("返回前端数据实体") public class WmsActionResponseBean { @@ -43,7 +45,7 @@ public class WmsActionResponseBean { @ApiParam(value = "结果代码") public boolean codeStatus; - private WmsActionResponseBean(boolean codeStatus, String message) { + public WmsActionResponseBean(boolean codeStatus, String message) { this.codeStatus = codeStatus; this.message = message; } From fd83bef49b4b5d53e1b9b8c3b1cf8188046b60d4 Mon Sep 17 00:00:00 2001 From: Silliter Date: Wed, 28 Nov 2018 16:37:08 +0800 Subject: [PATCH 10/19] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E5=86=B2=E7=AA=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionResponseBean.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionResponseBean.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionResponseBean.java index 3e6c163..1f61c44 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionResponseBean.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionResponseBean.java @@ -2,6 +2,7 @@ package cn.estsh.i3plus.pojo.wms.bean; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; +import lombok.AllArgsConstructor; import lombok.Data; import lombok.NoArgsConstructor; import lombok.RequiredArgsConstructor; @@ -18,6 +19,7 @@ import java.util.Map; **/ @Data @NoArgsConstructor +@AllArgsConstructor @Api("返回前端数据实体") public class WmsActionResponseBean { From 8bc9984e4eeb4b491b55a449f2deb2ddad6f5a4a Mon Sep 17 00:00:00 2001 From: "jessica.chen" Date: Wed, 28 Nov 2018 16:56:11 +0800 Subject: [PATCH 11/19] =?UTF-8?q?=E7=BB=84=E4=BB=B6=E4=B8=ADPO=E6=9D=A1?= =?UTF-8?q?=E7=A0=81=E8=A1=A8=E4=B8=AD=E7=8A=B6=E6=80=81=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 | 37 ++++++++++++++++++++++ 1 file changed, 37 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 7813c0f..7938ea3 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 @@ -1573,4 +1573,41 @@ public class WmsEnumUtil { return tmp; } } + + /** + * PO条码表条码状态 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum PO_SN_STATUS { + + fOUND(10, "创建"), + PRINTED(20, "已打印"), + RECEIPTED(30, "已收货"); + + private int value; + private String description; + + PO_SN_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 4d8148ea9d124d22664aea13a1b477e720e73fc1 Mon Sep 17 00:00:00 2001 From: amy <962239776@qq.com> Date: Wed, 28 Nov 2018 17:03:48 +0800 Subject: [PATCH 12/19] =?UTF-8?q?=E8=BF=94=E5=9B=9E=E5=AE=9E=E4=BD=93?= =?UTF-8?q?=E6=9E=84=E9=80=A0=E6=B7=BB=E5=8A=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java | 6 +++--- .../estsh/i3plus/pojo/wms/bean/WmsActionResponseBean.java | 15 +++++++++++++++ .../wms/repository/WmsASNMasterDetailsRepository.java | 2 ++ 3 files changed, 20 insertions(+), 3 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 7813c0f..4ee8408 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 @@ -49,9 +49,9 @@ public class WmsEnumUtil { */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum ORDER_DETAILS_STATUS { - NORMAL(10, "N", "正常"), - ANCEL(20, "C", "行取消"), - RECEIPTED(30, "R", "已收货"); + NORMAL(1, "N", "正常"), + ANCEL(10, "C", "行取消"), + RECEIPTED(20, "R", "已收货"); private int value; private String code; diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionResponseBean.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionResponseBean.java index 8de5899..187fad1 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionResponseBean.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionResponseBean.java @@ -41,4 +41,19 @@ public class WmsActionResponseBean { @ApiParam(value = "结果代码") public Boolean codeStatus; + + public WmsActionResponseBean(){} + + public WmsActionResponseBean(Boolean codeStatus,String message) { + this.message = message; + this.codeStatus = codeStatus; + } + + public WmsActionResponseBean(Double percent, String message, List informations, List> details, Boolean codeStatus) { + this.percent = percent; + this.message = message; + this.informations = informations; + this.details = details; + this.codeStatus = codeStatus; + } } diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsASNMasterDetailsRepository.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsASNMasterDetailsRepository.java index 00e94fd..dc69f66 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsASNMasterDetailsRepository.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsASNMasterDetailsRepository.java @@ -13,4 +13,6 @@ import org.springframework.stereotype.Repository; **/ @Repository public interface WmsASNMasterDetailsRepository extends BaseRepository { + + } From 52d4a995d4ebbe045fcd62485804bd6eadf2f7fd Mon Sep 17 00:00:00 2001 From: alwaysfrin <39822157+alwaysfrin@users.noreply.github.com> Date: Wed, 28 Nov 2018 17:21:54 +0800 Subject: [PATCH 13/19] =?UTF-8?q?spring=20gateway=E6=B7=BB=E5=8A=A0=20?= =?UTF-8?q?=E7=BB=86=E8=8A=82=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../estsh/i3plus/pojo/base/bean/BaseFallBackBean.java | 19 +++++++++++++++++++ .../estsh/i3plus/pojo/base/bean/BaseResultBean.java | 1 - .../i3plus/pojo/base/enumutil/CommonEnumUtil.java | 3 ++- 3 files changed, 21 insertions(+), 2 deletions(-) create mode 100644 modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/bean/BaseFallBackBean.java diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/bean/BaseFallBackBean.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/bean/BaseFallBackBean.java new file mode 100644 index 0000000..6c0fae6 --- /dev/null +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/bean/BaseFallBackBean.java @@ -0,0 +1,19 @@ +package cn.estsh.i3plus.pojo.base.bean; + +/** + * @Description : 基础fallback类，用于处理熔断 + * @Reference : + * @Author : alwaysfrin + * @CreateDate : 2018-11-22 18:47 + * @Modify: + **/ +public class BaseFallBackBean { + + public BaseResultBean makeBaseFallBack(){ + return makeBaseFallBack("服务暂停"); + } + + public BaseResultBean makeBaseFallBack(String msg){ + return BaseResultBean.buildBaseResultBean(false,msg); + } +} diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/bean/BaseResultBean.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/bean/BaseResultBean.java index ad47fee..5b3a15c 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/bean/BaseResultBean.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/bean/BaseResultBean.java @@ -95,7 +95,6 @@ public class BaseResultBean { return totalCount; } - public static BaseResultBean buildBaseResultBean(boolean success,String msg){ BaseResultBean rs = new BaseResultBean(); rs.success = success; 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 7714b9d..6cafa8e 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 @@ -20,9 +20,10 @@ public class CommonEnumUtil { CORE(2, "i3core", "i3业务平台"), WMS(3, "i3wms", "仓库管理软件"), MES(4, "i3mes", "生产管理软件"), + GATEWAY(96,"impp-gateway","服务网关"), CLOUD(97,"i3cloud","微服务"), SURFACE(98,"i3surface","对外服务"), - CENTER(99,"icloud-server","云服务中心"); + CENTER(99,"icloud-server","注册中心"); public int value; public String code; From bfc1d5ba2b17b59d9cf9f8cd0bb23de55c745f2b Mon Sep 17 00:00:00 2001 From: Silliter Date: Wed, 28 Nov 2018 18:29:44 +0800 Subject: [PATCH 14/19] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E5=86=B2=E7=AA=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/model/wms/ActionButlerModel.java | 28 ++++++++++++++++++++++ .../pojo/wms/bean/WmsActionResponseBean.java | 1 - .../i3plus/pojo/wms/bean/WmsOperationBean.java | 3 ++- 3 files changed, 30 insertions(+), 2 deletions(-) create mode 100644 modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/ActionButlerModel.java diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/ActionButlerModel.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/ActionButlerModel.java new file mode 100644 index 0000000..fdf6c5f --- /dev/null +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/ActionButlerModel.java @@ -0,0 +1,28 @@ +package cn.estsh.i3plus.pojo.model.wms; + +import lombok.Data; + +/** + * @Description : 流程管家模型 + * @Reference : + * @Author : silliter.yuan + * @CreateDate : 2018-11-28 15:50 + * @Modify: + **/ +@Data +public class ActionButlerModel { + + private String orderNo; + + private String sn; + + private String aLId; + + private String userNo; + + private String fixNo; + + private String barCode; + + private String funCallName; +} diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionResponseBean.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionResponseBean.java index 1f61c44..0b98807 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionResponseBean.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionResponseBean.java @@ -5,7 +5,6 @@ import io.swagger.annotations.ApiParam; import lombok.AllArgsConstructor; import lombok.Data; import lombok.NoArgsConstructor; -import lombok.RequiredArgsConstructor; import java.util.List; import java.util.Map; diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsOperationBean.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsOperationBean.java index 7367bd0..f492d9d 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsOperationBean.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsOperationBean.java @@ -1,5 +1,6 @@ package cn.estsh.i3plus.pojo.wms.bean; +import cn.estsh.i3plus.pojo.base.bean.BaseBean; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; @@ -16,7 +17,7 @@ import java.util.Map; **/ @Data @Api("接受前端数据实体") -public class WmsOperationBean { +public class WmsOperationBean extends BaseBean { @ApiParam("扫描内容") public String barCode; From 2753f64b7ebfe81ce4c45667683701f40070a8cd Mon Sep 17 00:00:00 2001 From: "wei.peng" Date: Wed, 28 Nov 2018 19:07:46 +0800 Subject: [PATCH 15/19] =?UTF-8?q?=E5=8A=9F=E8=83=BD=E4=BB=A3=E7=A0=81?= =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/cn/estsh/i3plus/pojo/platform/bean/SysMenu.java | 10 +++++++++- .../cn/estsh/i3plus/pojo/platform/sqlpack/CoreHqlPack.java | 6 ------ 2 files changed, 9 insertions(+), 7 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 23fa593..754a668 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 @@ -56,7 +56,15 @@ public class SysMenu extends BaseBean { @Column(name="MENU_CLASS_PATH") @ApiParam(value ="资源class path" , access ="资源class path") private String menuClassPath; - + + @Column(name="MENU_GRADE") + @ApiParam(value ="资源等级", example = "1") + private String menuGrade; + + @Column(name="MENU_SORT") + @ApiParam(value ="资源排序", example = "1") + private String menuSort; + @Column(name="MENU_URL") @ApiParam(value ="资源 url" , access ="资源 url") private String menuUrl; 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 7e2a33c..603a79a 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 @@ -130,12 +130,6 @@ public class CoreHqlPack { HqlPack.getStringLikerPack(department.getName(),"name",result); HqlPack.getStringLikerPack(department.getDepartmentCode(),"departmentCode",result); - // 默认排序 - if(department.getOrderByParam().isEmpty()){ - department.setOrderByParam("departmentSort"); - department.setAscOrDesc(CommonEnumUtil.ASC_OR_DESC.DESC.getValue()); - } - return result.toString(); } From 506f13d4b20a0ba43281d8b98dbc166a4d554c65 Mon Sep 17 00:00:00 2001 From: Silliter Date: Wed, 28 Nov 2018 19:22:24 +0800 Subject: [PATCH 16/19] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E5=86=B2=E7=AA=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/cn/estsh/i3plus/pojo/wms/bean/WmsActionResponseBean.java | 4 ++-- .../src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java | 3 +++ 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionResponseBean.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionResponseBean.java index 3a19099..52bdb57 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionResponseBean.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionResponseBean.java @@ -44,9 +44,9 @@ public class WmsActionResponseBean { public List> details; @ApiParam(value = "结果代码") - public boolean codeStatus; + public Boolean codeStatus; - public WmsActionResponseBean(boolean codeStatus, String message) { + public WmsActionResponseBean(Boolean codeStatus, String message) { this.codeStatus = codeStatus; this.message = 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 2e8af6e..8e9c428 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 @@ -1068,6 +1068,9 @@ public class WmsHqlPack { //查询参数封装 HqlPack.getStringLikerPack(wmsActionModule.getAmName(), "amName", result); + HqlPack.getNumEqualPack(wmsActionModule.getId(), "id", result); + HqlPack.getNumEqualPack(wmsActionModule.getAmType(), "amType", result); + getStringBuilderPack(wmsActionModule, result); return result.toString(); From 7e4801938627daeb70126380070d0f57616fa58a Mon Sep 17 00:00:00 2001 From: alwaysfrin <39822157+alwaysfrin@users.noreply.github.com> Date: Wed, 28 Nov 2018 22:55:40 +0800 Subject: [PATCH 17/19] =?UTF-8?q?=E5=BE=AE=E6=9C=8D=E8=B0=83=E7=94=A8?= =?UTF-8?q?=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/base/enumutil/CommonEnumUtil.java | 1 + 1 file changed, 1 insertion(+) 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 6cafa8e..241a767 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 @@ -20,6 +20,7 @@ public class CommonEnumUtil { CORE(2, "i3core", "i3业务平台"), WMS(3, "i3wms", "仓库管理软件"), MES(4, "i3mes", "生产管理软件"), + CONSOLE(95,"impp-console","服务监控台"), GATEWAY(96,"impp-gateway","服务网关"), CLOUD(97,"i3cloud","微服务"), SURFACE(98,"i3surface","对外服务"), From 9dd0392bc047e983aa0ade8ad4c584e86cba893b Mon Sep 17 00:00:00 2001 From: Silliter Date: Thu, 29 Nov 2018 09:25:58 +0800 Subject: [PATCH 18/19] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E5=86=B2=E7=AA=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 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 3595182..c790aca 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 @@ -1514,17 +1514,23 @@ public class WmsEnumUtil { @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum RC_RESPONSE_TIPS { - OK(true, "正确"), - NG(false, "失败"); + OK(1, true, "正确"), + NG(2, false, "失败"); + private int value; private boolean codeStatus; private String description; - RC_RESPONSE_TIPS(boolean codeStatus, String description) { + RC_RESPONSE_TIPS(int value, boolean codeStatus, String description) { + this.value = value; this.codeStatus = codeStatus; this.description = description; } + public int getValue() { + return value; + } + public boolean getCodeStatus() { return codeStatus; } From 76af7098412ce968c85950327476404e45e83567 Mon Sep 17 00:00:00 2001 From: jimmy <1622218722@qq.com> Date: Thu, 29 Nov 2018 10:08:06 +0800 Subject: [PATCH 19/19] =?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 | 39 ++++++++++++++++++++++ 1 file changed, 39 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 3595182..e99d6f1 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 @@ -1610,4 +1610,43 @@ public class WmsEnumUtil { return tmp; } } + + /** + * 组件类型 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum COMPONENT_TYPE { + + PROCESS_HANDLING(10, "流程处理组件,"), + PROCESS_INITIALIZATION(20, "流程初始化组件"), + PROCESS_END(30, "流程结束组件"), + DETAIL_PROCESS(40, "明细处理组件"), + BACK_DISPLAY(50, "回显示组件"); + + private int value; + private String description; + + COMPONENT_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; + } + } }