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

.gitignore

@@ -7,9 +7,8 @@ out
 gen
 target
 .idea
-.iml
-.jar
-.class
-.md
-.log
 *.iml
+*.jar
+*.class
+.md
+*.log

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

@@ -40,11 +40,13 @@ public class DdlPackBean {
     public DdlPackBean(){
         this.isHql = true;
         whereAppend = new StringBuilder();
+        hqlPreparedMap = new HashMap<>();
     }
 
     public DdlPackBean(boolean isHql){
         this.isHql = isHql;
         whereAppend = new StringBuilder();
+        hqlPreparedMap = new HashMap<>();
     }
 
     public boolean isHql() {

modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/dynamic/DynamicBean.java

@@ -85,13 +85,6 @@ public class DynamicBean {
         if(null != superclass) {
             generator.setSuperclass(superclass);
         }
-
-        /*Set keySet = propertyMap.keySet();
-        for (Iterator i = keySet.iterator(); i.hasNext(); ) {
-            String key = (String) i.next();
-            generator.addProperty(key, (Class) propertyMap.get(key));
-        }*/
-
         BeanGenerator.addProperties(generator, propertyMap);
         return generator.create();
     }

modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/dynamic/DynamicEntity.java

@@ -1,8 +1,11 @@
 package cn.estsh.i3plus.pojo.base.dynamic;
 
 import cn.estsh.i3plus.pojo.base.bean.BaseBean;
+import com.google.common.base.CaseFormat;
 import lombok.Getter;
 import lombok.Setter;
+import lombok.val;
+import org.apache.commons.lang3.StringUtils;
 import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -61,69 +64,6 @@ public class DynamicEntity extends BaseBean implements Serializable {
     }
 
     /**
-     * 获取当前对象
-     *
-     * @return
-     *//*
-    public DynamicEntity get(String method, String uri, Object[] args, Object result, String operator, String appName) {
-        setMethod(method);
-        setUri(uri);
-        setArgs(args);
-        setResult(result);
-        setOperator(operator);
-        setAppName(appName);
-        return this;
-    }
-
-    public String getMethod() {
-        return method;
-    }
-
-    public void setMethod(String method) {
-        this.method = method;
-    }
-
-    public String getUri() {
-        return uri;
-    }
-
-    public void setUri(String uri) {
-        this.uri = uri;
-    }
-
-    public Object[] getArgs() {
-        return args;
-    }
-
-    public void setArgs(Object[] args) {
-        this.args = args;
-    }
-
-    public Object getResult() {
-        return result;
-    }
-
-    public void setResult(Object result) {
-        this.result = result;
-    }
-
-    public String getOperator() {
-        return operator;
-    }
-
-    public void setOperator(String operator) {
-        this.operator = operator;
-    }
-
-    public String getAppName() {
-        return appName;
-    }
-
-    public void setAppName(String appName) {
-        this.appName = appName;
-    }*/
-
-    /**
      * 初始化属性，以便动态加载
      * @throws InvocationTargetException
      * @throws IllegalAccessException
@@ -131,18 +71,15 @@ public class DynamicEntity extends BaseBean implements Serializable {
      */
     public void initDynamic() {
         Field[] fields = this.getClass().getDeclaredFields();
-
         Method setMethod = null;
         String setMethodName,propName;
         Object fieldVal = null;
 
         for(Field f : fields) {
             propName = f.getName().replace("$cglib_prop_", "");
-            if(!"LOGGER".equals(propName) && !"propertyList".equals(propName)) {
+            if(!"LOGGER".equals(propName) && !"propertyList".equals(propName) && !"dynProperty".equals(propName)) {
                 this.getPropertyList().add(propName); //添加到属性list中
-
                 setMethodName = "set" + propName.substring(0,1).toUpperCase() + propName.substring(1);
-
                 f.setAccessible(true);
                 try {
                     fieldVal = f.get(this);
@@ -160,9 +97,9 @@ public class DynamicEntity extends BaseBean implements Serializable {
                     } else if (f.getType() == Double.class) {
                         fieldVal = 0.0d;
                     } else if (f.getType() == String.class) {
-                        fieldVal = "1";
+                        fieldVal = "";
                     }else if (f.getType() == Character.class) {
-                        fieldVal = "1";
+                        fieldVal = "";
                     }else if (f.getType() == Boolean.class) {
                         fieldVal = true;
                     }else if (f.getType() == Byte.class) {
@@ -170,7 +107,7 @@ public class DynamicEntity extends BaseBean implements Serializable {
                     }else if (f.getType() == Date.class) {
                         fieldVal = new Date();
                     }else {
-                        fieldVal = "1";
+                        fieldVal = "";
                     }
                 }
 
@@ -239,8 +176,18 @@ public class DynamicEntity extends BaseBean implements Serializable {
         return result;
     }
 
+
+    public void setDynProperty(Map<String,Object> params) {
+        if (params != null && params.size() > 0){
+            params.forEach((k,v)->{{
+                setDynProperty(k,v);
+            }});
+        }
+    }
+
     /**
      * 根据属性名，设置属性值
+     * //TODO  wei.peng 设置为空时会无效
      * @param propName
      * @param val
      * @throws InvocationTargetException
@@ -248,9 +195,9 @@ public class DynamicEntity extends BaseBean implements Serializable {
      * @throws NoSuchMethodException
      */
     public void setDynProperty(String propName,Object val){
-         //初始化set方法
-        String setMethodName = "set" + propName.substring(0, 1).toUpperCase() + propName.substring(1);
-            //获取方法
+        //初始化set方法
+        String setMethodName = "set" + CaseFormat.UPPER_UNDERSCORE.to(CaseFormat.UPPER_CAMEL, propName);
+        //获取方法
         Method setMethod = null;
         try {
             setMethod = this.getClass().getDeclaredMethod(setMethodName, new Class[]{val.getClass()});

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

@@ -334,6 +334,86 @@ public class BlockFormEnumUtil {
             return tmp;
         }
     }
+    /**
+     * 元素显示状态信息
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum ELEMENT_SHOW_STATUS {
+        ON(1, "ON", "开启"),
+        OFF(2, "OFF", "关闭");
+
+        private int value;
+        private String code;
+        private String description;
+
+        private ELEMENT_SHOW_STATUS(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)) {
+                    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 ELEMENT_SHOW_STATUS 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;
+        }
+    }
 
     /**
      * 元素新增信息
@@ -887,20 +967,22 @@ public class BlockFormEnumUtil {
      */
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)
     public enum PROPERTY_VIRTUAL_OPERATE_TYPE {
-        STRING_SPLICE(10, "SPLICE", "字符串拼接"),
-        NUM_ADD(20, "ADD", "加法计算"),
-        NUM_LESS(30, "MIN", "减法计算"),
-        NUM_MAKE(40, "MUL", "乘法计算"),
-        NUM_DIVISION(50, "DIVISION", "除法计算");
+        STRING_SPLICE(10, "SPLICE", "字符串拼接",String.class),
+        NUM_ADD(20, "ADD", "加法计算",Double.class),
+        NUM_LESS(30, "MIN", "减法计算",Double.class),
+        NUM_MAKE(40, "MUL", "乘法计算",Double.class),
+        NUM_DIVISION(50, "DIVISION", "除法计算",Double.class);
 
         private int value;
         private String code;
         private String description;
+        private Class clzFullName;
 
-        private PROPERTY_VIRTUAL_OPERATE_TYPE(int value, String code, String description) {
+        private PROPERTY_VIRTUAL_OPERATE_TYPE(int value, String code, String description,Class clzFullName) {
             this.value = value;
             this.code = code;
             this.description = description;
+            this.clzFullName = clzFullName;
         }
 
         public int getValue() {
@@ -915,6 +997,14 @@ public class BlockFormEnumUtil {
             return description;
         }
 
+        public Class getClzFullName() {
+            return clzFullName;
+        }
+
+        public void setClzFullName(Class clzFullName) {
+            this.clzFullName = clzFullName;
+        }
+
         public static String valueOfCode(int val) {
             String tmp = null;
             for (int i = 0; i < values().length; i++) {
@@ -964,6 +1054,8 @@ public class BlockFormEnumUtil {
             }
             return tmp;
         }
+
+
     }
 
     /**
@@ -983,8 +1075,8 @@ public class BlockFormEnumUtil {
         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),
-        DATE(60, "Date", "日期", "java.lang.String", String.class,PROPERTY_CONTROL_TYPE.DATE_TIME);
+        BYTE(50, "Byte", "字节", "java.lang.Byte", Byte.class,PROPERTY_CONTROL_TYPE.TEXT);
+//        DATE(60, "Date", "日期", "java.lang.String", String.class,PROPERTY_CONTROL_TYPE.DATE_TIME);
 
         /**
          * 属性类型值

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

@@ -141,7 +141,7 @@ public class WmsEnumUtil {
     public enum MASTER_ORDER_STATUS {
         CREATE(10, "新建"),
         RECEIPT(20, "处理中"),
-        RECEIPT_FINISH(30, "已处理"),
+        RECEIPT_FINISH(30, "已完成"),
         CLOSED(40, "已关闭"),
         CANCELLED(50, "已取消");
 
@@ -1102,7 +1102,7 @@ public class WmsEnumUtil {
      */
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)
     public enum QC_ITEM_STATUS {
-        NORMAL(10, "创建"),
+        NORMAL(10, "正常"),
         CANCELLATION(20, "已处理");
 
         private int value;

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

@@ -15,6 +15,7 @@ import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.persistence.Table;
 import javax.persistence.Transient;
+import java.util.List;
 
 /**
  * @Description :
@@ -74,16 +75,21 @@ public class BfElement extends BaseBean {
 
     @Transient
     @ApiParam(value = "数据对象")
-    @AnnoOutputColumn(hidden = true)
     private BfDataObject dataObject;
 
     @Transient
     @ApiParam(value = "元素表单")
-    @AnnoOutputColumn(hidden = true)
     private BfElementGrid elementGrid;
 
     @Transient
     @ApiParam(value = "元素树")
-    @AnnoOutputColumn(hidden = true)
     private BfElementTree elementTree;
+
+    @Transient
+    @ApiParam(value = "元素属性信息")
+    private List<BfElementProperty> propertyList;
+
+    @Transient
+    @ApiParam(value = "元素虚拟属性信息")
+    private List<BfElementPropertyVirtual> propertyVirtualList;
 }

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

@@ -40,6 +40,10 @@ public class BfElementGrid extends BaseBean {
     @ApiParam(value = "显示行号")
     private Integer isLineShowNumber;
 
+    @Column(name = "IS_LINE_MULTIPLE")
+    @ApiParam(value = "是否单选")
+    private Integer isLineMultiple;
+
     @Column(name = "IS_OBJECT_ADD")
     @ApiParam(value = "是否新增")
     private Integer isObjectAdd;

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

@@ -56,11 +56,15 @@ public class BfElementProperty extends BaseBean {
     private String propertyTypeNameRdd;
 
     @Column(name="PROPERTY_NAME")
-    @ApiParam(value ="元素描述")
+    @ApiParam(value ="元素名称")
     private String propertyName;
 
+    @Column(name="PROPERTY_CODE_RDD")
+    @ApiParam(value ="类属性名称")
+    private String propertyCodeRdd;
+
     @Column(name="PROPERTY_DEFAULT_VALUE")
-    @ApiParam(value ="元素描述")
+    @ApiParam(value ="元素默认值")
     private String propertyDefaultValue;
 
     @Column(name = "PROPERTY_VALUE_NOT_NULL")
@@ -77,7 +81,11 @@ public class BfElementProperty extends BaseBean {
 
     @Column(name = "PROPERTY_INPUT_TXT")
     @ApiParam(value = "输入提示")
-    private Integer propertyInputTxt;
+    private String propertyInputTxt;
+
+    @Column(name="PROPERTY_LABEL_TXT")
+    @ApiParam(value ="元素提示")
+    private String propertyLabelTxt;
 
     @Column(name = "PROPERTY_LENGTH")
     @ApiParam(value = "属性长度")

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

@@ -38,6 +38,14 @@ public class BfElementPropertyVirtual extends BaseBean {
     @JsonSerialize(using = ToStringSerializer.class)
     private Long elementId;
 
+    @Column(name="PROPERTY_NAME")
+    @ApiParam(value ="元素名称")
+    private String propertyName;
+
+    @Column(name="PROPERTY_TYPE")
+    @ApiParam(value ="属性类型")
+    private Integer propertyType;
+
     @Column(name = "PROPERTY_VIRTUAL_OPERATE_TYPE")
     @ApiParam(value = "虚拟元素类型")
     private Integer propertyVirtualType;

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

@@ -54,6 +54,16 @@ public class BfMethodDetailProperty extends BaseBean {
     @ApiParam(value ="主对象元素名称")
     private String priElementNameRdd;
 
+    @Column(name="PRI_ELEMENT_PROPERTY_ID")
+    @ApiParam(value ="主对象元素属性id")
+    @JsonSerialize(using = ToStringSerializer.class)
+    private Long priElementPropertyId;
+
+    @Column(name="PRI_ELEMENT_PROPERTY_NAME_RDD")
+    @ApiParam(value ="主对象元素属性名称")
+    @JsonSerialize(using = ToStringSerializer.class)
+    private String priElementPropertyNameRdd;
+
     // 枚举:BlockFormEnumUtil.TRIGGER_EVENT
     @Column(name="PRI_ELEMENT_EVENT")
     @ApiParam(value ="主对象元素事件")
@@ -78,7 +88,16 @@ public class BfMethodDetailProperty extends BaseBean {
     @JsonSerialize(using = ToStringSerializer.class)
     private Long secElementId;
 
-    @Column(name="sec_element_name_rdd")
+    @Column(name="SEC_ELEMENT_NAME_RDD")
     @ApiParam(value ="关联对象元素名称")
     private String secElementNameRdd;
+
+    @Column(name="SEC_ELEMENT_PROPERTY_ID")
+    @ApiParam(value ="关联对象元素属性id")
+    @JsonSerialize(using = ToStringSerializer.class)
+    private Long secElementPropertyId;
+
+    @Column(name="SEC_ELEMENT_PROPERTY_NAME_RDD")
+    @ApiParam(value ="关联对象元素属性名称")
+    private String secElementPropertyNameRdd;
 }

modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/sqlpack/FormHqlPack.java

@@ -1,5 +1,7 @@
 package cn.estsh.i3plus.pojo.form.sqlpack;
 
+import cn.estsh.i3plus.pojo.base.bean.DdlPackBean;
+import cn.estsh.i3plus.pojo.base.tool.DdlPreparedPack;
 import cn.estsh.i3plus.pojo.base.tool.HqlPack;
 import cn.estsh.i3plus.pojo.form.bean.*;
 import org.apache.commons.lang3.StringUtils;
@@ -154,15 +156,15 @@ public final class FormHqlPack {
      * @param bfIntercept 查询条件
      * @return hql
      */
-    public static String packHqlBfIntercept(BfIntercept bfIntercept) {
-        StringBuffer result = new StringBuffer();
+    public static DdlPackBean packHqlBfIntercept(BfIntercept bfIntercept) {
+        DdlPackBean ddlPackBean = new DdlPackBean();
 
-        HqlPack.getStringLikerPack(bfIntercept.getInterceptName(), "interceptName", result);
-        HqlPack.getNumEqualPack(bfIntercept.getExecuteMode(), "executeMode", result);
-        HqlPack.getNumEqualPack(bfIntercept.getIsDeleted(), "isDeleted", result);
-        result.append(bfIntercept.orderBy());
+        DdlPreparedPack.getStringLikerPack(bfIntercept.getInterceptName(), "interceptName", ddlPackBean);
+        DdlPreparedPack.getNumEqualPack(bfIntercept.getExecuteMode(), "executeMode", ddlPackBean);
+        DdlPreparedPack.getNumEqualPack(bfIntercept.getIsDeleted(), "isDeleted", ddlPackBean);
+        ddlPackBean.setOrderByStr(bfIntercept.orderBy());
 
-        return result.toString();
+        return ddlPackBean;
     }
 
     /**

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

@@ -0,0 +1,81 @@
+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.ColumnDefault;
+import org.hibernate.annotations.DynamicInsert;
+import org.hibernate.annotations.DynamicUpdate;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.Table;
+import java.util.Date;
+
+/**
+ * @Description :BOM清单
+ * @Reference :
+ * @Author : jack.jia
+ * @CreateDate : 2019-04-02
+ * @Modify:
+ **/
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Table(name="MES_BOM")
+@Api("BOM清单")
+public class MesBom extends BaseBean {
+    @Column(name="PART_NO")
+    @ApiParam("父零件号")
+    private String partNo;
+
+    @Column(name="PART_NAME")
+    @ApiParam("父零件名称")
+    private String partName;
+
+    @Column(name = "UNIT")
+    @ApiParam(value = "单位")
+    private String unit;
+
+    @Column(name = "QTY")
+    @ColumnDefault("0")
+    @ApiParam(value = "数量", example = "0")
+    private Double qty;
+
+    @Column(name="ITEM_PART_NO")
+    @ApiParam("子零件")
+    private String itemPartNo;
+
+    @Column(name="ITEM_PART_NAME")
+    @ApiParam("子零件名称")
+    private String itemPartName;
+
+    @Column(name = "ITEM_UNIT")
+    @ApiParam(value = "子零件单位")
+    private String itemUnit;
+
+    @Column(name = "ITEM_QTY")
+    @ColumnDefault("0")
+    @ApiParam(value = "子零件数量", example = "0")
+    private Double itemQty;
+
+    @Column(name = "BOM_VERSION")
+    @ApiParam(value = "BOM版本")
+    private String bomVersion;
+
+    @Column(name = "EFF_START_TIME")
+    @ApiParam(value = "生效时间")
+    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+    private Date effStartTime;
+
+    @Column(name = "EFF_END_TIME")
+    @ApiParam(value = "失效时间")
+    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+    private Date effEndTime;
+}

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

@@ -0,0 +1,56 @@
+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.ColumnDefault;
+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_PACK_SPEC")
+@Api("包装规格")
+public class MesPackSpec extends BaseBean {
+    @Column(name="SPEC_CODE")
+    @ApiParam("包装规格代码")
+    private String specCode;
+
+    @Column(name="SPEC_NAME")
+    @ApiParam("包装规格名称")
+    private String specName;
+
+    @Column(name="PARENT_SPEC")
+    @ApiParam("父包装规格代码")
+    private String parentSpec;
+
+    @Column(name = "QTY")
+    @ColumnDefault("0")
+    @ApiParam(value = "数量", example = "0")
+    private Double qty;
+
+    @Column(name="IS_MIXED")
+    @ApiParam("是否混包")
+    private Integer isMixed;
+
+    @Column(name="SPEC_LEVEL")
+    @ApiParam("规格级别")
+    private Integer specLevel;
+}

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

@@ -0,0 +1,66 @@
+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 : jack.jia
+ * @CreateDate : 2019-04-02
+ * @Modify:
+ **/
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Table(name="MES_PART")
+@Api("物料信息")
+public class MesPart extends BaseBean {
+    @Column(name="PART_NO")
+    @ApiParam("零件号")
+    private String partNo;
+
+    @Column(name="PART_NAME")
+    @ApiParam("零件名称")
+    private String partName;
+
+    @Column(name="BRIEF_TEXT")
+    @ApiParam("零件简称")
+    private String briefText;
+
+    @Column(name="PART_SPEC")
+    @ApiParam("零件规格")
+    private String partSpec;
+
+    @Column(name="CATEGORY_CODE1")
+    @ApiParam("分类1")
+    private String categoryCode1;
+
+    @Column(name="CATEGORY_CODE2")
+    @ApiParam("分类2")
+    private String categoryCode2;
+
+    @Column(name="CATEGORY_CODE3")
+    @ApiParam("分类3")
+    private String categoryCode3;
+
+    @Column(name="UNIT")
+    @ApiParam("单位")
+    private String unit;
+
+    @Column(name="PACK_SPEC_CODE")
+    @ApiParam("包装规格代码")
+    private String packSpecCode;
+}

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

@@ -0,0 +1,42 @@
+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 : jack.jia
+ * @CreateDate : 2019-04-02
+ * @Modify:
+ **/
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Table(name="MES_PART_CATEGORY")
+@Api("零件种类")
+public class MesPartCategory extends BaseBean {
+    @Column(name="CATEGORY_CODE")
+    @ApiParam("分类代码")
+    private String categoryCode;
+
+    @Column(name="CATEGORY_NAME")
+    @ApiParam("分类名称")
+    private String categoryName;
+
+    @Column(name="CATEGORY_TYPE")
+    @ApiParam("分类类型")
+    private String categoryType;
+}

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

@@ -0,0 +1,58 @@
+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.ColumnDefault;
+import org.hibernate.annotations.DynamicInsert;
+import org.hibernate.annotations.DynamicUpdate;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.Table;
+import java.util.Date;
+
+/**
+ * @Description :工序物料清单
+ * @Reference :
+ * @Author : jack.jia
+ * @CreateDate : 2019-04-02
+ * @Modify:
+ **/
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Table(name="MES_PROCESS_BOM")
+@Api("工序物料清单")
+public class MesProcessBom extends BaseBean {
+    @Column(name="PART_NO")
+    @ApiParam("零件号")
+    private String partNo;
+
+    @Column(name="PROCESS_CODE")
+    @ApiParam("工序代码")
+    private String processCode;
+
+    @Column(name="ITEM_PART_NO")
+    @ApiParam("子零件")
+    private String itemPartNo;
+
+    @Column(name = "QTY")
+    @ColumnDefault("0")
+    @ApiParam(value = "子零件数量", example = "0")
+    private Double qty;
+
+    @Column(name = "IS_REPEAT")
+    @ApiParam(value = "是否可重复")
+    private Integer isRepeat;
+
+    @Column(name = "IS_CHECK")
+    @ApiParam(value = "是否检查")
+    private Integer isCheck;
+}

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

@@ -0,0 +1,42 @@
+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 : jack.jia
+ * @CreateDate : 2019-04-02
+ * @Modify:
+ **/
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Table(name="MES_PROD_CFG")
+@Api("产品配置")
+public class MesProdCfg extends BaseBean {
+    @Column(name="PROD_CFG_CODE")
+    @ApiParam("产品配置代码")
+    private String prodCfgCode;
+
+    @Column(name="PROD_CFG_NAME")
+    @ApiParam("产品配置名称")
+    private String prodCfgTypeName;
+
+    @Column(name="PROD_CFG_Type_CODE")
+    @ApiParam("产品配置类型代码")
+    private String prodCfgTypeCode;
+}

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

@@ -0,0 +1,42 @@
+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 : jack.jia
+ * @CreateDate : 2019-04-02
+ * @Modify:
+ **/
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Table(name="MES_PROD_CFG_DETAIL")
+@Api("产品配置明细")
+public class MesProdCfgDetail extends BaseBean {
+    @Column(name="PROD_CFG_CODE")
+    @ApiParam("产品配置代码")
+    private String prodCfgCode;
+
+    @Column(name="PART_NO")
+    @ApiParam("零件号")
+    private String partNo;
+
+    @Column(name="IS_VIRTUAL")
+    @ApiParam("产品配置类型代码")
+    private Integer isVirtual;
+}

modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProdCfgType.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 : jack.jia
+ * @CreateDate : 2019-04-02
+ * @Modify:
+ **/
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Table(name="MES_PROD_CFG_TYPE")
+@Api("产品配置类型")
+public class MesProdCfgType extends BaseBean {
+    @Column(name="PROD_CFG_TYPE_CODE")
+    @ApiParam("产品配置类型代码")
+    private String prodCfgTypeCode;
+
+    @Column(name="PROD_CFG_TYPE_NAME")
+    @ApiParam("产品配置类型名称")
+    private String prodCfgTypeName;
+}

modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesBomRepository.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.MesBom;
+import org.springframework.stereotype.Repository;
+
+/**
+ * @Description :
+ * @Reference :
+ * @Author : jack.jia
+ * @CreateDate : 2019-04-02
+ * @Modify:
+ **/
+@Repository
+public interface MesBomRepository extends BaseRepository<MesBom, Long> {
+}

modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesPackSpecRepository.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.MesPackSpec;
+import org.springframework.stereotype.Repository;
+
+/**
+ * @Description :
+ * @Reference :
+ * @Author : jack.jia
+ * @CreateDate : 2019-04-02
+ * @Modify:
+ **/
+@Repository
+public interface MesPackSpecRepository extends BaseRepository<MesPackSpec, Long> {
+}

modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesPartCategoryRepository.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.MesPartCategory;
+import org.springframework.stereotype.Repository;
+
+/**
+ * @Description :
+ * @Reference :
+ * @Author : jack.jia
+ * @CreateDate : 2019-04-02
+ * @Modify:
+ **/
+@Repository
+public interface MesPartCategoryRepository extends BaseRepository<MesPartCategory, Long> {
+}

modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesPartRepository.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.MesPart;
+import org.springframework.stereotype.Repository;
+
+/**
+ * @Description :
+ * @Reference :
+ * @Author : jack.jia
+ * @CreateDate : 2019-04-02
+ * @Modify:
+ **/
+@Repository
+public interface MesPartRepository extends BaseRepository<MesPart, Long> {
+}

modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesProcessBomRepository.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.MesProcessBom;
+import org.springframework.stereotype.Repository;
+
+/**
+ * @Description :
+ * @Reference :
+ * @Author : jack.jia
+ * @CreateDate : 2019-04-02
+ * @Modify:
+ **/
+@Repository
+public interface MesProcessBomRepository extends BaseRepository<MesProcessBom, Long> {
+}

modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesProdCfgDetailRepository.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.MesProdCfgDetail;
+import org.springframework.stereotype.Repository;
+
+/**
+ * @Description :
+ * @Reference :
+ * @Author : jack.jia
+ * @CreateDate : 2019-04-02
+ * @Modify:
+ **/
+@Repository
+public interface MesProdCfgDetailRepository extends BaseRepository<MesProdCfgDetail, Long> {
+}

modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesProdCfgRepository.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.MesProdCfg;
+import org.springframework.stereotype.Repository;
+
+/**
+ * @Description :
+ * @Reference :
+ * @Author : jack.jia
+ * @CreateDate : 2019-04-02
+ * @Modify:
+ **/
+@Repository
+public interface MesProdCfgRepository extends BaseRepository<MesProdCfg, Long> {
+}

modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesProdCfgTypeRepository.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.MesProdCfgType;
+import org.springframework.stereotype.Repository;
+
+/**
+ * @Description :
+ * @Reference :
+ * @Author : jack.jia
+ * @CreateDate : 2019-04-02
+ * @Modify:
+ **/
+@Repository
+public interface MesProdCfgTypeRepository extends BaseRepository<MesProdCfgType, Long> {
+}

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

@@ -31,6 +31,9 @@ public class ElementModel{
     @ApiParam(value = "元素基础虚拟属性信息")
     private List<BfElementPropertyVirtual> virtualList;
 
+    @ApiParam(value = "动态对象Class")
+    private Class dynClass;
+
     @ApiParam(value = "数据对象信息")
     private BfDataObject dataObject;
 

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

@@ -52,6 +52,10 @@ public class SqlColumnModel {
     @ApiParam(value = "枚举:BlockFormEnumUtil.PROPERTY_TYPE")
     private Integer columnClassType;
 
+    @ApiParam(value = "属性值")
+    private Object value;
+    @ApiParam(value = "属性默认值")
+    private Object defaultValue;
 
 
 }

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

@@ -0,0 +1,37 @@
+package cn.estsh.i3plus.pojo.model.form;
+
+import cn.estsh.i3plus.pojo.base.dynamic.DynamicEntity;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * @Description :
+ * @Reference :
+ * @Author : Adair Peng
+ * @CreateDate : 2019-04-03 17:30
+ * @Modify:
+ **/
+@Data
+public class SqlScriptModel {
+
+    @ApiParam(value = "对象元素ID")
+    @JsonSerialize(using = ToStringSerializer.class)
+    private Long elementId;
+
+    @ApiParam(value = "元素内容")
+    private String elementContent ;
+
+    @ApiParam(value = "动态对象Class")
+    private Class dynClass;
+
+    @ApiParam(value = "动态对象")
+    private DynamicEntity dynObj;
+
+    @ApiParam(value = "封装数据", example = "-1")
+    private List<SqlColumnModel> params;
+
+}

modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/report/BeanBrPojoAttrModel.java

@@ -10,7 +10,7 @@ import lombok.Data;
 import java.util.List;
 
 /**
- * @Description ://TODO 提交注意修改 临时使用 带改动
+ * @Description ://
  * @Reference :
  * @Author : Adair Peng
  * @CreateDate : 2019-01-25 18:19

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

@@ -1,8 +1,6 @@
 package cn.estsh.i3plus.pojo.platform.bean;
 
 import cn.estsh.i3plus.pojo.base.bean.BaseBean;
-import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil;
-import cn.estsh.i3plus.pojo.base.enumutil.ImppEnumUtil;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
 import io.swagger.annotations.Api;
@@ -11,101 +9,104 @@ 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      : wei.peng
- * @Date        : 2018-10-22 16:58:43.952
- * @Modify      :
+ * @Reference :
+ * @Author : wei.peng
+ * @Date : 2018-10-22 16:58:43.952
+ * @Modify :
  **/
 @Data
 @Entity
 @DynamicInsert
 @DynamicUpdate
 @EqualsAndHashCode(callSuper = true)
-@Table(name="SYS_TASK_PLAN")
-@Api(value="任务计划",description = "任务计划")
+@Table(name = "SYS_TASK_PLAN")
+@Api(value = "任务计划", description = "任务计划")
 public class SysTaskPlan extends BaseBean {
 
-    @Column(name="NAME")
-    @ApiParam(value ="名称")
+    @Column(name = "NAME")
+    @ApiParam(value = "名称")
     private String name;
 
-    @Column(name="GROUP_NAME")
-    @ApiParam(value ="组名称")
+    @Column(name = "GROUP_NAME")
+    @ApiParam(value = "组名称")
     private String groupName;
 
-    @Column(name="TASK_CYCLE_ID")
-    @ApiParam(value ="任务周期ID" , example = "-1")
+    @Column(name = "TASK_CYCLE_ID")
+    @ApiParam(value = "任务周期ID", example = "-1")
     @JsonSerialize(using = ToStringSerializer.class)
     private Long taskCycleId;
 
-    @Column(name="TASK_CYCLE_NAME_RDD")
-    @ApiParam(value ="任务周期名称")
+    @Column(name = "TASK_CYCLE_NAME_RDD")
+    @ApiParam(value = "任务周期名称")
     private String taskCycleNameRdd;
 
-    @Column(name="TASK_CYCLE_EXPS_RDD")
-    @ApiParam(value ="任务周期表达式")
+    @Column(name = "TASK_CYCLE_EXPS_RDD")
+    @ApiParam(value = "任务周期表达式")
     private String taskCycleExpsRdd;
 
-    @Column(name="TASK_PLAN_EXEC_NUM")
-    @ApiParam(value ="定时任务运行次数" , example ="0")
+    @Column(name = "TASK_PLAN_EXEC_NUM")
+    @ApiParam(value = "定时任务运行次数", example = "0")
     private Integer taskPlanExecNum;
 
-    public int getTaskPlanExecNumValue(){
-        if(taskPlanExecNum == null){
+    /**
+     * 获取定时任务运行次数
+     * @return 定时任务运行次数
+     */
+    public int getTaskPlanExecNumValue() {
+        if (taskPlanExecNum == null) {
             return 0;
-        }else{
+        } else {
             return taskPlanExecNum.intValue();
         }
     }
 
     // 枚举 ImppEnumUtil.TASK_METHOD_TYPE.CLASS_METHOD
-    @Column(name="TASK_METHOD_TYPE")
-    @ApiParam(value ="任务执行类型" ,example = "-1")
+    @Column(name = "TASK_METHOD_TYPE")
+    @ApiParam(value = "任务执行类型", example = "-1")
     private Integer taskMethodType;
 
-    @Column(name="TASK_ID")
-    @ApiParam(value ="定时任务id")
+    @Column(name = "TASK_ID")
+    @ApiParam(value = "定时任务id")
     @JsonSerialize(using = ToStringSerializer.class)
     private Long taskId;
 
-    @Column(name="TASK_NAME_RDD")
-    @ApiParam(value ="定时任务名称")
+    @Column(name = "TASK_NAME_RDD")
+    @ApiParam(value = "定时任务名称")
     private String taskNameRdd;
 
-    @Column(name="TASK_SOFT_TYPE_RDD")
-    @ApiParam(value ="任务所属模块")
+    @Column(name = "TASK_SOFT_TYPE_RDD")
+    @ApiParam(value = "任务所属模块")
     private Integer taskSoftTypeRdd;
 
-    @Column(name="TASK_PLAN_PARAM")
-    @ApiParam(value ="任务计划参数")
+    @Column(name = "TASK_PLAN_PARAM")
+    @ApiParam(value = "任务计划参数")
     private String taskPlanParam;
 
-    @Column(name="TASK_CYCLE_START_DATE_TIME_RDD")
-    @ApiParam(value ="任务开始时间")
+    @Column(name = "TASK_CYCLE_START_DATE_TIME_RDD")
+    @ApiParam(value = "任务开始时间")
     private String taskCycleStartDateTimeRdd;
 
-    @Column(name="TASK_CYCLE_END_DATE_TIME_RDD")
-    @ApiParam(value ="任务结束时间")
+    @Column(name = "TASK_CYCLE_END_DATE_TIME_RDD")
+    @ApiParam(value = "任务结束时间")
     private String taskCycleEndDateTimeRdd;
 
-    @Column(name="TASK_PLAN_DESCRIPTION")
-    @ApiParam(value ="任务计划描述" , access ="任务计划描述")
+    @Column(name = "TASK_PLAN_DESCRIPTION")
+    @ApiParam(value = "任务计划描述", access = "任务计划描述")
     private String taskPlanDescription;
 
     // 枚举 CommonEnumUtil.TRUE_OR_FALSE
-    @Column(name="TASK_PLAN_STATUS")
-    @ApiParam(value ="任务状态" , example ="1")
+    @Column(name = "TASK_PLAN_STATUS")
+    @ApiParam(value = "任务状态", example = "1")
     private Integer taskPlanStatus;
 
-    @Column(name="LAST_RUN_DATE_TIME")
-    @ApiParam(value ="最后运行时间" , access ="最后运行时间")
+    @Column(name = "LAST_RUN_DATE_TIME")
+    @ApiParam(value = "最后运行时间", access = "最后运行时间")
     private String lastRunDateTime;
 
     // 枚举 CommonEnumUtil.TRUE_OR_FALSE

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

@@ -26,6 +26,14 @@ public class SwebPOForPubListResultItemModel extends BaseBean {
     @ApiParam(value = "零件号")
     private String partNo;
 
+    @ApiParam("供应商编号")
+    @Column(name = "VENDOR_CODE")
+    private String vendorCode;
+
+    @ApiParam("供应商名称")
+    @Column(name = "VENDOR_NAME")
+    private String vendorName;
+
     @Column(name = "PART_NAME")
     @ApiParam(value = "零件名称")
     private String partName;

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

@@ -105,7 +105,11 @@ public class WmsCSOrderDetails extends BaseBean {
 
     @Transient
     @ApiParam("目标库位编号")
-    public String descLocateNo;
+    public String destLocateNo;
+
+    @Transient
+    @ApiParam("前端表格编辑使用")
+    public Boolean isSet = false;
 
     public Double getQty() {
         return this.qty == null ? 0 : this.qty;
@@ -133,4 +137,18 @@ public class WmsCSOrderDetails extends BaseBean {
         this.partNameRdd = partName;
         this.sn = sn;
     }
+
+    public WmsCSOrderDetails(Double qty, String partNo,String orderNo,String whNo,String zoneNo,String locateNo,String partName,String sn,Long id,String organizeCode,Integer transStatus){
+        this.qty = qty;
+        this.partNo = partNo;
+        this.orderNo = orderNo;
+        this.whNo = whNo;
+        this.zoneNo = zoneNo;
+        this.locateNo = locateNo;
+        this.partNameRdd = partName;
+        this.sn = sn;
+        this.id = id;
+        this.organizeCode = organizeCode;
+        this.transStatus = transStatus;
+    }
 }

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

@@ -8,6 +8,7 @@ import cn.estsh.i3plus.pojo.base.tool.DdlPreparedPack;
 import cn.estsh.i3plus.pojo.base.tool.HqlPack;
 import cn.estsh.i3plus.pojo.base.tool.SqlPack;
 import cn.estsh.i3plus.pojo.wms.bean.*;
+import cn.estsh.i3plus.pojo.wms.engine.script.EngineScriptPersistence;
 import com.alibaba.fastjson.JSONObject;
 import com.google.common.base.Strings;
 import org.apache.commons.lang3.ArrayUtils;
@@ -86,7 +87,6 @@ public class WmsHqlPack {
 
         //查询参数封装
         HqlPack.getStringEqualPack(wmsPOMasterDetails.getOrderNo(), "orderNo", result);
-        HqlPack.getNumEqualPack(wmsPOMasterDetails.getItem(), "item", result);
         HqlPack.getStringEqualPack(wmsPOMasterDetails.getPartNo(), "partNo", result);
         HqlPack.getStringRightLikerPack(wmsPOMasterDetails.getPartNameRdd(), "partNameRdd", result);
         HqlPack.getStringRightLikerPack(wmsPOMasterDetails.getPlanTime(), "planTime", result);
@@ -647,7 +647,6 @@ public class WmsHqlPack {
         StringBuffer result = new StringBuffer();
 
         HqlPack.getStringEqualPack(wmsASNMasterDetails.getOrderNo(), "orderNo", result);
-        HqlPack.getNumEqualPack(wmsASNMasterDetails.getItem(), "item", result);
         HqlPack.getStringEqualPack(wmsASNMasterDetails.getPartNo(), "partNo", result);
         HqlPack.getStringLikerPack(wmsASNMasterDetails.getPartNameRdd(), "partNameRdd", result);
         HqlPack.getNumEqualPack(wmsASNMasterDetails.getQty(), "qty", result);
@@ -989,7 +988,6 @@ public class WmsHqlPack {
         StringBuffer result = new StringBuffer();
 
         HqlPack.getStringEqualPack(wmsMoveDetails.getOrderNo(), "orderNo", result);
-        HqlPack.getNumEqualPack(wmsMoveDetails.getItem(), "item", result);
         HqlPack.getStringEqualPack(wmsMoveDetails.getPartNo(), "partNo", result);
         HqlPack.getStringLikerPack(wmsMoveDetails.getPartNameRdd(), "partNameRdd", result);
         HqlPack.getStringEqualPack(wmsMoveDetails.getVendorNo(), "vendorNo", result);
@@ -1020,7 +1018,6 @@ public class WmsHqlPack {
         StringBuffer result = new StringBuffer();
 
         HqlPack.getStringEqualPack(wmsMoveSn.getOrderNo(), "orderNo", result);
-        HqlPack.getNumEqualPack(wmsMoveSn.getItem(), "item", result);
         HqlPack.getStringEqualPack(wmsMoveSn.getPartNo(), "partNo", result);
         HqlPack.getStringLikerPack(wmsMoveSn.getPartNameRdd(), "partNameRdd", result);
 
@@ -1075,6 +1072,26 @@ public class WmsHqlPack {
     }
 
     /**
+     * 库存条码开窗 查询条件封装
+     *
+     * @param wmsStockSn
+     * @return
+     */
+    public static String packHqlWmsStockSnDialog(WmsStockSn wmsStockSn) {
+        StringBuffer result = new StringBuffer();
+
+        //查询参数封装
+        HqlPack.getNotInPack(String.join(",", WmsEnumUtil.STOCK_SN_STATUS.CREATE.getValue() + "",
+                WmsEnumUtil.STOCK_SN_STATUS.QUALITY_CONTROL.getValue() + ""), "snStatus", result);
+        //单号
+        HqlPack.getStringLeftLikerPack(wmsStockSn.getSn(),"sn", result);
+        HqlPack.getStringEqualPack(wmsStockSn.getDateCode(),"dateCode",result);
+        getStringBuilderPack(wmsStockSn, result);
+
+        return result.toString();
+    }
+
+    /**
      * 质检单明细信息 查询条件封装
      *
      * @param wmsQCDetails
@@ -1099,11 +1116,10 @@ public class WmsHqlPack {
      */
     public static String packHqlWmsQCTrans(WmsQCTrans wmsQCTrans) {
         StringBuffer result = new StringBuffer();
-
         //单号
         HqlPack.getStringEqualPack(wmsQCTrans.getOrderNo(), "orderNo", result);
-        //行号
-        HqlPack.getNumEqualPack(wmsQCTrans.getItem(), "item", result);
+        //物料
+        HqlPack.getStringEqualPack(wmsQCTrans.getPartNo(), "partNo", result);
 
         getStringBuilderPack(wmsQCTrans, result);
 
@@ -1543,6 +1559,7 @@ public class WmsHqlPack {
         StringBuffer result = new StringBuffer();
         String data = String.join(",", vals);
         HqlPack.getInPackString(data, columnName, result);
+        HqlPack.getStringRightLikerPack(bean.getOrderNo(), "orderNo", result);
         HqlPack.getNumNOEqualPack(bean.getTaskStatus(), "taskStatus", result);
         getStringBuilderPack(bean, result);
         return result.toString();
@@ -1661,4 +1678,41 @@ public class WmsHqlPack {
 
         return result.toString();
     }
+
+    /**
+     * 查询脚本持久化 查询条件封装
+     * @return
+     */
+    public static DdlPackBean packEngineScriptPersistence(EngineScriptPersistence scriptPersistence) {
+        DdlPackBean packBean = new DdlPackBean();
+        DdlPreparedPack.getStringEqualPack(scriptPersistence.getScriptNo(), "scriptNo", packBean);
+        DdlPreparedPack.getStringRightLikerPack(scriptPersistence.getScriptName(), "scriptName", packBean);
+        DdlPreparedPack.getNumEqualPack(scriptPersistence.getScriptType(), "scriptType", packBean);
+        DdlPreparedPack.getNumEqualPack(scriptPersistence.getLanguageType(), "languageType", packBean);
+
+        getStringBuilderPack(scriptPersistence, packBean);
+
+        DdlPreparedPack.getOrderByPack(new Object[]{2}, new String[]{"createDatetime"}, packBean);
+        return packBean;
+    }
+
+    /**
+     * 盘点主表 分页查询(散件)
+     *
+     * @param wmsCSOrderMaster
+     * @return
+     */
+    public static String packHqlWmsCSOrderMasterPart(WmsCSOrderMaster wmsCSOrderMaster) {
+        StringBuffer result = new StringBuffer();
+
+        //查询参数封装
+        HqlPack.getInPack(String.join(",", WmsEnumUtil.CS_ORDER_STATUS.STARTING_INVENTORY.getValue() + "",
+                WmsEnumUtil.CS_ORDER_STATUS.IN_INVENTORY.getValue() + ""), "orderStatus", result);
+        HqlPack.getNumEqualPack(CommonEnumUtil.TRUE_OR_FALSE.TRUE.getValue(), "isPart", result);
+        HqlPack.getStringEqualPack(wmsCSOrderMaster.getOrderNo(), "orderNo", result);
+
+        getStringBuilderPack(wmsCSOrderMaster, result);
+
+        return result.toString();
+    }
 }