From 933654a86a3182e4aac6ae77a0b950eee2933bd8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9F=AF=E8=A3=95?= Date: Thu, 7 Mar 2019 09:17:39 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=BA=93=E4=BD=8D?= =?UTF-8?q?=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 | 34 ++++++++++++++++++++++ 1 file changed, 34 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 3bef53e..e5ac171 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 @@ -500,6 +500,40 @@ public class WmsEnumUtil { } /** + * 库位状态 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum LOCATE_STATUS { + CREATE(10, "空库位"), FINISH(20, "非空"), FAIL(30, "已满"); + + private int value; + private String description; + + LOCATE_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; + } + } + + /** * 外部单据：移库单移动类型 */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) From ba90dfb1231712318f480b643aef4f1d6b08c49e Mon Sep 17 00:00:00 2001 From: Silliter Date: Thu, 7 Mar 2019 09:28:25 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E5=BC=80=E5=8F=91=E4=BA=A4=E6=98=93?= =?UTF-8?q?=E5=A4=84=E7=90=86=E4=B8=BB=E7=A8=8B=E5=BA=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/base/enumutil/WmsEnumUtil.java | 4 +- .../i3plus/pojo/model/wms/WmsMoveDetailsModel.java | 50 +++------------------- .../i3plus/pojo/model/wms/WmsMoveMasterModel.java | 13 ++---- .../i3plus/pojo/model/wms/WmsMoveSnModel.java | 42 ------------------ .../estsh/i3plus/pojo/wms/bean/WmsMoveMaster.java | 12 ++++++ .../estsh/i3plus/pojo/wms/bean/WmsTransType.java | 13 ++++++ .../wms/repository/WmsTransModuleRepository.java | 16 +++++++ 7 files changed, 52 insertions(+), 98 deletions(-) delete mode 100644 modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsMoveSnModel.java create mode 100644 modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsTransModuleRepository.java 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 22163ea..e6ae28c 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 @@ -205,7 +205,7 @@ public class WmsEnumUtil { */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum ORDER_STATUS { - CREATE(10, "新建"), + CREATE(1, "新建"), RECEIPT(10, "收货中"), RECEIPT_FINISH(20, "收货完成"), WAREHOUSING(30, "入库中"), @@ -1664,6 +1664,4 @@ public class WmsEnumUtil { return description; } } - - } 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 index d885242..30fe13b 100644 --- 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 @@ -1,7 +1,10 @@ package cn.estsh.i3plus.pojo.model.wms; +import cn.estsh.i3plus.pojo.wms.bean.WmsMoveDetails; +import cn.estsh.i3plus.pojo.wms.bean.WmsMoveSn; import lombok.Data; +import java.io.Serializable; import java.util.List; /** @@ -12,48 +15,7 @@ import java.util.List; * @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; +public class WmsMoveDetailsModel implements Serializable { + private WmsMoveDetails details; + private List moveSn; } 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 index 5c7bddf..a4b54c4 100644 --- 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 @@ -1,7 +1,9 @@ package cn.estsh.i3plus.pojo.model.wms; +import cn.estsh.i3plus.pojo.wms.bean.WmsMoveMaster; import lombok.Data; +import java.io.Serializable; import java.util.List; /** @@ -12,14 +14,7 @@ import java.util.List; * @Modify: **/ @Data -public class WmsMoveMasterModel { - public String orderNo; - - public Integer orderStatus; - - public String reMark; - - private String transTypeCode; - +public class WmsMoveMasterModel implements Serializable { + private WmsMoveMaster moveMaster; 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 deleted file mode 100644 index 5d44741..0000000 --- a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsMoveSnModel.java +++ /dev/null @@ -1,42 +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 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; -} 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 3268ddd..285395a 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 @@ -46,4 +46,16 @@ public class WmsMoveMaster extends BaseBean { @Column(name = "TRANS_TYPE_CODE") @ApiParam(value = "交易类型代码") private String transTypeCode; + + @Column(name = "ERROR_MESSAGE") + @ApiParam(value = "错误信息") + private String errorMessage; + + @Column(name="IS_URGENT") + @ApiParam(value = "是否紧急", example = "0") + public Integer isUrgent; + + @Column(name = "CAR_NO") + @ApiParam(value = "车牌号") + private String carNo; } diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTransType.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTransType.java index a9dde28..9c4aa2c 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTransType.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTransType.java @@ -52,4 +52,17 @@ public class WmsTransType extends BaseBean { @ApiParam("中文流程名称") private String agNameC; + @Column(name = "TRANS_TYPE_DESC") + @ApiParam(value = "类型说明") + private String transTypeDesc; + + @Column(name = "TM_ID") + @ApiParam(value = "交易处理组件", example = "-1") + @JsonSerialize(using = ToStringSerializer.class) + private Long tmId; + + @Column(name = "OP_TYPE_ID") + @ApiParam(value = "作业类型编号", example = "-1") + @JsonSerialize(using = ToStringSerializer.class) + private Long opTypeId; } diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsTransModuleRepository.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsTransModuleRepository.java new file mode 100644 index 0000000..a94b4f4 --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsTransModuleRepository.java @@ -0,0 +1,16 @@ +package cn.estsh.i3plus.pojo.wms.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.wms.bean.WmsTransModule; +import org.springframework.stereotype.Repository; + +/** + * @Description : 对象持久层仓用方法控制 + * @Reference : + * @Author : siliter + * @CreateDate : 2019-03-06 9:47 + * @Modify: + **/ +@Repository +public interface WmsTransModuleRepository extends BaseRepository { +} From e9a04ec9601dd4af30ace9eae78e0b562e6bf6a6 Mon Sep 17 00:00:00 2001 From: Silliter Date: Thu, 7 Mar 2019 09:31:49 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E5=86=B2=E7=AA=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveMaster.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) 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 285395a..7910609 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 @@ -24,22 +24,22 @@ import javax.persistence.Table; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) -@Table(name="WMS_MOVE_MASTER") +@Table(name = "WMS_MOVE_MASTER") @Api("库存移动单主表信息") public class WmsMoveMaster extends BaseBean { - @Column(name="ORDER_NO") + @Column(name = "ORDER_NO") @ApiParam("单号") public String orderNo; /** * 状态:1=创建,10=待处理,20=已处理 */ - @Column(name="ORDER_STATUS") + @Column(name = "ORDER_STATUS") @ApiParam(value = "状态", example = "0") public Integer orderStatus; - @Column(name="REMARK") + @Column(name = "REMARK") @ApiParam("备注") public String reMark;