From 71c867dd8cebc93291d113e68619b4d81ac01c75 Mon Sep 17 00:00:00 2001 From: 1111 Date: Fri, 8 Nov 2019 16:53:06 +0800 Subject: [PATCH] =?UTF-8?q?=E3=80=90=E5=8C=85=E8=A3=85=E8=A7=84=E6=A0=BC?= =?UTF-8?q?=E3=80=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/base/enumutil/WmsEnumUtil.java | 53 ++++++++++++++++- .../i3plus/pojo/wms/bean/WmsContainerType.java | 51 ++++++++++++++++ .../estsh/i3plus/pojo/wms/bean/WmsPackageSpec.java | 64 ++++++++++++++++++++ .../cn/estsh/i3plus/pojo/wms/bean/WmsPart.java | 13 +++++ .../estsh/i3plus/pojo/wms/bean/WmsPartPackage.java | 68 ++++++++++++++++++++++ .../pojo/wms/modelbean/WmsDataAuthModel.java | 3 + .../wms/repository/WmsContainerTypeRepository.java | 16 +++++ .../wms/repository/WmsPackageSpecRepository.java | 17 ++++++ 8 files changed, 284 insertions(+), 1 deletion(-) create mode 100644 modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsContainerType.java create mode 100644 modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPackageSpec.java create mode 100644 modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPartPackage.java create mode 100644 modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsContainerTypeRepository.java create mode 100644 modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsPackageSpecRepository.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 457f5e5..c2b7c06 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 @@ -1970,7 +1970,8 @@ public class WmsEnumUtil { LOCATE(30, "LOCATE", "库位对象"), MATERIAL(40, "MATERIAL", "物料对象"), TRANS_TYPE(50, "TRANS_TYPE", "交易代码对象"), - BUSI_TYPE(60, "BUSI_TYPE", "业务类型对象"); + BUSI_TYPE(60, "BUSI_TYPE", "业务类型对象"), + BUSI_OPERATION_TYPE(70, "BUSI_OPERATION_TYPE", "业务操作对象"); private String code; private String description; @@ -2311,6 +2312,56 @@ public class WmsEnumUtil { return tmp; } } + /** + * NC处理 操作类型 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum BUSI_OPERATION_TYPE { + //收货改数 + GOODS_CHANGE_NUMBER(10, "GOODS_CHANGE_NUMBER", "收货改数") ; + + private int value; + private String code; + private String description; + + BUSI_OPERATION_TYPE(int value, String code, String description) { + this.value = value; + this.code = code; + this.description = description; + } + + public int getValue() { + return value; + } + + public String getDescription() { + return description; + } + + public String getCode() { + return code; + } + + 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; + } + + public static int descOf(String desc) { + int tmp = 1; + for (int i = 0; i < values().length; i++) { + if (values()[i].description.equals(desc)) { + tmp = values()[i].value; + } + } + return tmp; + } + } /** * 盘点物料 是否调差 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 new file mode 100644 index 0000000..c14e979 --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsContainerType.java @@ -0,0 +1,51 @@ +package cn.estsh.i3plus.pojo.wms.bean; + +import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn; +import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import cn.estsh.i3plus.pojo.base.enumutil.WmsEnumUtil; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.hibernate.annotations.ColumnDefault; +import org.hibernate.annotations.DynamicInsert; +import org.hibernate.annotations.DynamicUpdate; + +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.Table; +import javax.persistence.Transient; + +/** + * @Description :容器类型 + * @Reference : + * @Author : 容器类型 + * @CreateDate : 2019-11-07 16:06 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "WMS_CONTAINER_TYPE") +@Api("容器类型") +public class WmsContainerType extends BaseBean { + private static final long serialVersionUID = 4849044986767609347L; + @Column(name = "CT_CODE",unique = true) + @ApiParam(value = "容器类型代码") + private String ctCode; + + @Column(name = "CT_NAME") + @ApiParam(value = "容器类型名称") + private String ctName; + + @Column(name = "USE_LIMIT") + @ApiParam(value = "使用期限") + private Integer useLimit; + + @Column(name = "IS_RECYCLE") + @ApiParam(value = "是否回收") + @AnnoOutputColumn(refClass = WmsEnumUtil.TRUE_OR_FALSE.class, refForeignKey = "value", value = "description") + private Integer isRecycle; +} diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPackageSpec.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPackageSpec.java new file mode 100644 index 0000000..c39a72c --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPackageSpec.java @@ -0,0 +1,64 @@ +package cn.estsh.i3plus.pojo.wms.bean; + +import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.hibernate.annotations.DynamicInsert; +import org.hibernate.annotations.DynamicUpdate; + +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.Table; +import javax.persistence.Transient; + +/** + * @Description :容器类型 + * @Reference : + * @Author : 容器类型 + * @CreateDate : 2019-11-07 16:06 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "WMS_PACKAGE_SPEC") +@Api("包装规格") +public class WmsPackageSpec extends BaseBean { + private static final long serialVersionUID = 4849044986767609445L; + @Column(name = "SPEC_CODE",unique = true) + @ApiParam(value = "包装规格代码") + private String specCode; + + @Column(name = "SPEC_NAME") + @ApiParam(value = "包装规格名称") + private String specName; + + @Column(name = "QTY") + @ApiParam(value = "包装数量") + private Double qty; + + @Column(name = "PARENT_SPEC") + @ApiParam(value = "上级规格") + private String parentSpec; + + @Column(name = "SPEC_LEVEL") + @ApiParam(value = "规格层级") + private String specLevel; + + @Column(name = "IS_MIXED") + @ApiParam(value = "是否混包") + private Integer isMixed; + + + @Column(name = "POCKET_TYPE") + @ApiParam(value = "默认容器类型") + private String pocketType; + + @ApiParam(value = "上级规格名称") + @Transient + private String parentName; +} 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 d44f335..5f720bc 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 @@ -190,6 +190,19 @@ public class WmsPart extends BaseBean { public WmsPart() { } + public Double getQty() { + return qty == null? 0:qty; + } + + public Double getMin() { + return min == null? 0: min; + } + + public Double getMax() { + return max == null? 0:max; + } + + public WmsPart(String partNo, String partName, Double maxQty, Double minQty, Double cqty, String partType) { this.partNo = partNo; this.partName = partName; diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPartPackage.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPartPackage.java new file mode 100644 index 0000000..2b66b42 --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPartPackage.java @@ -0,0 +1,68 @@ +package cn.estsh.i3plus.pojo.wms.bean; + +import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn; +import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import cn.estsh.i3plus.pojo.base.enumutil.WmsEnumUtil; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.hibernate.annotations.DynamicInsert; +import org.hibernate.annotations.DynamicUpdate; + +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.Table; + +/** + * @Description :容器类型 + * @Reference : + * @Author : 容器类型 + * @CreateDate : 2019-11-07 16:06 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "WMS_PART_PACKAGE") +@Api("物料包装关系") +public class WmsPartPackage extends BaseBean { + private static final long serialVersionUID = 4849044986767609345L; + @Column(name = "PART_NO",unique = true) + @ApiParam(value = "物料编码") + private String partNo; + + @Column(name = "SPEC_CODE") + @ApiParam(value = "包装规格代码") + private String specCode; + + @Column(name = "SNP_QTY") + @ApiParam(value = "单包装数量") + private String snpQty; + + @Column(name = "BOX_QTY") + @ApiParam(value = "包装箱数") + private String boxQty; + + @Column(name = "IS_DEFAULT") + @ApiParam(value = "是否默认包规") + private String isDefault; + + @Column(name = "IS_MIXED") + @ApiParam(value = "是否混包") + private String isMixed; + + @Column(name = "IS_PRINT") + @ApiParam(value = "是否打印包装清单") + private String isPrint; + + @Column(name = "TEMPLATE_NO") + @ApiParam(value = "包装清单模板") + private String templateNo; + + @Column(name = "POCKET_TYPE") + @ApiParam(value = "容器类型") + private String pocketType; +} diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsDataAuthModel.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsDataAuthModel.java index 2079deb..9cd45da 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsDataAuthModel.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsDataAuthModel.java @@ -45,6 +45,9 @@ public class WmsDataAuthModel extends BaseBean { @ApiParam("业务类型列表") private List busiTypeList; + @ApiParam("业务类型列表") + private List busiOperationTypeList; + @ApiParam( value = "新增操作", example = "0" diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsContainerTypeRepository.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsContainerTypeRepository.java new file mode 100644 index 0000000..8c3f4da --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsContainerTypeRepository.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.WmsContainerType; +import org.springframework.stereotype.Repository; + +/** +* @Description :容器类型Repository的方法接口 +* @Reference : +* @Author : gcj +* @CreateDate : 2019-11-08 10:19 +* @Modify: +**/ +@Repository +public interface WmsContainerTypeRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsPackageSpecRepository.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsPackageSpecRepository.java new file mode 100644 index 0000000..461ef5a --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsPackageSpecRepository.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.WmsContainerType; +import cn.estsh.i3plus.pojo.wms.bean.WmsPackageSpec; +import org.springframework.stereotype.Repository; + +/** +* @Description :包装规格Repository的方法接口 +* @Reference : +* @Author : gcj +* @CreateDate : 2019-11-08 10:19 +* @Modify: +**/ +@Repository +public interface WmsPackageSpecRepository extends BaseRepository { +}