Merge branch 'dev' into test

modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/DataLink.java

@@ -0,0 +1,52 @@
+package cn.estsh.i3plus.pojo.aps.bean;
+
+import cn.estsh.i3plus.pojo.aps.enums.DATA_LINK_TYPE;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.Table;
+
+/**
+ * @Description :数据集成数据连接信息
+ * @Reference :
+ * @Author : jason.niu
+ * @CreateDate : 2019-09-23
+ * @Modify:
+ **/
+@Data
+@Entity
+@Table(name = "APS_DATA_LINK")
+@Api("数据集成数据连接信息")
+public class DataLink extends BaseAPS {
+    @Column(name="NAME")
+    @ApiParam(value ="编码")
+    private String name;
+
+    @Column(name="TYPE")
+    @ApiParam(value ="链接类型")
+    private DATA_LINK_TYPE type;
+
+    @Column(name="PATH")
+    @ApiParam(value ="IP/文件路径")
+    private String path;
+
+    @Column(name="PORT")
+    @ApiParam(value ="端口")
+    private Integer port;
+
+    @Column(name="DB_NAME")
+    @ApiParam(value ="数据库名")
+    private String dbName;
+
+    @Column(name="USER_NAME")
+    @ApiParam(value ="用户名")
+    private String userName;
+
+    @Column(name="PASSWORD")
+    @ApiParam(value ="密码")
+    private String password;
+
+}

modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ExportDetail.java

@@ -0,0 +1,38 @@
+package cn.estsh.i3plus.pojo.aps.bean;
+
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.Table;
+
+/**
+ * @Description :数据导出明细
+ * @Reference :
+ * @Author : jason.niu
+ * @CreateDate : 2019-09-23
+ * @Modify:
+ **/
+@Data
+@Entity
+@Table(name = "APS_EXPORT_DETAIL")
+@Api("数据导出明细")
+public class ExportDetail extends BaseAPS {
+    @Column(name="FILTER")
+    @ApiParam(value ="筛选")
+    private String filter;
+
+    @Column(name="SORT_BY")
+    @ApiParam(value ="排序")
+    private String sortBy;
+
+    @Column(name="OUT_NAME")
+    @ApiParam(value ="外部表名")
+    private String outName;
+
+    @Column(name="IN_NAME")
+    @ApiParam(value ="内部表名")
+    private String inName;
+}

modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ExportProject.java

@@ -0,0 +1,26 @@
+package cn.estsh.i3plus.pojo.aps.bean;
+
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.Table;
+
+/**
+ * @Description :数据导出明细集合
+ * @Reference :
+ * @Author : jason.niu
+ * @CreateDate : 2019-09-23
+ * @Modify:
+ **/
+@Data
+@Entity
+@Table(name = "APS_EXPORT_PROJECT")
+@Api("数据导出明细集合")
+public class ExportProject extends BaseAPS {
+    @Column(name="NAME")
+    @ApiParam(value ="标识名")
+    private String name;
+}

modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/FieldInfo.java

@@ -4,11 +4,13 @@ import cn.estsh.i3plus.pojo.aps.enums.FIELD_TYPE;
 import cn.estsh.i3plus.pojo.base.bean.BaseBean;
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiParam;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import org.hibernate.annotations.DynamicInsert;
 import org.hibernate.annotations.DynamicUpdate;
 
+import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.persistence.Table;
 import java.lang.reflect.Method;
