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] =?UTF-8?q?=E8=BF=94=E5=9B=9E=E5=AE=9E=E4=BD=93=E6=9E=84?= =?UTF-8?q?=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 { + + }