I3_YF_SEAT
/
i3plus-pojo
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source
yun-zuoyi
alwaysfrin 6 years ago
parent 4f0e3756df 9297c1f8fa
commit 97e0889971
53 changed files with 1591 additions and 213 deletions
Show Stats Download Patch File Download Diff File

151
modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/BlockFormEnumUtil.java
Unescape Escape View File

@ -1,9 +1,6 @@
package cn.estsh.i3plus.pojo.base.enumutil;
import com.fasterxml.jackson.annotation.JsonFormat;
import javafx.scene.chart.Chart;
import java.util.Date;
/**
* @Description : 模块表单枚举类
@ -501,6 +498,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 +967,57 @@ public class BlockFormEnumUtil {
}
/**
* 属性类型信息
* 属性类型信息(属性转换器)
* <per>
* <br/> Form 核心转换器
* <br/> 数据库字段类型转换Java 属性类型
* <br/> Java 属性 转换为控件类型
* </per>
*/
@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 +1052,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++) {
@ -1456,9 +1569,9 @@ public class BlockFormEnumUtil {
* 表单功能明细 触发效果信息
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum TRIGGER_EFFECT {
public enum BUTTON_TRIGGER_EFFECT {
DIALOG(10, "DIALOG", "弹出窗口"),
WINDOW_NEW(20, "NEW_WINDOW", "新开窗口"),
NEW_WINDOW(20, "NEW_WINDOW", "新开窗口"),
SQL(30, "SQL", "执行SQL"),
CLASS_METHOD(40, "CLASS_METHOD", "执行类方法");
@ -1466,7 +1579,7 @@ public class BlockFormEnumUtil {
private String name;
private String description;
TRIGGER_EFFECT(int value, String name, String description) {
BUTTON_TRIGGER_EFFECT(int value, String name, String description) {
this.value = value;
this.name = name;
this.description = description;
@ -1484,7 +1597,7 @@ public class BlockFormEnumUtil {
return name;
}
public static TRIGGER_EFFECT valueOf(int val) {
public static BUTTON_TRIGGER_EFFECT valueOf(int val) {
for (int i = 0; i < values().length; i++) {
if (values()[i].value == val) {
return values()[i];

90
modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java
Unescape Escape View File

@ -80,7 +80,6 @@ public class WmsEnumUtil {
}
/**
* 主表信息 单据类型
*/
@ -584,60 +583,37 @@ public class WmsEnumUtil {
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum LINK_ORDER_TYPE {
ASN(10, "ASN", "ASN"),
PO(20, "PO", "PO"),
SO(30, "SO", "SO"),
MOVE(40, "MOVE", "MOVE"),
IN_STOCK(50, "IN_STOCK", "IN_STOCK"),
SHIPPING(60, "SHIPPING", "SHIPPING"),
QC(70, "QC", "QC"),
CS(80, "CS", "CS");
private int value;
private String code;
ASN("ASN", "ASN"),
PO("PO", "PO"),
SO("SO", "SO"),
MOVE("MOVE", "MOVE"),
IN_STOCK("IN_STOCK", "IN_STOCK"),
SHIPPING("SHIPPING", "SHIPPING"),
QC("QC", "QC"),
CS("CS", "CS");
private String value;
private String description;
LINK_ORDER_TYPE(int value, String code, String description) {
LINK_ORDER_TYPE(String value, String description) {
this.value = value;
this.code = code;
this.description = description;
}
public int getValue() {
return value;
}
public String getDescription() {
return description;
}
public String getCode() {
return code;
}
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;
return value;
}
public static int descOf(String desc) {
int tmp = 1;
for (int i = 0; i < values().length; i++) {
if (values()[i].description.equals(desc)) {
tmp = values()[i].value;
}
}
return tmp;
public String getValue() {
return value;
}
public static LINK_ORDER_TYPE codeOf(String code) {
int tmp = 1;
public static LINK_ORDER_TYPE codeOf(String value) {
for (int i = 0; i < values().length; i++) {
if (values()[i].code.equals(code)) {
if (values()[i].value.equals(value)) {
return values()[i];
}
}
@ -720,7 +696,7 @@ public class WmsEnumUtil {
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum STOCK_SN_STATUS {
CREATE(10,"创建"),
CREATE(10, "创建"),
QUALITY_CONTROL(20, "质检中"),
PRE_INSTOCK(30, "待入库"),
INSTOCKED(40, "入库"),
@ -1987,4 +1963,38 @@ public class WmsEnumUtil {
return tmp;
}
}
/**
* 单据是否散件
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum IS_PART {
IS_ADJUST(1, "散件"), ADJUST(2, "非散件");
private int value;
private String description;
IS_PART(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;
}
}
}

35
modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfButton.java
Unescape Escape View File

@ -9,7 +9,6 @@ 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;
@ -26,31 +25,39 @@ import javax.persistence.Table;
@DynamicInsert
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
@Table(name="BF_BUTTON")
@Api(value="表单按钮",description = "表单按钮")
@Table(name = "BF_BUTTON")
@Api(value = "表单按钮", description = "表单按钮")
public class BfButton extends BaseBean {
@Column(name="BUTTON_NAME")
@ApiParam(value ="按钮名称")
@Column(name = "BUTTON_NAME")
@ApiParam(value = "按钮名称")
private String buttonName;
// 枚举:BlockFormEnumUtil.TRIGGER_EFFECT
@Column(name="TRIGGER_MODE")
@ApiParam(value ="触发方式")
// 枚举:BlockFormEnumUtil.BUTTON_TRIGGER_EFFECT
@Column(name = "TRIGGER_MODE")
@ApiParam(value = "触发方式")
private Integer triggerMode;
public Integer getTriggerMode() {
if (triggerMode == null) {
return null;
} else {
return triggerMode.intValue();
}
}
// 关联表单功能表id
@Column(name="METHOD_ID")
@ApiParam(value ="表单功能id")
@Column(name = "METHOD_ID")
@ApiParam(value = "表单功能id")
@JsonSerialize(using = ToStringSerializer.class)
private Long methodId;
@Column(name="METHOD_NAME_RDD")
@ApiParam(value ="表单功能名称")
@Column(name = "METHOD_NAME_RDD")
@ApiParam(value = "表单功能名称")
private String methodNameRdd;
// 执行类方法,sql,脚本
@Column(name="METHOD_CONTENT")
@ApiParam(value ="执行内容")
@Column(name = "METHOD_CONTENT")
@ApiParam(value = "执行内容")
private String methodContent;
}

8
modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfCascadeDetail.java
Unescape Escape View File

@ -33,13 +33,17 @@ public class BfCascadeDetail extends BaseBean {
@Column(name = "CASCADE_ID")
@ApiParam(value = "级联ID", example = "-1")
@JsonSerialize(using = ToStringSerializer.class)
private Long cascade_id;
private Long cascadeId;
@Column(name = "ELEMENT_ID")
@ApiParam(value = "对象元素ID", example = "-1")
@JsonSerialize(using = ToStringSerializer.class)
private Long elementId;
@Column(name = "DETAIL_LABEL_TEXT")
@ApiParam(value = "提示信息")
private String detailLabelText;
@Column(name="ELEMENT_NAME")
@ApiParam(value ="元素名称")
private String elementName;
@ -51,7 +55,7 @@ public class BfCascadeDetail extends BaseBean {
@Column(name = "PARENT_ID")
@ApiParam(value = "父级ID", example = "-1")
@JsonSerialize(using = ToStringSerializer.class)
private Long parent_id;
private Long parentId;
@Column(name = "ELEMENT_PROPERTY_VALUE_ID")
@ApiParam(value = "对象属性-元素属性ID", example = "-1")

4
modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfElement.java
Unescape Escape View File

@ -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;

8
modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfElementGrid.java
Unescape Escape View File

@ -46,18 +46,14 @@ public class BfElementGrid extends BaseBean {
@Column(name = "IS_OBJECT_EDIT")
@ApiParam(value = "是否编辑")
private Integer isObject_edit;
private Integer isObjectEdit;
@Column(name = "IS_OBJECT_DEL")
@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;
}

8
modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfElementProperty.java
Unescape Escape View File

@ -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;

9
modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfElementPropertyVirtual.java
Unescape Escape View File

@ -60,6 +60,11 @@ public class BfElementPropertyVirtual extends BaseBean {
@Transient
@ApiParam(value = "虚拟属性列表")
@AnnoOutputColumn(hidden = true)
private List<BfCascadeDetail> detailList;
private List<BfElementProperty> propertyList;
@Transient
@ApiParam(value = "虚拟属性ID列表")
@JsonSerialize(using = ToStringSerializer.class)
private List<Long> propertyIdList;
}

22
modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfElementTree.java
Unescape Escape View File

@ -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;
}

2
modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfMethodDetailProperty.java
Unescape Escape View File

@ -26,7 +26,7 @@ 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 {

21
modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfRefMethodRole.java
Unescape Escape View File

@ -9,7 +9,6 @@ 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;
@ -26,26 +25,26 @@ import javax.persistence.Table;
@DynamicInsert
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
@Table(name="BF_REF_METHOD_ROLE")
@Api(value="功能角色关系",description = "功能角色关系")
@Table(name = "BF_REF_METHOD_ROLE")
@Api(value = "功能角色关系", description = "功能角色关系")
public class BfRefMethodRole extends BaseBean {
@Column(name="METHOD_ID")
@ApiParam(value ="表单功能id")
@Column(name = "METHOD_ID")
@ApiParam(value = "表单功能id")
@JsonSerialize(using = ToStringSerializer.class)
private Long methodId;
@Column(name="METHOD_NAME_RDD")
@ApiParam(value ="表单功能名称")
@Column(name = "METHOD_NAME_RDD")
@ApiParam(value = "表单功能名称")
private String methodNameRdd;
@Column(name="ROLE_ID")
@ApiParam(value ="角色id")
@Column(name = "ROLE_ID")
@ApiParam(value = "角色id")
@JsonSerialize(using = ToStringSerializer.class)
private Long roleId;
@Column(name="ROLE_NAME_RDD")
@ApiParam(value ="角色名称")
@Column(name = "ROLE_NAME_RDD")
@ApiParam(value = "角色名称")
private String roleNameRdd;
}

88
modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/sqlpack/FormHqlPack.java
Unescape Escape View File

@ -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;
/**
@ -48,6 +45,35 @@ public final class FormHqlPack {
}
/**
* In 参数封装
* @param columnName 列名
* @param params 参数
* @param isDeleted 数据状态
* @return hql
*/
public static String packHqlIdsAndIsDeleted(String columnName, String[] params, Integer isDeleted) {
StringBuffer result = new StringBuffer(FormHqlPack.packHqlIds(columnName, params));
HqlPack.getNumEqualPack(isDeleted, "isDeleted", result);
return result.toString();
}
/**
* In 参数封装
* @param columnName 列名
* @param params 参数
* @param isDeleted 数据状态
* @return hql
*/
public static String packHqlIdsAndIsDeleted(String columnName, Long[] params, Integer isDeleted) {
StringBuffer result = new StringBuffer(FormHqlPack.packHqlIds(columnName, params));
HqlPack.getNumEqualPack(isDeleted, "isDeleted", result);
return result.toString();
}
/**
* 表单布局复杂查询
* @param bfLayout 表单布局
* @return hql
@ -63,32 +89,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 +128,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 +144,38 @@ 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();
}
/**
* 表单按钮复杂查询
* @param bfButton 查询条件
*/
public static String packHqlBfButton(BfButton bfButton){
StringBuffer result = new StringBuffer();
HqlPack.getStringLikerPack(bfButton.getButtonName(), "buttonName", result);
HqlPack.getNumEqualPack(bfButton.getTriggerMode(), "triggerMode", result);
HqlPack.getNumEqualPack(bfButton.getIsDeleted(), "isDeleted", result);
result.append(bfButton.orderBy());
return result.toString();
}

66
modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/MachineFactory.java
Unescape Escape View File

@ -1,66 +0,0 @@
package cn.estsh.i3plus.pojo.mes;
import cn.estsh.i3plus.pojo.base.bean.BaseBean;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiParam;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Table;
/**
* @Description :
* @Reference :
* @Author : alwaysfrin
* @CreateDate : 2018-09-04 15:58
* @Modify:
**/
@Entity
@Table(name="machine_factory")
@Api("工厂")
public class MachineFactory extends BaseBean {
@Column(name="factory_code")
@ApiParam("工厂代码")
private String factoryCode;
@Column(name="factory_name")
@ApiParam("工厂名称")
private String factoryName;
public MachineFactory() {
}
public MachineFactory(String factoryCode, String factoryName) {
this.factoryCode = factoryCode;
this.factoryName = factoryName;
}
public String getFactoryCode() {
return factoryCode;
}
public void setFactoryCode(String factoryCode) {
this.factoryCode = factoryCode;
}
public String getFactoryName() {
return factoryName;
}
public void setFactoryName(String factoryName) {
this.factoryName = factoryName;
}
@Override
public String toString() {
return "MachineFactory{" +
"factoryCode='" + factoryCode + '\'' +
", factoryName='" + factoryName + '\'' +
", id=" + id +
", createDate='" + createDatetime + '\'' +
", modifyDate='" + modifyDatetime + '\'' +
'}';
}
}

20
modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/WorkPlan.java
Unescape Escape View File

@ -1,20 +0,0 @@
package cn.estsh.i3plus.pojo.mes;
/**
* @Description :
* @Reference :
* @Author : alwaysfrin
* @CreateDate : 2018-09-04 15:58
* @Modify::
**/
public class WorkPlan {
private String desc;
public String getDesc() {
return desc;
}
public void setDesc(String desc) {
this.desc = desc;
}
}

73
modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/BfElement.java
Unescape Escape View File

@ -0,0 +1,73 @@
package cn.estsh.i3plus.pojo.mes.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;
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 : Adair Peng
* @CreateDate : 2019-03-21 13:14
* @Modify:
**/
@Data
@Entity
@DynamicInsert
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
@Table(name = "BF_ELEMENT")
@Api(value = "对象元素基础", description = "元素基础表")
public class BfElement extends BaseBean {
//外键关联数据对象主键
@Column(name = "ELEMENT_INFO_ID")
@ApiParam(value = "对象元素明细ID", example = "-1")
@JsonSerialize(using = ToStringSerializer.class)
private Long elementInfoId;
//外键关联数据对象主键
@Column(name = "DATA_OBJECT_ID")
@ApiParam(value = "数据对象ID", example = "-1")
@JsonSerialize(using = ToStringSerializer.class)
private Long dataObjectId;
@Column(name="ELEMENT_TYPE")
@ApiParam(value ="元素类型")
private Integer elementType;
@Column(name="ELEMENT_NAME")
@ApiParam(value ="元素名称")
private String elementName;
@Column(name="ELEMENT_CODE")
@ApiParam(value ="元素编码")
private String elementCode;
@Column(name="ELEMENT_ATTR_ID")
@ApiParam(value ="默认排序属性")
private String elementAttrId;
@Column(name="ELEMENT_SORT_TYPE")
@ApiParam(value ="默认排序规则")
private String elementSortType;
@Column(name="ELEMENT_CSS_STYLE")
@ApiParam(value ="元素样式")
private String elementCssStyle;
@Column(name="ELEMENT_DESCRIPTION")
@ApiParam(value ="元素描述")
private String elementDescription;
}

38
modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesArea.java
Unescape Escape View File

@ -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 15:58
* @Modify:
**/
@Data
@Entity
@DynamicInsert
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
@Table(name="MES_AREA")
@Api("生产区域")
public class MesArea extends BaseBean {
@Column(name="AREA_CODE")
@ApiParam("区域代码")
private String areaCode;
@Column(name="AREA_NAME")
@ApiParam("区域名称")
private String areaName;
}

45
modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkCell.java
Unescape Escape View File

@ -0,0 +1,45 @@
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 15:58
* @Modify:
**/
@Data
@Entity
@DynamicInsert
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
@Table(name = "MES_WORK_CELL")
@Api("工作单元")
public class MesWorkCell extends BaseBean {
@Column(name = "WORK_CELL_CODE")
@ApiParam("工作单元代码")
private String workCellCode;
@Column(name = "WORK_CELL_NAME")
@ApiParam("工作单元名称")
private String workCellName;
@Column(name = "WORK_CENTER_CODE")
@ApiParam("工作中心")
private String workCenterCode;
@Column(name = "AREA_CODE")
@ApiParam("生产区域代码")
private String areaCode;
}

49
modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkCenter.java
Unescape Escape View File

@ -0,0 +1,49 @@
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 15:58
* @Modify:
**/
@Data
@Entity
@DynamicInsert
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
@Table(name = "MES_WORK_CENTER")
@Api("工作中心")
public class MesWorkCenter extends BaseBean {
@Column(name = "WORK_CENTER_CODE")
@ApiParam("工作中心代码")
private String workCenterCode;
@Column(name = "WORK_CENTER_NAME")
@ApiParam("工作中心名称")
private String workCenterName;
@Column(name = "ERP_WORK_CENTER")
@ApiParam("ERP工作中心")
private String erpWorkCenter;
@Column(name = "WORK_VER")
@ApiParam("工作版本")
private String workVer;
@Column(name = "AREA_CODE")
@ApiParam("生产区域代码")
private String areaCode;
}

14
modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/BfElementRepository.java
Unescape Escape View File

@ -0,0 +1,14 @@
package cn.estsh.i3plus.pojo.mes.repository;
import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
import cn.estsh.i3plus.pojo.mes.bean.BfElement;
/**
* @Description :
* @Reference :
* @Author : Adair Peng
* @CreateDate : 2019-03-21 15:24
* @Modify:
**/
public interface BfElementRepository extends BaseRepository<BfElement,Long> {
}

16
modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesAreaRepository.java
Unescape Escape View File

@ -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.MesArea;
import org.springframework.stereotype.Repository;
/**
* @Description :
* @Reference :
* @Author : jack.jia
* @CreateDate : 2018-11-07 14:49
* @Modify:
**/
@Repository
public interface MesAreaRepository extends BaseRepository<MesArea, Long> {
}

17
modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesWorkCellRepository.java
Unescape Escape View File

@ -0,0 +1,17 @@
package cn.estsh.i3plus.pojo.mes.repository;
import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
import cn.estsh.i3plus.pojo.mes.bean.MesArea;
import cn.estsh.i3plus.pojo.mes.bean.MesWorkCell;
import org.springframework.stereotype.Repository;
/**
* @Description :
* @Reference :
* @Author : jack.jia
* @CreateDate : 2018-11-07 14:49
* @Modify:
**/
@Repository
public interface MesWorkCellRepository extends BaseRepository<MesWorkCell, Long> {
}

17
modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesWorkCenterRepository.java
Unescape Escape View File

@ -0,0 +1,17 @@
package cn.estsh.i3plus.pojo.mes.repository;
import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
import cn.estsh.i3plus.pojo.mes.bean.MesWorkCell;
import cn.estsh.i3plus.pojo.mes.bean.MesWorkCenter;
import org.springframework.stereotype.Repository;
/**
* @Description :
* @Reference :
* @Author : jack.jia
* @CreateDate : 2018-11-07 14:49
* @Modify:
**/
@Repository
public interface MesWorkCenterRepository extends BaseRepository<MesWorkCenter, Long> {
}

4
modules/i3plus-pojo-model/pom.xml
Unescape Escape View File

@ -38,6 +38,10 @@
<groupId>i3plus.pojo</groupId>
<artifactId>i3plus-pojo-wms</artifactId>
</dependency>
<dependency>
<groupId>i3plus.pojo</groupId>
<artifactId>i3plus-pojo-form</artifactId>
</dependency>
</dependencies>

40
modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/form/ElementModel.java
Unescape Escape View File

@ -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<BfElementProperty> propertyList;
@ApiParam(value = "元素基础虚拟属性信息")
private List<BfElementPropertyVirtual> virtualList;
@ApiParam(value = "数据对象信息")
private BfDataObject dataObject;
@ApiParam(value = "元素类型")
private Integer elementType;
}

46
modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/bean/SwebOrderDeliveryLog.java
Unescape Escape View File

@ -0,0 +1,46 @@
package cn.estsh.i3plus.pojo.sweb.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.lv
* @CreateDate : 2019-04-01 11:21
* @Modify:
**/
@Data
@Table(name = "SWEB_ORDER_DELIVERY_LOG")
@Entity
@DynamicInsert
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
@Api("订单发货通知记录表")
public class SwebOrderDeliveryLog extends BaseBean {
@Column(name = "ORDER_ITEM_NO")
@ApiParam("单据明细编号")
public String orderItemNo;
@Column(name = "CAR_NO")
@ApiParam(value = "发运车号")
public String carNo;
@Column(name = "CONTACT")
@ApiParam("联系人")
public String contact;
@Column(name = "CONTACT_TEL")
@ApiParam(value = "联系人电话")
public String contactTel;
}

48
modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/bean/SwebPackage.java
Unescape Escape View File

@ -0,0 +1,48 @@
package cn.estsh.i3plus.pojo.sweb.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.lv
* @CreateDate : 2019-04-01 11:21
* @Modify:
**/
@Data
@Table(name = "SWEB_PACKAGE")
@Entity
@DynamicInsert
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
@Api("物理包装")
public class SwebPackage extends BaseBean {
@Column(name="PACKAGE_NO")
@ApiParam("包装编号")
public String packageNo;
@Column(name="PACKAGE_TYPE_ID")
@ApiParam(value = "包装类型", example = "1")
public Integer packTypeId;
@Column(name="PARENT_PACKAGE_NO")
@ApiParam("上级包装编号")
public String parentPackageNo;
@ColumnDefault("0")
@Column(name="PACKAGE_QTY")
@ApiParam(value = "包装件数", example = "1")
public Integer packageQty;
}

46
modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/bean/SwebProcurementPlanOrder.java
Unescape Escape View File

@ -0,0 +1,46 @@
package cn.estsh.i3plus.pojo.sweb.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.lv
* @CreateDate : 2019-04-01 11:21
* @Modify:
**/
@Data
@Table(name = "SWEB_PROCUREMENT_PLAN_ORDER")
@Entity
@DynamicInsert
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
@Api("开口合同主表")
public class SwebProcurementPlanOrder extends BaseBean {
@ApiParam("合同号")
@Column(name = "ORDER_NO")
private String orderNo;
@ApiParam(value = "订单类型", example = "1")
@Column(name = "ORDER_TYPE")
private Integer orderType;
@ApiParam(value = "订单状态", example = "10")
@Column(name = "ORDER_STATUS")
private Integer orderStatus;
@ApiParam("供应商代码")
@Column(name = "VENDOR_CODE")
private String vendorCode;
}

56
modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/bean/SwebProcurementPlanOrderDetails.java
Unescape Escape View File

@ -0,0 +1,56 @@
package cn.estsh.i3plus.pojo.sweb.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.lv
* @CreateDate : 2019-04-01 11:21
* @Modify:
**/
@Data
@Table(name = "SWEB_PROCUREMENT_PLAN_ORDER_DETAILS")
@Entity
@DynamicInsert
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
@Api("开口合同明细表")
public class SwebProcurementPlanOrderDetails extends BaseBean {
@ApiParam("单据号")
@Column(name = "ORDER_NO")
private String orderNo;
@ApiParam(value = "零件号")
@Column(name = "PART_NO")
private String partNo;
@ApiParam(value = "零件名称")
@Column(name = "PART_NAME")
private String partName;
@ApiParam(value = "单位")
@Column(name = "UNIT")
private String unit;
@ColumnDefault("0")
@ApiParam("标准包装")
@Column(name = "SNP_QTY")
private Double snpQty;
@ApiParam(value = "行项目状态", example = "1")
@Column(name = "ITEM_STATUS")
private Integer itemStatus;
}

48
modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/bean/SwebPurchaseChangeLog.java
Unescape Escape View File

@ -0,0 +1,48 @@
package cn.estsh.i3plus.pojo.sweb.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.lv
* @CreateDate : 2019-04-01 11:21
* @Modify:
**/
@Data
@Table(name = "SWEB_PURCHASE_CHANGE_LOG")
@Entity
@DynamicInsert
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
@Api("订单修改日志记录表")
public class SwebPurchaseChangeLog extends BaseBean {
@Column(name = "ORDER_ITEM_NO")
@ApiParam("单据明细编号")
public String orderItemNo;
@ApiParam(value = "订单当前状态")
@Column(name = "ITEM_STATUS")
private Integer itemStatus;
@Column(name = "QTY")
@ApiParam("零件数量")
@ColumnDefault("0")
public Double qty;
@Column(name = "REMARK")
@ApiParam("备注")
private String remark;
}

98
modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/bean/SwebPurchaseOrder.java
Unescape Escape View File

@ -0,0 +1,98 @@
package cn.estsh.i3plus.pojo.sweb.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.lv
* @CreateDate : 2019-04-01 11:21
* @Modify:
**/
@Data
@Table(name = "SWEB_PURCHASE_ORDER")
@Entity
@DynamicInsert
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
@Api("采购订单表-主表")
public class SwebPurchaseOrder extends BaseBean {
@Column(name = "ORDER_NO")
@ApiParam("单据号")
public String orderNo;
@ApiParam("供应商编号")
@Column(name = "VENDOR_CODE")
private String vendorCode;
@ApiParam("供应商名称")
@Column(name = "VENDOR_NAME")
private String vendorName;
@ApiParam("计划员代码")
@Column(name = "PLANNER_CODE")
private String plannerCode;
@ApiParam(value = "订单类型", example = "1")
@Column(name = "ORDER_TYPE")
public Integer orderType;
@ApiParam(value = "订单状态", example = "1")
@Column(name = "ORDER_STATUS")
public Integer orderStatus;
@Column(name = "PARENT_PACKAGE_NO")
@ApiParam("上级包装编号")
public String parentPackageNo;
@Column(name = "DOCK")
@ApiParam("道口")
public String dock;
@Column(name = "ERP_WAREHOUSE")
@ApiParam(value = "库存地")
public String erpWarehouse;
@Column(name = "PO_STATUS")
@ApiParam(value = "PO状态", example = "1")
public Integer poStatus;
@Column(name = "SHIP_TIME")
@ApiParam(value = "发运时间")
public String shipTime;
@Column(name = "PUBLISH_TIME")
@ApiParam(value = "发布时间")
public String publishTime;
@Column(name = "DELIVERY_TIME")
@ApiParam(value = "交货时间")
public String deliveryTime;
@Column(name = "REC_TIME")
@ApiParam(value = "交货时间")
public String recTime;
@Column(name = "IS_SYN")
@ApiParam(value = "是否收货", example = "2")
public Integer isSyn;
@Column(name = "ORDER_TIME")
@ApiParam(value = "订单时间")
public String orderTime;
@Column(name = "REF_ORDER_NO")
@ApiParam(value = "关联单号")
public String refOrderNo;
}

169
modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/bean/SwebPurchaseOrderDetails.java
Unescape Escape View File

@ -0,0 +1,169 @@
package cn.estsh.i3plus.pojo.sweb.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.lv
* @CreateDate : 2019-04-01 11:21
* @Modify:
**/
@Data
@Table(name = "SWEB_PURCHASE_ORDER_DETAILS")
@Entity
@DynamicInsert
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
@Api("采购订单表-明细表")
public class SwebPurchaseOrderDetails extends BaseBean {
@Column(name = "ORDER_NO")
@ApiParam("单据号")
public String orderNo;
@Column(name = "PART_VERSION")
@ApiParam("零件版本")
private Integer partVersion;
@Column(name = "PART_NO")
@ApiParam(value = "零件号")
private String partNo;
@Column(name = "PART_NAME")
@ApiParam(value = "零件名称")
private String partName;
@ApiParam("零件类型")
@Column(name = "PART_TYPE")
private Integer partType;
@ApiParam(value = "单位")
@Column(name = "UNIT")
private String unit;
@ApiParam(value = "行项目状态", example = "1")
@Column(name = "ITEM_STATUS")
private Integer itemStatus;
@Column(name = "BOX_QTY")
@ColumnDefault("0")
@ApiParam(value = "箱数", example = "0")
private Integer boxQty;
@Column(name = "SNP_QTY")
@ColumnDefault("0")
@ApiParam(value = "默认包装规格", example = "0")
private Double snpQty;
@Column(name = "PRINT_QTY")
@ColumnDefault("0")
@ApiParam(value = "打印数", example = "0")
private Double printQty;
@Column(name = "REC_QTY")
@ColumnDefault("0")
@ApiParam(value = "收货数量", example = "0")
private Double recQty;
@Column(name = "REC_BOX_QTY")
@ColumnDefault("0")
@ApiParam(value = "已收箱数", example = "0")
private Double recBoxQty;
@Column(name = "UPLOAD_QTY")
@ColumnDefault("0")
@ApiParam(value = "上传数量", example = "0")
private Double uploadQty;
@Column(name = "ERP_WAREHOUSE")
@ApiParam("库存地")
private String erpWarehouse;
@Column(name = "REF_QTY")
@ColumnDefault("0")
@ApiParam(value = "订单数量", example = "0")
private Double refQty;
@Column(name = "ORDER_QTY")
@ColumnDefault("0")
@ApiParam(value = "需求数", example = "0")
private Double orderQty;
@Column(name = "SHIP_QTY")
@ColumnDefault("0")
@ApiParam(value = "发运数量", example = "0")
private Double shipQty;
@Column(name = "PRINT_TIME")
@ApiParam(value = "打印时间")
private String printTime;
@Column(name = "PRINT_USER_CODE")
@ApiParam("打印用户code")
private String printUserCode;
@Column(name = "IS_STEEL")
@ApiParam("是否为钢卷料")
private Integer IS_STEEL;
@Column(name = "REC_TIME")
@ApiParam(value = "预计到货日期")
public String recTime;
@Column(name = "REMARK")
@ApiParam("备注")
private String remark;
@ApiParam("是否同步")
@Column(name = "IS_SYN")
private String isSyn;
@Column(name = "INSTOCK_QTY")
@ColumnDefault("0")
@ApiParam(value = "入库数量", example = "0")
private Double instockQty;
@Column(name = "INSTOCK_BOX_QTY")
@ColumnDefault("0")
@ApiParam(value = "入库箱数", example = "0")
private Double instockBoxQty;
@Column(name = "NC_QTY")
@ColumnDefault("0")
@ApiParam(value = "不良数", example = "0")
private Double ncQty;
@Column(name = "NC_BOX_QTY")
@ColumnDefault("0")
@ApiParam(value = "不良箱数", example = "0")
private Double ncBoxQty;
@Column(name = "ITEM_NO")
@ColumnDefault("0")
@ApiParam(value = "行号", example = "0")
private Integer itemNo;
@Column(name = "COMFIRM_TIME")
@ApiParam(value = "确认时间")
public String comfirmTime;
@Column(name = "DELIVERY_TIME")
@ApiParam(value = "交货时间")
public String deliveryTime;
@Column(name = "REF_NO")
@ApiParam(value = "合同号")
public String refNo;
}

104
modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/bean/SwebPurchaseOrderSn.java
Unescape Escape View File

@ -0,0 +1,104 @@
package cn.estsh.i3plus.pojo.sweb.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.lv
* @CreateDate : 2019-04-01 11:21
* @Modify:
**/
@Data
@Table(name = "SWEB_PURCHASE_ORDER_SN")
@Entity
@DynamicInsert
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
@Api("采购订单表-条码明细表")
public class SwebPurchaseOrderSn extends BaseBean {
@Column(name = "ORDER_ITEM_NO")
@ApiParam("单据明细编号")
public String orderItemNo;
@Column(name = "PART_NO")
@ApiParam(value = "零件号")
private String partNo;
@Column(name = "PART_NAME")
@ApiParam(value = "零件名称")
private String partName;
@ApiParam("零件类型")
@Column(name = "PART_TYPE")
private Integer partType;
@ApiParam(value = "单位")
@Column(name = "UNIT")
private String unit;
@Column(name = "BOX_QTY")
@ColumnDefault("0")
@ApiParam(value = "箱数", example = "0")
private Integer boxQty;
@Column(name = "SERIAL_NO")
@ApiParam(value = "序列号")
private String serialNo;
@Column(name = "BAR_CODE")
@ApiParam(value = "箱条码")
private String barCode;
@Column(name = "ERP_WAREHOUSE")
@ApiParam("库存地")
private String erpWarehouse;
@Column(name = "PRODUCTION_TIME")
@ApiParam(value = "产生时间")
private String productionTime;
@Column(name = "PRINT_TIME")
@ApiParam(value = "打印时间")
private String printTime;
@Column(name = "PRINTS")
@ApiParam("打印次数")
private Integer prints;
@Column(name = "CHECK_CODE")
@ApiParam(value = "检验编号")
public String CHECK_CODE;
@Column(name = "STOVE_NO")
@ApiParam(value = "炉批号")
public String stoveNo;
@Column(name = "BATCH_NO")
@ApiParam(value = "批次号")
public String batchNo;
@ApiParam("是否同步")
@Column(name = "IS_SYN")
private String isSyn;
@Column(name = "REC_TIME")
@ApiParam(value = "收货时间")
public String recTime;
@Column(name = "PACKAGE_NO")
@ApiParam(value = "包装编号")
public String packageNo;
}

42
modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/bean/SwebVendorRel.java
Unescape Escape View File

@ -0,0 +1,42 @@
package cn.estsh.i3plus.pojo.sweb.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.lv
* @CreateDate : 2019-04-01 11:21
* @Modify:
**/
@Data
@Table(name = "SWEB_VENDOR_REL")
@Entity
@DynamicInsert
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
@Api("供应商关系表")
public class SwebVendorRel extends BaseBean {
@ApiParam("计划员代码")
@Column(name = "PLANNER_CODE")
private String plannerCode;
@ApiParam("供应商名称")
@Column(name = "VENDOR_NAME")
private String vendorName;
@ApiParam("供应商代码")
@Column(name = "VENDOR_CODE")
private String vendorCode;
}

14
modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/modelbean/SwebPurchaseForPubListModel.java
Unescape Escape View File

@ -0,0 +1,14 @@
package cn.estsh.i3plus.pojo.sweb.modelbean;
import lombok.Data;
/**
* @Description :
* @Reference :
* @Author : jack.lv
* @CreateDate : 2019-04-02 13:13
* @Modify:
**/
@Data
public class SwebPurchaseForPubListModel {
}

14
modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/repository/SwebOrderDeliveryLogRepository.java
Unescape Escape View File

@ -0,0 +1,14 @@
package cn.estsh.i3plus.pojo.sweb.repository;
import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
import cn.estsh.i3plus.pojo.sweb.bean.SwebOrderDeliveryLog;
/**
* @Description :订单发货通知记录表 dao
* @Reference :
* @Author : jack.lv
* @CreateDate : 2019-04-01 14:51
* @Modify:
**/
public interface SwebOrderDeliveryLogRepository extends BaseRepository<SwebOrderDeliveryLog, Long> {
}

14
modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/repository/SwebPackageRepository.java
Unescape Escape View File

@ -0,0 +1,14 @@
package cn.estsh.i3plus.pojo.sweb.repository;
import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
import cn.estsh.i3plus.pojo.sweb.bean.SwebPackage;
/**
* @Description :物理包装 dao
* @Reference :
* @Author : jack.lv
* @CreateDate : 2019-04-01 14:51
* @Modify:
**/
public interface SwebPackageRepository extends BaseRepository<SwebPackage, Long> {
}

14
modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/repository/SwebProcurementPlanOrderDetailsRepository.java
Unescape Escape View File

@ -0,0 +1,14 @@
package cn.estsh.i3plus.pojo.sweb.repository;
import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
import cn.estsh.i3plus.pojo.sweb.bean.SwebProcurementPlanOrderDetails;
/**
* @Description :开口合同明细表 dao
* @Reference :
* @Author : jack.lv
* @CreateDate : 2019-04-01 14:51
* @Modify:
**/
public interface SwebProcurementPlanOrderDetailsRepository extends BaseRepository<SwebProcurementPlanOrderDetails, Long> {
}

15
modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/repository/SwebProcurementPlanOrderRepository.java
Unescape Escape View File

@ -0,0 +1,15 @@
package cn.estsh.i3plus.pojo.sweb.repository;
import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
import cn.estsh.i3plus.pojo.sweb.bean.SwebPackage;
import cn.estsh.i3plus.pojo.sweb.bean.SwebProcurementPlanOrder;
/**
* @Description :开口合同主表 dao
* @Reference :
* @Author : jack.lv
* @CreateDate : 2019-04-01 14:51
* @Modify:
**/
public interface SwebProcurementPlanOrderRepository extends BaseRepository<SwebProcurementPlanOrder, Long> {
}

14
modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/repository/SwebPurchaseChangeLogRepository.java
Unescape Escape View File

@ -0,0 +1,14 @@
package cn.estsh.i3plus.pojo.sweb.repository;
import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
import cn.estsh.i3plus.pojo.sweb.bean.SwebPurchaseChangeLog;
/**
* @Description :订单修改日志记录表 dao
* @Reference :
* @Author : jack.lv
* @CreateDate : 2019-04-01 14:51
* @Modify:
**/
public interface SwebPurchaseChangeLogRepository extends BaseRepository<SwebPurchaseChangeLog, Long> {
}

14
modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/repository/SwebPurchaseOrderDetailsRepository.java
Unescape Escape View File

@ -0,0 +1,14 @@
package cn.estsh.i3plus.pojo.sweb.repository;
import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
import cn.estsh.i3plus.pojo.sweb.bean.SwebPurchaseOrderDetails;
/**
* @Description :采购订单表-明细表 dao
* @Reference :
* @Author : jack.lv
* @CreateDate : 2019-04-01 14:51
* @Modify:
**/
public interface SwebPurchaseOrderDetailsRepository extends BaseRepository<SwebPurchaseOrderDetails, Long> {
}

14
modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/repository/SwebPurchaseOrderRepository.java
Unescape Escape View File

@ -0,0 +1,14 @@
package cn.estsh.i3plus.pojo.sweb.repository;
import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
import cn.estsh.i3plus.pojo.sweb.bean.SwebPurchaseOrder;
/**
* @Description :采购订单表-主表 dao
* @Reference :
* @Author : jack.lv
* @CreateDate : 2019-04-01 14:51
* @Modify:
**/
public interface SwebPurchaseOrderRepository extends BaseRepository<SwebPurchaseOrder, Long> {
}

14
modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/repository/SwebPurchaseOrderSnRepository.java
Unescape Escape View File

@ -0,0 +1,14 @@
package cn.estsh.i3plus.pojo.sweb.repository;
import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
import cn.estsh.i3plus.pojo.sweb.bean.SwebPurchaseOrderSn;
/**
* @Description :采购订单表-条码明细表 dao
* @Reference :
* @Author : jack.lv
* @CreateDate : 2019-04-01 14:51
* @Modify:
**/
public interface SwebPurchaseOrderSnRepository extends BaseRepository<SwebPurchaseOrderSn, Long> {
}

14
modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/repository/SwebVendorRelRepository.java
Unescape Escape View File

@ -0,0 +1,14 @@
package cn.estsh.i3plus.pojo.sweb.repository;
import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
import cn.estsh.i3plus.pojo.sweb.bean.SwebVendorRel;
/**
* @Description :供应商关系表 dao
* @Reference :
* @Author : jack.lv
* @CreateDate : 2019-04-01 14:51
* @Modify:
**/
public interface SwebVendorRelRepository extends BaseRepository<SwebVendorRel, Long> {
}

73
modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/sqlpack/SwebHqlPack.java
Unescape Escape View File

@ -0,0 +1,73 @@
package cn.estsh.i3plus.pojo.sweb.sqlpack;
import cn.estsh.i3plus.pojo.base.bean.BaseBean;
import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil;
import cn.estsh.i3plus.pojo.base.tool.HqlPack;
import cn.estsh.i3plus.pojo.base.tool.SqlPack;
import cn.estsh.i3plus.pojo.sweb.bean.*;
import org.apache.commons.lang3.StringUtils;
/**
* @Description : hql 封装
* @Reference :
* @Author : jack.lv
* @CreateDate : 2019-04-01 17:59
* @Modify:
**/
public class SwebHqlPack {
/**
* 通用封装isValid、isDeleted等参数
*
* @param bean
* @param hqlStr
* @return
*/
private static String buildHql(BaseBean bean, StringBuffer hqlStr) {
// 判断工厂代码是否为空
if (StringUtils.isNotBlank(bean.getOrganizeCode())) {
SqlPack.getStringEqualPack(bean.getOrganizeCode(), "organizeCode", hqlStr);
}
// 封装有效状态和删除状态
SqlPack.getNumEqualPack(bean.getIsValid(), "isValid", hqlStr);
SqlPack.getNumEqualPack(CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue(), "isDeleted", hqlStr);
return hqlStr.toString();
}
public static String getPurchaseOrderWhereHql(SwebPurchaseOrder purchaseOrder) {
StringBuffer result = new StringBuffer();
HqlPack.getStringEqualPack(purchaseOrder.getOrderNo(), "orderNo", result);
HqlPack.getStringEqualPack(purchaseOrder.getVendorCode(), "vendorCode", result);
HqlPack.getNumEqualPack(purchaseOrder.getOrderStatus(), "orderStatus", result);
return buildHql(purchaseOrder, result);
}
public static String getPackAgeWhereHql(SwebPackage swebPackage) {
StringBuffer result = new StringBuffer();
HqlPack.getStringEqualPack(swebPackage.getPackageNo(), "packageNo", result);
HqlPack.getStringEqualPack(swebPackage.getParentPackageNo(), "parentPackageNo", result);
HqlPack.getNumEqualPack(swebPackage.getPackTypeId(), "packTypeId", result);
return buildHql(swebPackage, result);
}
public static String getProcurementPlanOrderWhereHql(SwebProcurementPlanOrder swebProcurementPlanOrder) {
StringBuffer result = new StringBuffer();
HqlPack.getStringEqualPack(swebProcurementPlanOrder.getVendorCode(), "vendorCode", result);
HqlPack.getStringLikerPack(swebProcurementPlanOrder.getOrderNo(), "orderNo", result);
return buildHql(swebProcurementPlanOrder, result);
}
public static String getProcurementPlanOrderDeatilsWhereHql(SwebProcurementPlanOrderDetails swebProcurementPlanOrderDetails) {
StringBuffer result = new StringBuffer();
HqlPack.getStringLikerPack(swebProcurementPlanOrderDetails.getOrderNo(), "orderNo", result);
return buildHql(swebProcurementPlanOrderDetails, result);
}
public static String getVendorRelWhereHql(SwebVendorRel vendorRel) {
StringBuffer result = new StringBuffer();
HqlPack.getStringLikerPack(vendorRel.getVendorCode(), "vendorCode", result);
HqlPack.getStringLikerPack(vendorRel.getPlannerCode(), "plannerCode", result);
return buildHql(vendorRel, result);
}
}

4
modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSOrderDetails.java
Unescape Escape View File

@ -109,14 +109,14 @@ public class WmsCSOrderDetails extends BaseBean {
public WmsCSOrderDetails(){}
public WmsCSOrderDetails(Double qty, String partNo,String orderNo,String whNo,String zoneNo,String locateNo,String partName){
public WmsCSOrderDetails(Double qty, String partNo,String orderNo,String partName,String whNo,String zoneNo,String locateNo){
this.qty = qty;
this.partNo = partNo;
this.orderNo = orderNo;
this.partNameRdd = partName;
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){

16
modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementDetails.java
Unescape Escape View File

@ -141,10 +141,26 @@ public class WmsDocMovementDetails extends BaseBean {
public String destAreaNo;
@Transient
@ApiParam("实际批次")
private String actualLot;
@Transient
@ApiParam("实际数量")
private Double actualQty;
@Transient
@ApiParam("推荐批次")
private String recommondLot;
@Transient
@ApiParam("推荐库位")
private String recommondLocateNo;
@Transient
@ApiParam("前端表格编辑使用")
private Boolean isSet = false;
public Double getQty() {return qty == null ? 0L : this.qty.doubleValue(); }
public Double getOutQty() {return outQty == null ? 0L : this.outQty.doubleValue(); }
}

21
modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementSn.java
Unescape Escape View File

@ -12,6 +12,7 @@ import org.hibernate.annotations.DynamicUpdate;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Table;
import javax.persistence.Transient;
/**
* @Description : 移库单条码表
@ -66,4 +67,24 @@ public class WmsDocMovementSn extends BaseBean {
@Column(name="SN")
@ApiParam("条码")
public String sn;
@Transient
@ApiParam("前端表格编辑使用")
private Boolean isSet = false;
@Transient
@ApiParam("目标库位代码")
public String destLocateNo;
@Transient
@ApiParam("源库位代码")
public String srcLocateNo;
@Transient
@ApiParam("生产日期")
public String dateCode;
@ApiParam(value = "散件移库输入移库数量")
@Transient
public Double inputMoveQty;
}

4
modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsLocatePart.java
Unescape Escape View File

@ -56,6 +56,10 @@ public class WmsLocatePart extends BaseBean{
@ApiParam(value = "是否生成领料单", example = "2")
private Integer isGeneratePicklist;
public Double getMix() {
return this.min == null ? 0 : this.min;
}
public Integer getIsGeneratePicklist() {
return this.isGeneratePicklist == null ? 0 : this.isGeneratePicklist;
}

8
modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveDetails.java
Unescape Escape View File

@ -57,10 +57,18 @@ public class WmsMoveDetails extends BaseBean {
@ApiParam(value = "处理数量", example = "0")
public Double transQty;
public Double getTransQty(){
return this.transQty == null ? 0 : this.transQty.doubleValue();
}
@Column(name="REJECT_QTY")
@ApiParam(value = "不合格处理数量", example = "0")
public Double rejectQty;
public Double getRejectQty(){
return this.rejectQty == null ? 0 : this.rejectQty.doubleValue();
}
@Column(name="UNIT")
@ApiParam("单位")
public String unit;

7
modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPOMasterDetails.java
Unescape Escape View File

@ -122,6 +122,13 @@ public class WmsPOMasterDetails extends BaseBean {
@ApiParam(value = "供应商批次")
public String dateCode;
@Transient
@ApiParam("前端表格编辑使用")
public Boolean isSet = false;
@Transient
@ApiParam("供应商批次字段是否可编辑")
public Boolean isDateCodeEdit = true;
public Double getInputRcQty(){ return this.inputRcQty == null ? 0 : this.inputRcQty; }
}

8
modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockSn.java
Unescape Escape View File

@ -170,9 +170,17 @@ public class WmsStockSn extends BaseBean {
@Transient
public Double inputNCQty;
@ApiParam(value = "前端散件表格是否编辑")
@Transient
public Boolean isSet = false;
public WmsStockSn(){}
public WmsStockSn(String partNo){
this.partNo = partNo;
}
public Double getQty() {return qty == null ? 0L : this.qty.doubleValue(); }
public Double getInputNCQty(){return inputNCQty == null ? 0L : this.inputNCQty.doubleValue();}
}

5
modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTaskInfo.java
Unescape Escape View File

@ -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<WmsTaskDetails> taskDetailsList;
}

15
modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java
Unescape Escape View File

@ -163,7 +163,7 @@ public class WmsHqlPack {
//查询参数封装
HqlPack.getInPack(String.join(",", WmsEnumUtil.MASTER_ORDER_STATUS.CREATE.getValue() + "",
WmsEnumUtil.MASTER_ORDER_STATUS.RECEIPT.getValue() + ""),"poStatus",result);
HqlPack.getNumEqualPack(wmsPOMaster.getIsPart(),"isPart", result);
HqlPack.getNumEqualPack(CommonEnumUtil.TRUE_OR_FALSE.TRUE.getValue(),"isPart", result);
HqlPack.getStringEqualPack(wmsPOMaster.getOrderNo(), "orderNo", result);
HqlPack.getStringEqualPack(wmsPOMaster.getPoType(), "poType", result);
HqlPack.getStringEqualPack(wmsPOMaster.getVendorNo(), "vendorNo", result);
@ -1033,18 +1033,9 @@ public class WmsHqlPack {
//查询参数封装
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.getNumEqualPack(CommonEnumUtil.TRUE_OR_FALSE.TRUE.getValue(),"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();
@ -1515,7 +1506,7 @@ public class WmsHqlPack {
StringBuffer result = new StringBuffer();
String data = String.join(",", vals);
HqlPack.getInPackString(data,columnName,result);
HqlPack.getNumEqualPack(bean.getTaskStatus(), "taskStatus", result);
HqlPack.getNumNOEqualPack(bean.getTaskStatus(), "taskStatus", result);
getStringBuilderPack(bean, result);
return result.toString();
}

Write Preview
Loading…
Cancel
Save