Merge remote-tracking branch 'origin/dev' into dev

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

@@ -20,8 +20,7 @@ public class ImppEnumUtil {
 
         TYPE_GROUP(1, "集团", "集团"),
         TYPE_COMPANY(2, "公司", "公司"),
-        TYPE_FACTORY(3,"工厂","工厂"),
-        ;
+        TYPE_FACTORY(3, "工厂", "工厂");
 
         private int value;
         private String name;
@@ -829,6 +828,7 @@ public class ImppEnumUtil {
             return tmp;
         }
     }
+
     /**
      * 系统值类型
      * 1. String
@@ -1054,6 +1054,7 @@ public class ImppEnumUtil {
         }
     }
 
+
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)
     public enum MESSAGE_RECEIVER_TYPE {
         INTERNAL(1, "内部人员"),

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

@@ -2564,17 +2564,19 @@ public class MesEnumUtil {
      */
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)
     public enum MES_QC_CHECK_TYPE {
-        INCOMING_CHECK(5, "来料检验"),
-        FIRST_CHECK(10, "首检"),
-        ON_SITE_CHECK(20, "巡检"),
-        END_CHECK(30, "末检"),
-        RC_CHECK(40, "发货检验");
+        INCOMING_CHECK(5, "IN_MATERIAL_CHECK", "来料检验"),
+        FIRST_CHECK(10, "FIRST_CHECK", "首检"),
+        ON_SITE_CHECK(20, "ON_SITE_CHECK", "巡检"),
+        END_CHECK(30, "END_CHECK", "末检"),
+        RC_CHECK(40, "EDELIVERY_CHECK", "发货检验");
 
         private int value;
+        private String code;
         private String description;
 
-        MES_QC_CHECK_TYPE(int value, String description) {
+        MES_QC_CHECK_TYPE(int value, String code, String description) {
             this.value = value;
+            this.code = code;
             this.description = description;
         }
 
@@ -2582,6 +2584,10 @@ public class MesEnumUtil {
             return value;
         }
 
+        public String getCode() {
+            return code;
+        }
+
         public String getDescription() {
             return description;
         }

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

@@ -6575,4 +6575,105 @@ public class WmsEnumUtil {
             return valueOf(val);
         }
     }
+
+    /**
+     * 运输方式
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum TRANSPORT_TYPE {
+        LONG_HAUL(10, "长途运输"),
+        SHORT_DISTANCE(20, "短途运输");
+
+        private int value;
+        private String description;
+
+        TRANSPORT_TYPE(int value, String description) {
+            this.value = value;
+            this.description = description;
+        }
+
+        public int getValue() {
+            return value;
+        }
+
+        public String getDescription() {
+            return description;
+        }
+
+        public static TRANSPORT_TYPE codeOf(int value) {
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].value == value) {
+                    return values()[i];
+                }
+            }
+            return null;
+        }
+
+        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;
+        }
+
+        public static int descriptionOfValue(String desc) {
+            return descOf(desc);
+        }
+    }
+
+    /**
+     * 物流供应商类型
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum LOGISTICS_PROVIDER_TYPE {
+        VENDOR(10, "承运商");
+
+        private int value;
+        private String description;
+
+        LOGISTICS_PROVIDER_TYPE(int value, String description) {
+            this.value = value;
+            this.description = description;
+        }
+
+        public int getValue() {
+            return value;
+        }
+
+        public String getDescription() {
+            return description;
+        }
+
+        public static LOGISTICS_PROVIDER_TYPE codeOf(int value) {
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].value == value) {
+                    return values()[i];
+                }
+            }
+            return null;
+        }
+
+        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/WmsCSOrderMaster.java

@@ -115,9 +115,9 @@ public class WmsCSOrderMaster extends BaseBean {
     @Column(name = "is_obvious")
     private Integer isObvious;
 
-    @ApiParam(value = "允许盘入的库位")
-    @Column(name = "ALLOW_LOCATES")
-    private String allowLocates;
+    //    @ApiParam(value = "允许盘入的库位")
+//    @Column(name = "ALLOW_LOCATES")
+//    private String allowLocates;
     public Integer getIsInventoryVal() {
         return this.isInventory == null ? 0 : this.isInventory.intValue();
     }

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

@@ -0,0 +1,80 @@
+package cn.estsh.i3plus.pojo.wms.bean;
+
+import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn;
+import cn.estsh.i3plus.pojo.base.annotation.DynamicField;
+import cn.estsh.i3plus.pojo.base.bean.BaseBean;
+import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil;
+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 : qianhuasheng
+ * @CreateDate : 2020-05-06 14:50
+ * @Modify:
+ **/
+@Data
+@Entity
+@Table(name = "WMS_LOGISTICS_COSTS")
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Api(value = "物流费用管理", description = "物流费用管理")
+public class WmsLogisticsCosts extends BaseBean {
+
+    @Column(name = "ORGANIZE_NAME")
+    @ApiParam(value = "工厂名称")
+    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT)
+    private String organizeName;
+
+    @Column(name = "PLACE_OF_ORIGIN")
+    @ApiParam(value = "发出地")
+    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT)
+    private String placeOfOrigin;
+
+    @Column(name = "SHIPPING_FLAG")
+    @ApiParam(value = "发往地")
+    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT)
+    private String shippingFlag;
+
+    @Column(name = "LOGISTICS_VENDOR_NO")
+    @ApiParam(value = "物流供应商")
+    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT)
+    private String logisticsVendorNo;
+
+    @Column(name = "SALES_UNIT")
+    @ApiParam(value = "计价单位")
+    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT)
+    private String salesUnit;
+
+    @Column(name = "TRANSPORT_TYPE")
+    @ApiParam(value = "运输方式")
+    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT)
+    @AnnoOutputColumn(refClass = WmsEnumUtil.TRANSPORT_TYPE.class, refForeignKey = "value", value = "description")
+    private Integer transportType;
+
+    @Column(name = "price")
+    @ApiParam(value = "单价")
+    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT)
+    private Double price;
+
+    @Column(name = "START_DATE")
+    @ApiParam(value = "生效日期")
+    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT)
+    private String startDate;
+
+    @Column(name = "END_DATE")
+    @ApiParam(value = "结束日期")
+    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT)
+    private String endDate;
+}

modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsModeTransport.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.annotation.DynamicField;
+import cn.estsh.i3plus.pojo.base.bean.BaseBean;
+import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil;
+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 : qianhuasheng
+ * @CreateDate : 2020-05-06 14:50
+ * @Modify:
+ **/
+@Data
+@Entity
+@Table(name = "WMS_MODE_TRANSPORT")
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Api(value = "运输方式", description = "运输方式")
+public class WmsModeTransport extends BaseBean {
+
+    @Column(name = "ORGANIZE_NAME")
+    @ApiParam(value = "工厂名称")
+    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT)
+    private String organizeName;
+
+    @Column(name = "ORGANIZE_CODE")
+    @ApiParam(value = "工厂代码")
+    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT)
+    private String organizeCode;
+
+    @Column(name = "TRANSPORT_TYPE")
+    @ApiParam(value = "运输方式")
+    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT, dataSrc = "TRANSPORT_TYPE")
+    @AnnoOutputColumn(refClass = WmsEnumUtil.TRANSPORT_TYPE.class, refForeignKey = "value", value = "description")
+    private Integer transportType;
+
+}

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

@@ -0,0 +1,53 @@
+package cn.estsh.i3plus.pojo.wms.bean;
+
+import cn.estsh.i3plus.pojo.base.annotation.DynamicField;
+import cn.estsh.i3plus.pojo.base.bean.BaseBean;
+import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil;
+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 : qianhuasheng
+ * @CreateDate : 2020-05-06 14:50
+ * @Modify:
+ **/
+@Data
+@Entity
+@Table(name = "WMS_PROVIDER_FLAG")
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Api(value = "物流供应商关系", description = "库存物流供应商关系条码信息")
+public class WmsProviderFlag extends BaseBean {
+
+    @Column(name = "ORGANIZE_NAME")
+    @ApiParam(value = "工厂名称")
+    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT)
+    private String organizeName;
+
+
+    @Column(name = "VENDOR_NO")
+    @ApiParam(value = "物流供应商")
+    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT)
+    private String vendorNo;
+
+    @Column(name = "VENDOR_NAME")
+    @ApiParam(value = "物流供应商名称")
+    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT)
+    private String vendorName;
+
+    @Column(name = "SHIPPING_FLAG")
+    @ApiParam(value = "发往地编号")
+    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT)
+    private String shippingFlag;
+}

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

