Merge branch 'dev' into test

modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/BlockFormEnumUtil.java

@@ -3,6 +3,7 @@ package cn.estsh.i3plus.pojo.base.enumutil;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import org.apache.commons.lang3.StringUtils;
 
+import java.math.BigDecimal;
 import java.util.Date;
 
 /**
@@ -2284,7 +2285,7 @@ public class BlockFormEnumUtil {
         LONG(21, "Long", "长整型", "java.lang.Long", Long.class,PROPERTY_CONTROL_TYPE.NUMBER,SQL_WHERE.EQUAL,"0"),
         DOUBLE(30, "Double", "大浮点型", "java.lang.Double", Double.class,PROPERTY_CONTROL_TYPE.NUMBER,SQL_WHERE.EQUAL,"0.0"),
         FLOAT(31, "Float", "小浮点型", "java.lang.Float", Float.class,PROPERTY_CONTROL_TYPE.NUMBER,SQL_WHERE.EQUAL,"0.0"),
-        BIG_DECIMAL(32, "Double", "大浮点型", "java.math.BigDecimal", Double.class,PROPERTY_CONTROL_TYPE.NUMBER,SQL_WHERE.EQUAL,"0.0"),
+        BIG_DECIMAL(32, "BigDecimal", "大浮点型", "java.math.BigDecimal", BigDecimal.class,PROPERTY_CONTROL_TYPE.NUMBER,SQL_WHERE.EQUAL,"0.0"),
         BOOLEAN(40, "Boolean", "布尔值", "java.lang.Boolean", Boolean.class,PROPERTY_CONTROL_TYPE.RADIO,SQL_WHERE.EQUAL,null),
         BYTE(50, "Byte", "字节", "java.lang.Byte", Byte.class,PROPERTY_CONTROL_TYPE.TEXT,SQL_WHERE.EQUAL,null),
         DATE_TIME(12, "String", "日期时分秒", "java.sql.Timestamp", String.class,PROPERTY_CONTROL_TYPE.DATE_TIME,SQL_WHERE.BETWEEN,null,"yyyy-MM-dd hh:mm:ss");

modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java

@@ -1986,7 +1986,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;
@@ -2327,6 +2328,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;
+        }
+    }
 
     /**
      * 盘点物料 是否调差
@@ -3507,10 +3558,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;
@@ -4016,4 +4064,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;
+        }
+    }
 }

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 : gcj
+ * @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;
+}

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;
+}

modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPart.java

@@ -194,6 +194,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;

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;
+}

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<WmsPartPackage> partPackages;
+
+}

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() {

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<String> busiTypeList;
 
+    @ApiParam("业务类型列表")
+    private List<String> busiOperationTypeList;
+
     @ApiParam(
             value = "新增操作",
             example = "0"

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<WmsContainerType, Long> {
+}

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<WmsPackageSpec, Long> {
+}

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<WmsPartPackage, Long> {
+}