Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev

modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/bean/BaseBean.java

@@ -22,14 +22,13 @@ import java.io.Serializable;
  * @Modify:
  **/
 @Data
-@Entity
+@MappedSuperclass
+//@Entity
 //以子类table为准
-@javax.persistence.Inheritance(strategy=InheritanceType.TABLE_PER_CLASS)
+//@javax.persistence.Inheritance(strategy=InheritanceType.TABLE_PER_CLASS)
 //@JsonInclude(value = JsonInclude.Include.NON_EMPTY) //""或null属性不参加序列转换
 public abstract class BaseBean implements Serializable {
 
-    private static final long serialVersionUID = 1L;
-
     //此处使用hibernate的主键策略方式
     //手动设置,使用iplus-platform-common中的idtool生成
     //将Long类型系列化成String避免精度丢失
@@ -130,7 +129,7 @@ public abstract class BaseBean implements Serializable {
     @ApiParam(value = "排序类型，1 正序，2 倒序",example = "1")
     @AnnoOutputColumn(hidden = true)
     //CommonEnumUtil.ASC_OR_DESC  1 asc,2 desc
-    public Integer ascOrDesc = 1;
+    public transient Integer ascOrDesc = 1;
 
     //排序方式
     public String orderBy(){

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

@@ -430,7 +430,8 @@ public class ImppEnumUtil {
 
         MAIL(1,"邮件","邮件"),
         LETTER(2,"站内信","站内信"),
-        SWEB_NOTICE(3,"SWEB通知","SWEB通知");
+        SWEB_NOTICE(3,"SWEB通知","SWEB通知"),
+        SWEB_PUBLIC_NOTICE(4,"SWEB公告","SWEB公告");
 
         private int value;
         private String name;
@@ -1092,7 +1093,8 @@ public class ImppEnumUtil {
     public enum FILE_ATTACH_SOURCE {
         MAIL(1,"邮件","邮件"),
         LETTER(2,"站内信","站内信"),
-        SWEB_NOTICE(3,"SWEB通知","SWEB通知");
+        SWEB_NOTICE(3,"SWEB通知","SWEB通知"),
+        SWEB_PUBLIC_NOTICE(4,"SWEB公告","SWEB公告");
 
         private int value;
         private String name;

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

@@ -259,4 +259,276 @@ public class SwebEnumUtil {
             return tmp;
         }
     }
+
+    /**
+     * 用户消息类型
+     * 1.NOTICE：通知
+     * 2.STATION_LETTER：站内信
+     * 3.SWEB_NOTICE：SWEB通知
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum MESSAGE_TYPE {
+
+//        MAIL(1, "邮件", "邮件"),
+//        LETTER(2, "站内信", "站内信"),
+        SWEB_NOTICE(3, "SWEB通知", "SWEB通知"),
+        SWEB_PUBLIC_NOTICE(4, "SWEB公告", "SWEB公告");
+
+        private int value;
+        private String name;
+        private String description;
+
+        MESSAGE_TYPE() {
+        }
+
+        MESSAGE_TYPE(int value, String name, String description) {
+            this.value = value;
+            this.name = name;
+            this.description = description;
+        }
+
+        public int getValue() {
+            return value;
+        }
+
+        public String getName() {
+            return name;
+        }
+
+        public String getDescription() {
+            return description;
+        }
+
+        public static String valueOfCode(int val) {
+            String tmp = null;
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].value == val) {
+                    tmp = values()[i].name;
+                }
+            }
+            return tmp;
+        }
+
+        public static String valueOfDescription(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 String codeOfDescription(String code) {
+            String tmp = null;
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].name.equals(code)) {
+                    tmp = values()[i].description;
+                }
+            }
+            return tmp;
+        }
+    }
+
+    /**
+     * 附件来源
+     * 1.NOTICE：通知
+     * 2.STATION_LETTER：站内信
+     * 3.SWEB_NOTICE：SWEB通知
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum FILE_ATTACH_SOURCE {
+        MAIL(1, "邮件", "邮件"),
+        LETTER(2, "站内信", "站内信"),
+        SWEB_NOTICE(3, "SWEB通知", "SWEB通知"),
+        SWEB_PUBLIC_NOTICE(4, "SWEB公告", "SWEB公告");
+
+        private int value;
+        private String name;
+        private String description;
+
+        FILE_ATTACH_SOURCE() {
+        }
+
+        FILE_ATTACH_SOURCE(int value, String name, String description) {
+            this.value = value;
+            this.name = name;
+            this.description = description;
+        }
+
+        public int getValue() {
+            return value;
+        }
+
+        public String getName() {
+            return name;
+        }
+
+        public String getDescription() {
+            return description;
+        }
+
+        public static String valueOfCode(int val) {
+            String tmp = null;
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].value == val) {
+                    tmp = values()[i].name;
+                }
+            }
+            return tmp;
+        }
+
+        public static String valueOfDescription(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 String codeOfDescription(String code) {
+            String tmp = null;
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].name.equals(code)) {
+                    tmp = values()[i].description;
+                }
+            }
+            return tmp;
+        }
+    }
+
+    /**
+     * 前端系统平台
+     * IMPP_FE：impp系统
+     * SWEB_FE：sweb系统
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum FE_PLATFORM {
+        IMPP_FE("IMPP_FE", "IMPP_FE", "impp系统"),
+        SWEB_FE("SWEB_FE", "SWEB_FE", "sweb系统");
+
+        private String value;
+        private String code;
+        private String description;
+
+        FE_PLATFORM() {
+        }
+
+        FE_PLATFORM(String value, String code, String description) {
+            this.value = value;
+            this.code = code;
+            this.description = description;
+        }
+
+        public String getValue() {
+            return value;
+        }
+
+        public String getCode() {
+            return code;
+        }
+
+        public String getDescription() {
+            return description;
+        }
+
+        public static String valueOfCode(String val) {
+            String tmp = null;
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].value == val) {
+                    tmp = values()[i].code;
+                }
+            }
+            return tmp;
+        }
+
+        public static String valueOfDescription(String 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 String codeOfDescription(String code) {
+            String tmp = null;
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].code.equals(code)) {
+                    tmp = values()[i].description;
+                }
+            }
+            return tmp;
+        }
+    }
+
+    /**
+     * 用户消息状态
+     * 1.READ：已读
+     * 2.UNREAD：未读
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum MESSAGE_STATUS {
+
+        READ(1,"已读","fa cell-fa fa-file-text"),
+        UNREAD(2,"未读","fa cell-fa fa-file-o");
+
+        private int value;
+        private String code;
+        private String description;
+
+        MESSAGE_STATUS() {
+        }
+
+        MESSAGE_STATUS(int value, String description, String code) {
+            this.value = value;
+            this.code = code;
+            this.description = description;
+        }
+
+        public int getValue() {
+            return value;
+        }
+
+        public String getCode() {
+            return code;
+        }
+
+        public String getDescription() {
+            return description;
+        }
+
+        public static String valueOfCode(int val) {
+            String tmp = null;
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].value == val) {
+                    tmp = values()[i].code;
+                }
+            }
+            return tmp;
+        }
+
+        public static String valueOfDescription(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 String codeOfDescription(String code) {
+            String tmp = null;
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].code.equals(code)) {
+                    tmp = values()[i].description;
+                }
+            }
+            return tmp;
+        }
+    }
 }

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

@@ -139,17 +139,19 @@ public class WmsEnumUtil {
      */
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)
     public enum MASTER_ORDER_STATUS {
-        CREATE(10, "新建"),
+        CREATE(10, "CREATE","新建"),
-        RECEIPT(20, "处理中"),
+        RECEIPT(20, "RECEIPT","处理中"),
-        RECEIPT_FINISH(30, "已完成"),
+        RECEIPT_FINISH(30, "RECEIPT_FINISH","已完成"),
-        CLOSED(40, "已关闭"),
+        CLOSED(40, "CLOSED","已关闭"),
-        CANCELLED(50, "已取消");
+        CANCELLED(50, "CANCELLED","已取消");
 
         private int value;
+        private String code;
         private String description;
 
-        MASTER_ORDER_STATUS(int value, String description) {
+        MASTER_ORDER_STATUS(int value,String code, String description) {
             this.value = value;
+            this.code = code;
             this.description = description;
         }
 
@@ -157,6 +159,10 @@ public class WmsEnumUtil {
             return value;
         }
 
+        public String getCode() {
+            return code;
+        }
+
         public String getDescription() {
             return description;
         }
@@ -2096,4 +2102,88 @@ public class WmsEnumUtil {
             return tmp;
         }
     }
+
+    /**
+     * 脚本类型
+     * 10=组件脚本，20=表单脚本，30=报表脚本，40=JOB脚本，50=其他脚本
+     */
+    public enum SCRIPT_TYPE {
+        MODUAL(10,"Modual","组件脚本"),
+        FORM(20,"Form","表单脚本"),
+        REPORT(30,"Report","报表脚本"),
+        JOB(40,"Job","JOB脚本"),
+        OTHER(50,"Other","其他脚本");
+
+        private String description;
+        private int value;
+        private String code;
+
+        SCRIPT_TYPE(int value, String code, String description) {
+            this.description = description;
+            this.value = value;
+            this.code = code;
+        }
+
+        public String getCode() {
+            return this.code;
+        }
+
+        public int getIndex() {
+            return this.value;
+        }
+
+        public int getValue() {
+            return value;
+        }
+
+        public String getDescription() {
+            return description;
+        }
+    }
+
+    /**
+     * 脚本语言类型
+     * 10=Groovy, 20=Jython, 30=JavaScript, 40=Scala, 50=JRuby
+     */
+    public enum LANGUAGE_TYPE {
+        GROOVY(1,"Groovy", 10),
+        PYTHON(2,"Python", 20),
+        JS(3,"JavaScript", 30);
+        // 下面这2种语言没人会写，暂不支持
+        //SCALA(40,"scala"),
+        //JRUBY(50,"jruby");
+
+        private int index;
+        private String description;
+        private int value;
+
+        private LANGUAGE_TYPE(int index, String description, int value) {
+            this.index = index;
+            this.description = description;
+            this.value = value;
+        }
+
+        public String getDescription() {
+            return description;
+        }
+
+        public int getIndex() {
+            return this.index;
+        }
+
+        public int getValue() {
+            return value;
+        }
+
+        // 根据枚举编号获取语言代码
+        public static String getCodeByIndex(int index) {
+            for (LANGUAGE_TYPE languageType : LANGUAGE_TYPE.values()) {
+                if (languageType.getIndex() == index) {
+                    return languageType.getDescription();
+                }
+            }
+
+            return null;
+        }
+    }
 }

modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/tool/DdlPreparedPack.java

@@ -307,6 +307,30 @@ public class DdlPreparedPack {
     }
 
     /**
+     * 封装String对象成大于语句
+     *
+     * @param columnName 列名
+     * @param packBean
+     */
+    public static void getStringBiggerPack(Object data, String columnName, DdlPackBean packBean) {
+        if (data != null && !StringUtils.isEmpty(String.valueOf(data))) {
+            packBean.addColumnQuery(columnName," and model." + columnName + " > :m_" + columnName, data);
+        }
+    }
+
+    /**
+     * 封装String对象成小于语句
+     *
+     * @param columnName 列名
+     * @param packBean
+     */
+    public static void getStringSmallerPack(Object data, String columnName, DdlPackBean packBean) {
+        if (data != null && !StringUtils.isEmpty(String.valueOf(data))) {
+            packBean.addColumnQuery(columnName," and model." + columnName + " < :m_" + columnName, data);
+        }
+    }
+
+    /**
      * 封装double对象成大于语句
      *
      * @param columnName 列名

modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfElement.java

@@ -105,6 +105,10 @@ public class BfElement extends BaseBean {
     private BfDataObject dataObject;
 
     @Transient
+    @ApiParam(value = "数据对象")
+    private BfElementProperty elementSortProperty;
+
+    @Transient
     @ApiParam(value = "元素表单")
     private BfElementGrid elementGrid;
 

modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfElementTree.java

@@ -42,16 +42,28 @@ public class BfElementTree extends BaseBean {
     @JsonSerialize(using = ToStringSerializer.class)
     private Long treeParentId;
 
+    @Column(name = "TREE_PARENT_RDD")
+    @ApiParam(value = "父级属性ID")
+    private String treeParentRdd;
+
     @Column(name = "TREE_ATTR_NAME_ID")
     @ApiParam(value = "显示属性ID")
     @JsonSerialize(using = ToStringSerializer.class)
     private Long treeAttrNameId;
 
+    @Column(name = "TREE_ATTR_NAME_RDD")
+    @ApiParam(value = "显示属性ID")
+    private String treeAttrNameRdd;
+
     @Column(name = "TREE_ATTR_VALUE_ID")
     @ApiParam(value = "取值属性ID")
     @JsonSerialize(using = ToStringSerializer.class)
     private Long treeAttrValueId;
 
+    @Column(name = "TREE_ATTR_VALUE_RDD")
+    @ApiParam(value = "取值属性ID")
+    private String treeAttrValueRdd;
+
     @Column(name="TREE_IS_OPEN_ALL")
     @ApiParam(value ="是否全部展开")
     private Integer treeIsOpenAll;

modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesArea.java

@@ -0,0 +1,38 @@
+package cn.estsh.i3plus.pojo.mes.pcn.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;
+
+/**
+ * @Description :生产区域
+ * @Reference :
+ * @Author : jack.jia
+ * @CreateDate : 2019-04-02
+ * @Modify:
+ **/
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Table(name="MES_AREA")
+@Api("生产区域")
+public class MesArea extends BaseBean {
+    @Column(name="AREA_CODE")
+    @ApiParam("区域代码")
+    private String areaCode;
+
+    @Column(name="AREA_NAME")
+    @ApiParam("区域名称")
+    private String areaName;
+}

modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/StationResultBean.java

@@ -18,13 +18,13 @@ import java.util.List;
 public class StationResultBean implements Serializable {
 
     /**
-     * 根据客户端所需数据结构，约定不同数据类型
+     * 根据客户端所需数据结构，约定不同数据类型,message:信息、stepList:工步列表、stepHtml：工步内容
      */
     @ApiParam("数据类型")
     private String flagType;
 
     @ApiParam("是否错误信息")
-    private boolean fail;
+    private boolean error;
 
     @ApiParam("执行结果信息")
     private String message;

modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesAreaRepository.java

@@ -0,0 +1,16 @@
+package cn.estsh.i3plus.pojo.mes.pcn.repository;
+
+import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
+import cn.estsh.i3plus.pojo.mes.pcn.bean.MesArea;
+import org.springframework.stereotype.Repository;
+
+/**
+ * @Description :
+ * @Reference :
+ * @Author : jack.jia
+ * @CreateDate : 2019-04-02
+ * @Modify:
+ **/
+@Repository
+public interface MesAreaRepository extends BaseRepository<MesArea, Long> {
+}

modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPart.java

@@ -69,11 +69,11 @@ public class MesPart extends BaseBean {
     @ApiParam("默认工作中心")
     private String defaultWorkCenter;
 
-    @Column(name="PRODUCE_CATEGORY")
+    @Column(name="PRODUCE_CTGY_CODE")
-    @ApiParam("产品类型")
+    @ApiParam("产品类型代码")
-    private String  produceCategory;
+    private String  produceCategoryCode;
 
     @Transient
-    @ApiParam("分类名称")
+    @ApiParam("产品类型名称")
-    private String categoryName;
+    private String produceCategoryName;
 }

modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPlanOrder.java

@@ -142,7 +142,7 @@ public class MesPlanOrder extends BaseBean {
         return this.status == null ? 0 : this.status;
     }
 
-    public int getOrderTypeVal() {
+    public int getPlanTypeVal() {
         return this.planType == null ? 0 : this.planType;
     }
 }

modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProduceCategory.java

@@ -0,0 +1,38 @@
+package cn.estsh.i3plus.pojo.mes.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;
+
+/**
+ * @Description:
+ * @Reference:
+ * @Author: Crish
+ * @CreateDate:2019-04-26-10:25
+ * @Modify:
+ **/
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Table(name="MES_PRODUCE_CATEGORY")
+@Api("系统业务动作")
+public class MesProduceCategory extends BaseBean {
+
+    @Column(name="PRODUCE_CTGY_CODE")
+    @ApiParam("产品类型代码")
+    private String produceCategoryCode;
+
+    @Column(name="PRODUCE_CTGY_NAME")
+    @ApiParam("产品类型名称")
+    private String  produceCategoryName;
+}

modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProduceSn.java

@@ -36,6 +36,10 @@ public class MesProduceSn extends BaseBean {
     @ApiParam("物料号")
     private String partNo;
 
+    @Column(name="PART_NAME_RDD")
+    @ApiParam("物料名称")
+    private String partNameRdd;
+
     @Column(name="QTY")
     @ApiParam("数量")
     private Double qty;

modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueOrder.java

@@ -11,6 +11,7 @@ import org.hibernate.annotations.DynamicUpdate;
 import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.persistence.Table;
+import javax.persistence.Transient;
 
 /**
  * @Description:
@@ -33,12 +34,16 @@ public class MesQueueOrder extends BaseBean {
 
     @Column(name="VIN_CODE")
     @ApiParam("Vin")
-    private Integer vinCode;
+    private String vinCode;
 
     @Column(name="CUST_FLAG_NO")
     @ApiParam("客户标识号")
     private String custFlagNo;
 
+    @Column(name="PROD_CFG_CODE")
+    @ApiParam("产品配置代码")
+    private String prodCfgCode;
+
     @Column(name="SEQ")
     @ApiParam("排序")
     private Double seq;
@@ -59,6 +64,14 @@ public class MesQueueOrder extends BaseBean {
     @ApiParam("区域代码")
     private String areaCode;
 
+    @Transient
+    @ApiParam("起始车号")
+    private String custFlagNoStart;
+
+    @Transient
+    @ApiParam("截至车号")
+    private String custFlagNoEnd;
+
     public int getStatusVal() {
         return this.status == null ? 0 : this.status;
     }

modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueOrderDetail.java

@@ -33,7 +33,11 @@ public class MesQueueOrderDetail extends BaseBean {
 
     @Column(name="PART_NO")
     @ApiParam("物料号")
-    private Integer partNo;
+    private String partNo;
+
+    @Column(name="PART_NAME_RDD")
+    @ApiParam("物料名称")
+    private String partNameRdd;
 
     @Column(name="SERIAL_NUMBER")
     @ApiParam("产品条码")
@@ -53,7 +57,7 @@ public class MesQueueOrderDetail extends BaseBean {
 
     @Column(name="WORK_TYPE")
     @ApiParam("生产类型")
-    private String workType;
+    private String workOrderType;
 
     @Column(name="PRODUCE_CATEGORY")
     @ApiParam("产品类型")

modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkOrder.java

@@ -88,6 +88,10 @@ public class MesWorkOrder extends BaseBean {
     @ApiParam("工作中心代码")
     private String workCenterCode;
 
+    @Column(name="AREA_CODE")
+    @ApiParam("区域代码")
+    private String areaCode;
+
     @Column(name="WORK_CELL_CODE")
     @ApiParam("工作单元代码")
     private String workCellCode;

modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesProduceCategoryRepository.java

@@ -0,0 +1,16 @@
+package cn.estsh.i3plus.pojo.mes.repository;
+
+import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
+import cn.estsh.i3plus.pojo.mes.bean.MesProduceCategory;
+import org.springframework.stereotype.Repository;
+
+/**
+ * @Description:
+ * @Reference:
+ * @Author: Crish
+ * @CreateDate:2019-04-26-10:28
+ * @Modify:
+ **/
+@Repository
+public interface MesProduceCategoryRepository extends BaseRepository<MesProduceCategory, Long> {
+}

modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java

@@ -3,9 +3,11 @@ package cn.estsh.i3plus.pojo.mes.sqlpack;
 import cn.estsh.i3plus.pojo.base.bean.BaseBean;
 import cn.estsh.i3plus.pojo.base.bean.DdlPackBean;
 import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil;
+import cn.estsh.i3plus.pojo.base.enumutil.MesEnumUtil;
 import cn.estsh.i3plus.pojo.base.tool.DdlPreparedPack;
 import cn.estsh.i3plus.pojo.mes.bean.MesPart;
 import cn.estsh.i3plus.pojo.mes.bean.MesPlanOrder;
+import cn.estsh.i3plus.pojo.mes.bean.MesQueueOrder;
 import cn.estsh.i3plus.pojo.mes.bean.MesWorkOrder;
 import org.apache.commons.lang3.StringUtils;
 
@@ -48,13 +50,13 @@ public class MesHqlPack {
         if (StringUtils.isNotEmpty(mesPlanOrder.getPartNo())) {
             DdlPreparedPack.getStringEqualPack(mesPlanOrder.getPartNo(), "partNo", packBean);
         }
-        if (StringUtils.isNotEmpty(mesPlanOrder.getPlanType() + "")) {
+        if (StringUtils.isNotEmpty(mesPlanOrder.getPlanType() + "") && mesPlanOrder.getPlanTypeVal() != 0) {
             DdlPreparedPack.getNumEqualPack(mesPlanOrder.getPlanType(), "planType", packBean);
         }
-        if (StringUtils.isNotEmpty(mesPlanOrder.getStatusVal() + "")) {
+        if (StringUtils.isNotEmpty(mesPlanOrder.getStatus() + "") && mesPlanOrder.getStatusVal() != 0) {
-            DdlPreparedPack.getNumEqualPack(mesPlanOrder.getStatusVal(), "status", packBean);
+            DdlPreparedPack.getNumEqualPack(mesPlanOrder.getStatus(), "status", packBean);
         }
-        if (StringUtils.isNotEmpty(mesPlanOrder.getStatusVal() + "")) {
+        if (StringUtils.isNotEmpty(mesPlanOrder.getCreateUser())) {
             DdlPreparedPack.getStringEqualPack(mesPlanOrder.getCreateUser(), "createUser", packBean);
         }
 
@@ -70,7 +72,7 @@ public class MesHqlPack {
         DdlPreparedPack.timeBuilder(
                 mesPlanOrder.getCreateDateTimeStart(),
                 mesPlanOrder.getCreateDateTimeEnd(),
-                "createDateTime", packBean, true);
+                "createDatetime", packBean, true);
 
         // 排序
          DdlPreparedPack.getOrderDefault(mesPlanOrder);
@@ -111,8 +113,8 @@ public class MesHqlPack {
     }
 
     /**
-     * 物料信息查询条件封装
+     * 生产工单查询条件封装
-     * @param mesPart
+     * @param mesWorkOrder
      * @return
      */
     public static DdlPackBean getWorkOrderCondition(MesWorkOrder mesWorkOrder, String organizeCode) {
@@ -123,7 +125,7 @@ public class MesHqlPack {
         if (StringUtils.isNotEmpty(mesWorkOrder.getPartNo())) {
             DdlPreparedPack.getStringLikerPack(mesWorkOrder.getPartNo(), "partNo", packBean);
         }
-        if (StringUtils.isNotEmpty(mesWorkOrder.getWorkOrderStatus() + "")) {
+        if (StringUtils.isNotEmpty(mesWorkOrder.getWorkOrderStatus() + "") && mesWorkOrder.getWorkOrderStatusVal() != 0) {
             DdlPreparedPack.getNumEqualPack(mesWorkOrder.getWorkOrderStatus(), "workOrderStatus", packBean);
         }
         if (StringUtils.isNotEmpty(mesWorkOrder.getWorkCenterCode())) {
@@ -132,7 +134,7 @@ public class MesHqlPack {
         if (StringUtils.isNotEmpty(mesWorkOrder.getWorkCellCode())) {
             DdlPreparedPack.getStringEqualPack(mesWorkOrder.getWorkCellCode(), "workCellCode", packBean);
         }
-        if (StringUtils.isNotEmpty(mesWorkOrder.getWorkOrderType() + "")) {
+        if (StringUtils.isNotEmpty(mesWorkOrder.getWorkOrderType() + "") && mesWorkOrder.getWorkOrderTypeVal() != 0) {
             DdlPreparedPack.getNumEqualPack(mesWorkOrder.getWorkOrderType(), "workOrderType", packBean);
         }
         if (StringUtils.isNotEmpty(mesWorkOrder.getProdCfgCode())) {
@@ -155,4 +157,30 @@ public class MesHqlPack {
         DdlPreparedPack.getOrderByPack(new Object[]{"2"},new String[]{mesWorkOrder.getOrderByParam()} , packBean);
         return packBean;
     }
+
+    /**
+     * 生产队列查询条件封装
+     * @param mesQueueOrder
+     * @return
+     */
+    public static DdlPackBean getQueueOrder(MesQueueOrder mesQueueOrder, String organizeCode) {
+        DdlPackBean packBean = getAllBaseData(organizeCode);
+        if (StringUtils.isNotEmpty(mesQueueOrder.getCustFlagNoStart())) {
+            DdlPreparedPack.getStringBiggerPack(mesQueueOrder.getCustFlagNoStart(), "custFlagNo", packBean);
+        }
+
+        if (StringUtils.isNotEmpty(mesQueueOrder.getCustFlagNoEnd() + "")) {
+            DdlPreparedPack.getStringSmallerPack(mesQueueOrder.getCustFlagNoEnd(), "custFlagNo", packBean);
+        }
+        DdlPreparedPack.getNumEqualPack(MesEnumUtil.QUEUE_ORDER_STATUS.NORMAL.getValue(), "status", packBean);
+        // 时间段查询
+        DdlPreparedPack.timeBuilder(
+                mesQueueOrder.getCreateDateTimeStart(),
+                mesQueueOrder.getCreateDateTimeEnd(),
+                "createDatetime", packBean, true);
+
+        DdlPreparedPack.getOrderDefault(mesQueueOrder);
+        DdlPreparedPack.getOrderByPack(new Object[]{"2"},new String[]{mesQueueOrder.getOrderByParam()} , packBean);
+        return packBean;
+    }
 }

modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/form/ElementModel.java

@@ -1,5 +1,6 @@
 package cn.estsh.i3plus.pojo.model.form;
 
+import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn;
 import cn.estsh.i3plus.pojo.form.bean.*;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
@@ -7,6 +8,7 @@ import io.swagger.annotations.ApiParam;
 import lombok.Data;
 
 import javax.persistence.Column;
+import javax.persistence.Transient;
 import java.util.List;
 
 /**
@@ -36,6 +38,9 @@ public class ElementModel{
     @ApiParam(value = "元素基础属性信息")
     private List<BfElementProperty> propertyList;
 
+    @ApiParam(value = "元素查询排序")
+    private BfElementProperty propertySort;
+
     @ApiParam(value = "元素基础虚拟属性信息")
     private List<BfElementPropertyVirtual> virtualList;
 
@@ -51,4 +56,11 @@ public class ElementModel{
     @ApiParam(value = "元素类型")
     private Integer elementType;
 
+    @ApiParam(value = "排序属性")
+    public String orderByParam;
+
+    //CommonEnumUtil.ASC_OR_DESC  1 asc,2 desc
+    @ApiParam(value = "排序类型，1 正序，2 倒序",example = "1")
+    public Integer ascOrDesc = 1;
+
 }

modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/softswitch/DataSwitchModel.java

@@ -0,0 +1,26 @@
+package cn.estsh.i3plus.pojo.model.softswitch;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * @Description : 数据模型转换对象
+ * @Reference :
+ * @Author : alwaysfrin
+ * @CreateDate : 2019-04-29 11:11
+ * @Modify:
+ **/
+public class DataSwitchModel {
+
+    private String stringVal;
+
+    private Long longVal;
+
+    private Double doubleVal;
+
+    private List<?> listVal;
+
+    private Map<String,?> mapVal;
+
+    private Object[] arrayVal;
+}

modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsActionGroupDetailsModel.java

@@ -0,0 +1,32 @@
+package cn.estsh.i3plus.pojo.model.wms;
+
+import cn.estsh.i3plus.pojo.base.bean.BaseBean;
+import cn.estsh.i3plus.pojo.wms.bean.WmsActionGroupDetails;
+import cn.estsh.i3plus.pojo.wms.bean.WmsActionStep;
+import cn.estsh.i3plus.pojo.wms.bean.WmsActionStepCall;
+import cn.estsh.i3plus.pojo.wms.bean.WmsActionStepCallParam;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * @Description : 作业流程明细Model
+ * @Reference :
+ * @Author : dragon.xu
+ * @CreateDate : 2019-04-29 15:39
+ * @Modify:
+ **/
+@Data
+@Api("作业流程明细Model")
+public class WmsActionGroupDetailsModel {
+    @ApiParam("作业流程明细")
+    public WmsActionGroupDetails wmsActionGroupDetails;
+    @ApiParam("作业步骤")
+    public WmsActionStep wmsActionStep;
+    @ApiParam("作业步骤调用")
+    public List<WmsActionStepCall> wmsActionStepCallList;
+    @ApiParam("作业步骤调用参数")
+    public List<WmsActionStepCallParam> wmsActionStepCallParamList;
+}

modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsActionGroupModel.java

@@ -0,0 +1,26 @@
+package cn.estsh.i3plus.pojo.model.wms;
+
+import cn.estsh.i3plus.pojo.base.bean.BaseBean;
+import cn.estsh.i3plus.pojo.wms.bean.WmsActionGroup;
+import cn.estsh.i3plus.pojo.wms.bean.WmsActionGroupDetails;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+
+import java.util.List;
+
+/**
+* @Description : 作业流程Model
+* @Reference :
+* @Author : dragon.xu
+* @CreateDate : 2019-04-29 15:39
+* @Modify: 
+**/
+@Data
+@Api("作业流程Model")
+public class WmsActionGroupModel {
+    @ApiParam("流程")
+    public WmsActionGroup wmsActionGroup;
+    @ApiParam("流程明细Model集合")
+    public List<WmsActionGroupDetailsModel> wmsActionGroupDetailsModelList;
+}

modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsOrderMasterModel.java

@@ -3,7 +3,6 @@ package cn.estsh.i3plus.pojo.model.wms;
 import cn.estsh.i3plus.pojo.base.bean.BaseBean;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiParam;
-import io.swagger.models.auth.In;
 import lombok.Data;
 
 /**

modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysMessage.java

@@ -100,6 +100,14 @@ public class SysMessage extends BaseBean {
     @JsonSerialize(using = ToStringSerializer.class)
     private Long readCount;
 
+    public long getReadCountVal(){
+        if(readCount == null){
+            return 0;
+        } else {
+            return readCount.longValue();
+        }
+    }
+
     public SysMessage() {
     }
 

modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/TestInfo.java

@@ -1,27 +0,0 @@
-package cn.estsh.i3plus.pojo.platform.bean;
-
-import cn.estsh.i3plus.pojo.base.bean.BaseBean;
-
-/**
- * @Description : 测试类
- * @Reference :
- * @Author : yunhao
- * @CreateDate : 2019-02-24 16:21
- * @Modify:
- **/
-public class TestInfo extends BaseBean {
-
-
-    /**
-     * 执行耗时
-     */
-    private long executeTime;
-
-    public TestInfo(){
-
-    }
-
-    public TestInfo(long executeTime){
-        this.executeTime = System.currentTimeMillis() - executeTime;
-    }
-}

modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/sqlpack/CoreHqlPack.java

@@ -613,6 +613,7 @@ public class CoreHqlPack {
         StringBuffer result =  new StringBuffer();
 
         HqlPack.getNumEqualPack(sysRefUserMessage.getMessageTypeRdd(),"messageTypeRdd",result);
+        HqlPack.getNumEqualPack(sysRefUserMessage.getMessageSoftType(),"messageSoftType",result);
         HqlPack.getStringLikerPack(sysRefUserMessage.getMessageTitleRdd(),"messageTitleRdd",result);
         HqlPack.getStringLikerPack(sysRefUserMessage.getMessageSenderNameRdd(),"messageSenderNameRdd",result);
         HqlPack.getNumEqualPack(sysRefUserMessage.getMessageStatus(),"messageStatus",result);

modules/i3plus-pojo-report/src/main/java/cn/estsh/i3plus/pojo/report/bean/BrRefReportTypeset.java

@@ -59,7 +59,7 @@ public class BrRefReportTypeset extends BaseBean {
     /**
      * 关联元素或模板html
      */
-    @Column(name = "REF_HTML")
+    @Column(name = "REF_HTML",columnDefinition = "TEXT")
     @ApiParam(value = "关联对象html")
     private String refHtml;
 

modules/i3plus-pojo-report/src/main/java/cn/estsh/i3plus/pojo/report/bean/BrReport.java

@@ -55,7 +55,7 @@ public class BrReport extends BaseBean {
     @ApiParam(value ="布局名称")
     private String layoutNameRdd;
 
-    @Column(name="LAYOUT_HTML")
+    @Column(name="LAYOUT_HTML",columnDefinition = "TEXT")
     @ApiParam(value ="报表html")
     private String reportHtml;
 

modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/modelbean/SwebLoginUserModel.java

@@ -31,4 +31,9 @@ public class SwebLoginUserModel implements Serializable {
 
     @ApiParam(value = "ip地址")
     private String ip;
+
+    public SwebLoginUserModel(Long id, String userName) {
+        this.id = id;
+        this.userName = userName;
+    }
 }

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

@@ -63,4 +63,12 @@ public class BasVendor extends BaseBean{
     @Column(name = "PASSWORD")
     @ApiParam(value = "密码")
     private String password;
+
+    public BasVendor() {
+    }
+
+    public BasVendor(Long id,String userName) {
+        this.id = id;
+        this.userName = userName;
+    }
 }

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

@@ -8,10 +8,7 @@ import lombok.EqualsAndHashCode;
 import org.hibernate.annotations.DynamicInsert;
 import org.hibernate.annotations.DynamicUpdate;
 
-import javax.persistence.Column;
+import javax.persistence.*;
-import javax.persistence.Entity;
-import javax.persistence.Table;
-import javax.persistence.Transient;
 import java.util.List;
 
 /**
@@ -26,7 +23,10 @@ import java.util.List;
 @DynamicInsert
 @DynamicUpdate
 @EqualsAndHashCode(callSuper = true)
-@Table(name = "WMS_DOC_ASN_MASTER")
+@Table(name = "WMS_DOC_ASN_MASTER", indexes = {
+        @Index(columnList = "ORDER_NO"),
+        @Index(columnList = "ORGANIZE_CODE")
+})
 @Api("ASN主表信息")
 public class WmsASNMaster extends BaseBean {
 
@@ -38,7 +38,7 @@ public class WmsASNMaster extends BaseBean {
     @ApiParam("单据类型")
     public String asnType;
 
-    @Column(name = "MASTER_ORDER_STATUS")
+    @Column(name = "ASN_STATUS")
     @ApiParam(value = "状态", example = "0")
     public Integer asnStatus;
 

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

@@ -12,6 +12,7 @@ import org.hibernate.annotations.DynamicUpdate;
 
 import javax.persistence.Column;
 import javax.persistence.Entity;
+import javax.persistence.Index;
 import javax.persistence.Table;
 import java.util.List;
 
@@ -28,7 +29,13 @@ import java.util.List;
 @DynamicInsert
 @DynamicUpdate
 @EqualsAndHashCode(callSuper = true)
-@Table(name = "WMS_DOC_ASN_DETAILS")
+@Table(name = "WMS_DOC_ASN_DETAILS", indexes = {
+        @Index(columnList = "ORDER_NO"),
+        @Index(columnList = "PART_NO"),
+        @Index(columnList = "SN_1D"),
+        @Index(columnList = "SN_2D"),
+        @Index(columnList = "ORGANIZE_CODE")
+})
 @Api("ASN订单明细信息")
 public class WmsASNMasterDetails extends BaseBean {
     @Column(name = "PART_NO")

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

@@ -52,6 +52,10 @@ public class WmsActionGroup extends BaseBean {
     @ApiParam(value = "明细处理组件编号", example = "0")
     private Long detailsAmId;
 
+    @Column(name="SUBMIT_AM_ID")
+    @ApiParam(value = "提交组件编号", example = "0")
+    private Long submitAmId;
+
     @Column(name="END_AM_ID")
     @ApiParam(value = "结束组件编号", example = "0")
     private Long endAmId;

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

@@ -4,17 +4,13 @@ import cn.estsh.i3plus.pojo.base.bean.BaseBean;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
 import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
 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.*;
-import javax.persistence.Entity;
-import javax.persistence.Table;
-import javax.persistence.Transient;
 
 /**
  * @Description : 作业步骤调用
@@ -28,7 +24,11 @@ import javax.persistence.Transient;
 @DynamicInsert
 @DynamicUpdate
 @EqualsAndHashCode(callSuper = true)
-@Table(name="WMS_ACTION_STEP_CALL")
+@Table(name="WMS_ACTION_STEP_CALL", indexes = {
+        @Index(columnList = "ORGANIZE_CODE"),
+        @Index(columnList = "AS_ID"),
+        @Index(columnList = "AM_ID")
+})
 @Api("作业步骤调用信息")
 public class WmsActionStepCall extends BaseBean {
 

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

@@ -9,10 +9,7 @@ import org.hibernate.annotations.ColumnDefault;
 import org.hibernate.annotations.DynamicInsert;
 import org.hibernate.annotations.DynamicUpdate;
 
-import javax.persistence.Column;
+import javax.persistence.*;
-import javax.persistence.Entity;
-import javax.persistence.Table;
-import javax.persistence.Transient;
 
 /**
  * @Description :移库单明细实体(用于转储类业务)
@@ -26,7 +23,12 @@ import javax.persistence.Transient;
 @DynamicInsert
 @DynamicUpdate
 @EqualsAndHashCode(callSuper = true)
-@Table(name = "WMS_DOC_MOVEMENT_DETAILS")
+@Table(name = "WMS_DOC_MOVEMENT_DETAILS", indexes = {
+        @Index(columnList = "ORDER_NO"),
+        @Index(columnList = "PART_NO"),
+        @Index(columnList = "SRC_NO"),
+        @Index(columnList = "ORGANIZE_CODE")
+})
 @Api("移库单明细表")
 public class WmsDocMovementDetails extends BaseBean {
     @Column(name = "PART_NO")

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

@@ -9,10 +9,7 @@ import lombok.ToString;
 import org.hibernate.annotations.DynamicInsert;
 import org.hibernate.annotations.DynamicUpdate;
 
-import javax.persistence.Column;
+import javax.persistence.*;
-import javax.persistence.Entity;
-import javax.persistence.Table;
-import javax.persistence.Transient;
 import java.util.List;
 
 /**
@@ -27,7 +24,13 @@ import java.util.List;
 @DynamicInsert
 @DynamicUpdate
 @EqualsAndHashCode(callSuper = true)
-@Table(name = "WMS_DOC_MOVEMENT_MASTER")
+@Table(name = "WMS_DOC_MOVEMENT_MASTER", indexes = {
+        @Index(columnList = "ORDER_NO"),
+        @Index(columnList = "REF_NO"),
+        @Index(columnList = "ERP_SRC_NO"),
+        @Index(columnList = "BUSI_TYPE"),
+        @Index(columnList = "ORGANIZE_CODE")
+})
 @Api("移库单表")
 @ToString
 public class WmsDocMovementMaster extends BaseBean {

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

@@ -9,10 +9,7 @@ import org.hibernate.annotations.ColumnDefault;
 import org.hibernate.annotations.DynamicInsert;
 import org.hibernate.annotations.DynamicUpdate;
 
-import javax.persistence.Column;
+import javax.persistence.*;
-import javax.persistence.Entity;
-import javax.persistence.Table;
-import javax.persistence.Transient;
 
 /**
  * @Description : 移库单条码表
@@ -27,7 +24,12 @@ import javax.persistence.Transient;
 @DynamicInsert
 @DynamicUpdate
 @EqualsAndHashCode(callSuper = true)
-@Table(name="WMS_DOC_MOVEMENT_SN")
+@Table(name="WMS_DOC_MOVEMENT_SN", indexes = {
+        @Index(columnList = "ORDER_NO"),
+        @Index(columnList = "PART_NO"),
+        @Index(columnList = "SN"),
+        @Index(columnList = "ORGANIZE_CODE")
+})
 @Api("移库条码信息")
 public class WmsDocMovementSn extends BaseBean {
 

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

@@ -8,10 +8,7 @@ import lombok.EqualsAndHashCode;
 import org.hibernate.annotations.DynamicInsert;
 import org.hibernate.annotations.DynamicUpdate;
 
-import javax.persistence.Column;
+import javax.persistence.*;
-import javax.persistence.Entity;
-import javax.persistence.Table;
-import javax.persistence.Transient;
 
 /**
  * @Description : 库存移动单明细信息
@@ -25,7 +22,11 @@ import javax.persistence.Transient;
 @DynamicInsert
 @DynamicUpdate
 @EqualsAndHashCode(callSuper = true)
-@Table(name="WMS_MOVE_DETAILS")
+@Table(name="WMS_MOVE_DETAILS", indexes = {
+        @Index(columnList = "PART_NO"),
+        @Index(columnList = "ORDER_NO"),
+        @Index(columnList = "ORGANIZE_CODE")
+})
 @Api("库存移动单明细信息")
 public class WmsMoveDetails extends BaseBean {
 

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

@@ -10,6 +10,7 @@ import org.hibernate.annotations.DynamicUpdate;
 
 import javax.persistence.Column;
 import javax.persistence.Entity;
+import javax.persistence.Index;
 import javax.persistence.Table;
 
 /**
@@ -24,7 +25,11 @@ import javax.persistence.Table;
 @DynamicInsert
 @DynamicUpdate
 @EqualsAndHashCode(callSuper = true)
-@Table(name = "WMS_MOVE_MASTER")
+@Table(name = "WMS_MOVE_MASTER", indexes = {
+        @Index(columnList = "TRANS_TYPE_CODE"),
+        @Index(columnList = "ORDER_NO"),
+        @Index(columnList = "ORGANIZE_CODE")
+})
 @Api("库存移动单主表信息")
 public class WmsMoveMaster extends BaseBean {
 

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

@@ -9,10 +9,7 @@ import org.hibernate.annotations.ColumnDefault;
 import org.hibernate.annotations.DynamicInsert;
 import org.hibernate.annotations.DynamicUpdate;
 
-import javax.persistence.Column;
+import javax.persistence.*;
-import javax.persistence.Entity;
-import javax.persistence.Table;
-import javax.persistence.Transient;
 
 /**
  * @Description : 库存移动单条码信息
@@ -26,7 +23,12 @@ import javax.persistence.Transient;
 @DynamicInsert
 @DynamicUpdate
 @EqualsAndHashCode(callSuper = true)
-@Table(name="WMS_MOVE_SN")
+@Table(name="WMS_MOVE_SN", indexes = {
+        @Index(columnList = "PART_NO"),
+        @Index(columnList = "ORDER_NO"),
+        @Index(columnList = "SN"),
+        @Index(columnList = "ORGANIZE_CODE")
+})
 @Api("库存移动单条码信息")
 public class WmsMoveSn extends BaseBean {
 

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

@@ -8,10 +8,7 @@ import lombok.EqualsAndHashCode;
 import org.hibernate.annotations.DynamicInsert;
 import org.hibernate.annotations.DynamicUpdate;
 
-import javax.persistence.Column;
+import javax.persistence.*;
-import javax.persistence.Entity;
-import javax.persistence.Table;
-import javax.persistence.Transient;
 import java.util.List;
 
 /**
@@ -26,7 +23,10 @@ import java.util.List;
 @DynamicInsert
 @DynamicUpdate
 @EqualsAndHashCode(callSuper = true)
-@Table(name = "WMS_DOC_PO_MASTER")
+@Table(name = "WMS_DOC_PO_MASTER", indexes = {
+        @Index(columnList = "ORDER_NO"),
+        @Index(columnList = "ORGANIZE_CODE")
+})
 @Api("PO主表信息")
 public class WmsPOMaster extends BaseBean {
 

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

@@ -9,10 +9,7 @@ import org.hibernate.annotations.ColumnDefault;
 import org.hibernate.annotations.DynamicInsert;
 import org.hibernate.annotations.DynamicUpdate;
 
-import javax.persistence.Column;
+import javax.persistence.*;
-import javax.persistence.Entity;
-import javax.persistence.Table;
-import javax.persistence.Transient;
 
 /**
  * @Description : PO订单明细信息
@@ -26,7 +23,11 @@ import javax.persistence.Transient;
 @DynamicInsert
 @DynamicUpdate
 @EqualsAndHashCode(callSuper = true)
-@Table(name = "WMS_DOC_PO_DETAILS")
+@Table(name = "WMS_DOC_PO_DETAILS", indexes = {
+        @Index(columnList = "ORDER_NO"),
+        @Index(columnList = "PART_NO"),
+        @Index(columnList = "ORGANIZE_CODE")
+})
 @Api("PO订单明细信息")
 public class WmsPOMasterDetails extends BaseBean {
     @Column(name = "PART_NO")

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

@@ -11,6 +11,7 @@ import org.hibernate.annotations.DynamicUpdate;
 
 import javax.persistence.Column;
 import javax.persistence.Entity;
+import javax.persistence.Index;
 import javax.persistence.Table;
 
 /**
@@ -26,7 +27,13 @@ import javax.persistence.Table;
 @DynamicInsert
 @DynamicUpdate
 @EqualsAndHashCode(callSuper = true)
-@Table(name="WMS_DOC_PO_SN")
+@Table(name="WMS_DOC_PO_SN", indexes = {
+        @Index(columnList = "ORDER_NO"),
+        @Index(columnList = "PART_NO"),
+        @Index(columnList = "SN_1D"),
+        @Index(columnList = "SN_2D"),
+        @Index(columnList = "ORGANIZE_CODE")
+})
 @Api("PO条码信息")
 public class WmsPoSn extends BaseBean {
 

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

@@ -28,7 +28,7 @@ import javax.persistence.Transient;
 @EqualsAndHashCode(callSuper = true)
 @Table(name="WMS_DOC_SHIPPING")
 @Api("产品发运信息")
-public class WmsShopping extends BaseBean {
+public class WmsShipping extends BaseBean {
 
     @Column(name="ORDER_NO")
     @ApiParam("发运单号")

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

@@ -11,6 +11,7 @@ import org.hibernate.annotations.DynamicUpdate;
 
 import javax.persistence.Column;
 import javax.persistence.Entity;
+import javax.persistence.Index;
 import javax.persistence.Table;
 
 /**
@@ -22,7 +23,11 @@ import javax.persistence.Table;
  **/
 @Data
 @Entity
-@Table(name = "WMS_STOCK_QUAN")
+@Table(name = "WMS_STOCK_QUAN", indexes = {
+        @Index(columnList = "WH_NO"),
+        @Index(columnList = "ZONE_NO"),
+        @Index(columnList = "LOCATE_NO")
+})
 @DynamicInsert
 @DynamicUpdate
 @EqualsAndHashCode(callSuper = true)

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

@@ -10,10 +10,7 @@ import org.hibernate.annotations.DynamicInsert;
 import org.hibernate.annotations.DynamicUpdate;
 import org.springframework.format.annotation.DateTimeFormat;
 
-import javax.persistence.Column;
+import javax.persistence.*;
-import javax.persistence.Entity;
-import javax.persistence.Table;
-import javax.persistence.Transient;
 import java.util.Date;
 
 /**
@@ -25,7 +22,20 @@ import java.util.Date;
  **/
 @Data
 @Entity
-@Table(name = "WMS_STOCK_SN")
+@Table(name = "WMS_STOCK_SN", indexes = {
+        @Index(columnList = "PACKAGE_NO"),
+        @Index(columnList = "PART_NO"),
+        @Index(columnList = "REF_SRC"),
+        @Index(columnList = "SN"),
+        @Index(columnList = "SN_2D"),
+        @Index(columnList = "WH_NO"),
+        @Index(columnList = "ZONE_NO"),
+        @Index(columnList = "LOCATE_NO"),
+        @Index(columnList = "LOT_NO"),
+        @Index(columnList = "FIX_LOT_NO"),
+        @Index(columnList = "DATE_CODE"),
+        @Index(columnList = "VENDOR_NO")
+        })
 @DynamicInsert
 @DynamicUpdate
 @EqualsAndHashCode(callSuper = true)
@@ -174,6 +184,10 @@ public class WmsStockSn extends BaseBean {
     @Transient
     public Boolean isSet = false;
 
+    @ApiParam(value = "加减库容标志")
+    @Transient
+    public Boolean isAdd;
+
     public WmsStockSn(){}
 
     public WmsStockSn(String partNo){

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

@@ -11,6 +11,7 @@ import org.hibernate.annotations.DynamicUpdate;
 
 import javax.persistence.Column;
 import javax.persistence.Entity;
+import javax.persistence.Index;
 import javax.persistence.Table;
 
 /**
@@ -25,7 +26,11 @@ import javax.persistence.Table;
 @DynamicInsert
 @DynamicUpdate
 @EqualsAndHashCode(callSuper = true)
-@Table(name = "WMS_TASK_DETAILS")
+@Table(name = "WMS_TASK_DETAILS", indexes = {
+        @Index(columnList = "ORDER_NO"),
+        @Index(columnList = "PART_NO"),
+        @Index(columnList = "ITEM_STATUS")
+})
 @Api("作业任务明细信息")
 public class WmsTaskDetails extends BaseBean {
 

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

@@ -11,6 +11,7 @@ import org.hibernate.annotations.DynamicUpdate;
 
 import javax.persistence.Column;
 import javax.persistence.Entity;
+import javax.persistence.Index;
 import javax.persistence.Table;
 
 /**
@@ -25,7 +26,13 @@ import javax.persistence.Table;
 @DynamicInsert
 @DynamicUpdate
 @EqualsAndHashCode(callSuper = true)
-@Table(name = "WMS_TRANS_QUAN")
+@Table(name = "WMS_TRANS_QUAN", indexes = {
+        @Index(columnList = "WH_NO"),
+        @Index(columnList = "ZONE_NO"),
+        @Index(columnList = "LOCATE_NO"),
+        @Index(columnList = "REF_SRC"),
+        @Index(columnList = "ORGANIZE_CODE")
+})
 @Api("库存交易信息")
 public class WmsTransQuan extends BaseBean {
 

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

@@ -4,11 +4,15 @@ import cn.estsh.i3plus.pojo.base.bean.BaseBean;
 import io.swagger.annotations.Api;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
+import lombok.NoArgsConstructor;
 import org.hibernate.annotations.DynamicInsert;
 import org.hibernate.annotations.DynamicUpdate;
 
 import javax.persistence.*;
 import javax.script.CompiledScript;
+import javax.script.ScriptContext;
+import javax.script.ScriptEngine;
+import javax.script.ScriptException;
 
 /**
  * 脚本持久化实体类
@@ -20,6 +24,7 @@ import javax.script.CompiledScript;
 @Entity
 @DynamicInsert
 @DynamicUpdate
+@NoArgsConstructor
 @EqualsAndHashCode(callSuper = true)
 @Table(name = "SCRIPT_PERSISTENCE")
 @Api("系统动态脚本")
@@ -27,30 +32,34 @@ public class EngineScriptPersistence extends BaseBean {
     // 脚本调用的唯一编号，例如：WMS_PDA_0001
     @Column(name = "SCRIPT_NO", length = 50)
     private String scriptNo;
+
     // 脚本的中文名称
     @Column(name = "SCRIPT_NAME", length = 50)
     private String scriptName;
+
     // 10=组件脚本，20=表单脚本，30=报表脚本，40=JOB脚本，50=其他脚本
     @Column(name = "SCRIPT_TYPE")
-    private int scriptType;
+    private Integer scriptType;
+
     // 脚本编写的语言
     // 10=Groovy, 20=Jython, 30=JavaScript, 40=Scala, 50=JRuby
     @Column(name = "LANGUAGE_TYPE")
-    private int languageType;
+    private Integer languageType;
+
     // 脚本的具体内容
     @Column(name = "SCRIPT_CONTENT", columnDefinition = "TEXT")
     private String scriptContent;
+
     // 脚本的描述，包含脚本的用法，参数说明等
     @Column(name = "SCRIPT_REMARK", length = 2000)
     private String scriptRemark;
+
     // 编译后的脚本内容，通过预编译加快脚本的运行速度
     @Transient
-    private CompiledScript compiledScript;
+    private Object compiledScript;
-
-    public EngineScriptPersistence() {}
 
     // 构造方法，便于批量创建数据
-    public EngineScriptPersistence(long id, String scriptNo, String scriptName, int scriptType, int languageType,
+    public EngineScriptPersistence(Long id, String scriptNo, String scriptName, Integer scriptType, Integer languageType,
                                    String scriptContent, String scriptRemark) {
         this.id = id;
         this.scriptNo = scriptNo;

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

@@ -0,0 +1,26 @@
+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 io.swagger.annotations.Api;
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+
+/**
+ * @Description : 供应商微服调用Model
+ * @Reference :
+ * @Author : jack.lv
+ * @CreateDate : 2019-04-30 19:18
+ * @Modify:
+ **/
+@Data
+@Api("供应商微服调用Model")
+public class WmsBasVendorModel extends BaseBean {
+
+    @ApiParam("供应商")
+    private BasVendor basVendor;
+
+    @ApiParam("分页对象")
+    private Pager pager;
+}

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

@@ -1,49 +0,0 @@
-package cn.estsh.i3plus.pojo.wms.modelbean;
-
-import cn.estsh.i3plus.pojo.base.bean.BaseBean;
-import cn.estsh.i3plus.pojo.wms.bean.WmsASNMasterDetails;
-import com.fasterxml.jackson.annotation.JsonInclude;
-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.*;
-import java.util.List;
-
-/**
- * @Description : 单据明细Model
- * @Reference :
- * @Author : dragon.xu
- * @CreateDate : 2019-03-07 19:18
- * @Modify:
- **/
-@Data
-@Entity
-//以子类table为准
-@javax.persistence.Inheritance(strategy= InheritanceType.TABLE_PER_CLASS)
-@JsonInclude(value = JsonInclude.Include.NON_EMPTY)
-@Api("单据明细Model")
-public class WmsOrderDetailsModel extends BaseBean {
-
-    @Column(name = "PART_NO")
-    @ApiParam("物料编码")
-    public String partNo;
-    @Column(name = "PART_NAME_RDD")
-    @ApiParam("物料名称")
-    public String partNameRdd;
-    @Column(name = "ITEM")
-    @ApiParam("行号")
-    public Integer item;
-    @Column(name = "QTY")
-    @ApiParam(value = "需求数量", example = "0")
-    public Double qty;
-    @Column(name = "UNIT")
-    @ApiParam("单位")
-    public String unit;
-    @Column(name = "ORDER_NO")
-    @ApiParam("订单号")
-    public String orderNo;
-}

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

@@ -1,23 +0,0 @@
-package cn.estsh.i3plus.pojo.wms.modelbean;
-
-import cn.estsh.i3plus.pojo.base.bean.BaseBean;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiParam;
-import lombok.Data;
-
-import javax.persistence.Column;
-
-/**
- * @Description : 单据Model
- * @Reference :
- * @Author : dragon.xu
- * @CreateDate : 2019-03-07 19:18
- * @Modify:
- **/
-@Data
-@Api("单据Model")
-public class WmsOrderMasterModel extends BaseBean {
-    @Column(name = "ORDER_NO")
-    @ApiParam("订单号")
-    public String orderNo;
-}

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

@@ -0,0 +1,27 @@
+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;
+import lombok.Data;
+
+/**
+ * @Description : 供应商微服调用Model
+ * @Reference :
+ * @Author : jack.lv
+ * @CreateDate : 2019-04-30 19:18
+ * @Modify:
+ **/
+@Data
+@Api("供应商微服调用Model")
+public class WmsPartModel extends BaseBean {
+
+    @ApiParam("物料")
+    private WmsPart wmsPart;
+
+    @ApiParam("分页对象")
+    private Pager pager;
+}

modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsShoppingRepository.java

@@ -1,7 +1,7 @@
 package cn.estsh.i3plus.pojo.wms.repository;
 
 import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
-import cn.estsh.i3plus.pojo.wms.bean.WmsShopping;
+import cn.estsh.i3plus.pojo.wms.bean.WmsShipping;
 import org.springframework.stereotype.Repository;
 
 /**
@@ -12,5 +12,5 @@ import org.springframework.stereotype.Repository;
  * @Modify:
  **/
 @Repository
-public interface WmsShoppingRepository extends BaseRepository<WmsShopping, Long> {
+public interface WmsShoppingRepository extends BaseRepository<WmsShipping, Long> {
 }