@@ -28,14 +30,44 @@ import java.lang.reflect.Method;
 @Table(name="APS_FIELD_INFO")
 @Api("字段信息")
 public class FieldInfo extends BaseCode {
+    @Column(name="CLASS_NAME")
+    @ApiParam(value ="所属类简称")
     private String className;
+
+    @Column(name="TYPE")
+    @ApiParam(value ="类型")
     private FIELD_TYPE type;
+
+    @Column(name="TYPE_NAME")
+    @ApiParam(value ="类型全称")
+    private String typeName;
+
+    @Column(name="CUSTOMIZE")
+    @ApiParam(value ="是否为自定义字段")
     private Boolean customize;
+
+    @Column(name="MODIFY")
+    @ApiParam(value ="是否能修改")
     private Boolean modify;
+
+    @Column(name="DISPLAY")
+    @ApiParam(value ="是否在界面显示")
     private Boolean display;
+
+    @Column(name="PRIC")
+    @ApiParam(value ="浮点数显示精度")
     private Integer pric;
+
+    @Column(name="TIPS")
+    @ApiParam(value ="字段提示")
     private String tips;
+
+    @Column(name="EXPRESSION")
+    @ApiParam(value ="表达式")
     private String expression;
+
+    @Column(name="POSITION")
+    @ApiParam(value ="位置")
     private String position;
 
     @JsonIgnore

modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ImportDetail.java

@@ -0,0 +1,35 @@
+package cn.estsh.i3plus.pojo.aps.bean;
+
+import cn.estsh.i3plus.pojo.aps.enums.IMPORT_DETAIL_TYPE;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.Table;
+
+/**
+ * @Description :数据导入明细
+ * @Reference :
+ * @Author : jason.niu
+ * @CreateDate : 2019-09-23
+ * @Modify:
+ **/
+@Data
+@Entity
+@Table(name = "APS_IMPORT_DETAIL")
+@Api("数据导入明细")
+public class ImportDetail extends BaseAPS {
+    @Column(name="TYPE")
+    @ApiParam(value ="导入类型")
+    private IMPORT_DETAIL_TYPE type;
+
+    @Column(name="OUT_NAME")
+    @ApiParam(value ="外部表名")
+    private String outName;
+
+    @Column(name="IN_NAME")
+    @ApiParam(value ="内部表名")
+    private String inName;
+}

modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ImportProject.java

@@ -0,0 +1,26 @@
+package cn.estsh.i3plus.pojo.aps.bean;
+
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.Table;
+
+/**
+ * @Description :数据导入明细集合
+ * @Reference :
+ * @Author : jason.niu
+ * @CreateDate : 2019-09-23
+ * @Modify:
+ **/
+@Data
+@Entity
+@Table(name = "APS_IMPORT_PROJECT")
+@Api("数据导入明细集合")
+public class ImportProject extends BaseAPS {
+    @Column(name="NAME")
+    @ApiParam(value ="标识名")
+    private String name;
+}

modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/enums/DATA_LINK_TYPE.java

@@ -0,0 +1,8 @@
+package cn.estsh.i3plus.pojo.aps.enums;
+
+public enum DATA_LINK_TYPE {
+    CSV,
+    MYSQL,
+    ORACLE,
+    SQLSERVER
+}

modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/enums/IMPORT_DETAIL_TYPE.java

@@ -0,0 +1,6 @@
+package cn.estsh.i3plus.pojo.aps.enums;
+
+public enum IMPORT_DETAIL_TYPE {
+    REPLACE,
+    DIFF
+}

modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EExportProject.java

@@ -0,0 +1,6 @@
+package cn.estsh.i3plus.pojo.aps.holders;
+
+public enum EExportProject {
+    Link,
+    Details
+}

modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EImportProject.java

@@ -0,0 +1,6 @@
+package cn.estsh.i3plus.pojo.aps.holders;
+
+public enum EImportProject {
+    Link,
+    Details
+}

modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/APSPager.java

@@ -0,0 +1,10 @@
+package cn.estsh.i3plus.pojo.aps.model;
+
+import cn.estsh.i3plus.pojo.base.common.Pager;
+import lombok.Data;
+
+@Data
+public class APSPager extends Pager {
+    private String filter;
+    private String sort;
+}

modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/repository/DataLinkRepository.java

@@ -0,0 +1,9 @@
+package cn.estsh.i3plus.pojo.aps.repository;
+
+import cn.estsh.i3plus.pojo.aps.bean.DataLink;
+import org.springframework.data.repository.CrudRepository;
+import org.springframework.stereotype.Repository;
+
+@Repository
+public interface DataLinkRepository extends CrudRepository<DataLink, Long> {
+}

modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/repository/ExportDetailRepository.java

@@ -0,0 +1,9 @@
+package cn.estsh.i3plus.pojo.aps.repository;
+
+import cn.estsh.i3plus.pojo.aps.bean.ExportDetail;
+import org.springframework.data.repository.CrudRepository;
+import org.springframework.stereotype.Repository;
+
+@Repository
+public interface ExportDetailRepository extends CrudRepository<ExportDetail, Long> {
+}

modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/repository/ExportProjectRepository.java

@@ -0,0 +1,9 @@
+package cn.estsh.i3plus.pojo.aps.repository;
+
+import cn.estsh.i3plus.pojo.aps.bean.ExportProject;
+import org.springframework.data.repository.CrudRepository;
+import org.springframework.stereotype.Repository;
+
+@Repository
+public interface ExportProjectRepository extends CrudRepository<ExportProject, Long> {
+}

modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/repository/ImportDetailRepository.java

@@ -0,0 +1,9 @@
+package cn.estsh.i3plus.pojo.aps.repository;
+
+import cn.estsh.i3plus.pojo.aps.bean.ImportDetail;
+import org.springframework.data.repository.CrudRepository;
+import org.springframework.stereotype.Repository;
+
+@Repository
+public interface ImportDetailRepository extends CrudRepository<ImportDetail, Long> {
+}

modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/repository/ImportProjectRepository.java

@@ -0,0 +1,9 @@
+package cn.estsh.i3plus.pojo.aps.repository;
+
+import cn.estsh.i3plus.pojo.aps.bean.ImportProject;
+import org.springframework.data.repository.CrudRepository;
+import org.springframework.stereotype.Repository;
+
+@Repository
+public interface ImportProjectRepository extends CrudRepository<ImportProject, Long> {
+}

modules/i3plus-pojo-aps/src/main/resources/relations/ExportProject.xml

@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Class name="ExportProject">
+    <Relation field="Link" name="DataLink" type="MULTI_TO_ONE">
+    </Relation>
+    <Relation field="Details" name="ExportDetail" type="ONE_TO_MULTI" owner="true">
+    </Relation>
+</Class>

modules/i3plus-pojo-aps/src/main/resources/relations/ImportProject.xml

@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Class name="ImportProject">
+    <Relation field="Link" name="DataLink" type="MULTI_TO_ONE">
+    </Relation>
+    <Relation field="Details" name="ImportDetail" type="ONE_TO_MULTI" owner="true">
+    </Relation>
+</Class>

modules/i3plus-pojo-aps/src/main/resources/relations/Material.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Class name="Material">
-    <Relation field="ProductRouting" name="ProductRouting" reverse="Material" type="ONE_TO_MULTI" owner="true">
-    </Relation>
+<Relation field="ProductRouting" name="ProductRouting" reverse="Material" type="ONE_TO_MULTI" owner="true">
+</Relation>
 </Class>

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

@@ -12,6 +12,82 @@ import com.fasterxml.jackson.annotation.JsonFormat;
 public class MesEnumUtil {
 
     /**
+     * mes按钮状态配置 判断符号
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum MES_BUTTON_STATUS_JUDGE_FLAG {
+
+        EQUAL("=", "等于"),
+        NOT_EQUAL("!=", "不等于"),
+        GREATER_THAN(">", "大于"),
+        NOT_LESS_THAN(">=", "大于大于"),
+        LESS_THAN("<", "小于"),
+        NOT_GREATER_THAN("<=", "小于等于");
+
+        private String value;
+        private String description;
+
+        MES_BUTTON_STATUS_JUDGE_FLAG(String value, String description) {
+            this.value = value;
+            this.description = description;
+        }
+
+        public String getValue() {
+            return value;
+        }
+
+        public String getDescription() {
+            return description;
+        }
+
+        public static String valueOfDescription(String val) {
+            String tmp = null;
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].value.equals(val)) {
+                    tmp = values()[i].description;
+                }
+            }
+            return tmp;
+        }
+    }
+
+    /**
+     * mes按钮状态配置 逻辑符号
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum MES_BUTTON_STATUS_LOGIC_FLAG {
+
+        AND("&&", "逻辑与"),
+        OR("||", "逻辑或");
+
+        private String value;
+        private String description;
+
+        MES_BUTTON_STATUS_LOGIC_FLAG(String value, String description) {
+            this.value = value;
+            this.description = description;
+        }
+
+        public String getValue() {
+            return value;
+        }
+
+        public String getDescription() {
+            return description;
+        }
+
+        public static String valueOfDescription(String val) {
+            String tmp = null;
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].value.equals(val)) {
+                    tmp = values()[i].description;
+                }
+            }
+            return tmp;
+        }
+    }
+
+    /**
      * MesWorkOrder实体对应的approvalStatus值  审批状态
      */
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)
@@ -554,7 +630,7 @@ public class MesEnumUtil {
     }
 
     /**
-     * MesPlanOrder实体对应的source值  计划来源
+     * MesWorkOrder实体对应的source值  计划来源
      */
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)
     public enum WORK_ORDER_SOURCE {

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

@@ -14,7 +14,7 @@ import javax.persistence.Entity;
 import javax.persistence.Table;
 
 /**
- * @Description :mes状态配置表
+ * @Description :mes按钮状态配置表
  * @Reference :
  * @Author : wangjie
  * @CreateDate : 2019-09-19
@@ -25,26 +25,36 @@ import javax.persistence.Table;
 @DynamicInsert
 @DynamicUpdate
 @EqualsAndHashCode(callSuper = true)
-@Table(name="MES_STATUS")
-@Api("系统业务动作")
-public class MesStatus extends BaseBean {
-    @Column(name="STATUS_CODE")
-    @ApiParam("状态代码")
-    private String statusCode;
+@Table(name="MES_BUTTON_STATUS")
+@Api("按钮状态配置表")
+public class MesButtonStatus extends BaseBean {
 
-    @Column(name="STATUS_NAME")
-    @ApiParam("状态名称")
-    private String statusName;
+    @Column(name="BUTTON_CODE")
+    @ApiParam("按钮代码")
+    private String buttonCode;
 
-    @Column(name="STATUS_VALUE")
-    @ApiParam("状态值")
-    private Integer statusValue;
+    @Column(name="CLASS_NAME")
+    @ApiParam("实体类名称")
+    private String ClassName;
 
     @Column(name="STATUS_FIELD")
     @ApiParam("状态字段")
     private String statusField;
 
-    public int getStatusValueVal() {
-        return this.statusValue == null ? 0 : this.statusValue;
-    }
+    @Column(name="JUDGE_FLAG")
+    @ApiParam("判断符合")
+    private String judgeFlag;
+
+    @Column(name="STATUS_VALUE")
+    @ApiParam("状态值")
+    private String statusValue;
+
+    @Column(name="LOGIC_FLAG")
+    @ApiParam("逻辑符合")
+    private String logicFlag;
+
+    @Column(name="STATUS_DESC")
+    @ApiParam("描述")
+    private String statusDesc;
+
 }

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

@@ -187,6 +187,10 @@ public class MesWorkOrder extends BaseBean {
     @ApiParam("mes生产工单页面按钮控制")
     private MesWorkOrderButtonModel workOrderButtonModel;
 
+    @Transient
+    @ApiParam(value="下达按钮编号")
+    public String buttonCode;
+
 
     public double getQtyVal() {
         return this.qty == null ? 0.0d : this.qty;

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

@@ -0,0 +1,17 @@
+package cn.estsh.i3plus.pojo.mes.repository;
+
+import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
+import cn.estsh.i3plus.pojo.mes.bean.MesButtonStatus;
+import org.springframework.stereotype.Repository;
+
+/**
+ * @Description :按钮条件配置
+ * @Reference :
+ * @Author : wangjie
+ * @CreateDate : 2019-09-23
+ * @Modify:
+ **/
+@Repository
+public interface MesButtonStatusRepository extends BaseRepository<MesButtonStatus, Long> {
+
+}

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

@@ -1215,4 +1215,19 @@ public class MesHqlPack {
         DdlPreparedPack.getNumEqualPack(CommonEnumUtil.IS_VAILD.VAILD.getValue(), "isValid", packBean);
         return packBean;
     }
+
+    /**
+     * 按钮条件配置
+     *
+     * @param organizeCode
+     * @return
+     */
+    public static DdlPackBean getMesButtonStatus(MesButtonStatus buttonStatus, String organizeCode) {
+        DdlPackBean packBean = getAllBaseDataByNormalPro(buttonStatus, organizeCode);
+        if (StringUtils.isNotEmpty(buttonStatus.getButtonCode())) {
+            DdlPreparedPack.getStringLikerPack(buttonStatus.getButtonCode(), "buttonCode", packBean);
+        }
+        packBean.setOrderByStr(buttonStatus.orderBy());
+        return packBean;
+    }
 }

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

@@ -63,7 +63,7 @@ public class WmsDocMovementSn extends BaseBean {
     public String unit;
 
     /**
-     * 状态：操作状态
+     * 状态：操作状态  itemStatus
      */
     @Column(name="SN_STATUS")
     @ApiParam(value = "操作状态", example = "10")
@@ -105,4 +105,9 @@ public class WmsDocMovementSn extends BaseBean {
     @Transient
     @ApiParam("ERP库存地")
     private String erpWhNo;
+
+    @Column(name="SN_STATUS")
+    @ApiParam(value = "状态", example = "10")
+    @AnnoOutputColumn(refClass = WmsEnumUtil.STOCK_SN_STATUS.class,refForeignKey = "value",value = "description")
+    public Integer itemStatus;
 }