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/dynamic/DynamicEntity.java

@@ -108,9 +108,10 @@ public class DynamicEntity extends BaseBean implements Serializable {
      */
     public void setDynProperty(String propName,Object val){
         String setMethodName = "set" + propName.substring(0,1).toUpperCase() + propName.substring(1);
+//        String setMethodName = "set" + propName.toUpperCase();
         try {
             val = getValue(propName,val);
-            LOGGER.error("设置动态对象属性值 attr name:{} -> value:{} ",setMethodName,val);
+//            LOGGER.error("设置动态对象属性值 attr name:{} -> value:{} ",setMethodName,val);
             Method setMethod = this.getClass().getDeclaredMethod(setMethodName, new Class[]{val.getClass()});
             setMethod.invoke(this, val);
         } catch (NoSuchMethodException e) {

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

@@ -1,6 +1,7 @@
 package cn.estsh.i3plus.pojo.base.enumutil;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
+import org.apache.commons.lang3.StringUtils;
 
 /**
  * @Description : 模块表单枚举类
@@ -1161,14 +1162,14 @@ public class BlockFormEnumUtil {
      */
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)
     public enum PROPERTY_TYPE {
-        STRING(10, "String", "字符串", "java.lang.String", String.class,PROPERTY_CONTROL_TYPE.TEXT),
-        CHAR(11, "Character", "单字符", "java.lang.Character", Character.class,PROPERTY_CONTROL_TYPE.TEXT),
-        INTEGER(20, "Integer", "短整型", "java.lang.Integer", Integer.class,PROPERTY_CONTROL_TYPE.NUMBER),
-        LONG(21, "Long", "长整型", "java.lang.Long", Long.class,PROPERTY_CONTROL_TYPE.NUMBER),
-        DOUBLE(30, "Double", "大浮点型", "java.lang.Double", Double.class,PROPERTY_CONTROL_TYPE.NUMBER),
-        FLOAT(31, "Float", "小浮点型", "java.lang.Float", Float.class,PROPERTY_CONTROL_TYPE.NUMBER),
-        BOOLEAN(40, "Boolean", "布尔值", "java.lang.Boolean", Boolean.class,PROPERTY_CONTROL_TYPE.RADIO),
-        BYTE(50, "Byte", "字节", "java.lang.Byte", Byte.class,PROPERTY_CONTROL_TYPE.TEXT);
+        STRING(10, "String", "字符串", "java.lang.String", String.class,PROPERTY_CONTROL_TYPE.TEXT,SQL_WHERE.LIKE),
+        CHAR(11, "Character", "单字符", "java.lang.Character", Character.class,PROPERTY_CONTROL_TYPE.TEXT,SQL_WHERE.EQUAL),
+        INTEGER(20, "Integer", "短整型", "java.lang.Integer", Integer.class,PROPERTY_CONTROL_TYPE.NUMBER,SQL_WHERE.EQUAL),
+        LONG(21, "Long", "长整型", "java.lang.Long", Long.class,PROPERTY_CONTROL_TYPE.NUMBER,SQL_WHERE.EQUAL),
+        DOUBLE(30, "Double", "大浮点型", "java.lang.Double", Double.class,PROPERTY_CONTROL_TYPE.NUMBER,SQL_WHERE.EQUAL),
+        FLOAT(31, "Float", "小浮点型", "java.lang.Float", Float.class,PROPERTY_CONTROL_TYPE.NUMBER,SQL_WHERE.EQUAL),
+        BOOLEAN(40, "Boolean", "布尔值", "java.lang.Boolean", Boolean.class,PROPERTY_CONTROL_TYPE.RADIO,SQL_WHERE.EQUAL),
+        BYTE(50, "Byte", "字节", "java.lang.Byte", Byte.class,PROPERTY_CONTROL_TYPE.TEXT,SQL_WHERE.EQUAL);
 //        DATE(60, "Date", "日期", "java.lang.String", String.class,PROPERTY_CONTROL_TYPE.DATE_TIME);
 
         /**
@@ -1196,13 +1197,19 @@ public class BlockFormEnumUtil {
          */
         private PROPERTY_CONTROL_TYPE controlType;
 
-        private PROPERTY_TYPE(int value, String code, String description,String classPath,Class clzFullName,PROPERTY_CONTROL_TYPE controlType) {
+        /**
+         * 默认查询关系
+         */
+        private SQL_WHERE defaultWhere;
+
+        private PROPERTY_TYPE(int value, String code, String description,String classPath,Class clzFullName,PROPERTY_CONTROL_TYPE controlType,SQL_WHERE defaultWhere) {
             this.value = value;
             this.code = code;
             this.description = description;
             this.classPath = classPath;
             this.clzFullName = clzFullName;
             this.controlType = controlType;
+            this.defaultWhere = defaultWhere;
         }
 
         public int getValue() {
@@ -1229,6 +1236,10 @@ public class BlockFormEnumUtil {
             return controlType;
         }
 
+        public SQL_WHERE getDefaultWhere() {
+            return defaultWhere;
+        }
+
         public static String valueOfCode(int val) {
             String tmp = null;
             for (int i = 0; i < values().length; i++) {
@@ -1239,16 +1250,17 @@ public class BlockFormEnumUtil {
             return tmp;
         }
 
-        public static Class valueOfClzFullName(int val) {
-            Class tmp = null;
+        public static PROPERTY_TYPE valueOfClzFullName(int val) {
+            PROPERTY_TYPE tmp = null;
             for (int i = 0; i < values().length; i++) {
                 if (values()[i].value == val) {
-                    tmp = values()[i].clzFullName;
+                    tmp = values()[i];
                 }
             }
             return tmp;
         }
 
+
         public static PROPERTY_CONTROL_TYPE valueOfControlType(int val) {
             PROPERTY_CONTROL_TYPE tmp = null;
             for (int i = 0; i < values().length; i++) {
@@ -2122,23 +2134,25 @@ public class BlockFormEnumUtil {
      */
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)
     public enum DATA_SOURCE_TYPE {
-        SOURCE_MARIA_DB(100, "MariaDB", "MariaDB 10.1","com.mysql.jdbc.Driver",3306),
-        SOURCE_SQL_SERVER(200, "SQL Server", "SQL Server 2017","com.microsoft.sqlserver.jdbc.SQLServerDriver",1433),
-        SOURCE_ORACLE(300, "Oracle", "Oralce 12C","oracle.jdbc.driver.OracleDriver",1521),
-        SOURCE_POSTGRE_SQL(400, "PostgreSql", "PostgreSql 10.5","org.postgresql.Driver",5432);
+        SOURCE_MARIA_DB(100, "MariaDB", "MariaDB 10.1","com.mysql.jdbc.Driver",3306,null),
+        SOURCE_SQL_SERVER(200, "SQL Server", "SQL Server 2017","com.microsoft.sqlserver.jdbc.SQLServerDriver",1433,"dbo"),
+        SOURCE_ORACLE(300, "Oracle", "Oralce 12C","oracle.jdbc.driver.OracleDriver",1521,null),
+        SOURCE_POSTGRE_SQL(400, "PostgreSql", "PostgreSql 10.5","org.postgresql.Driver",5432,"public");
 
         private int value;
         private String code;
         private String description;
         private String driverClassName;
         private int defaultPort;
+        private String defaultSchemaPattern;
 
-        private DATA_SOURCE_TYPE (int value, String code, String description,String driverClassName,int port) {
+        private DATA_SOURCE_TYPE (int value, String code, String description,String driverClassName,int port,String defaultSchemaPattern) {
             this.value = value;
             this.code = code;
             this.description = description;
             this.driverClassName = driverClassName;
             this.defaultPort = port;
+            this.defaultSchemaPattern = defaultSchemaPattern;
         }
 
         public int getValue() {
@@ -2161,6 +2175,10 @@ public class BlockFormEnumUtil {
             return defaultPort;
         }
 
+        public String getDefaultSchemaPattern() {
+            return defaultSchemaPattern;
+        }
+
         public static String valueOfCode(int val) {
             String tmp = null;
             for (int i = 0; i < values().length; i++) {
@@ -2224,6 +2242,21 @@ public class BlockFormEnumUtil {
             return null;
         }
 
+        public static DATA_SOURCE_TYPE getDataSourceURL(String databaseProductName){
+            if(StringUtils.isNotBlank(databaseProductName)){
+                if(databaseProductName.indexOf(":mysql:") != -1){
+                    return SOURCE_MARIA_DB;
+                }else if(databaseProductName.indexOf(":oracle:") != -1){
+                    return SOURCE_ORACLE;
+                }else if(databaseProductName.indexOf(":postgresql:") != -1){
+                    return SOURCE_POSTGRE_SQL;
+                }else if(databaseProductName.indexOf(":sqlserver:") != -1){
+                    return SOURCE_SQL_SERVER;
+                }
+            }
+            return null;
+        }
+
         private String getJDBCUrlMySQL(String database,String host,Integer port){
             return "jdbc:mysql://"+host+":"+port+"/"+database+"?autoReconnect=true&useSSL=false&characterEncoding=utf-8";
         }
@@ -2327,7 +2360,7 @@ public class BlockFormEnumUtil {
      * 条件运算符
      */
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)
-    public enum CONDITIONAL_OPERATOR {
+    public enum SQL_WHERE {
         EQUAL(1, "=", "等于"),
         NOT_EQUAL(2, "<>", "不等于"),
         MORE(3, ">", "大于"),
@@ -2343,7 +2376,7 @@ public class BlockFormEnumUtil {
         private String code;
         private String description;
 
-        private CONDITIONAL_OPERATOR(int value, String code, String description) {
+        private SQL_WHERE(int value, String code, String description) {
             this.value = value;
             this.code = code;
             this.description = description;
@@ -2391,7 +2424,7 @@ public class BlockFormEnumUtil {
             return tmp;
         }
 
-        public static CONDITIONAL_OPERATOR valueOf(int val) {
+        public static SQL_WHERE valueOf(int val) {
             String tmp = null;
             for (int i = 0; i < values().length; i++) {
                 if (values()[i].value == val) {

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

@@ -78,6 +78,16 @@ public class BfDataObject extends BaseBean {
     private List<BfDataObjectProperty> propertyList;
 
     @Transient
+    @ApiParam(value = "数据对象主键属性")
+    @AnnoOutputColumn(hidden = true)
+    private List<BfDataObjectProperty> primaryPropertyList;
+
+    @Transient
+    @ApiParam(value = "数据对象主键属性")
+    @AnnoOutputColumn(hidden = true)
+    private List<String> primaryNameList;
+
+    @Transient
     @ApiParam(value = "元素对象虚拟属性")
     @AnnoOutputColumn(hidden = true)
     List<BfElementPropertyVirtual> virtualList;

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

@@ -58,6 +58,10 @@ public class BfDataObjectProperty extends BaseBean {
     @ApiParam(value ="默认查询条件")
     private Integer objectColumnDefaultWhere;
 
+    @Column(name="IS_PRIMARY_KEY")
+    @ApiParam(value ="是否主键")
+    private Integer isPrimaryKey;
+
     // 字段长度
     @ApiParam(value = "字段长度")
     @Column(name="OBJECT_COLUMN_PRECISION")

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

@@ -27,18 +27,18 @@ import javax.persistence.Transient;
 @DynamicInsert
 @DynamicUpdate
 @EqualsAndHashCode(callSuper = true)
-@Table(name="MES_PROCESS_BOM")
+@Table(name = "MES_PROCESS_BOM")
 @Api("工序物料清单")
 public class MesProcessBom extends BaseBean {
-    @Column(name="PART_NO")
+    @Column(name = "PART_NO")
     @ApiParam("零件号")
     private String partNo;
 
-    @Column(name="PROCESS_CODE")
+    @Column(name = "PROCESS_CODE")
     @ApiParam("工序代码")
     private String processCode;
 
-    @Column(name="ITEM_PART_NO")
+    @Column(name = "ITEM_PART_NO")
     @ApiParam("子零件")
     private String itemPartNo;
 
@@ -57,7 +57,7 @@ public class MesProcessBom extends BaseBean {
 
     @Transient
     @ApiParam("是否已绑定")
-    private boolean isBind;
+    private Boolean isBind;
 
     @Transient
     @ApiParam("显示颜色")
@@ -69,10 +69,42 @@ public class MesProcessBom extends BaseBean {
     }
 
     public int getIsRepeatVal() {
-        return  this.isRepeat == null ? 0 : this.isRepeat;
+        return this.isRepeat == null ? 0 : this.isRepeat;
     }
 
     public int getIsCheckVal() {
         return this.isCheck == null ? 0 : this.isCheck;
     }
+
+    public boolean getIsBindVal() {
+        return this.isBind == null ? false : this.isBind;
+    }
+
+    @Override
+    public String toString() {
+        return "MesProcessBom{" +
+                "partNo='" + partNo + '\'' +
+                ", processCode='" + processCode + '\'' +
+                ", itemPartNo='" + itemPartNo + '\'' +
+                ", qty=" + qty +
+                ", isRepeat=" + isRepeat +
+                ", isCheck=" + isCheck +
+                ", isBind=" + isBind +
+                ", color='" + color + '\'' +
+                ", id=" + id +
+                ", organizeCode='" + organizeCode + '\'' +
+                ", isValid=" + isValid +
+                ", isDeleted=" + isDeleted +
+                ", createUser='" + createUser + '\'' +
+                ", createDatetime='" + createDatetime + '\'' +
+                ", modifyUser='" + modifyUser + '\'' +
+                ", modifyDatetime='" + modifyDatetime + '\'' +
+                ", createDateTimeStart='" + createDateTimeStart + '\'' +
+                ", createDateTimeEnd='" + createDateTimeEnd + '\'' +
+                ", modifyDateTimeStart='" + modifyDateTimeStart + '\'' +
+                ", modifyDateTimeEnd='" + modifyDateTimeEnd + '\'' +
+                ", orderByParam='" + orderByParam + '\'' +
+                ", ascOrDesc=" + ascOrDesc +
+                '}';
+    }
 }

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

@@ -83,15 +83,18 @@ public class MesStep extends BaseBean {
     @ApiParam("工步是否跳过")
     private boolean isJump;
 
-//    public MesStep(String stepCode,String stepName,String stepText,String stepType,String stepObject,
-//                   String routeCode,String processCode,Integer stepSeq){
-//        this.stepCode = stepCode;
-//        this.stepName = stepName;
-//        this.stepText = stepText;
-//        this.stepType = stepType;
-//        this.stepObject = stepObject;
-//        this.routeCode = routeCode;
-//        this.processCode = processCode;
-//        this.stepSeq = stepSeq;
-//    }
+    public MesStep() {
+    }
+
+    public MesStep(String stepCode, String stepName, String stepText, String stepType, String stepObject,
+                   String routeCode, String processCode, Integer stepSeq){
+        this.stepCode = stepCode;
+        this.stepName = stepName;
+        this.stepText = stepText;
+        this.stepType = stepType;
+        this.stepObject = stepObject;
+        this.routeCode = routeCode;
+        this.processCode = processCode;
+        this.stepSeq = stepSeq;
+    }
 }

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

@@ -14,6 +14,7 @@ import org.springframework.format.annotation.DateTimeFormat;
 import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.persistence.Table;
+import javax.persistence.Transient;
 import java.util.Date;
 
 /**
@@ -56,6 +57,15 @@ public class MesProcessBom extends BaseBean {
     @ApiParam(value = "是否检查")
     private Integer isCheck;
 
+    @Transient
+    @ApiParam("是否已绑定")
+    private Boolean isBind;
+
+    @Transient
+    @ApiParam("显示颜色")
+    private String color;
+
+
     public double getQtyVal() {
         return this.qty == null ? 0.0d : this.qty;
     }
@@ -67,4 +77,36 @@ public class MesProcessBom extends BaseBean {
     public int getIsCheckVal() {
         return this.isCheck == null ? 0 : this.isCheck;
     }
+
+    public boolean getIsBindVal() {
+        return this.isBind == null ? false : this.isBind;
+    }
+
+    @Override
+    public String toString() {
+        return "MesProcessBom{" +
+                "partNo='" + partNo + '\'' +
+                ", processCode='" + processCode + '\'' +
+                ", itemPartNo='" + itemPartNo + '\'' +
+                ", qty=" + qty +
+                ", isRepeat=" + isRepeat +
+                ", isCheck=" + isCheck +
+                ", isBind=" + isBind +
+                ", color='" + color + '\'' +
+                ", id=" + id +
+                ", organizeCode='" + organizeCode + '\'' +
+                ", isValid=" + isValid +
+                ", isDeleted=" + isDeleted +
+                ", createUser='" + createUser + '\'' +
+                ", createDatetime='" + createDatetime + '\'' +
+                ", modifyUser='" + modifyUser + '\'' +
+                ", modifyDatetime='" + modifyDatetime + '\'' +
+                ", createDateTimeStart='" + createDateTimeStart + '\'' +
+                ", createDateTimeEnd='" + createDateTimeEnd + '\'' +
+                ", modifyDateTimeStart='" + modifyDateTimeStart + '\'' +
+                ", modifyDateTimeEnd='" + modifyDateTimeEnd + '\'' +
+                ", orderByParam='" + orderByParam + '\'' +
+                ", ascOrDesc=" + ascOrDesc +
+                '}';
+    }
 }

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

@@ -132,4 +132,31 @@ public class MesProduceSn extends BaseBean {
     public int getPrintStatusVal() {
         return this.printStatus == null ? 0 : this.printStatus;
     }
+
+    @Override
+    public String toString() {
+        return "MesProduceSn{" +
+                "serialNumber='" + serialNumber + '\'' +
+                ", partNo='" + partNo + '\'' +
+                ", partNameRdd='" + partNameRdd + '\'' +
+                ", qty=" + qty +
+                ", qcStatus=" + qcStatus +
+                ", snStatus=" + snStatus +
+                ", printCount=" + printCount +
+                ", printStatus=" + printStatus +
+                ", workCenterCode='" + workCenterCode + '\'' +
+                ", workCellCode='" + workCellCode + '\'' +
+                ", routeCode='" + routeCode + '\'' +
+                ", processCode='" + processCode + '\'' +
+                ", nextProcessCode='" + nextProcessCode + '\'' +
+                ", inWorkCenterTime='" + inWorkCenterTime + '\'' +
+                ", outWorkCenterTime='" + outWorkCenterTime + '\'' +
+                ", shippingTime='" + shippingTime + '\'' +
+                ", workOrderNo='" + workOrderNo + '\'' +
+                ", custSn='" + custSn + '\'' +
+                ", custPartNo='" + custPartNo + '\'' +
+                ", packageSn='" + packageSn + '\'' +
+                ", resultMsg='" + resultMsg + '\'' +
+                '}';
+    }
 }

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

@@ -1,21 +1,25 @@
 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;
+import javax.persistence.Transient;
 
 /**
-* @Description : 产品条码履历实体类
-* @Reference :
-* @Author : dragon.xu
-* @CreateDate : 2019-05-29 16:22
-* @Modify: 
-**/
+ * @Description : 产品条码履历实体类
+ * @Reference :
+ * @Author : dragon.xu
+ * @CreateDate : 2019-05-29 16:22
+ * @Modify:
+ **/
 @Data
 @Entity
 @DynamicInsert
@@ -23,5 +27,108 @@ import javax.persistence.Table;
 @EqualsAndHashCode(callSuper = true)
 @Table(name="MES_PRODUCE_SN_TRAVEL")
 @Api("产品条码履历表")
-public class MesProduceSnTravel extends MesProduceSn {
+public class MesProduceSnTravel extends BaseBean {
+    @Column(name="SERIAL_NUMBER")
+    @ApiParam("产品条码")
+    private String serialNumber;
+
+    @Column(name="PART_NO")
+    @ApiParam("物料号")
+    private String partNo;
+
+    @Column(name="PART_NAME_RDD")
+    @ApiParam("物料名称")
+    private String partNameRdd;
+
+    @Column(name="QTY")
+    @ApiParam("数量")
+    private Double qty;
+
+    @Column(name="QC_STATUS")
+    @ApiParam("质量状态")
+    private Integer qcStatus;
+
+    @Column(name="SN_STATUS")
+    @ApiParam("条码状态")
+    private Integer snStatus;
+
+    @Column(name="PRINT_COUNT")
+    @ApiParam("打印次数")
+    private Integer printCount;
+
+    @Column(name="PRINT_STATUS")
+    @ApiParam("打印状态")
+    private Integer printStatus;
+
+    @Column(name="WORK_CENTER_CODE")
+    @ApiParam("工作中心代码")
+    private String workCenterCode;
+
+    @Column(name="WORK_CELL_CODE")
+    @ApiParam("工作单元代码")
+    private String workCellCode;
+
+    @Column(name="ROUTE_CODE")
+    @ApiParam("流程代码")
+    private String routeCode;
+
+    @Column(name="PROCESS_CODE")
+    @ApiParam("工序代码")
+    private String processCode;
+
+    @Column(name="NEXT_PROCESS_CODE")
+    @ApiParam("下一工序代码")
+    private String nextProcessCode;
+
+    @Column(name="IN_WC_TIME")
+    @ApiParam("进产线时间")
+    private String inWorkCenterTime;
+
+    @Column(name="OUT_WC_TIME")
+    @ApiParam("出产线时间")
+    private String outWorkCenterTime;
+
+    @Column(name="SHIPPING_TIME")
+    @ApiParam("发运时间")
+    private String shippingTime;
+
+    @Column(name="WORK_ORDER_NO")
+    @ApiParam("生产工单号")
+    private String workOrderNo;
+
+    @Column(name="CUST_SN")
+    @ApiParam("客户条码")
+    private String custSn;
+
+    @Column(name="CUST_PART_NO")
+    @ApiParam("客户零件号")
+    private String custPartNo;
+
+    @Column(name="PACKAGE_SN")
+    @ApiParam("包装条码")
+    private String packageSn;
+
+    @Transient
+    @ApiParam("返回信息")
+    private String resultMsg;
+
+    public double getQtyVal() {
+        return this.qty == null ? 0.0d : this.qty;
+    }
+
+    public int getQcStatusVal() {
+        return this.qcStatus == null ? 0 : this.qcStatus;
+    }
+
+    public int getSnStatusVal() {
+        return this.snStatus == null ? 0 : this.snStatus;
+    }
+
+    public int getPrintCountVal() {
+        return this.printCount == null ? 0 : this.printCount;
+    }
+
+    public int getPrintStatusVal() {
+        return this.printStatus == null ? 0 : this.printStatus;
+    }
 }

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

@@ -37,19 +37,17 @@ public class CloudFormModel {
     private List<Map<String,Object>> insertList;
 
     // 修改条件
-    private List<BfDataObjectProperty> updateConditionList;
+//    private List<BfDataObjectProperty> updateConditionList;
+    // 修改数据
+    private List<Map<String,Object>> updateList;
 
     // 查询数据
     private List<BfDataObjectProperty> selectList;
 
-    // 查询单条数据
-    private Long select;
-
     // 删除数据
-    private List<BfDataObjectProperty> deleteConditionList;
+    private List<Map<String,Object>> deleteList;
 
-    // 删除数据ID
-    private Long delete;
+    private Map<String,Object> delete;
 
     public String orderByParam;
 

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

@@ -52,6 +52,9 @@ public class SqlColumnModel {
     // 字段Java 类型
     @ApiParam(value = "枚举:BlockFormEnumUtil.PROPERTY_TYPE")
     private Integer columnClassType;
+    // 属性是否主键
+    @ApiParam(value = "枚举: CommonEnumUtil.TRUE_OR_FALSE")
+    private Integer columnPrimaryKey;
 
     @ApiParam(value = "属性值")
     private Object value;

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

@@ -1,4 +1,4 @@
-package cn.estsh.i3plus.pojo.mes.pcn.model;
+package cn.estsh.i3plus.pojo.model.mes;
 
 import io.swagger.annotations.ApiParam;
 import lombok.Data;
@@ -51,9 +51,22 @@ public class StepModel implements Serializable {
      */
     @ApiParam("工步是否跳过")
     private boolean isJump;
+    /**
+     * 参数代码
+     */
+    @ApiParam("参数代码")
+    private String paramCode;
+    /**
+     * 工作单元代码
+     */
+    @ApiParam("工作单元代码")
+    private String workCellCode;
+
+    public StepModel() {
+    }
 
-        public StepModel(String stepCode,String stepName,String stepText,String stepType,String stepObject,
-                   String routeCode,String processCode,Integer stepSeq){
+    public StepModel(String stepCode, String stepName, String stepText, String stepType, String stepObject,
+                     String routeCode, String processCode, Integer stepSeq, String paramCode, String workCellCode) {
         this.stepCode = stepCode;
         this.stepName = stepName;
         this.stepText = stepText;
@@ -62,5 +75,7 @@ public class StepModel implements Serializable {
         this.routeCode = routeCode;
         this.processCode = processCode;
         this.stepSeq = stepSeq;
+        this.paramCode = paramCode;
+        this.workCellCode = workCellCode;
     }
 }

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

@@ -0,0 +1,90 @@
+package cn.estsh.i3plus.pojo.wms.bean;
+
+import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn;
+import cn.estsh.i3plus.pojo.base.bean.BaseBean;
+import com.fasterxml.jackson.annotation.JsonFormat;
+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 javax.persistence.Transient;
+
+/**
+ * @Description :
+ * @Reference :
+ * @Author : amy
+ * @CreateDate : 2019-06-11 15:03
+ * @Modify:
+ **/
+@Data
+@Entity
+@Table(name="WMS_BOM")
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Api(value="物料清单",description = "物料清单")
+public class WmsBom extends BaseBean {
+
+    @Column(name = "PART_NO")
+    @ApiParam(value = "父物料号")
+    private String partNo;
+
+    @Column(name = "PART_NAME")
+    @ApiParam(value = "父物料描述")
+    private String partName;
+
+    @Column(name = "UNIT")
+    @ApiParam(value = "计量单位")
+    private String unit;
+
+    @Column(name = "QTY")
+    @ApiParam(value = "数量")
+    private Double qty;
+
+    @Column(name = "ITEM_PART_NO")
+    @ApiParam(value = "子物料号")
+    private String itemPartNo;
+
+    @Column(name = "ITEM_PART_NAM")
+    @ApiParam(value = "子料物料描述")
+    private String itemPartNam;
+
+    @Column(name = "ITEM_UNIT")
+    @ApiParam(value = "子计量单位")
+    private String itemUnit;
+
+    @Column(name = "ITEM_QTY")
+    @ApiParam(value = "子用量")
+    private Double itemQty;
+
+    @Column(name = "BOM_VERSION")
+    @ApiParam(value = "BOM版本号")
+    private String bomVersion;
+
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    @ApiParam(value="有效起始日期",example = "2018-12-31 23:59:59")
+    @AnnoOutputColumn(hidden = true)
+    @Column(name = "EFF_START_TIME")
+    private String effStartTime;
+
+
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    @ApiParam(value="有效截止日期",example = "2018-12-31 23:59:59")
+    @AnnoOutputColumn(hidden = true)
+    @Column(name = "EFF_END_TIME")
+    private String effEndTime;
+
+    public Double getQty() {
+        return this.qty == null ? 0 : this.qty.doubleValue();
+    }
+
+    public Double getItemQty() {
+        return this.itemQty == null ? 0 : this.itemQty.doubleValue();
+    }
+}

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

@@ -0,0 +1,43 @@
+package cn.estsh.i3plus.pojo.wms.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 : amy
+ * @CreateDate : 2019-06-11 14:50
+ * @Modify:
+ **/
+@Data
+@Entity
+@Table(name="WMS_CUSTOMER_PART")
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Api(value="客户零件关系表",description = "客户零件关系表")
+public class WmsCustomerPart extends BaseBean {
+
+    @Column(name = "CUSTOMER_CODE")
+    @ApiParam(value = "客户代码")
+    private String customerCode;
+
+    @Column(name = "PART_NO")
+    @ApiParam(value = "物料号")
+    private String partNo;
+
+    @Column(name = "CUSTOMER_PART_NO")
+    @ApiParam(value = "客户零件号")
+    private String customerPartNo;
+
+}

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

@@ -0,0 +1,43 @@
+package cn.estsh.i3plus.pojo.wms.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 : amy
+ * @CreateDate : 2019-06-11 13:54
+ * @Modify:
+ **/
+@Data
+@Entity
+@Table(name="WMS_UNIT")
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Api(value="单位定义",description = "单位定义")
+public class WmsUnit extends BaseBean {
+
+    @Column(name = "UNIT_CODE")
+    @ApiParam(value = "单位代码")
+    private String vendorNo;
+
+    @Column(name = "UNIT_NAME")
+    @ApiParam(value = "单位名称")
+    private String unitName;
+
+    @Column(name = "UNIT_PRECISION")
+    @ApiParam(value = "单位精度")
+    private String unitPrecision;
+
+}

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

@@ -0,0 +1,46 @@
+package cn.estsh.i3plus.pojo.wms.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 : amy
+ * @CreateDate : 2019-06-11 14:18
+ * @Modify:
+ **/
+@Data
+@Entity
+@Table(name="WMS_UNIT_CONVERT")
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Api(value="单位换算",description = "单位换算")
+public class WmsUnitConvert extends BaseBean {
+
+    @Column(name = "UNIT_CODE")
+    @ApiParam(value = "单位代码")
+    private String unitCode;
+
+    @Column(name = "DEST_UNIT_CODE")
+    @ApiParam(value = "目标单位")
+    private String destUnitCode;
+
+    @Column(name = "UNIT_COEFFICIENT")
+    @ApiParam(value = "换算率")
+    private Double unitCoefficient;
+
+    public Double getUnitCoefficient() {
+        return this.unitCoefficient == null ? 0 : this.unitCoefficient.doubleValue();
+    }
+}

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

@@ -0,0 +1,39 @@
+package cn.estsh.i3plus.pojo.wms.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 : amy
+ * @CreateDate : 2019-06-11 13:47
+ * @Modify:
+ **/
+@Data
+@Entity
+@Table(name="WMS_VENDOR_PART")
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Api(value="供应商零件关系",description = "供应商零件关系")
+public class WmsVendorPart extends BaseBean {
+
+    @Column(name = "VENDOR_NO")
+    @ApiParam(value = "供应商编号")
+    private String vendorNo;
+
+    @Column(name = "PART_NO")
+    @ApiParam(value = "物料号")
+    private String partNo;
+
+}

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

@@ -0,0 +1,59 @@
+package cn.estsh.i3plus.pojo.wms.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 : amy
+ * @CreateDate : 2019-06-11 14:56
+ * @Modify:
+ **/
+@Data
+@Entity
+@Table(name="WMS_WORK_CENTER")
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Api(value="工作中心",description = "工作中心")
+public class WmsWorkCenter extends BaseBean {
+
+    @Column(name = "WORK_CENTER_CODE")
+    @ApiParam(value = "工作中心代码")
+    private String workCenterCode;
+
+    @Column(name = "WORK_CENTER_NAME")
+    @ApiParam(value = "工作中心名称")
+    private String workCenterName;
+
+    @Column(name = "ERP_WORK_CENTER")
+    @ApiParam(value = "ERP_工作中心")
+    private String erpWorkCenter;
+
+    @Column(name = "WORK_VER")
+    @ApiParam(value = "生产版本")
+    private String workVer;
+
+    @Column(name = "SRC_ZONE_NO")
+    @ApiParam(value = "原料扣减库区")
+    private String srcZoneNo;
+
+    @Column(name = "DESC_ZONE_NO")
+    @ApiParam(value = "成品库区")
+    private String descZoneNo;
+
+    @Column(name = "DESC_LOCATION_CODE")
+    @ApiParam(value = "成品库位")
+    private String descLocationCode;
+
+}

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

@@ -0,0 +1,38 @@
+package cn.estsh.i3plus.pojo.wms.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 : amy
+ * @CreateDate : 2019-06-11 15:01
+ * @Modify:
+ **/
+@Data
+@Entity
+@Table(name="WMS_WORK_CENTER_ZONE")
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Api(value="工作中心线边库区关系",description = "工作中心线边库区关系")
+public class WmsWorkCenterZone extends BaseBean {
+
+    @Column(name = "WORK_CENTER_CODE")
+    @ApiParam(value = "工作中心代码")
+    private String workCenterCode;
+
+    @Column(name = "ZONE_NO")
+    @ApiParam(value = "线边库区")
+    private String zoneNo;
+}