From c05b22668f842bb0fac2f30c08ae294be66f54a7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=88=98=E6=95=8F?= <962239776@qq.com> Date: Wed, 4 Sep 2019 19:08:57 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E5=AD=97=E6=AE=B5=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../estsh/i3plus/pojo/wms/bean/WmsMoveMaster.java | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveMaster.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveMaster.java index 05347ae..40a2930 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveMaster.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveMaster.java @@ -146,6 +146,28 @@ public class WmsMoveMaster extends BaseBean { public WmsMoveMaster(){}; + public WmsMoveMaster(String orderNo, Integer orderStatus, String transTypeCode, String errorMessage, + Integer isUrgent,String carNo, Integer busiTypeCode, String refOrderNo, String refSrc,String partNo, Integer itemStatus,String remark, + String organizeCode,String createDatetime,String createUser,String modifyDatetime,String modifyUser) { + this.orderNo = orderNo; + this.orderStatus = orderStatus; + this.remark = remark; + this.isUrgent=isUrgent; + this.transTypeCode = transTypeCode; + this.errorMessage = errorMessage; + this.busiTypeCode = busiTypeCode; + this.partNo = partNo; + this.itemStatus = itemStatus; + this.refOrderNo = refOrderNo; + this.carNo = carNo; + this.refSrc = refSrc; + this.organizeCode =organizeCode; + this.createDatetime= createDatetime; + this.createUser = createUser; + this.modifyDatetime =modifyDatetime; + this.modifyUser =modifyUser; + } + public WmsMoveMaster(Long id,String orderNo,String organizeCode,String partNo,String partNameRdd,String transTypeCode,String transTypeName,Integer itemStatus, String unit,String srcWhNo,String srcZoneNo,String destWhNo,String destZoneNo,Double transQty, Double rejectQty,String fixId,Integer busiTypeCode,String refSrc) { this.id = id; From 7ce78b170fa34ee9dcfd706f74d89e474cc1828f Mon Sep 17 00:00:00 2001 From: crish <570360737@qq.com> Date: Wed, 4 Sep 2019 19:22:47 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E5=B7=A5=E4=BD=9C=E5=8F=82=E6=95=B0?= =?UTF-8?q?=E6=9E=9A=E4=B8=BE?= 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/base/enumutil/MesEnumUtil.java | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java index 7ebba6f..f2a4690 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java @@ -881,15 +881,17 @@ public class MesEnumUtil { @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum STEP_PARAM_TYPE { - QUALIFIED(10, "数字"), - DEFECTED(20, "字符串"), - SCRAPED(30, "可选值"); + QUALIFIED(10,"number", "数字"), + DEFECTED(20, "text","字符串"), + SCRAPED(30,"select", "可选值"); private int value; + private String code; private String description; - STEP_PARAM_TYPE(int value, String description) { + STEP_PARAM_TYPE(int value,String code, String description) { this.value = value; + this.code = code; this.description = description; } @@ -897,6 +899,8 @@ public class MesEnumUtil { return value; } + public String getCode(){return code;} + public String getDescription() { return description; }