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

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

@@ -2322,4 +2322,93 @@ public class BlockFormEnumUtil {
             return tmp;
         }
     }
+
+    /**
+     * 条件运算符
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum CONDITIONAL_OPERATOR {
+        EQUAL(1, "=", "等于"),
+        NOT_EQUAL(2, "<>", "不等于"),
+        MORE(3, ">", "大于"),
+        LESS(4, "<", "小于"),
+        MORE_OR_EQUAL(5, ">=", "大于等于"),
+        LESS_OR_EQUAL (6, "<=", "小于等于"),
+        LIKE(7, "LIKE", "全模糊"),
+        START_LIKE(7, "LIKE", "前模糊"),
+        END_LIKE(7, "LIKE", "后模糊"),
+        IN(8, "in", "in");
+
+        private int value;
+        private String code;
+        private String description;
+
+        private CONDITIONAL_OPERATOR(int value, String code, String description) {
+            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 int codeOfValue(String code) {
+            int tmp = 1;
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].code.equals(code.toLowerCase())) {
+                    tmp = values()[i].value;
+                }
+            }
+            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 CONDITIONAL_OPERATOR valueOf(int val) {
+            String tmp = null;
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].value == val) {
+                    return values()[i];
+                }
+            }
+            return null;
+        }
+
+        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-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfDataObjectProperty.java

@@ -14,6 +14,7 @@ import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.persistence.Table;
 import javax.persistence.Transient;
+import java.util.List;
 
 /**
  * @Description : 数据对象
@@ -95,8 +96,19 @@ public class BfDataObjectProperty extends BaseBean {
     @ApiParam(value ="默认查询条件")
     private Integer objectColumnCustomWhere;
 
+    public int getObjectColumnCustomWhereVal(){
+        if(objectColumnCustomWhere == null){
+            objectColumnCustomWhere = -1;
+        }
+        return objectColumnCustomWhere;
+    }
+
     @Transient
     @ApiParam(value ="元素值")
     private transient Object propertyFormValue;
 
+    @Transient
+    @ApiParam(value ="元素值集合")
+    private transient List<Object> propertyFormValueList;
+
 }

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

@@ -36,8 +36,8 @@ public class CloudFormModel {
     // 新增数据
     private List<Map<String,Object>> insertList;
 
-    // 修改数据
+    // 修改条件
-    private List<Map<String,Object>> updateList;
+    private List<BfDataObjectProperty> updateConditionList;
 
     // 查询数据
     private List<BfDataObjectProperty> selectList;
@@ -46,7 +46,7 @@ public class CloudFormModel {
     private Long select;
 
     // 删除数据
-    private List<Long> deleteList;
+    private List<BfDataObjectProperty> deleteConditionList;
 
     // 删除数据ID
     private Long delete;

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

@@ -0,0 +1,28 @@
+package cn.estsh.i3plus.pojo.wms.dbinterface;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+
+/**
+ * WMS - SAP 字段映射关系
+ * 暂时不考虑字段的类型
+ *
+ * @author Rock.Yu
+ * @since 2019-06-09 21:06
+ */
+@Data
+@AllArgsConstructor
+public class MappingItem {
+    /**
+     * 来源字段名称
+     */
+    public String srcName;
+    /**
+     * 目标对象的属性名称
+     */
+    public String destName;
+    /**
+     * 当来源数据中无此字段时的默认值
+     */
+    public String defaultValue;
+}

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

@@ -0,0 +1,91 @@
+package cn.estsh.i3plus.pojo.wms.dbinterface;
+
+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.Column;
+import javax.persistence.Entity;
+import javax.persistence.Table;
+
+/**
+ * WMS - SAP 中间数据库接口映射关系
+ *
+ * @author Rock.Yu
+ * @since 2019-06-09 20:08
+ */
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@NoArgsConstructor
+@EqualsAndHashCode(callSuper = true)
+@Table(name = "WMS_INTERFACE_DATA_MAPPER")
+@Api("接口数据映射")
+public class WmsInterfaceDataMapper extends BaseBean {
+    /**
+     * 排序编号
+     */
+    @Column(name = "SEQ")
+    public int seq;
+    /**
+     * 来源表的每次查询记录数，防止大量数据造成内存溢出
+     */
+    @Column(name = "SRC_GET_LIMIT")
+    public int srcGetLimit;
+    /**
+     * 接口数据源编号（在动态表单中配置）
+     */
+    @Column(name = "SCR_DATA_SOURCE", length = 50)
+    public String dataSource;
+    /**
+     * 来源表名
+     */
+    @Column(name = "SCR_TABLE_NAME", length = 50)
+    public String srcTableName;
+    /**
+     * 来源表的排序条件
+     */
+    @Column(name = "SCR_ORDER_BY", length = 50)
+    public String srcOrderBy;
+    /**
+     * 来源表的查询条件
+     */
+    @Column(name = "SCR_WHERE", length = 255)
+    public String scrWhere;
+    /**
+     * 数据同步到业务库后需要更新的接口库标记字段，多个字段用半角逗号分隔
+     * 例如：SYNFLG=Y,SYNDATE={Date}
+     */
+    @Column(name = "SCR_UPDATE_SYNC", length = 255)
+    public String srcUpdateSync;
+    /**
+     * 业务表单的主键，多个主键用半角逗号分隔
+     */
+    @Column(name = "SCR_PK_COLUMNS", length = 255)
+    public String srcPkColumns;
+    /**
+     * 按照组织代码(半角逗号分隔)复制多份到业务表（用于物料、供应商、客户...等集团数据）
+     */
+    @Column(name = "COPY_BY_ORGS", length = 50)
+    public String copyByOrgs;
+    /**
+     * 目标实体对象的名字
+     */
+    @Column(name = "DEST_BEAN_NAME", length = 50)
+    public String destBeanName;
+    /**
+     * 目标实体对象判断数据是否存在的一组业务属性名称，多个属性用半角逗号分隔
+     */
+    @Column(name = "DEST_PK_PROPERTIES", length = 50)
+    public String destPkProperties;
+    /**
+     * 源表字段与目标对象属性的映射关系，List<MappingItem> 对象，JSON 格式存储
+     *
+     */
+    @Column(name = "DEST_COLUMN_MAPPING", length = 5000)
+    public String destColumnMapping;
+}