diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/BlockFormEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/BlockFormEnumUtil.java
index 1d698a4..672767d 100644
--- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/BlockFormEnumUtil.java
+++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/BlockFormEnumUtil.java
@@ -501,6 +501,87 @@ public class BlockFormEnumUtil {
}
/**
+ * 元素类型
+ */
+ @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+ public enum ELEMENT_TYPE {
+ GRID(1, "TABLE", "表格"),
+ TREE(2, "TREE", "树");
+
+ private int value;
+ private String code;
+ private String description;
+
+ private ELEMENT_TYPE(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_TYPE 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;
+ }
+ }
+
+ /**
* 元素删除信息
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
@@ -889,32 +970,57 @@ public class BlockFormEnumUtil {
}
/**
- * 属性类型信息
+ * 属性类型信息(属性转换器)
+ *
+ *
Form 核心转换器
+ *
数据库字段类型转换Java 属性类型
+ *
Java 属性 转换为控件类型
+ *
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum PROPERTY_TYPE {
- STRING(10, "String", "字符串", "java.lang.String", String.class),
- CHAR(11, "Character", "单字符", "java.lang.Character", Character.class),
- INTEGER(20, "Integer", "短整型", "java.lang.Integer", Integer.class),
- LONG(21, "Long", "长整型", "java.lang.Long", Long.class),
- DOUBLE(30, "Double", "大浮点型", "java.lang.Double", Double.class),
- FLOAT(31, "Float", "小浮点型", "java.lang.Float", Float.class),
- BOOLEAN(40, "Boolean", "布尔值", "java.lang.Boolean", Boolean.class),
- BYTE(50, "Byte", "字节", "java.lang.Byte", Byte.class),
- DATE(60, "Date", "日期", "java.sql.Timestamp", Date.class);
-
+ 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),
+ DATE(60, "Date", "日期", "java.lang.String", String.class,PROPERTY_CONTROL_TYPE.DATE_TIME);
+
+ /**
+ * 属性类型值
+ */
private int value;
+ /**
+ * 属性类型代码
+ */
private String code;
+ /**
+ * 属性类型描述
+ */
private String description;
+ /**
+ * 属性类型ClassPath
+ */
private String classPath;
+ /**
+ * 属性类型 Class
+ */
private Class clzFullName;
+ /**
+ * 属性类型 对应的 控件类型
+ */
+ private PROPERTY_CONTROL_TYPE controlType;
- private PROPERTY_TYPE(int value, String code, String description,String classPath,Class clzFullName) {
+ private PROPERTY_TYPE(int value, String code, String description,String classPath,Class clzFullName,PROPERTY_CONTROL_TYPE controlType) {
this.value = value;
this.code = code;
this.description = description;
this.classPath = classPath;
this.clzFullName = clzFullName;
+ this.controlType = controlType;
}
public int getValue() {
@@ -949,6 +1055,16 @@ public class BlockFormEnumUtil {
return tmp;
}
+ public static PROPERTY_CONTROL_TYPE valueOfControlType(int val) {
+ PROPERTY_CONTROL_TYPE tmp = null;
+ for (int i = 0; i < values().length; i++) {
+ if (values()[i].value == val) {
+ tmp = values()[i].controlType;
+ }
+ }
+ return tmp;
+ }
+
public static int codeOfValue(String code) {
int tmp = 1;
for (int i = 0; i < values().length; i++) {
diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java
index f97d508..bf6d6ea 100644
--- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java
+++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java
@@ -1953,4 +1953,38 @@ public class WmsEnumUtil {
return tmp;
}
}
+
+ /**
+ * 盘点物料 是否调差
+ */
+ @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+ public enum CS_IS_ADJUST {
+ IS_ADJUST(1, "是调差"), ADJUST(2, "否调差");
+
+ private int value;
+ private String description;
+
+ CS_IS_ADJUST(int value, String description) {
+ this.value = value;
+ this.description = description;
+ }
+
+ public int getValue() {
+ return value;
+ }
+
+ public String getDescription() {
+ return description;
+ }
+
+ public static String valueOf(int val) {
+ String tmp = null;
+ for (int i = 0; i < values().length; i++) {
+ if (values()[i].value == val) {
+ tmp = values()[i].description;
+ }
+ }
+ return tmp;
+ }
+ }
}
diff --git a/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfButton.java b/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfButton.java
index d8192c2..7b20d71 100644
--- a/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfButton.java
+++ b/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfButton.java
@@ -1,6 +1,8 @@
package cn.estsh.i3plus.pojo.form.bean;
import cn.estsh.i3plus.pojo.base.bean.BaseBean;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiParam;
import lombok.Data;
@@ -40,6 +42,7 @@ public class BfButton extends BaseBean {
// 关联表单功能表id
@Column(name="METHOD_ID")
@ApiParam(value ="表单功能id")
+ @JsonSerialize(using = ToStringSerializer.class)
private Long methodId;
@Column(name="METHOD_NAME_RDD")
diff --git a/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfElement.java b/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfElement.java
index cfc903f..7bfc237 100644
--- a/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfElement.java
+++ b/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfElement.java
@@ -52,6 +52,10 @@ public class BfElement extends BaseBean {
@ApiParam(value ="元素名称")
private String elementName;
+ @Column(name="ELEMENT_CODE")
+ @ApiParam(value ="元素编码")
+ private String elementCode;
+
@Column(name="ELEMENT_ATTR_ID")
@ApiParam(value ="默认排序属性")
private String elementAttrId;
diff --git a/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfElementGrid.java b/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfElementGrid.java
index c80b7d9..69d0ca8 100644
--- a/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfElementGrid.java
+++ b/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfElementGrid.java
@@ -52,12 +52,8 @@ public class BfElementGrid extends BaseBean {
@ApiParam(value = "是否删除")
private Integer isObjectDel;
- @Column(name = "ELEMENT_TYPE")
- @ApiParam(value = "是否查询")
- private Integer elementType;
-
@Column(name = "IS_OBJECT_FIND")
- @ApiParam(value = "元素类型")
+ @ApiParam(value = "是否查询")
private Integer isObjectFind;
}
diff --git a/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfElementProperty.java b/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfElementProperty.java
index 94dfe6d..1b33377 100644
--- a/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfElementProperty.java
+++ b/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfElementProperty.java
@@ -47,6 +47,14 @@ public class BfElementProperty extends BaseBean {
@JsonSerialize(using = ToStringSerializer.class)
private Long dataObjectPropertyId;
+ @Column(name="PROPERTY_TYPE")
+ @ApiParam(value ="属性类型")
+ private Integer propertyType;
+
+ @Column(name="PROPERTY_TYPE_NAME_RDD")
+ @ApiParam(value ="属性类型名称")
+ private String propertyTypeNameRdd;
+
@Column(name="PROPERTY_NAME")
@ApiParam(value ="元素描述")
private String propertyName;
diff --git a/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfElementPropertyVirtual.java b/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfElementPropertyVirtual.java
index 00e71ce..cd877fa 100644
--- a/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfElementPropertyVirtual.java
+++ b/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfElementPropertyVirtual.java
@@ -60,6 +60,11 @@ public class BfElementPropertyVirtual extends BaseBean {
@Transient
@ApiParam(value = "虚拟属性列表")
- @AnnoOutputColumn(hidden = true)
- private List detailList;
+ private List propertyList;
+
+ @Transient
+ @ApiParam(value = "虚拟属性ID列表")
+ @JsonSerialize(using = ToStringSerializer.class)
+ private List propertyIdList;
+
}
diff --git a/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfElementTree.java b/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfElementTree.java
index bb7beda..8883376 100644
--- a/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfElementTree.java
+++ b/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfElementTree.java
@@ -13,6 +13,7 @@ import org.hibernate.annotations.DynamicUpdate;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Table;
+import javax.persistence.Transient;
/**
* @Description :
@@ -38,15 +39,18 @@ public class BfElementTree extends BaseBean {
@Column(name = "TREE_PARENT_ID")
@ApiParam(value = "父级属性ID")
- private Integer treeParentId;
+ @JsonSerialize(using = ToStringSerializer.class)
+ private Long treeParentId;
@Column(name = "TREE_ATTR_NAME_ID")
@ApiParam(value = "显示属性ID")
- private Integer treeAttrNameId;
+ @JsonSerialize(using = ToStringSerializer.class)
+ private Long treeAttrNameId;
@Column(name = "TREE_ATTR_VALUE_ID")
@ApiParam(value = "取值属性ID")
- private Integer treeAttrValueId;
+ @JsonSerialize(using = ToStringSerializer.class)
+ private Long treeAttrValueId;
@Column(name="TREE_DEFAULT_DIRECTION")
@ApiParam(value ="树默认方向")
@@ -55,4 +59,16 @@ public class BfElementTree extends BaseBean {
@Column(name = "TREE_IS_DIRECTION")
@ApiParam(value = "树是否开启切换方向")
private Integer treeIsDirection;
+
+ @Transient
+ @ApiParam(value = "父级属性")
+ private String treeParentIdStr;
+
+ @Transient
+ @ApiParam(value = "显示属性")
+ private String treeAttrNameIdStr;
+
+ @Transient
+ @ApiParam(value = "取值属性")
+ private String treeAttrValueIdStr;
}
diff --git a/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfIntercept.java b/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfIntercept.java
index 6004684..4803300 100644
--- a/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfIntercept.java
+++ b/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfIntercept.java
@@ -1,6 +1,8 @@
package cn.estsh.i3plus.pojo.form.bean;
import cn.estsh.i3plus.pojo.base.bean.BaseBean;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiParam;
import lombok.Data;
@@ -34,9 +36,11 @@ public class BfIntercept extends BaseBean {
@Column(name="EXECUTE_MODE")
@ApiParam(value ="执行方式")
+ @JsonSerialize(using = ToStringSerializer.class)
private Integer executeMode;
@Column(name="EXECUTE_CONTENT")
@ApiParam(value ="执行内容")
+ @JsonSerialize(using = ToStringSerializer.class)
private Integer executeContent;
}
diff --git a/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfInterceptDetail.java b/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfInterceptDetail.java
index a2a3741..37bbade 100644
--- a/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfInterceptDetail.java
+++ b/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfInterceptDetail.java
@@ -1,6 +1,8 @@
package cn.estsh.i3plus.pojo.form.bean;
import cn.estsh.i3plus.pojo.base.bean.BaseBean;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiParam;
import lombok.Data;
@@ -30,6 +32,7 @@ public class BfInterceptDetail extends BaseBean {
@Column(name="INTERCEPT_ID")
@ApiParam(value ="拦截器id")
+ @JsonSerialize(using = ToStringSerializer.class)
private Long interceptId;
@Column(name="INTERCEPT_NAME_RDD")
@@ -46,6 +49,7 @@ public class BfInterceptDetail extends BaseBean {
@Column(name="INTERCEPT_TARGET_ID")
@ApiParam(value ="拦截目标id")
+ @JsonSerialize(using = ToStringSerializer.class)
private Long interceptTargetId;
@Column(name="INTERCEPT_TARGET_NAME_RDD")
diff --git a/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfMenu.java b/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfMenu.java
index 81e5d14..054e5cd 100644
--- a/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfMenu.java
+++ b/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfMenu.java
@@ -1,6 +1,8 @@
package cn.estsh.i3plus.pojo.form.bean;
import cn.estsh.i3plus.pojo.base.bean.BaseBean;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiParam;
import lombok.Data;
@@ -34,6 +36,7 @@ public class BfMenu extends BaseBean {
@Column(name="PARENT_ID")
@ApiParam(value ="父级菜单id")
+ @JsonSerialize(using = ToStringSerializer.class)
private Long parentId;
@Column(name="PARENT_NAME_RDD")
@@ -62,6 +65,7 @@ public class BfMenu extends BaseBean {
@Column(name="METHOD_ID")
@ApiParam(value ="功能id")
+ @JsonSerialize(using = ToStringSerializer.class)
private Long methodId;
@Column(name = "MENU_STATUS")
diff --git a/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfMethod.java b/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfMethod.java
index a03d889..e88a130 100644
--- a/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfMethod.java
+++ b/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfMethod.java
@@ -1,6 +1,8 @@
package cn.estsh.i3plus.pojo.form.bean;
import cn.estsh.i3plus.pojo.base.bean.BaseBean;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiParam;
import lombok.Data;
@@ -34,6 +36,7 @@ public class BfMethod extends BaseBean {
@Column(name="LAYOUT_ID")
@ApiParam(value ="布局id")
+ @JsonSerialize(using = ToStringSerializer.class)
private Long layoutId;
@Column(name="LAYOUT_NAME_RDD")
diff --git a/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfMethodDetail.java b/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfMethodDetail.java
index b590a94..41bd85a 100644
--- a/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfMethodDetail.java
+++ b/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfMethodDetail.java
@@ -1,6 +1,8 @@
package cn.estsh.i3plus.pojo.form.bean;
import cn.estsh.i3plus.pojo.base.bean.BaseBean;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiParam;
import lombok.Data;
@@ -30,10 +32,12 @@ public class BfMethodDetail extends BaseBean {
@Column(name="METHOD_ID")
@ApiParam(value ="功能id")
+ @JsonSerialize(using = ToStringSerializer.class)
private Long methodId;
@Column(name="layout_column_id")
@ApiParam(value ="布局列id")
+ @JsonSerialize(using = ToStringSerializer.class)
private Long layoutColumnId;
@Column(name="METHOD_DETAIL_NAME")
@@ -42,6 +46,7 @@ public class BfMethodDetail extends BaseBean {
@Column(name="ELEMENT_ID")
@ApiParam(value ="表单元素id")
+ @JsonSerialize(using = ToStringSerializer.class)
private Long elementId;
@Column(name="ELEMENT_NAME_RDD")
diff --git a/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfMethodDetailProperty.java b/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfMethodDetailProperty.java
index f36a739..d73b51f 100644
--- a/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfMethodDetailProperty.java
+++ b/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfMethodDetailProperty.java
@@ -1,6 +1,8 @@
package cn.estsh.i3plus.pojo.form.bean;
import cn.estsh.i3plus.pojo.base.bean.BaseBean;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiParam;
import lombok.Data;
@@ -24,17 +26,19 @@ import javax.persistence.Table;
@DynamicInsert
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
-@Table(name="BR_METHOD_DETAIL_PROPERTY")
+@Table(name="BF_METHOD_DETAIL_PROPERTY")
@Api(value="表单功能明细关联属性",description = "表单功能明细关联属性")
public class BfMethodDetailProperty extends BaseBean {
@Column(name="METHOD_ID")
@ApiParam(value ="功能id")
+ @JsonSerialize(using = ToStringSerializer.class)
private Long methodId;
// 关联功能明细表id
@Column(name="PRI_METHOD_DETAIL_ID")
@ApiParam(value ="主功能明细id")
+ @JsonSerialize(using = ToStringSerializer.class)
private Long priMethodDetailId;
@Column(name="PRI_METHOD_DETAIL_NAME_RDD")
@@ -43,6 +47,7 @@ public class BfMethodDetailProperty extends BaseBean {
@Column(name="PRI_ELEMENT_ID")
@ApiParam(value ="主对象元素id")
+ @JsonSerialize(using = ToStringSerializer.class)
private Long priElementId;
@Column(name="PRI_ELEMENT_NAME_RDD")
@@ -61,6 +66,7 @@ public class BfMethodDetailProperty extends BaseBean {
@Column(name="SEC_METHOD_DETAIL_ID")
@ApiParam(value ="关联功能明细id")
+ @JsonSerialize(using = ToStringSerializer.class)
private Long secMethodDetailId;
@Column(name="SEC_METHOD_DETAIL_NAME_RDD")
@@ -69,6 +75,7 @@ public class BfMethodDetailProperty extends BaseBean {
@Column(name="SEC_ELEMENT_ID")
@ApiParam(value ="关联对象元素id")
+ @JsonSerialize(using = ToStringSerializer.class)
private Long secElementId;
@Column(name="sec_element_name_rdd")
diff --git a/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfRefButtonMethod.java b/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfRefButtonMethod.java
index 65edec8..dd5388c 100644
--- a/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfRefButtonMethod.java
+++ b/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfRefButtonMethod.java
@@ -1,6 +1,8 @@
package cn.estsh.i3plus.pojo.form.bean;
import cn.estsh.i3plus.pojo.base.bean.BaseBean;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiParam;
import lombok.Data;
@@ -30,6 +32,7 @@ public class BfRefButtonMethod extends BaseBean {
@Column(name="BUTTON_ID")
@ApiParam(value ="按钮id")
+ @JsonSerialize(using = ToStringSerializer.class)
private Long buttonId;
@Column(name="BUTTON_NAME_RDD")
diff --git a/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfRefMethodRole.java b/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfRefMethodRole.java
index 4dbf270..d41e560 100644
--- a/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfRefMethodRole.java
+++ b/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfRefMethodRole.java
@@ -1,6 +1,8 @@
package cn.estsh.i3plus.pojo.form.bean;
import cn.estsh.i3plus.pojo.base.bean.BaseBean;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiParam;
import lombok.Data;
@@ -30,6 +32,7 @@ public class BfRefMethodRole extends BaseBean {
@Column(name="METHOD_ID")
@ApiParam(value ="表单功能id")
+ @JsonSerialize(using = ToStringSerializer.class)
private Long methodId;
@Column(name="METHOD_NAME_RDD")
@@ -38,6 +41,7 @@ public class BfRefMethodRole extends BaseBean {
@Column(name="ROLE_ID")
@ApiParam(value ="角色id")
+ @JsonSerialize(using = ToStringSerializer.class)
private Long roleId;
@Column(name="ROLE_NAME_RDD")
diff --git a/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/sqlpack/FormHqlPack.java b/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/sqlpack/FormHqlPack.java
index 21c8c2a..6fdcbef 100644
--- a/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/sqlpack/FormHqlPack.java
+++ b/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/sqlpack/FormHqlPack.java
@@ -1,10 +1,7 @@
package cn.estsh.i3plus.pojo.form.sqlpack;
import cn.estsh.i3plus.pojo.base.tool.HqlPack;
-import cn.estsh.i3plus.pojo.form.bean.BfLayout;
-import cn.estsh.i3plus.pojo.form.bean.BfLayoutRow;
-import cn.estsh.i3plus.pojo.form.bean.BfMenu;
-import cn.estsh.i3plus.pojo.form.bean.BfMethod;
+import cn.estsh.i3plus.pojo.form.bean.*;
import org.apache.commons.lang3.StringUtils;
/**
@@ -63,32 +60,31 @@ public final class FormHqlPack {
/**
* 根据表单布局查询表单布局行
- * @param bfLayout 表单布局
+ * @param bfLayoutRow 表单布局
* @return hql
*/
- public static String packHqlBfLayoutRowByBfLayout(BfLayout bfLayout) {
+ public static String packHqlBfLayoutRow(BfLayoutRow bfLayoutRow) {
StringBuffer result = new StringBuffer();
- HqlPack.getNumEqualPack(bfLayout.getId(), "layoutId", result);
- HqlPack.getNumEqualPack(bfLayout.getIsDeleted(), "isDeleted", result);
+ HqlPack.getNumEqualPack(bfLayoutRow.getLayoutId(), "layoutId", result);
+ HqlPack.getNumEqualPack(bfLayoutRow.getIsDeleted(), "isDeleted", result);
- result.append(bfLayout.orderBy());
+ result.append(bfLayoutRow.orderBy());
return result.toString();
}
/**
* 根据表单布局行查询表单布局列
- * @param bfLayoutRow 表单布局行
+ * @param bfLayoutColumn 表单布局行
* @return hql
*/
- public static String packHqlBfLayoutColumnByBfLayoutRow(BfLayoutRow bfLayoutRow) {
+ public static String packHqlBfLayoutColumn(BfLayoutColumn bfLayoutColumn) {
StringBuffer result = new StringBuffer();
- HqlPack.getNumEqualPack(bfLayoutRow.getLayoutId(), "layoutId", result);
- HqlPack.getNumEqualPack(bfLayoutRow.getId(), "layoutRowId", result);
- HqlPack.getNumEqualPack(bfLayoutRow.getIsDeleted(), "isDeleted", result);
+ HqlPack.getNumEqualPack(bfLayoutColumn.getLayoutRowId(), "layoutRowId", result);
+ HqlPack.getNumEqualPack(bfLayoutColumn.getIsDeleted(), "isDeleted", result);
- result.append(bfLayoutRow.orderBy());
+ result.append(bfLayoutColumn.orderBy());
return result.toString();
}
@@ -103,6 +99,7 @@ public final class FormHqlPack {
HqlPack.getStringLikerPack(bfMenu.getMenuName(), "menuName", result);
HqlPack.getNumEqualPack(bfMenu.getParentId(), "parentId", result);
HqlPack.getNumEqualPack(bfMenu.getIsDeleted(), "isDeleted", result);
+ result.append(bfMenu.orderBy());
return result.toString();
}
@@ -118,6 +115,23 @@ public final class FormHqlPack {
HqlPack.getStringLikerPack(bfMethod.getMethodName(), "methodName", result);
HqlPack.getNumEqualPack(bfMethod.getLayoutId(), "layoutId", result);
HqlPack.getNumEqualPack(bfMethod.getIsDeleted(), "isDeleted", result);
+ result.append(bfMethod.orderBy());
+
+ return result.toString();
+ }
+
+ /**
+ * 表单拦截器复杂查询
+ * @param bfIntercept 查询条件
+ * @return hql
+ */
+ public static String packHqlBfIntercept(BfIntercept bfIntercept) {
+ StringBuffer result = new StringBuffer();
+
+ HqlPack.getStringLikerPack(bfIntercept.getInterceptName(), "interceptName", result);
+ HqlPack.getNumEqualPack(bfIntercept.getExecuteMode(), "executeMode", result);
+ HqlPack.getNumEqualPack(bfIntercept.getIsDeleted(), "isDeleted", result);
+ result.append(bfIntercept.orderBy());
return result.toString();
}
diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/form/ElementModel.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/form/ElementModel.java
new file mode 100644
index 0000000..b87214e
--- /dev/null
+++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/form/ElementModel.java
@@ -0,0 +1,40 @@
+package cn.estsh.i3plus.pojo.model.form;
+
+import cn.estsh.i3plus.pojo.form.bean.*;
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * @Description : 元素Model
+ * @Reference : 元素整体封装
+ * @Author : Adair Peng
+ * @CreateDate : 2019-03-21 13:14
+ * @Modify:
+ **/
+@Data
+public class ElementModel{
+
+ @ApiParam(value = "元素基础信息")
+ private BfElement element;
+
+ @ApiParam(value = "元素Tree信息")
+ private BfElementTree elementTree;
+
+ @ApiParam(value = "元素Grid信息")
+ private BfElementGrid elementGrid;
+
+ @ApiParam(value = "元素基础属性信息")
+ private List propertyList;
+
+ @ApiParam(value = "元素基础虚拟属性信息")
+ private List virtualList;
+
+ @ApiParam(value = "数据对象信息")
+ private BfDataObject dataObject;
+
+ @ApiParam(value = "元素类型")
+ private Integer elementType;
+
+}
diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/MailConfig.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/MailConfig.java
index ba018d1..6581078 100644
--- a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/MailConfig.java
+++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/MailConfig.java
@@ -7,7 +7,7 @@ import lombok.Data;
* @Description : 邮件配置信息
* @Reference :
* @Author : yunhao
- * @CreateDate : 2019-01-27 10:53
+ * @CreateDate : 2019-01-27 10:54
* @Modify:
**/
@Data
diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysTaskPlan.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysTaskPlan.java
index beecd61..e70a097 100644
--- a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysTaskPlan.java
+++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysTaskPlan.java
@@ -57,6 +57,14 @@ public class SysTaskPlan extends BaseBean {
@ApiParam(value ="定时任务运行次数" , example ="0")
private Integer taskPlanExecNum;
+ public int getTaskPlanExecNumValue(){
+ if(taskPlanExecNum == null){
+ return 0;
+ }else{
+ return taskPlanExecNum.intValue();
+ }
+ }
+
// 枚举 ImppEnumUtil.TASK_METHOD_TYPE.CLASS_METHOD
@Column(name="TASK_METHOD_TYPE")
@ApiParam(value ="任务执行类型" ,example = "-1")
diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSFactTrans.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSFactTrans.java
index 9186610..719f50e 100644
--- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSFactTrans.java
+++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSFactTrans.java
@@ -29,6 +29,17 @@ import javax.persistence.Table;
@Api("盘点实盘信息")
public class WmsCSFactTrans extends BaseBean {
+ public WmsCSFactTrans(){}
+
+ public WmsCSFactTrans(Double factQty, String partNo){
+ if(factQty == null) {
+ this.factQty = 0d;
+ }else{
+ this.factQty = factQty;
+ }
+ this.partNo = partNo;
+ }
+
@Column(name="ORDER_NO")
@ApiParam("单号")
public String orderNo;
@@ -81,11 +92,4 @@ public class WmsCSFactTrans extends BaseBean {
@Column(name="REMARK")
@ApiParam(value = "备注")
public String reMark;
-
- public WmsCSFactTrans(){}
-
- public WmsCSFactTrans(double factQty, String partNo){
- this.factQty = factQty;
- this.partNo = partNo;
- }
}
diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSOrderDetails.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSOrderDetails.java
index 1fc9743..f1c8cf5 100644
--- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSOrderDetails.java
+++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSOrderDetails.java
@@ -95,11 +95,12 @@ public class WmsCSOrderDetails extends BaseBean {
@ApiParam(value = "处理状态", example = "1")
public Integer transStatus;
- //虚拟字段（实盘数量、剩余数量）
@Transient
+ @ApiParam(value = "实盘数量", example = "1")
public Double factQty;
@Transient
+ @ApiParam(value = "剩余数量", example = "1")
public Double surplusQty;
public Double getQty() {
@@ -108,8 +109,24 @@ public class WmsCSOrderDetails extends BaseBean {
public WmsCSOrderDetails(){}
- public WmsCSOrderDetails(double qty, String partNo){
+ public WmsCSOrderDetails(Double qty, String partNo,String orderNo,String whNo,String zoneNo,String locateNo,String partName){
this.qty = qty;
this.partNo = partNo;
+ this.orderNo = orderNo;
+ this.whNo = whNo;
+ this.zoneNo = zoneNo;
+ this.locateNo = locateNo;
+ this.partNameRdd = partName;
+ }
+
+ public WmsCSOrderDetails(Double qty, String partNo,String orderNo,String whNo,String zoneNo,String locateNo,String partName,String sn){
+ this.qty = qty;
+ this.partNo = partNo;
+ this.orderNo = orderNo;
+ this.whNo = whNo;
+ this.zoneNo = zoneNo;
+ this.locateNo = locateNo;
+ this.partNameRdd = partName;
+ this.sn = sn;
}
}
diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementMaster.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementMaster.java
index 56da324..816f364 100644
--- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementMaster.java
+++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementMaster.java
@@ -120,12 +120,4 @@ public class WmsDocMovementMaster extends BaseBean {
@Transient
@ApiParam(value = "打印时间")
private String printDate;
-
- @Transient
- @ApiParam(value = "发货人")
- private String sendUser;
-
- @Transient
- @ApiParam(value = "发货日期")
- private String sendDate;
}
diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockSn.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockSn.java
index 234adad..09e3519 100644
--- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockSn.java
+++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockSn.java
@@ -166,6 +166,10 @@ public class WmsStockSn extends BaseBean {
@Transient
public String barCode;
+ @ApiParam(value = "散件质检输入不良数量")
+ @Transient
+ public Double inputNCQty;
+
public WmsStockSn(){}
public WmsStockSn(String partNo){
diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTaskInfo.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTaskInfo.java
index 24b41f8..20b4193 100644
--- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTaskInfo.java
+++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTaskInfo.java
@@ -12,6 +12,7 @@ import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Table;
import javax.persistence.Transient;
+import java.util.List;
/**
* @Description : 作业任务表信息
@@ -72,4 +73,8 @@ public class WmsTaskInfo extends BaseBean {
@Transient
public String opTypeName;
+ @ApiParam("作业任务明细")
+ @Transient
+ public List taskDetailsList;
+
}
diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/rules/WmsSNCheckRule.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/engine/rule/WmsSNCheckRule.java
similarity index 96%
rename from modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/rules/WmsSNCheckRule.java
rename to modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/engine/rule/WmsSNCheckRule.java
index 7ddb183..3abbe1d 100644
--- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/rules/WmsSNCheckRule.java
+++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/engine/rule/WmsSNCheckRule.java
@@ -1,4 +1,4 @@
-package cn.estsh.i3plus.pojo.wms.rules;
+package cn.estsh.i3plus.pojo.wms.engine.rule;
/**
* @Description : 纯POJO，WMS PDA 操作前的条码状态检查
diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/rules/WmsSNNextStatusRule.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/engine/rule/WmsSNNextStatusRule.java
similarity index 96%
rename from modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/rules/WmsSNNextStatusRule.java
rename to modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/engine/rule/WmsSNNextStatusRule.java
index cec3ca8..1f74f53 100644
--- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/rules/WmsSNNextStatusRule.java
+++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/engine/rule/WmsSNNextStatusRule.java
@@ -1,4 +1,4 @@
-package cn.estsh.i3plus.pojo.wms.rules;
+package cn.estsh.i3plus.pojo.wms.engine.rule;
/**
* @Description : 纯POJO，WMS 获取条码下一步的状态
@@ -17,7 +17,7 @@ public class WmsSNNextStatusRule {
private boolean oneStep;
// 免检
private boolean skipQC;
- // 自动入库
+ // 自动入库t
private boolean defaultInStock;
// 原条码状态
private int srcSNStatusCode;
diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/engine/script/EngineScriptPersistence.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/engine/script/EngineScriptPersistence.java
new file mode 100644
index 0000000..7e498d3
--- /dev/null
+++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/engine/script/EngineScriptPersistence.java
@@ -0,0 +1,63 @@
+package cn.estsh.i3plus.pojo.wms.engine.script;
+
+import cn.estsh.i3plus.pojo.base.bean.BaseBean;
+import io.swagger.annotations.Api;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.hibernate.annotations.DynamicInsert;
+import org.hibernate.annotations.DynamicUpdate;
+
+import javax.persistence.*;
+import javax.script.CompiledScript;
+
+/**
+ * 脚本持久化实体类
+ *
+ * @author Rock.Yu
+ * @since 2019-03-18 14:22
+ */
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Table(name = "SCRIPT_PERSISTENCE")
+@Api("系统动态脚本")
+public class EngineScriptPersistence extends BaseBean {
+ // 脚本调用的唯一编号，例如：WMS_PDA_0001
+ @Column(name = "SCRIPT_NO", length = 50)
+ private String scriptNo;
+ // 脚本的中文名称
+ @Column(name = "SCRIPT_NAME", length = 50)
+ private String scriptName;
+ // 10=组件脚本，20=表单脚本，30=报表脚本，40=JOB脚本，50=其他脚本
+ @Column(name = "SCRIPT_TYPE")
+ private int scriptType;
+ // 脚本编写的语言
+ // 10=Groovy, 20=Jython, 30=JavaScript, 40=Scala, 50=JRuby
+ @Column(name = "LANGUAGE_TYPE")
+ private int languageType;
+ // 脚本的具体内容
+ @Column(name = "SCRIPT_CONTENT", columnDefinition = "TEXT")
+ private String scriptContent;
+ // 脚本的描述，包含脚本的用法，参数说明等
+ @Column(name = "SCRIPT_REMARK", length = 2000)
+ private String scriptRemark;
+ // 编译后的脚本内容，通过预编译加快脚本的运行速度
+ @Transient
+ private CompiledScript compiledScript;
+
+ public EngineScriptPersistence() {}
+
+ // 构造方法，便于批量创建数据
+ public EngineScriptPersistence(long id, String scriptNo, String scriptName, int scriptType, int languageType,
+ String scriptContent, String scriptRemark) {
+ this.id = id;
+ this.scriptNo = scriptNo;
+ this.scriptName = scriptName;
+ this.scriptType = scriptType;
+ this.languageType = languageType;
+ this.scriptContent = scriptContent;
+ this.scriptRemark = scriptRemark;
+ }
+}
diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/IEngineScriptPersistenceDao.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/IEngineScriptPersistenceDao.java
new file mode 100644
index 0000000..a44d246
--- /dev/null
+++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/IEngineScriptPersistenceDao.java
@@ -0,0 +1,16 @@
+package cn.estsh.i3plus.pojo.wms.repository;
+
+import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
+import cn.estsh.i3plus.pojo.wms.engine.script.EngineScriptPersistence;
+import org.springframework.data.jpa.repository.Query;
+import org.springframework.stereotype.Repository;
+
+import java.util.List;
+
+@Repository
+public interface IEngineScriptPersistenceDao extends BaseRepository {
+ EngineScriptPersistence findByScriptNo(String scriptNo);
+
+ @Query("select t.languageType from EngineScriptPersistence t group by t.languageType")
+ List findGroupByLanguageType();
+}
diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java
index 0adc360..e74178b 100644
--- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java
+++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java
@@ -747,6 +747,7 @@ public class WmsHqlPack {
HqlPack.getStringEqualPack(wmsCSPart.getOrderNo(), "orderNo", result);
HqlPack.getStringEqualPack(wmsCSPart.getPartNo(), "partNo", result);
+ HqlPack.getNumEqualPack(wmsCSPart.getIsAdjust(), "isAdjust", result);
HqlPack.getStringLikerPack(wmsCSPart.getPartNameRdd(), "partNameRdd", result);
getStringBuilderPack(wmsCSPart, result);
@@ -1021,6 +1022,35 @@ public class WmsHqlPack {
}
/**
+ * 散件质检单信息 查询条件封装
+ *
+ * @param wmsQCMaster
+ * @return
+ */
+ public static String packHqlWmsQCMasterPart(WmsQCMaster wmsQCMaster) {
+ StringBuffer result = new StringBuffer();
+
+ //查询参数封装
+ HqlPack.getInPack(String.join(",", WmsEnumUtil.QC_INFO_STATUS.CREATE.getValue() + "",
+ WmsEnumUtil.QC_INFO_STATUS.FINISH.getValue() + ""),"orderStatus",result);
+ HqlPack.getNumEqualPack(wmsQCMaster.getIsPart(),"isPart",result);
+ //单号
+ HqlPack.getStringEqualPack(wmsQCMaster.getOrderNo(), "orderNo", result);
+ //业务类型
+ HqlPack.getNumEqualPack(wmsQCMaster.getOrderType(), "orderType", result);
+ //关联单据类型
+ HqlPack.getStringEqualPack(wmsQCMaster.getRefType(), "refType", result);
+ //关联单据号
+ HqlPack.getStringEqualPack(wmsQCMaster.getRefSrc(), "refSrc", result);
+ //入库单号
+ HqlPack.getStringEqualPack(wmsQCMaster.getIbNo(), "ibNo", result);
+
+ getStringBuilderPack(wmsQCMaster, result);
+
+ return result.toString();
+ }
+
+ /**
* 质检单明细信息 查询条件封装
*
* @param wmsQCDetails
@@ -1103,6 +1133,7 @@ public class WmsHqlPack {
//查询参数封装
HqlPack.getStringEqualPack(wmsCSFactTrans.getOrderNo(), "orderNo", result);
+ HqlPack.getStringEqualPack(wmsCSFactTrans.getPartNo(), "partNo", result);
getStringBuilderPack(wmsCSFactTrans, result);