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, "巡检"),
-        ND_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-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/IfQcOrderDataModel.java

@@ -51,7 +51,7 @@ public class IfQcOrderDataModel extends BaseBean {
     private String matnr;
 
     @ApiParam("收货数量")
-    private String erfmg;
+    private Double erfmg;
 
     @ApiParam("计量单位")
     private String erfme;

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

@@ -30,6 +30,7 @@ import javax.persistence.Table;
 @Api("BH子检测项")
 public class WmsBhChildDetectionItem extends BaseBean {
 
+    private static final long serialVersionUID = -8005468634643773682L;
     @Column(name = "CHECK_TYPE")
     @ApiParam("检测大类")
     @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT, dataSrc = "BH_CHECK_TYPE")

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

@@ -34,6 +34,7 @@ import javax.persistence.Transient;
 @EqualsAndHashCode(callSuper = true)
 @Api(value = "bom历史记录", description = "bom历史记录")
 public class WmsBomHistory extends BaseBean {
+    private static final long serialVersionUID = -2781401699752981565L;
     @Column(name = "PART_NO")
     @ApiParam(value = "父物料号")
     @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT)

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

@@ -31,6 +31,7 @@ import javax.persistence.Table;
 @Api("车辆信息")
 public class WmsCar extends BaseBean {
 
+    private static final long serialVersionUID = -905792638347428695L;
     @Column(name = "CAR_NO")
     @ApiParam(value = "车牌号")
     @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT)

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

@@ -31,6 +31,7 @@ import javax.persistence.Table;
 @Api(value="客户窗口时间",description = "客户窗口时间")
 public class WmsCustWindow extends BaseBean {
 
+    private static final long serialVersionUID = -6544671103929721988L;
     @Column(name = "CUST_NO")
     @ApiParam(value = "客户编码")
     private String custNo;

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

@@ -28,6 +28,7 @@ import javax.persistence.Table;
 @Api(value="客户物料发往地",description = "客户物料发往地")
 public class WmsCustomerPartShipping extends BaseBean {
 
+    private static final long serialVersionUID = 9091356911517332847L;
     @Column(name = "CUSTOMER_CODE")
     @ApiParam(value = "客户代码")
     private String customerCode;

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

@@ -29,6 +29,7 @@ import javax.persistence.Table;
 @Table(name="WMS_DOCK")
 @Api("道口预约信息")
 public class WmsDock extends BaseBean {
+    private static final long serialVersionUID = 1084849307899138229L;
     @Column(name="DOCK_CODE")
     @ApiParam("道口代码")
     @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT)

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

@@ -31,6 +31,7 @@ import javax.persistence.Transient;
 @Api("道口预约信息")
 public class WmsDockOrderInfo extends BaseBean {
 
+    private static final long serialVersionUID = -18500387985953214L;
     @Column(name="DOCK_CODE")
     @ApiParam("道口代码")
     @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT)

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

@@ -30,6 +30,7 @@ import javax.persistence.Table;
 @Api("道口窗口时间")
 public class WmsDockWindowTime extends BaseBean {
 
+    private static final long serialVersionUID = -3188113111546998811L;
     @Column(name="DOCK_CODE")
     @ApiParam("道口代码")
     @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT, isRequire = 2)

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

@@ -0,0 +1,54 @@
+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 : siliter.yuan
+ * @CreateDate : 2020-05-13 13:54
+ * @Modify:
+ **/
+@Data
+@Entity
+@Table(name="WMS_HEALTH_INDICATOR")
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Api(value="仓库健康度指标",description = "仓库健康度指标")
+public class WmsHealthIndicator extends BaseBean {
+
+    private static final long serialVersionUID = 7332606119041273554L;
+
+    @Column(name = "INDICATOR_CODE")
+    @ApiParam(value = "指标代码")
+    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT)
+    private String indicatorCode;
+
+    @Column(name = "INDICATOR_NAME")
+    @ApiParam(value = "指标名称")
+    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT)
+    private String indicatorName;
+
+    @Column(name = "GROUP_NAME")
+    @ApiParam(value = "模块名称")
+    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT)
+    private String groupName;
+
+    @Column(name = "CALC_FORMULA")
+    @ApiParam(value = "指标测算公式")
+    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT)
+    private String calcFormula;
+}

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

