From 3faba3bbc26b9df7b916e587af03398ef01a5de2 Mon Sep 17 00:00:00 2001 From: Silliter Date: Wed, 6 Mar 2019 17:06:59 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E5=AE=9E=E4=BD=93=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- modules/i3plus-pojo-model/pom.xml | 5 ++++ .../i3plus/pojo/model/wms/ActionButlerModel.java | 28 ---------------------- .../i3plus/pojo/model/wms/WmsMoveInfoModel.java | 15 ++++++++++++ modules/i3plus-pojo-wms/pom.xml | 5 ---- .../pojo/wms/bean/WmsActionResponseBean.java | 4 +--- .../i3plus/pojo/wms/bean/WmsOperationBean.java | 2 -- .../i3plus/pojo/wms/bean/WmsOptionModel.java} | 4 ++-- .../cn/estsh/i3plus/pojo/wms/bean/WmsPart.java | 4 ++++ 8 files changed, 27 insertions(+), 40 deletions(-) delete mode 100644 modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/ActionButlerModel.java create mode 100644 modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsMoveInfoModel.java rename modules/{i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/OptionModel.java => i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsOptionModel.java} (89%) diff --git a/modules/i3plus-pojo-model/pom.xml b/modules/i3plus-pojo-model/pom.xml index 24763f0..e975c42 100644 --- a/modules/i3plus-pojo-model/pom.xml +++ b/modules/i3plus-pojo-model/pom.xml @@ -29,6 +29,11 @@ i3plus-pojo-report + + i3plus.pojo + i3plus-pojo-wms + + 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 deleted file mode 100644 index fdf6c5f..0000000 --- a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/ActionButlerModel.java +++ /dev/null @@ -1,28 +0,0 @@ -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-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsMoveInfoModel.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsMoveInfoModel.java new file mode 100644 index 0000000..46f72e4 --- /dev/null +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsMoveInfoModel.java @@ -0,0 +1,15 @@ +package cn.estsh.i3plus.pojo.model.wms; + +import lombok.Data; + +/** + * @Description : 库存移动单模型 + * @Reference : + * @Author : siliter.yuan + * @CreateDate : 2019-03-06 15:50 + * @Modify: + **/ +@Data +public class WmsMoveInfoModel { + +} diff --git a/modules/i3plus-pojo-wms/pom.xml b/modules/i3plus-pojo-wms/pom.xml index 7409467..db2f77a 100644 --- a/modules/i3plus-pojo-wms/pom.xml +++ b/modules/i3plus-pojo-wms/pom.xml @@ -16,11 +16,6 @@ i3plus.pojo - i3plus-pojo-model - - - - i3plus.pojo i3plus-pojo-base 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 d87e915..ce8cd86 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 @@ -1,7 +1,5 @@ package cn.estsh.i3plus.pojo.wms.bean; -import cn.estsh.i3plus.pojo.base.bean.BaseResultBean; -import cn.estsh.i3plus.pojo.model.wms.OptionModel; import com.fasterxml.jackson.databind.annotation.JsonSerialize; import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; import io.swagger.annotations.Api; @@ -45,7 +43,7 @@ public class WmsActionResponseBean { public List informations; @ApiParam("可选项") - public List options; + public List options; @ApiParam("选中的明细数据") public Obj details; 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 1fbbbf4..b572de7 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,13 +1,11 @@ package cn.estsh.i3plus.pojo.wms.bean; import cn.estsh.i3plus.pojo.base.bean.BaseBean; -import cn.estsh.i3plus.pojo.model.wms.OptionModel; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; import java.util.List; -import java.util.Map; /** * @Description : PDA传输到后台的实体bean对象 diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/OptionModel.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsOptionModel.java similarity index 89% rename from modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/OptionModel.java rename to modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsOptionModel.java index 7ab343e..fa5063d 100644 --- a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/OptionModel.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsOptionModel.java @@ -1,4 +1,4 @@ -package cn.estsh.i3plus.pojo.model.wms; +package cn.estsh.i3plus.pojo.wms.bean; import lombok.Data; @@ -10,7 +10,7 @@ import lombok.Data; * @Modify: **/ @Data -public class OptionModel { +public class WmsOptionModel { private String code; diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPart.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPart.java index c019a19..48154b2 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPart.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPart.java @@ -106,4 +106,8 @@ public class WmsPart extends BaseBean { @Column(name="LOT_CHECK_RULE") @ApiParam(value ="批次校验规则") private String lotCheckRule; + + @Column(name="IN_LOCATE_NO") + @ApiParam(value ="默认入库库位") + private String inLocateNo; } From e80d4769025ffb971cacc83219e11d727a67bcfe Mon Sep 17 00:00:00 2001 From: Silliter Date: Wed, 6 Mar 2019 17:23:55 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E8=B0=83=E6=95=B4model=E5=AE=9E=E4=BD=93?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/model/wms/WmsMoveInfoModel.java | 15 ------------- .../i3plus/pojo/model/wms/WmsMoveMasterModel.java | 25 ++++++++++++++++++++++ 2 files changed, 25 insertions(+), 15 deletions(-) delete mode 100644 modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsMoveInfoModel.java create mode 100644 modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsMoveMasterModel.java diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsMoveInfoModel.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsMoveInfoModel.java deleted file mode 100644 index 46f72e4..0000000 --- a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsMoveInfoModel.java +++ /dev/null @@ -1,15 +0,0 @@ -package cn.estsh.i3plus.pojo.model.wms; - -import lombok.Data; - -/** - * @Description : 库存移动单模型 - * @Reference : - * @Author : siliter.yuan - * @CreateDate : 2019-03-06 15:50 - * @Modify: - **/ -@Data -public class WmsMoveInfoModel { - -} diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsMoveMasterModel.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsMoveMasterModel.java new file mode 100644 index 0000000..5c7bddf --- /dev/null +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsMoveMasterModel.java @@ -0,0 +1,25 @@ +package cn.estsh.i3plus.pojo.model.wms; + +import lombok.Data; + +import java.util.List; + +/** + * @Description : 库存移动单模型 + * @Reference : + * @Author : siliter.yuan + * @CreateDate : 2019-03-06 15:50 + * @Modify: + **/ +@Data +public class WmsMoveMasterModel { + public String orderNo; + + public Integer orderStatus; + + public String reMark; + + private String transTypeCode; + + private List moveDetails; +} From b0d34a04b48976b2e8c796fc964fd251e848ed53 Mon Sep 17 00:00:00 2001 From: Silliter Date: Wed, 6 Mar 2019 17:24:44 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E8=B0=83=E6=95=B4model=E5=AE=9E=E4=BD=93?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/model/wms/WmsMoveDetailsModel.java | 59 ++++++++++++++++++++++ .../i3plus/pojo/model/wms/WmsMoveSnModel.java | 42 +++++++++++++++ 2 files changed, 101 insertions(+) create mode 100644 modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsMoveDetailsModel.java create mode 100644 modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsMoveSnModel.java diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsMoveDetailsModel.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsMoveDetailsModel.java new file mode 100644 index 0000000..d885242 --- /dev/null +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsMoveDetailsModel.java @@ -0,0 +1,59 @@ +package cn.estsh.i3plus.pojo.model.wms; + +import lombok.Data; + +import java.util.List; + +/** + * @Description : 库存移动明细模型 + * @Reference : + * @Author : siliter.yuan + * @CreateDate : 2019-03-06 15:50 + * @Modify: + **/ +@Data +public class WmsMoveDetailsModel { + public String orderNo; + + public Integer item; + + public String partNo; + + public String partNameRdd; + + public String vendorNo; + + public String custNo; + + public Double qty; + + public Double transQty; + + public String unit; + + public String srcWhNo; + + public String srcZoneNo; + + public String srcLocateNo; + + public String destWhNo; + + public String destZoneNo; + + public String destLocateNo; + + /** + * 状态:1=创建,10=待处理,20=已处理 + */ + public Integer itemStatus; + + /** + * ASN,PO,SO + */ + public Integer refType; + + public String refSrc; + + private List moveDetails; +} diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsMoveSnModel.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsMoveSnModel.java new file mode 100644 index 0000000..5d44741 --- /dev/null +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsMoveSnModel.java @@ -0,0 +1,42 @@ +package cn.estsh.i3plus.pojo.model.wms; + +import lombok.Data; + +/** + * @Description : 库存移动条码模型 + * @Reference : + * @Author : siliter.yuan + * @CreateDate : 2019-03-06 15:50 + * @Modify: + **/ +@Data +public class WmsMoveSnModel { + public String orderNo; + + public Integer item; + + public String partNo; + + public String partNameRdd; + + public String unit; + + public String sn; + + /** + * 状态:1=创建,10=待处理,20=已处理 + */ + public Integer itemStatus; + + public String reMark; + + public String lotNo; + + public String packAgeNo; + + public Double qty; + + public String srcLocateNo; + + public String destLocateNo; +} From 8e029e82e0696e4221c45555e1f7256dde09a0b1 Mon Sep 17 00:00:00 2001 From: "yunhao.wang" Date: Wed, 6 Mar 2019 20:01:14 +0800 Subject: [PATCH 4/4] =?UTF-8?q?=E6=8A=A5=E8=A1=A8=E4=BC=98=E5=8C=96=20?= =?UTF-8?q?=E8=A7=A3=E5=86=B3bug=20=E9=82=AE=E4=BB=B6=E6=B6=88=E6=81=AF?= =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/base/enumutil/ImppEnumUtil.java | 34 ++++++++++++++++++++++ .../estsh/i3plus/pojo/platform/bean/SysConfig.java | 4 +++ .../i3plus/pojo/platform/bean/SysMessage.java | 6 +++- 3 files changed, 43 insertions(+), 1 deletion(-) diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/ImppEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/ImppEnumUtil.java index 0d0e9c0..4d003e2 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/ImppEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/ImppEnumUtil.java @@ -1047,4 +1047,38 @@ public class ImppEnumUtil { return tmp; } } + + //messageReceiverType + + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum MESSAGE_RECEIVER_TYPE { + INTERNAL(1, "内部人员接收"), + EXTERNAL(2, "外部人员接收"), + URGENT(3, "紧急联系人接收"); + private int value; + private String description; + + public int getValue() { + return value; + } + + public String getDescription() { + return description; + } + + private MESSAGE_RECEIVER_TYPE(int value, String description) { + this.value = value; + this.description = 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; + } + } } diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysConfig.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysConfig.java index 32d44bc..85501de 100644 --- a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysConfig.java +++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysConfig.java @@ -55,6 +55,10 @@ public class SysConfig extends BaseBean { @ApiParam(value ="参数值") private String configValue; + @Column(name="CONFIG_VALUE_OPTION") + @ApiParam(value ="参数值选项（参数类型为多选时使用），格式：{key:'',value:''}") + private String configValueOption; + @Column(name="CONFIG_DESCRIPTION") @ApiParam(value ="参数描述") private String configDescription; diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysMessage.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysMessage.java index be4d80c..978c2d1 100644 --- a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysMessage.java +++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysMessage.java @@ -55,8 +55,12 @@ public class SysMessage extends BaseBean { @ApiParam(value ="发送者名称" ) private String messageSenderNameRdd; + @Column(name="MESSAGE_RECEIVER_TYPE") + @ApiParam(value ="收件人类型(枚举：ImppEnumUtil.MESSAGE_TYPE)" , example ="-1") + private Integer messageReceiverType; + @Column(name="MESSAGE_RECEIVERS_ID") - @ApiParam(value ="发送者id" ) + @ApiParam(value ="收件者id" ) private String messageReceiversId; @Column(name="MESSAGE_RECEIVERS_NAME_RDD")