From 7378df1b9e6a9429a85cf260554e479aca4e2027 Mon Sep 17 00:00:00 2001 From: 1111 Date: Sat, 9 Nov 2019 11:53:57 +0800 Subject: [PATCH] =?UTF-8?q?=E3=80=90=E5=AE=81=E5=BE=B7=E9=97=AE=E9=A2=98?= =?UTF-8?q?=E6=B8=85=E5=8D=95=E3=80=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/base/enumutil/WmsEnumUtil.java | 40 +++++++++++++++++++--- .../i3plus/pojo/wms/bean/WmsContainerType.java | 2 +- .../estsh/i3plus/pojo/wms/dto/PartPackagDto.java | 27 +++++++++++++++ .../cn/estsh/i3plus/pojo/wms/dto/QuanWarnDto.java | 12 +++++++ .../wms/repository/WmsPartPackageRepository.java | 17 +++++++++ 5 files changed, 93 insertions(+), 5 deletions(-) create mode 100644 modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dto/PartPackagDto.java create mode 100644 modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsPartPackageRepository.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 f0f21ca..29b40bd 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 @@ -3548,10 +3548,7 @@ public class WmsEnumUtil { public enum REC_STATUS { UNRECEIVED("UNRECEIVED", "未收货"), COMPLETE_RECEIPT("COMPLETE_RECEIPT", "完成收货"), - PARTIAL_RECEIPT("PARTIAL_RECEIPT", "部分收货"), - OVER_RECEIVED_GOODS("OVER_RECEIVED_GOODS", "超量收货"), - OTHER("ELSE", "其他"), - ; + PARTIAL_RECEIPT("PARTIAL_RECEIPT", "部分收货"); private String value; private String description; @@ -4057,4 +4054,39 @@ public class WmsEnumUtil { return tmp; } } + + + /** + * 日志推送至MQ的处理类型 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum SPEC_LEVEL { + FIRST_LEVEL(10, "一层"), SECOND_LEVEL(20, "二层"), THIRD_LEVEL(30, "三层"), FOURTH_LEVEL(40, "四层"), FIFTH_LEVEL(50, "五层"); + + private int value; + private String description; + + SPEC_LEVEL(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; + } + } } \ No newline at end of file diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsContainerType.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsContainerType.java index c14e979..78f240d 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsContainerType.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsContainerType.java @@ -19,7 +19,7 @@ import javax.persistence.Transient; /** * @Description :容器类型 * @Reference : - * @Author : 容器类型 + * @Author : gcj * @CreateDate : 2019-11-07 16:06 * @Modify: **/ diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dto/PartPackagDto.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dto/PartPackagDto.java new file mode 100644 index 0000000..812dda1 --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dto/PartPackagDto.java @@ -0,0 +1,27 @@ +package cn.estsh.i3plus.pojo.wms.dto; + +import cn.estsh.i3plus.pojo.base.common.Pager; +import cn.estsh.i3plus.pojo.wms.bean.WmsPartPackage; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.Data; + +import java.util.List; + +/** + * @Description :物料包装关系入参 + * @Reference : + * @Author : gcj + * @CreateDate : 2019-11-07 16:06 + * @Modify: + **/ +@Data +@Api("物料包装关系入参") +public class PartPackagDto{ + + @ApiParam(value = "物料编码") + private String partNo; + @ApiParam(value = "工厂代码") + private List partPackages; + +} diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dto/QuanWarnDto.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dto/QuanWarnDto.java index ace266b..0adf02a 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dto/QuanWarnDto.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dto/QuanWarnDto.java @@ -2,15 +2,27 @@ package cn.estsh.i3plus.pojo.wms.dto; import cn.estsh.i3plus.pojo.base.common.Pager; import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; import lombok.Data; +/** + * @Description :库存预警入参 + * @Reference : + * @Author : gcj + * @CreateDate : 2019-11-07 16:06 + * @Modify: + **/ @Data @Api("库存预警入参") public class QuanWarnDto extends Pager { + @ApiParam(value = "工厂代码") private String organizeCode; + @ApiParam(value = "是否选择") private Integer checked; + @ApiParam(value = "物料编码") private String partNo; + @ApiParam(value = "物料类型") private String partType; public Integer getChecked() { diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsPartPackageRepository.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsPartPackageRepository.java new file mode 100644 index 0000000..69075b7 --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsPartPackageRepository.java @@ -0,0 +1,17 @@ +package cn.estsh.i3plus.pojo.wms.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.wms.bean.WmsPackageSpec; +import cn.estsh.i3plus.pojo.wms.bean.WmsPartPackage; +import org.springframework.stereotype.Repository; + +/** +* @Description :包装关系Repository的方法接口 +* @Reference : +* @Author : gcj +* @CreateDate : 2019-11-08 10:19 +* @Modify: +**/ +@Repository +public interface WmsPartPackageRepository extends BaseRepository { +}