@@ -0,0 +1,64 @@
+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 : siliter.yuan
+ * @CreateDate : 2020-05-13 13:54
+ * @Modify:
+ **/
+@Data
+@Entity
+@Table(name="WMS_HEALTH_INDICATOR_LEVEL")
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Api(value="仓库健康度指标分级",description = "仓库健康度指标分级")
+public class WmsHealthIndicatorLevel extends BaseBean {
+
+    private static final long serialVersionUID = 7332606229041273554L;
+
+    @Column(name = "INDICATOR_CODE")
+    @ApiParam(value = "指标代码")
+    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT)
+    private String indicatorCode;
+
+    @Column(name = "INDICATOR_NAME")
+    @ApiParam(value = "指标名称")
+    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT)
+    private String indicatorName;
+
+    @Column(name = "INDICATOR_LOWER_LIMIT")
+    @ApiParam(value = "指标下限")
+    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.NUMBER)
+    private Double indicatorLowerLimit;
+
+    @Column(name = "INDICATOR_UPPER_LIMIT")
+    @ApiParam(value = "指标上限")
+    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.NUMBER)
+    private Double indicatorUpperLimit;
+
+    @Column(name = "INDICATOR_GRADE")
+    @ApiParam(value = "指标等级")
+    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT)
+    private String indicatorGrade;
+
+    @Column(name = "INDICATOR_COLOR")
+    @ApiParam(value = "指标颜色")
+    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT)
+    private String indicatorColor;
+}

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

@@ -0,0 +1,56 @@
+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.Lob;
+import javax.persistence.Table;
+
+/**
+ * @Description : 仓库健康度指标结果
+ * @Reference :
+ * @Author : siliter.yuan
+ * @CreateDate : 2020-05-13 13:54
+ * @Modify:
+ **/
+@Data
+@Entity
+@Table(name="WMS_HEALTH_INDICATOR_RESULT")
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Api(value="仓库健康度指标结果",description = "仓库健康度指标结果")
+public class WmsHealthIndicatorResult extends BaseBean {
+
+    private static final long serialVersionUID = 7332606339041273554L;
+
+    @Column(name = "INDICATOR_CODE")
+    @ApiParam(value = "指标代码")
+    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT)
+    private String indicatorCode;
+
+    @Column(name = "INDICATOR_NAME")
+    @ApiParam(value = "指标名称")
+    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT)
+    private String indicatorName;
+
+    @Column(name = "INDICATOR_VALUE")
+    @ApiParam(value = "指标测算值")
+    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.NUMBER)
+    private Double indicatorValue;
+
+    @Lob
+    @Column(name = "INDICATOR_DETAILS")
+    @ApiParam(value = "指标测算明细")
+    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT)
+    private String indicatorDetails;
+}

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

@@ -0,0 +1,97 @@
+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.Lob;
+import javax.persistence.Table;
+
+/**
+ * @Description : 仓库健康度变量
+ * @Reference :
+ * @Author : siliter.yuan
+ * @CreateDate : 2020-05-13 13:54
+ * @Modify:
+ **/
+@Data
+@Entity
+@Table(name="WMS_HEALTH_VARIABLE")
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Api(value="仓库健康度变量",description = "仓库健康度变量")
+public class WmsHealthVariable extends BaseBean {
+
+    private static final long serialVersionUID = 7332606449041273554L;
+
+    @Column(name = "VARIABLE_CODE")
+    @ApiParam(value = "变量代码")
+    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT)
+    private String variableCode;
+
+    @Column(name = "VARIABLE_NAME")
+    @ApiParam(value = "变量名称")
+    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT)
+    private String variableName;
+
+    @Column(name = "CYCLE_RANGE")
+    @ApiParam(value = "周期(天)")
+    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.NUMBER)
+    private Integer cycleRange;
+
+    @Column(name = "CALC_FREQUENCY")
+    @ApiParam(value = "计算频次(天)")
+    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.NUMBER)
+    private Integer calcFrequency;
+
+    @Column(name = "LAST_CALC_TIME")
+    @ApiParam(value = "末次计算时间")
+    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT)
+    private String LastCalcTime;
+
+    @Column(name = "NEXT_CALC_TIME")
+    @ApiParam(value = "下次计算时间")
+    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT)
+    private String nextCalcTime;
+
+    @Column(name = "APPLY_AREA")
+    @ApiParam(value = "适应存储区")
+    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT)
+    private String applyArea;
+
+    @Column(name = "APPLY_PART_GROUP")
+    @ApiParam(value = "适应物料组")
+    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT)
+    private String applyPartGroup;
+
+    @Lob
+    @Column(name = "VARIABLE_PARAM")
+    @ApiParam(value = "变量参数")
+    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT)
+    private String variableParam;
+
+    @Lob
+    @Column(name = "SQL_STATEMENT")
+    @ApiParam(value = "SQL语句")
+    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT)
+    private String sqlStatement;
+
+    @Column(name = "FUNCTION_NAME")
+    @ApiParam(value = "方法名称")
+    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT)
+    private String functionName;
+
+    @Column(name = "SCRIPT_NO")
+    @ApiParam(value = "脚本编号")
+    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT)
+    private String scriptNo;
+}

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