@@ -0,0 +1,90 @@
+package cn.estsh.i3plus.pojo.wms.bean;
+
+import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn;
+import cn.estsh.i3plus.pojo.base.annotation.DynamicField;
+import cn.estsh.i3plus.pojo.base.bean.BaseBean;
+import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil;
+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 : qianhuasheng
+ * @CreateDate : 2020-05-06 14:50
+ * @Modify:
+ **/
+@Data
+@Entity
+@Table(name = "WMS_LOGISTICS_COSTS")
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Api(value = "物流费用管理", description = "物流费用管理")
+public class WmsShortLogisticsCosts extends BaseBean {
+
+    @Column(name = "ORGANIZE_NAME")
+    @ApiParam(value = "工厂名称")
+    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT)
+    private String organizeName;
+
+    @Column(name = "part_no")
+    @ApiParam(value = "物料编号")
+    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT)
+    private String partNo;
+
+    @Column(name = "part_name")
+    @ApiParam(value = "物料名称")
+    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT)
+    private String partName;
+
+    @Column(name = "PLACE_OF_ORIGIN")
+    @ApiParam(value = "发出地")
+    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT)
+    private String placeOfOrigin;
+
+    @Column(name = "SHIPPING_FLAG")
+    @ApiParam(value = "发往地")
+    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT)
+    private String shippingFlag;
+
+    @Column(name = "LOGISTICS_VENDOR_NO")
+    @ApiParam(value = "物流供应商")
+    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT)
+    private String logisticsVendorNo;
+
+    @Column(name = "TRANSPORT_TYPE")
+    @ApiParam(value = "运输方式")
+    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT)
+    @AnnoOutputColumn(refClass = WmsEnumUtil.TRANSPORT_TYPE.class, refForeignKey = "value", value = "description")
+    private Integer transportType;
+
+    @Column(name = "SALES_UNIT")
+    @ApiParam(value = "计价单位")
+    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT)
+    private String salesUnit;
+
+    @Column(name = "price")
+    @ApiParam(value = "单价")
+    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT)
+    private Double price;
+
+    @Column(name = "START_DATE")
+    @ApiParam(value = "生效日期")
+    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT)
+    private String startDate;
+
+    @Column(name = "END_DATE")
+    @ApiParam(value = "结束日期")
+    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT)
+    private String endDate;
+}

modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsLogisticsCostsRepository.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.WmsLogisticsCosts;
+import org.springframework.stereotype.Repository;
+
+/**
+ * @Description : 物流费用管理
+ * @Reference :
+ * @Author : qianhuasheng
+ * @CreateDate : 2019-06-28 15:17
+ * @Modify:
+ **/
+@Repository
+public interface WmsLogisticsCostsRepository extends BaseRepository<WmsLogisticsCosts, Long> {
+}

modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsModeTransportRepository.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.WmsModeTransport;
+import org.springframework.stereotype.Repository;
+
+/**
+ * @Description : 运输方式
+ * @Reference :
+ * @Author : qianhuasheng
+ * @CreateDate : 2019-06-28 15:17
+ * @Modify:
+ **/
+@Repository
+public interface WmsModeTransportRepository extends BaseRepository<WmsModeTransport, Long> {
+}

modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsProviderFlagRepository.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.WmsProviderFlag;
+import org.springframework.stereotype.Repository;
+
+/**
+ * @Description : 物流供应商与发往地关系
+ * @Reference :
+ * @Author : qianhuasheng
+ * @CreateDate : 2019-06-28 15:17
+ * @Modify:
+ **/
+@Repository
+public interface WmsProviderFlagRepository extends BaseRepository<WmsProviderFlag, Long> {
+}

modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsShortLogisticsCostsRepository.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.WmsShortLogisticsCosts;
+import org.springframework.stereotype.Repository;
+
+/**
+ * @Description : 物流费用管理(短途运输)
+ * @Reference :
+ * @Author : qianhuasheng
+ * @CreateDate : 2019-06-28 15:17
+ * @Modify:
+ **/
+@Repository
+public interface WmsShortLogisticsCostsRepository extends BaseRepository<WmsShortLogisticsCosts, Long> {
+}