From 8bc9984e4eeb4b491b55a449f2deb2ddad6f5a4a Mon Sep 17 00:00:00 2001 From: "jessica.chen" Date: Wed, 28 Nov 2018 16:56:11 +0800 Subject: [PATCH 1/3] =?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 2/3] =?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 3/3] =?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;