From 71e73622166bca46555c121da80d2d73e33863ee Mon Sep 17 00:00:00 2001 From: crish <570360737@qq.com> Date: Thu, 29 Aug 2019 09:33:22 +0800 Subject: [PATCH 1/2] =?UTF-8?q?PCN=E6=95=B0=E6=8D=AE=E5=90=8C=E6=AD=A5?= =?UTF-8?q?=EF=BC=8C=20=E9=80=BB=E8=BE=91=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: crish <570360737@qq.com> --- .../java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesProdRouteOptParam.java | 4 ++++ .../main/java/cn/estsh/i3plus/pojo/mes/bean/MesProdRouteOptParam.java | 4 ++++ 2 files changed, 8 insertions(+) diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesProdRouteOptParam.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesProdRouteOptParam.java index 4ca2cb4..effd957 100644 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesProdRouteOptParam.java +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesProdRouteOptParam.java @@ -62,4 +62,8 @@ public class MesProdRouteOptParam extends BaseBean { public int getStepSeq() { return this.stepSeq == null ? 0 : this.stepSeq; } + + public void setStepSeq(int stepSeq) { + this.stepSeq = stepSeq; + } } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProdRouteOptParam.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProdRouteOptParam.java index 786c2eb..313d7e7 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProdRouteOptParam.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProdRouteOptParam.java @@ -73,6 +73,10 @@ public class MesProdRouteOptParam extends BaseBean { return this.stepSeq == null ? 0 : this.stepSeq; } + public void setStepSeq(int stepSeq) { + this.stepSeq = stepSeq; + } + public int getParamTypeVal() { return this.paramType == null ? 0 : this.paramType; } From 27d574314d701f612bb42b010ab7481ce801db56 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=AE=B8=E5=BF=83=E6=B4=81?= Date: Thu, 29 Aug 2019 15:17:07 +0800 Subject: [PATCH 2/2] =?UTF-8?q?getList=E6=9C=AA=E6=9F=A5=E5=88=B0=E6=95=B0?= =?UTF-8?q?=E6=8D=AE=E8=A6=81=E5=88=A4=E6=96=AD+=E8=A1=A5=E5=85=A8?= =?UTF-8?q?=E6=89=80=E6=9C=89showInformation=E5=8C=BA=E5=88=86=E9=A2=9C?= =?UTF-8?q?=E8=89=B2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cn/estsh/i3plus/pojo/model/wms/WmsMessageStyleModel.java | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsMessageStyleModel.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsMessageStyleModel.java index edbc48f..15714c1 100644 --- a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsMessageStyleModel.java +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsMessageStyleModel.java @@ -1,5 +1,6 @@ package cn.estsh.i3plus.pojo.model.wms; +import cn.estsh.i3plus.pojo.base.enumutil.WmsEnumUtil; import io.swagger.annotations.ApiParam; import lombok.Data; @@ -40,4 +41,15 @@ public class WmsMessageStyleModel implements Serializable { public WmsMessageStyleModel(String message) { this.message = message; } + + public WmsMessageStyleModel(String message, double transQty, double actQty) { + this.message = message; + if (actQty == 0) {//未处理 + this.odStatus = WmsEnumUtil.MASTER_ORDER_STATUS.CREATE.getValue(); + } else if (actQty > 0) { + this.odStatus = WmsEnumUtil.MASTER_ORDER_STATUS.RECEIPT.getValue(); + } else if (actQty == transQty) { + this.odStatus = WmsEnumUtil.MASTER_ORDER_STATUS.RECEIPT_FINISH.getValue(); + } + } }