@@ -0,0 +1,56 @@
+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.Lob;
+import javax.persistence.Table;
+
+/**
+ * @Description : 仓库健康度变量测算结果
+ * @Reference :
+ * @Author : siliter.yuan
+ * @CreateDate : 2020-05-13 13:54
+ * @Modify:
+ **/
+@Data
+@Entity
+@Table(name="WMS_HEALTH_VARIABLE_RESULT")
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Api(value="仓库健康度变量测算结果",description = "仓库健康度变量测算结果")
+public class WmsHealthVariableResult extends BaseBean {
+
+    private static final long serialVersionUID = 7332606559041273554L;
+
+    @Column(name = "VARIABLE_CODE")
+    @ApiParam(value = "变量代码")
+    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT)
+    private String variableCode;
+
+    @Column(name = "VARIABLE_NAME")
+    @ApiParam(value = "变量名称")
+    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT)
+    private String variableName;
+
+    @Column(name = "VARIABLE_VALUE")
+    @ApiParam(value = "变量测算值")
+    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.NUMBER)
+    private Double variableValue;
+
+    @Lob
+    @Column(name = "VARIABLE_DETAILS")
+    @ApiParam(value = "变量测算明细")
+    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT)
+    private String variableDetails;
+}

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

@@ -0,0 +1,81 @@
+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 {
+
+    private static final long serialVersionUID = -5307311210847854654L;
+    @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,52 @@
+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 {
+
+    private static final long serialVersionUID = 2323715097364547677L;
+    @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/WmsPartCheckType.java

@@ -30,6 +30,7 @@ import javax.persistence.Table;
 @Api("物料检测大类")
 public class WmsPartCheckType extends BaseBean {
 
+    private static final long serialVersionUID = -5189386821943180930L;
     @Column(name = "WORK_CENTER_CODE")
     @ApiParam("产线代码")
     @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT, isRequire = 2)

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

@@ -33,6 +33,7 @@ import javax.persistence.Table;
 @Api("物料扩展属性表")
 public class WmsPartExtend extends BaseBean {
 
+    private static final long serialVersionUID = 353287580297379377L;
     @Column(name = "PART_NO")
     @ApiParam(value = "物料编码")
     private String partNo;

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

@@ -30,6 +30,7 @@ import javax.persistence.Table;
 @Api("物料子检测项")
 public class WmsPartItemCheck extends BaseBean {
 
+    private static final long serialVersionUID = 2889708862689686630L;
     @Column(name = "WORK_CENTER_CODE")
     @ApiParam("产线代码")
     @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT, isRequire = 2)

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

@@ -30,6 +30,7 @@ import javax.persistence.Table;
 @Api(value="物料关系表",description = "物料关系表")
 public class WmsPartRelation extends BaseBean {
 
+    private static final long serialVersionUID = -3532040201124896970L;
     @Column(name = "PART_NO")
     @ApiParam(value = "物料编码")
     private String partNo;

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

@@ -28,6 +28,7 @@ import javax.persistence.Table;
 @Api("开口合同PO关系表")
 public class WmsProcurementPlanContract extends BaseBean {
 
+    private static final long serialVersionUID = 3966394697226562966L;
     @Column(name = "ORDER_NO")
     @ApiParam(value = "合同号")
     private String orderNo;

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

@@ -1,7 +1,6 @@
 package cn.estsh.i3plus.pojo.wms.bean;
 
 import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn;
-import cn.estsh.i3plus.pojo.base.bean.BaseBean;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiParam;
 import lombok.Data;
@@ -20,6 +19,7 @@ import java.io.Serializable;
 @Api(value="生产退料导入模板",description = "生产退料导入模板")
 public class WmsProductReturnMovement implements Serializable{
 
+    private static final long serialVersionUID = -4099139082544312496L;
     @ApiParam(value = "单号")
     @AnnoOutputColumn
     private String orderNo;

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

@@ -0,0 +1,54 @@
+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 {
+
+    private static final long serialVersionUID = -4732299479463118555L;
+    @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/WmsPullRule.java

@@ -28,6 +28,7 @@ import javax.persistence.Table;
 @Table(name = "WMS_PULL_RULE")
 @Api("拉动规则")
 public class WmsPullRule extends BaseBean {
+    private static final long serialVersionUID = -4259512587710548316L;
     @Column(name = "PULL_WAY")
     @ApiParam(value = "拉动类型", example = "10")
     @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT, dataSrc = "PULL_WAY_STATUS")

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

@@ -0,0 +1,91 @@
+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_SHORT_LOGISTICS_COSTS")
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Api(value = "物流费用管理", description = "物流费用管理")
+public class WmsShortLogisticsCosts extends BaseBean {
+
+    private static final long serialVersionUID = 733863151632950809L;
+    @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/bean/WmsSnOperateRecord.java

@@ -33,6 +33,7 @@ import javax.persistence.Table;
 @Api(value="条码操作记录表",description = "条码操作记录表")
 public class WmsSnOperateRecord extends BaseBean {
 
+    private static final long serialVersionUID = -8163029081131228416L;
     @Column(name = "SN")
     @ApiParam(value = "条码")
     @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT, isRequire = 2)

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

@@ -32,6 +32,7 @@ import javax.persistence.Table;
 @Api("库存初始化信息")
 public class WmsStockInitialize extends BaseBean {
 
+    private static final long serialVersionUID = -6653811290493674698L;
     @Column(name = "WH_NO")
     @ApiParam(value = "仓库代码")
     @AnnoOutputColumn(required = false)

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

@@ -33,6 +33,7 @@ import javax.persistence.Table;
 @Api("替代料")
 public class WmsSubPart extends BaseBean {
 
+    private static final long serialVersionUID = -8864784324056827764L;
     @Column(name = "PART_NO")
     @ApiParam(value = "物料编码")
     @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT)

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

@@ -31,6 +31,7 @@ import javax.persistence.Table;
 @Api("驾驶员信息")
 public class WmsTmsDriver extends BaseBean {
 
+    private static final long serialVersionUID = 2083909056682628791L;
     @Column(name="DRIVER_NO")
     @ApiParam(value ="驾驶员编号")
     @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT)

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

@@ -32,6 +32,7 @@ import java.util.List;
 @Api("装车单信息")
 public class WmsTmsShippingExt extends BaseBean {
 
+    private static final long serialVersionUID = -3261413137866351406L;
     @Column(name="MOVE_NO")
     @ApiParam(value ="移库单号")
     private String moveNo;

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

@@ -28,6 +28,7 @@ import javax.persistence.Table;
 @Api(value="供应商计划员",description = "供应商计划员")
 public class WmsVendorPlanner extends BaseBean {
 
+    private static final long serialVersionUID = 6444925010696953067L;
     @Column(name = "VENDOR_NO")
     @ApiParam(value = "供应商编号")
     private String vendorNo;

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

@@ -28,6 +28,7 @@ import javax.persistence.Table;
 @Api(value="供应商父子关系",description = "供应商父子关系")
 public class WmsVendorRelation extends BaseBean {
 
+    private static final long serialVersionUID = 723387673958938803L;
     @Column(name = "VENDOR_NO")
     @ApiParam(value = "供应商编号")
     private String vendorNo;

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

@@ -28,6 +28,7 @@ import javax.persistence.Table;
 @Api(value="供应商窗口时间",description = "供应商窗口时间")
 public class WmsVendorWindow extends BaseBean {
 
+    private static final long serialVersionUID = -8156667748890281030L;
     @Column(name = "VENDOR_NO")
     @ApiParam(value = "供应商编号")
     private String vendorNo;

modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dbinterface/WmsInterfaceDataMapper.java

@@ -7,6 +7,7 @@ import lombok.EqualsAndHashCode;
 import lombok.NoArgsConstructor;
 import org.hibernate.annotations.DynamicInsert;
 import org.hibernate.annotations.DynamicUpdate;
+
 import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.persistence.Table;
@@ -26,6 +27,7 @@ import javax.persistence.Table;
 @Table(name = "WMS_INTERFACE_DATA_MAPPER")
 @Api("接口数据映射")
 public class WmsInterfaceDataMapper extends BaseBean {
+    private static final long serialVersionUID = 4139044040492108498L;
     /**
      * 排序编号
      */

modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dto/WmsCarDto.java

@@ -4,12 +4,12 @@ import io.swagger.annotations.ApiParam;
 import lombok.Data;
 
 import javax.persistence.Column;
-import javax.persistence.Transient;
 import java.io.Serializable;
 
 @Data
 public class WmsCarDto extends BaseDto implements Serializable {
 
+    private static final long serialVersionUID = 1477585131669086208L;
     @Column(name="CAR_NO")
     @ApiParam(value ="车牌号")
     private String carNo;

modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dto/WmsTmsDriverDto.java

@@ -16,6 +16,7 @@ import java.io.Serializable;
 @Data
 public class WmsTmsDriverDto extends BaseDto implements Serializable {
 
+    private static final long serialVersionUID = 1686388995931944419L;
     @Column(name="DRIVER_NO")
     @ApiParam(value ="驾驶员编号")
     private String driverNo;

modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dto/WmsTmsShipBacthDto.java

@@ -18,6 +18,7 @@ import java.util.List;
 @Api("装车单批量入参")
 @Data
 public class WmsTmsShipBacthDto extends BaseDto implements Serializable {
+    private static final long serialVersionUID = -6901734563284429774L;
     @ApiParam("装车单集合")
       private  List<WmsTmsShipDto> wmsTmsShipDtoList=new ArrayList<>();
 }

modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dto/WmsTmsShipDto.java

@@ -17,6 +17,7 @@ import java.io.Serializable;
 @Data
 public class WmsTmsShipDto extends BaseDto implements Serializable {
 
+    private static final long serialVersionUID = -523839265877092396L;
     @ApiParam("物料号")
     private String partNo;
 

modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/engine/rule/EngineRulePersistence.java

@@ -31,6 +31,7 @@ import javax.persistence.Table;
 @Table(name = "DROOLS_RULE_PERSISTENCE")
 @Api("系统动态业务规则")
 public class EngineRulePersistence extends BaseBean {
+    private static final long serialVersionUID = 5119552483383770556L;
     // 规则调用的唯一编号，例如：WMS_RECEIVE_0001
     @Column(name = "RULE_NO", length = 50)
     private String ruleNo;

modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/engine/script/EngineScriptPersistence.java

@@ -7,13 +7,12 @@ import lombok.EqualsAndHashCode;
 import lombok.NoArgsConstructor;
 import org.hibernate.annotations.DynamicInsert;
 import org.hibernate.annotations.DynamicUpdate;
-import org.hibernate.annotations.Type;
 
-import javax.persistence.*;
-import javax.script.CompiledScript;
-import javax.script.ScriptContext;
-import javax.script.ScriptEngine;
-import javax.script.ScriptException;
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.Lob;
+import javax.persistence.Table;
+import javax.persistence.Transient;
 
 /**
  * 脚本持久化实体类
@@ -30,6 +29,7 @@ import javax.script.ScriptException;
 @Table(name = "SCRIPT_PERSISTENCE")
 @Api("系统动态脚本")
 public class EngineScriptPersistence extends BaseBean {
+    private static final long serialVersionUID = 7893111140559759490L;
     // 脚本调用的唯一编号，例如：WMS_PDA_0001
     @Column(name = "SCRIPT_NO", length = 50)
     private String scriptNo;

modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/engine/script/EngineScriptPersistenceHistory.java

@@ -30,6 +30,7 @@ import javax.persistence.Transient;
 @Api("系统动态脚本")
 public class EngineScriptPersistenceHistory extends BaseBean {
 
+    private static final long serialVersionUID = 7201021903118622899L;
     // 脚本调用的唯一编号，例如：WMS_PDA_0001
     @Column(name = "SCRIPT_NO", length = 50)
     private String scriptNo;

modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsBasVendorModel.java

@@ -18,6 +18,7 @@ import lombok.Data;
 @Api("供应商微服调用Model")
 public class WmsBasVendorModel extends BaseBean {
 
+    private static final long serialVersionUID = -4097250031510982530L;
     @ApiParam("供应商")
     private BasVendor basVendor;
 

modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsDataAuthModel.java

@@ -18,6 +18,7 @@ import java.util.List;
 @Api("数据权限Model")
 public class WmsDataAuthModel extends BaseBean {
 
+    private static final long serialVersionUID = -1830754107669382563L;
     @ApiParam("角色编号")
     private String roleCode;
 

modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsMoveUnfinishedOrderModel.java

@@ -14,6 +14,7 @@ import lombok.Data;
 @Api("未完成订单模型")
 public class WmsMoveUnfinishedOrderModel extends  BaseBean{
 
+    private static final long serialVersionUID = 363976915707604557L;
     @ApiParam("物料编码")
     private String partNo;
 

modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsPartModel.java

@@ -2,7 +2,6 @@ package cn.estsh.i3plus.pojo.wms.modelbean;
 
 import cn.estsh.i3plus.pojo.base.bean.BaseBean;
 import cn.estsh.i3plus.pojo.base.common.Pager;
-import cn.estsh.i3plus.pojo.wms.bean.BasVendor;
 import cn.estsh.i3plus.pojo.wms.bean.WmsPart;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiParam;
@@ -19,6 +18,7 @@ import lombok.Data;
 @Api("供应商微服调用Model")
 public class WmsPartModel extends BaseBean {
 
+    private static final long serialVersionUID = -4435519990466605445L;
     @ApiParam("物料")
     private WmsPart wmsPart;
 

modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsPoAsnRecvModel.java

@@ -18,6 +18,7 @@ import java.time.LocalTime;
 @Api("供应商收货看板")
 public class WmsPoAsnRecvModel extends BaseBean implements Comparable<WmsPoAsnRecvModel> {
 
+    private static final long serialVersionUID = 7985236317993813219L;
     @ApiParam("订单号")
     private String orderNo;
     @ApiParam("供应商名称")

modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsStaticCsModel.java

@@ -18,6 +18,8 @@ import javax.persistence.Entity;
 @Entity
 @Api("静态盘点查询输出model")
 public class WmsStaticCsModel extends BaseBean {
+    private static final long serialVersionUID = 9039981061448266666L;
+
     public WmsStaticCsModel(String staticStr, String orderNo, String locateNo, String sn, double qty) {
         this.orderNo = orderNo;
         this.locateNo = locateNo;

modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsHealthIndicatorLevelRepository.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.WmsHealthIndicatorLevel;
+import org.springframework.stereotype.Repository;
+
+/**
+ * @Description :
+ * @Reference :
+ * @Author : siliter.yuan
+ * @CreateDate : 2020-05-13 15:17
+ * @Modify:
+ **/
+@Repository
+public interface WmsHealthIndicatorLevelRepository extends BaseRepository<WmsHealthIndicatorLevel, Long> {
+}

modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsHealthIndicatorRepository.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.WmsHealthIndicator;
+import org.springframework.stereotype.Repository;
+
+/**
+ * @Description :
+ * @Reference :
+ * @Author : siliter.yuan
+ * @CreateDate : 2020-05-13 15:17
+ * @Modify:
+ **/
+@Repository
+public interface WmsHealthIndicatorRepository extends BaseRepository<WmsHealthIndicator, Long> {
+}

modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsHealthIndicatorResultRepository.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.WmsHealthIndicatorResult;
+import org.springframework.stereotype.Repository;
+
+/**
+ * @Description :
+ * @Reference :
+ * @Author : siliter.yuan
+ * @CreateDate : 2020-05-13 15:17
+ * @Modify:
+ **/
+@Repository
+public interface WmsHealthIndicatorResultRepository extends BaseRepository<WmsHealthIndicatorResult, Long> {
+}

modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsHealthVariableRepository.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.WmsHealthVariable;
+import org.springframework.stereotype.Repository;
+
+/**
+ * @Description :
+ * @Reference :
+ * @Author : siliter.yuan
+ * @CreateDate : 2020-05-13 15:17
+ * @Modify:
+ **/
+@Repository
+public interface WmsHealthVariableRepository extends BaseRepository<WmsHealthVariable, Long> {
+}

modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsHealthVariableResultRepository.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.WmsHealthVariableResult;
+import org.springframework.stereotype.Repository;
+
+/**
+ * @Description :
+ * @Reference :
+ * @Author : siliter.yuan
+ * @CreateDate : 2020-05-13 15:17
+ * @Modify:
+ **/
+@Repository
+public interface WmsHealthVariableResultRepository extends BaseRepository<WmsHealthVariableResult, Long> {
+}

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

modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java

@@ -21,11 +21,7 @@ import com.alibaba.fastjson.JSONObject;
 import com.google.common.base.Strings;
 import org.apache.commons.lang3.StringUtils;
 
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
+import java.util.*;
 import java.util.stream.Collectors;
 
 /**
@@ -3254,4 +3250,65 @@ public class WmsHqlPack {
         getStringBuilderPack(thymeleaf, result);
         return result;
     }
+
+    /**
+     * 仓库健康指标信息分页查询条件
+     * @param healthIndicator
+     * @return
+     */
+    public static DdlPackBean packHqlWmsHealthIndicator(WmsHealthIndicator healthIndicator) {
+        DdlPackBean result = new DdlPackBean();
+        DdlPreparedPack.getStringEqualPack(healthIndicator.getIndicatorCode(), "indicatorCode", result);
+        DdlPreparedPack.getStringEqualPack(healthIndicator.getGroupName(), "groupName", result);
+        getStringBuilderPack(healthIndicator, result);
+        return result;
+    }
+
+    /**
+     * 仓库健康指标分级信息分页查询条件
+     * @param healthIndicatorLevel
+     * @return
+     */
+    public static DdlPackBean packHqlWmsHealthIndicatorLevel(WmsHealthIndicatorLevel healthIndicatorLevel) {
+        DdlPackBean result = new DdlPackBean();
+        DdlPreparedPack.getStringEqualPack(healthIndicatorLevel.getIndicatorCode(), "indicatorCode", result);
+        getStringBuilderPack(healthIndicatorLevel, result);
+        return result;
+    }
+
+    /**
+     * 仓库健康指标分级信息分页查询条件
+     * @param wmsHealthVariable
+     * @return
+     */
+    public static DdlPackBean packHqlWmsHealthVariable(WmsHealthVariable wmsHealthVariable) {
+        DdlPackBean result = new DdlPackBean();
+        DdlPreparedPack.getStringEqualPack(wmsHealthVariable.getVariableCode(), "variableCode", result);
+        getStringBuilderPack(wmsHealthVariable, result);
+        return result;
+    }
+
+    /**
+     * 仓库健康指标测算结果信息查询条件
+     * @param healthIndicatorResult
+     * @return
+     */
+    public static DdlPackBean packHqlWmsHealthIndicatorResult(WmsHealthIndicatorResult healthIndicatorResult) {
+        DdlPackBean result = new DdlPackBean();
+        DdlPreparedPack.getStringEqualPack(healthIndicatorResult.getIndicatorCode(), "indicatorCode", result);
+        getStringBuilderPack(healthIndicatorResult, result);
+        return result;
+    }
+
+    /**
+     * 仓库健康指标变量测算结果信息查询条件
+     * @param healthVariableResult
+     * @return
+     */
+    public static DdlPackBean packHqlWmsHealthVariableResult(WmsHealthVariableResult healthVariableResult) {
+        DdlPackBean result = new DdlPackBean();
+        DdlPreparedPack.getStringEqualPack(healthVariableResult.getVariableCode(), "variableCode", result);
+        getStringBuilderPack(healthVariableResult, result);
+        return result;
+    }
 }