diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/dynamic/DynamicEntity.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/dynamic/DynamicEntity.java index 99771c9..5665951 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/dynamic/DynamicEntity.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/dynamic/DynamicEntity.java @@ -1,9 +1,11 @@ package cn.estsh.i3plus.pojo.base.dynamic; import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import io.swagger.annotations.ApiParam; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import javax.persistence.Transient; import java.io.Serializable; import java.lang.reflect.Field; import java.lang.reflect.InvocationTargetException; @@ -28,6 +30,8 @@ public class DynamicEntity extends BaseBean implements Serializable { public String tableName; public List propertyList; + @ApiParam(value ="子集列表") + private List childList = new ArrayList<>(); public DynamicEntity(){ try { @@ -42,13 +46,6 @@ public class DynamicEntity extends BaseBean implements Serializable { this.tableName = tableName; } - public String getTableName() { - return tableName; - } - - public void setTableName(String tableName) { - this.tableName = tableName; - } /** * 初始化属性，以便动态加载 @@ -60,8 +57,7 @@ public class DynamicEntity extends BaseBean implements Serializable { Field[] fields = this.getClass().getDeclaredFields(); for(Field f : fields) { String propName = f.getName().replace(ATTR_PREFIX, ""); - if(!"LOGGER".equals(propName) && !"ATTR_PREFIX".equals(propName) - && !"propertyList".equals(propName) && !"dynProperty".equals(propName) ) { + if (!isDefaultField(propName)) { // 添加到属性list中 this.getPropertyList().add(propName); // 属性初始化 @@ -77,8 +73,7 @@ public class DynamicEntity extends BaseBean implements Serializable { Field[] fields = this.getClass().getDeclaredFields(); for(Field f : fields) { String fieldName = f.getName().replace(ATTR_PREFIX, ""); - if (!"LOGGER".equals(fieldName) && !"ATTR_PREFIX".equals(fieldName) - && !"propertyList".equals(fieldName) && !"dynProperty".equals(fieldName)) { + if (!isDefaultField(fieldName)) { result += "\"" + fieldName + "\":\"" + getDynProperty(fieldName) + "\","; } @@ -92,7 +87,6 @@ public class DynamicEntity extends BaseBean implements Serializable { return result; } - public void setDynProperty(Map params) { if (params != null && params.size() > 0){ params.forEach((k,v)->{{ @@ -140,14 +134,6 @@ public class DynamicEntity extends BaseBean implements Serializable { return getValue(propName,result); } - public List getPropertyList() { - return propertyList; - } - - public void setPropertyList(List propertyList) { - this.propertyList = propertyList; - } - /** * 获取默认值 * @param propName @@ -188,4 +174,43 @@ public class DynamicEntity extends BaseBean implements Serializable { return val; } + /** + * 是否是本类属性 + * @param fieldName + * @return + */ + public boolean isDefaultField(String fieldName){ + if (!ATTR_PREFIX.equals(fieldName)) { + if("propertyList".equals(fieldName) || "dynProperty".equals(fieldName) || "childList".equals(fieldName) + || "LOGGER".equals(fieldName)){ + return true; + } + } + return false; + } + + + public String getTableName() { + return tableName; + } + + public void setTableName(String tableName) { + this.tableName = tableName; + } + + public List getPropertyList() { + return propertyList; + } + + public void setPropertyList(List propertyList) { + this.propertyList = propertyList; + } + + public List getChildList() { + return childList; + } + + public void setChildList(List childList) { + this.childList = childList; + } } 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 1b302cd..895a4a9 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 @@ -832,6 +832,7 @@ public class BlockFormEnumUtil { PASSWORD(230, "PASSWORD", "密码"), DATE(300, "DATE", "日期(yyyy-MM-dd)"), DATE_TIME(310, "DATE_TIME", "时间(yyyy-MM-dd hh:mm:ss)"), +// ELEMENT(700, "DICT_SELECT", "元素"), DICTIONARY(800, "DICT_SELECT", "字典"), CASCADE(900, "CASCADE", "级联"); //FILE(400, "file", "文件"), diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java index 65e65db..19e3575 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java @@ -51,7 +51,7 @@ public class MesEnumUtil { * MesPlanOrder实体对应的status值 计划状态 */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) - public enum PALN_ORDER_STATUS{ + public enum PLAN_ORDER_STATUS{ CREATE(10,"创建"), DE_COMPOSE_ING(20,"分解中"), @@ -61,7 +61,7 @@ public class MesEnumUtil { private int value; private String description; - PALN_ORDER_STATUS(int value, String description) { + PLAN_ORDER_STATUS(int value, String description) { this.value = value; this.description = description; } @@ -166,14 +166,14 @@ public class MesEnumUtil { * MesPlanOrder实体对应的planType值 计划类型 */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) - public enum PALN_ORDER_TYPE{ + public enum PLAN_ORDER_TYPE{ - ATTEMPT_ORDER(10,"标准"); + STANDARD_ORDER(10,"标准"); private int value; private String description; - PALN_ORDER_TYPE(int value, String description) { + PLAN_ORDER_TYPE(int value, String description) { this.value = value; this.description = description; } 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 6a618b3..dd4ba2e 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 @@ -1810,6 +1810,11 @@ public class WmsEnumUtil { } return tmp; } + + //取反 + public static int getInvertValue(int val) { + return val == 1 ? 2 : 1; + } } /** diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/tool/DdlPreparedPack.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/tool/DdlPreparedPack.java index 384b1bb..1082439 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/tool/DdlPreparedPack.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/tool/DdlPreparedPack.java @@ -242,6 +242,16 @@ public class DdlPreparedPack { * @param columnName 列名 * @param packBean */ + public static void getStringNotNullPack(String columnName, DdlPackBean packBean) { + packBean.addColumnQuery(null," and model." + columnName + " is not null", null); + } + + /** + * 封装String对象成equal语句 + * + * @param columnName 列名 + * @param packBean + */ public static void getStringEqualPackOr(String val, String columnName, DdlPackBean packBean) { if (val != null && val.trim().length() > 0) { packBean.addColumnQuery(columnName," or model." + columnName + " = :m_" + columnName, val); 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 3a2b46f..f4a6151 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 @@ -115,10 +115,9 @@ public class BfElementProperty extends BaseBean { @ApiParam(value = "控件显示格式") private String propertyControlFormat; - @Column(name = "PROPERTY_CONTROL_REF_ID") - @ApiParam(value = "控件引用RefId") - @JsonSerialize(using = ToStringSerializer.class) - private Long propertyControlRefId; + @Column(name = "PROPERTY_CONTROL_REF_KEY") + @ApiParam(value = "控件引用RefKey") + private String propertyControlRefKey; @Column(name = "PROPERTY_DESCRIPTION") @ApiParam(value = "属性描述") 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 8883376..aefdef9 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 @@ -52,6 +52,10 @@ public class BfElementTree extends BaseBean { @JsonSerialize(using = ToStringSerializer.class) private Long treeAttrValueId; + @Column(name="TREE_IS_OPEN_ALL") + @ApiParam(value ="是否全部展开") + private Integer treeIsOpenAll; + @Column(name="TREE_DEFAULT_DIRECTION") @ApiParam(value ="树默认方向") private Integer treeDefaultDirection; 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 0f63450..6a404a4 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,7 @@ package cn.estsh.i3plus.pojo.form.bean; import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil; import com.fasterxml.jackson.databind.annotation.JsonSerialize; import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; import io.swagger.annotations.Api; @@ -10,10 +11,7 @@ import lombok.EqualsAndHashCode; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Table; -import javax.persistence.Transient; +import javax.persistence.*; import java.util.List; /** @@ -28,7 +26,9 @@ import java.util.List; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) -@Table(name="BF_MENU") +@Table(name="BF_MENU",indexes = { + @Index(name="index_bf_menu_parent_id",columnList = "PARENT_ID"), +}) @Api(value="表单菜单目录",description = "表单菜单目录") public class BfMenu extends BaseBean { @@ -41,6 +41,14 @@ public class BfMenu extends BaseBean { @JsonSerialize(using = ToStringSerializer.class) private Long parentId; + public long getParentIdVal(){ + if(parentId == null){ + return CommonEnumUtil.PARENT.DEFAULT.getValue().longValue(); + } else { + return parentId.longValue(); + } + } + @Column(name="PARENT_NAME_RDD") @ApiParam(value ="父级菜单名称") private String parentNameRdd; @@ -80,6 +88,10 @@ public class BfMenu extends BaseBean { private Integer menuStatus; @Transient - @ApiParam(value = "菜单状态") + @ApiParam(value = "菜单子集") private List bfMenuList; + + @Transient + @ApiParam(value = "菜单父级") + private List parentBfMenuList; } 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 6f59cbe..373f34e 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 @@ -61,9 +61,12 @@ public class BfMethodDetailProperty extends BaseBean { @Column(name="PRI_ELEMENT_PROPERTY_NAME_RDD") @ApiParam(value ="主对象元素属性名称") - @JsonSerialize(using = ToStringSerializer.class) private String priElementPropertyNameRdd; + @Column(name="PRI_ELEMENT_PROPERTY_CODE_RDD") + @ApiParam(value ="主对象元素属性code") + private String priElementPropertyCodeRdd; + // 枚举:BlockFormEnumUtil.TRIGGER_EVENT @Column(name="PRI_ELEMENT_EVENT") @ApiParam(value ="主对象元素事件") @@ -100,4 +103,8 @@ public class BfMethodDetailProperty extends BaseBean { @Column(name="SEC_ELEMENT_PROPERTY_NAME_RDD") @ApiParam(value ="关联对象元素属性名称") private String secElementPropertyNameRdd; + + @Column(name="SEC_ELEMENT_PROPERTY_CODE_RDD") + @ApiParam(value ="关联对象元素属性Code") + private String secElementPropertyCodeRdd; } 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 176e57e..c8ce167 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 @@ -281,4 +281,20 @@ public final class FormHqlPack { return ddlPackBean; } + + /** + * 根据功能id数组查询菜单信息 + * @param methodIds 功能id + * @param status 菜单状态 + * @return + */ + public static DdlPackBean findBfMenuByMethodIdsAndStatus(Long[] methodIds, int status) { + DdlPackBean ddlPackBean = new DdlPackBean(); + + DdlPreparedPack.getInPackArray(methodIds, "methodId", ddlPackBean); + DdlPreparedPack.getNumEqualPack(status, "menuStatus", ddlPackBean); + DdlPreparedPack.getNumEqualPack(CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue(), "isDeleted", ddlPackBean); + + return ddlPackBean; + } } diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesBom.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesBom.java new file mode 100644 index 0000000..f58ac6d --- /dev/null +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesBom.java @@ -0,0 +1,88 @@ +package cn.estsh.i3plus.pojo.mes.pcn.bean; + + +import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.hibernate.annotations.ColumnDefault; +import org.hibernate.annotations.DynamicInsert; +import org.hibernate.annotations.DynamicUpdate; +import org.springframework.format.annotation.DateTimeFormat; + +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.Table; + +/** + * @Description :BOM清单 + * @Reference : + * @Author : jack.jia + * @CreateDate : 2019-04-02 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name="MES_BOM") +@Api("BOM清单") +public class MesBom extends BaseBean { + @Column(name="PART_NO") + @ApiParam("父零件号") + private String partNo; + + @Column(name="PART_NAME") + @ApiParam("父零件名称") + private String partName; + + @Column(name = "UNIT") + @ApiParam(value = "单位") + private String unit; + + @Column(name = "QTY") + @ColumnDefault("0") + @ApiParam(value = "数量", example = "0") + private Double qty; + + @Column(name="ITEM_PART_NO") + @ApiParam("子零件") + private String itemPartNo; + + @Column(name="ITEM_PART_NAME") + @ApiParam("子零件名称") + private String itemPartName; + + @Column(name = "ITEM_UNIT") + @ApiParam(value = "子零件单位") + private String itemUnit; + + @Column(name = "ITEM_QTY") + @ColumnDefault("0") + @ApiParam(value = "子零件数量", example = "0") + private Double itemQty; + + @Column(name = "BOM_VERSION") + @ApiParam(value = "BOM版本") + private String bomVersion; + + @Column(name = "EFF_START_TIME") + @ApiParam(value = "生效时间") + @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") + private String effStartTime; + + @Column(name = "EFF_END_TIME") + @ApiParam(value = "失效时间") + @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") + private String effEndTime; + + public double getQtyVal() { + return this.qty == null ? 0.0d : this.qty; + } + + public double getitemQtyVal() { + return this.itemQty == null ? 0.0d : this.itemQty; + } +} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPart.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPart.java new file mode 100644 index 0000000..504a987 --- /dev/null +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPart.java @@ -0,0 +1,74 @@ +package cn.estsh.i3plus.pojo.mes.pcn.bean; + + +import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.hibernate.annotations.DynamicInsert; +import org.hibernate.annotations.DynamicUpdate; + +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.Table; + +/** + * @Description :物料信息 + * @Reference : + * @Author : jack.jia + * @CreateDate : 2019-04-02 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name="MES_PART") +@Api("物料信息") +public class MesPart extends BaseBean { + @Column(name="PART_NO") + @ApiParam("零件号") + private String partNo; + + @Column(name="PART_NAME") + @ApiParam("零件名称") + private String partName; + + @Column(name="BRIEF_TEXT") + @ApiParam("零件简称") + private String briefText; + + @Column(name="PART_SPEC") + @ApiParam("零件规格") + private String partSpec; + + @Column(name="CATEGORY_CODE1") + @ApiParam("分类1") + private String categoryCode1; + + @Column(name="CATEGORY_CODE2") + @ApiParam("分类2") + private String categoryCode2; + + @Column(name="CATEGORY_CODE3") + @ApiParam("分类3") + private String categoryCode3; + + @Column(name="UNIT") + @ApiParam("单位") + private String unit; + + @Column(name="PACK_SPEC_CODE") + @ApiParam("包装规格代码") + private String packSpecCode; + + @Column(name="DEFAULT_WORK_CENTER") + @ApiParam("默认工作中心") + private String defaultWorkCenter; + + @Column(name="PRODUCE_CATEGORY") + @ApiParam("产品类型") + private String produceCategory; +} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesProdRouteCfg.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesProdRouteCfg.java new file mode 100644 index 0000000..d76b0d8 --- /dev/null +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesProdRouteCfg.java @@ -0,0 +1,41 @@ +package cn.estsh.i3plus.pojo.mes.pcn.bean; + +import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.hibernate.annotations.DynamicInsert; +import org.hibernate.annotations.DynamicUpdate; + +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.Table; + +/** + * @Description :产品类流程配置表 + * @Reference : + * @Author : jack.jia + * @CreateDate : 2019-04-02 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "MES_PROD_ROUTE_CFG") +@Api("产品类流程配置表") +public class MesProdRouteCfg extends BaseBean { + @Column(name = "PART_NO") + @ApiParam("物料号") + private String partNo; + + @Column(name = "WORK_CENTER_CODE") + @ApiParam("工作中心代码") + private String workCenterCode; + + @Column(name = "ROUTE_CODE") + @ApiParam("流程代码") + private String routeCode; +} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesProdRouteOptParam.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesProdRouteOptParam.java new file mode 100644 index 0000000..4ca2cb4 --- /dev/null +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesProdRouteOptParam.java @@ -0,0 +1,65 @@ +package cn.estsh.i3plus.pojo.mes.pcn.bean; + +import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.hibernate.annotations.DynamicInsert; +import org.hibernate.annotations.DynamicUpdate; + +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.Table; + +/** + * @Description :产品流程配置操作参数表 + * @Reference : + * @Author : jack.jia + * @CreateDate : 2019-04-02 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "MES_PROD_ROUTE_OPT_PARAM") +@Api("产品流程配置操作参数表") +public class MesProdRouteOptParam extends BaseBean { + @Column(name = "PROD_ROUTE_CFG_ID") + @ApiParam("产品流程ID") + private Long prodRouteCfgId; + + @Column(name = "ROUTE_CODE") + @ApiParam("流程代码") + private String routeCode; + + @Column(name = "PROCESS_CODE") + @ApiParam("工序代码") + private String processCode; + + @Column(name = "STEP_CODE") + @ApiParam("工步代码") + private String stepCode; + + @Column(name = "STEP_SEQ") + @ApiParam("工步顺序") + private Integer stepSeq; + + @Column(name = "PARAM_CODE") + @ApiParam("工步参数代码") + private String paramCode; + + @Column(name = "PARAM_VALUE") + @ApiParam("工步参数值") + private String paramValue; + + public long getProdRouteCfgIdVal() { + return this.prodRouteCfgId == null ? 0l : this.prodRouteCfgId; + } + + public int getStepSeq() { + return this.stepSeq == null ? 0 : this.stepSeq; + } +} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesProduceSn.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesProduceSn.java new file mode 100644 index 0000000..8889ab4 --- /dev/null +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesProduceSn.java @@ -0,0 +1,126 @@ +package cn.estsh.i3plus.pojo.mes.pcn.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: Crish + * @CreateDate:2019-04-16-17:36 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name="MES_PRODUCE_SN") +@Api("产品条码表") +public class MesProduceSn extends BaseBean { + + @Column(name="SERIAL_NUMBER") + @ApiParam("产品条码") + private String serialNumber; + + @Column(name="PART_NO") + @ApiParam("物料号") + private String partNo; + + @Column(name="QTY") + @ApiParam("数量") + private Double qty; + + @Column(name="QC_STATUS") + @ApiParam("质量状态") + private Integer qcStatus; + + @Column(name="SN_STATUS") + @ApiParam("条码状态") + private Integer snStatus; + + @Column(name="PRINT_COUNT") + @ApiParam("打印次数") + private Integer printCount; + + @Column(name="PRINT_STATUS") + @ApiParam("打印状态") + private Integer printStatus; + + @Column(name="WORK_CENTER_CODE") + @ApiParam("工作中心代码") + private String workCenterCode; + + @Column(name="WORK_CELL_CODE") + @ApiParam("工作单元代码") + private String workCellCode; + + @Column(name="ROUTE_CODE") + @ApiParam("流程代码") + private String routeCode; + + @Column(name="PROCESS_CODE") + @ApiParam("工序代码") + private String processCode; + + @Column(name="NEXT_PROCESS_CODE") + @ApiParam("下一工序代码") + private String nextProcessCode; + + @Column(name="IN_WC_TIME") + @ApiParam("进产线时间") + private String inWorkCenterTime; + + @Column(name="OUT_WC_TIME") + @ApiParam("出产线时间") + private String outWorkCenterTime; + + @Column(name="SHIPPING_TIME") + @ApiParam("发运时间") + private String shippingTime; + + @Column(name="WORK_ORDER_NO") + @ApiParam("生产工单号") + private String workOrderNo; + + @Column(name="CUST_SN") + @ApiParam("客户条码") + private String custSn; + + @Column(name="CUST_PART_NO") + @ApiParam("客户零件号") + private String custPartNo; + + @Column(name="PACKAGE_SN") + @ApiParam("包装条码") + private String packageSn; + + public double getQtyVal() { + return this.qty == null ? 0.0d : this.qty; + } + + public int getQcStatusVal() { + return this.qcStatus == null ? 0 : this.qcStatus; + } + + public int getSnStatusVal() { + return this.snStatus == null ? 0 : this.snStatus; + } + + public int getPrintCountVal() { + return this.printCount == null ? 0 : this.printCount; + } + + public int getPrintStatusVal() { + return this.printStatus == null ? 0 : this.printStatus; + } +} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesQueueOrder.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesQueueOrder.java new file mode 100644 index 0000000..32e27cb --- /dev/null +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesQueueOrder.java @@ -0,0 +1,69 @@ +package cn.estsh.i3plus.pojo.mes.pcn.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: Crish + * @CreateDate:2019-04-16-17:36 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name="MES_QUEUE_ORDER") +@Api("生产队列主表") +public class MesQueueOrder extends BaseBean { + @Column(name="ORDER_NO") + @ApiParam("主队列编号") + private String orderNo; + + @Column(name="VIN_CODE") + @ApiParam("Vin") + private Integer vinCode; + + @Column(name="CUST_FLAG_NO") + @ApiParam("客户标识号") + private String custFlagNo; + + @Column(name="SEQ") + @ApiParam("排序") + private Double seq; + + @Column(name="WORK_ORDER_NO") + @ApiParam("生产工单号") + private String workOrderNo; + + @Column(name="STATUS") + @ApiParam("状态") + private Integer status; + + @Column(name="CUST_PROD_LINE_CODE") + @ApiParam("客户产线代码") + private String custProdLineCode; + + @Column(name="AREA_CODE") + @ApiParam("区域代码") + private String areaCode; + + public int getStatusVal() { + return this.status == null ? 0 : this.status; + } + + public double getSeq() { + return this.seq == null ? 0.0d : this.seq; + } +} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesQueueOrderDetail.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesQueueOrderDetail.java new file mode 100644 index 0000000..5b4c453 --- /dev/null +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesQueueOrderDetail.java @@ -0,0 +1,73 @@ +package cn.estsh.i3plus.pojo.mes.pcn.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: Crish + * @CreateDate:2019-04-16-17:36 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name="MES_QUEUE_ORDER_DETAIL") +@Api("生产队列明细") +public class MesQueueOrderDetail extends BaseBean { + @Column(name="ORDER_NO") + @ApiParam("工单号") + private String orderNo; + + @Column(name="PART_NO") + @ApiParam("物料号") + private Integer partNo; + + @Column(name="SERIAL_NUMBER") + @ApiParam("产品条码") + private String serialNumber; + + @Column(name="SEQ") + @ApiParam("队列明细序号") + private Double seq; + + @Column(name="QTY") + @ApiParam("数量") + private Double qty; + + @Column(name="STATUS") + @ApiParam("状态") + private Integer status; + + @Column(name="WORK_TYPE") + @ApiParam("生产类型") + private String workType; + + @Column(name="PRODUCE_CATEGORY") + @ApiParam("产品类型") + private String produceCategory; + + public double getSeqVal() { + return this.seq == null ? 0.0d : this.seq; + } + + public double getQtyVal() { + return this.qty == null ? 0.0d : this.qty; + } + + public int getStatusVal() { + return this.status == null ? 0 : this.status; + } +} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesRouteProcessCell.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesRouteProcessCell.java new file mode 100644 index 0000000..d531539 --- /dev/null +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesRouteProcessCell.java @@ -0,0 +1,41 @@ +package cn.estsh.i3plus.pojo.mes.pcn.bean; + +import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.hibernate.annotations.DynamicInsert; +import org.hibernate.annotations.DynamicUpdate; + +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.Table; + +/** + * @Description :工序工作单元 + * @Reference : + * @Author : jack.jia + * @CreateDate : 2019-04-02 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "MES_ROUTE_PROCESS_CELL") +@Api("工序工作单元对照") +public class MesRouteProcessCell extends BaseBean { + @Column(name = "ROUTE_CODE") + @ApiParam("流程代码") + private String routeCode; + + @Column(name = "PROCESS_CODE") + @ApiParam("工序代码") + private String processCode; + + @Column(name = "WORK_CELL_CODE") + @ApiParam("工作单元代码") + private String workCellCode; +} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesStep.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesStep.java new file mode 100644 index 0000000..1917e34 --- /dev/null +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesStep.java @@ -0,0 +1,49 @@ +package cn.estsh.i3plus.pojo.mes.pcn.bean; + +import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.hibernate.annotations.DynamicInsert; +import org.hibernate.annotations.DynamicUpdate; + +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.Table; + +/** + * @Description :工步 + * @Reference : + * @Author : jack.jia + * @CreateDate : 2019-04-02 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "MES_STEP") +@Api("工步") +public class MesStep extends BaseBean { + @Column(name = "STEP_CODE") + @ApiParam("工步代码") + private String stepCode; + + @Column(name = "STEP_NAME") + @ApiParam("工步名称") + private String stepName; + + @Column(name = "STEP_TEXT") + @ApiParam("工步描述") + private String stepText; + + @Column(name = "STEP_TYPE") + @ApiParam("工步类型") + private String stepType; + + @Column(name = "STEP_OBJECT") + @ApiParam("工步对象") + private String stepObject; +} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesStepParam.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesStepParam.java new file mode 100644 index 0000000..1c938ef --- /dev/null +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesStepParam.java @@ -0,0 +1,45 @@ +package cn.estsh.i3plus.pojo.mes.pcn.bean; + +import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.hibernate.annotations.DynamicInsert; +import org.hibernate.annotations.DynamicUpdate; + +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.Table; + +/** + * @Description :工步参数 + * @Reference : + * @Author : jack.jia + * @CreateDate : 2019-04-02 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "MES_STEP_PARAM") +@Api("工步参数") +public class MesStepParam extends BaseBean { + @Column(name = "STEP_CODE") + @ApiParam("工步代码") + private String stepCode; + + @Column(name = "PARAM_CODE") + @ApiParam("参数代码") + private String paramCode; + + @Column(name = "PARAM_NAME") + @ApiParam("参数名称") + private String paramName; + + @Column(name = "PARAM_ATTRIBUTE") + @ApiParam("参数属性") + private String paramAttribute; +} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesWorkCell.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesWorkCell.java new file mode 100644 index 0000000..68c7a7a --- /dev/null +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesWorkCell.java @@ -0,0 +1,45 @@ +package cn.estsh.i3plus.pojo.mes.pcn.bean; + +import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.hibernate.annotations.DynamicInsert; +import org.hibernate.annotations.DynamicUpdate; + +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.Table; + +/** + * @Description :工作单元 + * @Reference : + * @Author : jack.jia + * @CreateDate : 2019-04-02 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "MES_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; +} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesWorkCenter.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesWorkCenter.java new file mode 100644 index 0000000..d28d53b --- /dev/null +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesWorkCenter.java @@ -0,0 +1,49 @@ +package cn.estsh.i3plus.pojo.mes.pcn.bean; + +import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.hibernate.annotations.DynamicInsert; +import org.hibernate.annotations.DynamicUpdate; + +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.Table; + +/** + * @Description :工作中心 + * @Reference : + * @Author : jack.jia + * @CreateDate : 2019-04-02 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "MES_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; +} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesWorkOrder.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesWorkOrder.java new file mode 100644 index 0000000..4bcccee --- /dev/null +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesWorkOrder.java @@ -0,0 +1,141 @@ +package cn.estsh.i3plus.pojo.mes.pcn.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: Crish + * @CreateDate:2019-04-16-17:36 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name="MES_WORK_ORDER") +@Api("生产工单") +public class MesWorkOrder extends BaseBean { + @Column(name="ORDER_NO") + @ApiParam("工单号") + private String orderNo; + + @Column(name="PART_NO") + @ApiParam("物料号") + private String partNo; + + @Column(name="PROD_CFG_CODE") + @ApiParam("产品配置代码") + private String prodCfgCode; + + @Column(name="QTY") + @ApiParam("数量") + private Double qty; + + @Column(name="COMPLETE_QTY") + @ApiParam("完成数量") + private Double completeQty; + + @Column(name="REPAIR_QTY") + @ApiParam("返修数量") + private Double repairQty; + + @Column(name="SCRAP_QTY") + @ApiParam("报废数量") + private Double scrapQty; + + @Column(name="SEQ") + @ApiParam("工单序号") + private Double seq; + + @Column(name="WO_STATUS") + @ApiParam("工单状态") + private Integer workOrderStatus; + + @Column(name="WO_TYPE") + @ApiParam("工单类型") + private Integer workOrderType; + + @Column(name="NEXT_ORDER") + @ApiParam("下一工单") + private String nextOrder; + + @Column(name="PLAN_ORDER_NO") + @ApiParam("生产计划单号") + private String planOrderNo; + + @Column(name="WORK_CENTER_CODE") + @ApiParam("工作中心代码") + private String workCenterCode; + + @Column(name="WORK_CELL_CODE") + @ApiParam("工作单元代码") + private String workCellCode; + + @Column(name="SCHEDULE_DATE") + @ApiParam("排产日期") + private String scheduleDate; + + @Column(name="CUST_PROD_LINE_CODE") + @ApiParam("客户禅产线代码") + private String custProdLineCode; + + @Column(name="SHIFT_CODE") + @ApiParam("班次") + private String shiftCode; + + @Column(name="START_TIME") + @ApiParam("开始时间") + private String startTime; + + @Column(name="END_TIME") + @ApiParam("结束时间") + private String endTime; + + @Column(name="WO_SOURCE") + @ApiParam("工单来源") + private String workOrderSource; + + @Column(name="MEMO") + @ApiParam("备注") + private String memo; + + public double getQtyVal() { + return this.qty == null ? 0.0d : this.qty; + } + + public double getCompleteQtyVal() { + return this.completeQty == null ? 0.0d : this.completeQty; + } + + public double getRepairQtyVal() { + return this.repairQty == null ? 0.0d : this.repairQty; + } + + public double getScrapQtyVal() { + return this.scrapQty == null ? 0.0d : this.scrapQty; + } + + public double getSeqVal() { + return this.seq == null ? 0.0d : this.seq; + } + + public int getWorkOrderStatusVal() { + return this.workOrderStatus == null ? 0 : this.workOrderStatus; + } + + public int getWorkOrderTypeVal() { + return this.workOrderType == null ? 0 : this.workOrderType; + } +} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/StationRequestBean.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/StationRequestBean.java new file mode 100644 index 0000000..f91da45 --- /dev/null +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/StationRequestBean.java @@ -0,0 +1,48 @@ +package cn.estsh.i3plus.pojo.mes.pcn.model; + +import io.swagger.annotations.ApiParam; +import lombok.Data; + +import javax.persistence.Column; +import java.io.Serializable; + +/** + * @Description : 工位请求bean + * @Reference : + * @Author : jack.jia + * @CreateDate : 2019-04-19 + * @Modify: + **/ +@Data +public class StationRequestBean implements Serializable { + + @ApiParam("产品条码") + private String serialNumber; + + @ApiParam("物料号") + private String partNo; + + @ApiParam("工作中心代码") + private String workCenterCode; + + @ApiParam("工作单元代码") + private String workCellCode; + + @ApiParam("流程代码") + private String routeCode; + + @ApiParam("工序代码") + private String processCode; + + @ApiParam("客户端信息") + private String clientInfo; + + @ApiParam("用户信息") + private String userInfo; + + /** + * heartBit:心跳，scan：扫描 + */ + @ApiParam("业务类型") + private String busiType; +} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesBomRepository.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesBomRepository.java new file mode 100644 index 0000000..42b5b30 --- /dev/null +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesBomRepository.java @@ -0,0 +1,16 @@ +package cn.estsh.i3plus.pojo.mes.pcn.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.mes.pcn.bean.MesBom; +import org.springframework.stereotype.Repository; + +/** + * @Description : + * @Reference : + * @Author : jack.jia + * @CreateDate : 2019-04-02 + * @Modify: + **/ +@Repository +public interface MesBomRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesPartRepository.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesPartRepository.java new file mode 100644 index 0000000..0324dd1 --- /dev/null +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesPartRepository.java @@ -0,0 +1,16 @@ +package cn.estsh.i3plus.pojo.mes.pcn.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.mes.pcn.bean.MesPart; +import org.springframework.stereotype.Repository; + +/** + * @Description : + * @Reference : + * @Author : jack.jia + * @CreateDate : 2019-04-02 + * @Modify: + **/ +@Repository +public interface MesPartRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesProdRouteCfgRepository.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesProdRouteCfgRepository.java new file mode 100644 index 0000000..7a55397 --- /dev/null +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesProdRouteCfgRepository.java @@ -0,0 +1,16 @@ +package cn.estsh.i3plus.pojo.mes.pcn.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.mes.pcn.bean.MesProdRouteCfg; +import org.springframework.stereotype.Repository; + +/** + * @Description : + * @Reference : + * @Author : jack.jia + * @CreateDate : 2019-04-02 + * @Modify: + **/ +@Repository +public interface MesProdRouteCfgRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesProdRouteOptParamRepository.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesProdRouteOptParamRepository.java new file mode 100644 index 0000000..93e532b --- /dev/null +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesProdRouteOptParamRepository.java @@ -0,0 +1,16 @@ +package cn.estsh.i3plus.pojo.mes.pcn.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.mes.pcn.bean.MesProdRouteOptParam; +import org.springframework.stereotype.Repository; + +/** + * @Description : + * @Reference : + * @Author : jack.jia + * @CreateDate : 2019-04-02 + * @Modify: + **/ +@Repository +public interface MesProdRouteOptParamRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesProduceSnRepository.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesProduceSnRepository.java new file mode 100644 index 0000000..e049715 --- /dev/null +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesProduceSnRepository.java @@ -0,0 +1,16 @@ +package cn.estsh.i3plus.pojo.mes.pcn.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.mes.pcn.bean.MesProduceSn; +import org.springframework.stereotype.Repository; + +/** + * @Description: + * @Reference: + * @Author: Crish + * @CreateDate:2019-04-17-17:10 + * @Modify: + **/ +@Repository +public interface MesProduceSnRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesQueueOrderDetailRepository.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesQueueOrderDetailRepository.java new file mode 100644 index 0000000..82bbefb --- /dev/null +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesQueueOrderDetailRepository.java @@ -0,0 +1,16 @@ +package cn.estsh.i3plus.pojo.mes.pcn.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.mes.pcn.bean.MesQueueOrderDetail; +import org.springframework.stereotype.Repository; + +/** + * @Description: + * @Reference: + * @Author: Crish + * @CreateDate:2019-04-17-17:12 + * @Modify: + **/ +@Repository +public interface MesQueueOrderDetailRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesQueueOrderRepository.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesQueueOrderRepository.java new file mode 100644 index 0000000..989e14f --- /dev/null +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesQueueOrderRepository.java @@ -0,0 +1,16 @@ +package cn.estsh.i3plus.pojo.mes.pcn.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.mes.pcn.bean.MesQueueOrder; +import org.springframework.stereotype.Repository; + +/** + * @Description: + * @Reference: + * @Author: Crish + * @CreateDate:2019-04-17-17:11 + * @Modify: + **/ +@Repository +public interface MesQueueOrderRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesRouteProcessCellRepository.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesRouteProcessCellRepository.java new file mode 100644 index 0000000..f217869 --- /dev/null +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesRouteProcessCellRepository.java @@ -0,0 +1,16 @@ +package cn.estsh.i3plus.pojo.mes.pcn.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.mes.pcn.bean.MesRouteProcessCell; +import org.springframework.stereotype.Repository; + +/** + * @Description : + * @Reference : + * @Author : jack.jia + * @CreateDate : 2019-04-02 + * @Modify: + **/ +@Repository +public interface MesRouteProcessCellRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesStepParamRepository.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesStepParamRepository.java new file mode 100644 index 0000000..f7b386f --- /dev/null +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesStepParamRepository.java @@ -0,0 +1,16 @@ +package cn.estsh.i3plus.pojo.mes.pcn.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.mes.pcn.bean.MesStepParam; +import org.springframework.stereotype.Repository; + +/** + * @Description : + * @Reference : + * @Author : jack.jia + * @CreateDate : 2019-04-02 + * @Modify: + **/ +@Repository +public interface MesStepParamRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesStepRepository.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesStepRepository.java new file mode 100644 index 0000000..5f3f562 --- /dev/null +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesStepRepository.java @@ -0,0 +1,16 @@ +package cn.estsh.i3plus.pojo.mes.pcn.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.mes.pcn.bean.MesStep; +import org.springframework.stereotype.Repository; + +/** + * @Description : + * @Reference : + * @Author : jack.jia + * @CreateDate : 2019-04-02 + * @Modify: + **/ +@Repository +public interface MesStepRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesWorkCellRepository.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesWorkCellRepository.java new file mode 100644 index 0000000..ce59423 --- /dev/null +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesWorkCellRepository.java @@ -0,0 +1,16 @@ +package cn.estsh.i3plus.pojo.mes.pcn.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.mes.pcn.bean.MesWorkCell; +import org.springframework.stereotype.Repository; + +/** + * @Description : + * @Reference : + * @Author : jack.jia + * @CreateDate : 2019-04-02 + * @Modify: + **/ +@Repository +public interface MesWorkCellRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesWorkCenterRepository.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesWorkCenterRepository.java new file mode 100644 index 0000000..e24b5db --- /dev/null +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesWorkCenterRepository.java @@ -0,0 +1,16 @@ +package cn.estsh.i3plus.pojo.mes.pcn.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.mes.pcn.bean.MesWorkCenter; +import org.springframework.stereotype.Repository; + +/** + * @Description : + * @Reference : + * @Author : jack.jia + * @CreateDate : 2019-04-02 + * @Modify: + **/ +@Repository +public interface MesWorkCenterRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesWorkOrderRepository.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesWorkOrderRepository.java new file mode 100644 index 0000000..40676c4 --- /dev/null +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesWorkOrderRepository.java @@ -0,0 +1,16 @@ +package cn.estsh.i3plus.pojo.mes.pcn.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.mes.pcn.bean.MesWorkOrder; +import org.springframework.stereotype.Repository; + +/** + * @Description: + * @Reference: + * @Author: Crish + * @CreateDate:2019-04-17-17:13 + * @Modify: + **/ +@Repository +public interface MesWorkOrderRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesCustomer.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesCustomer.java new file mode 100644 index 0000000..f7191c8 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesCustomer.java @@ -0,0 +1,54 @@ +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 :mes客户表 + * @Reference : + * @Author : crish + * @CreateDate : 2019-04-22 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name="MES_CUSTOMER") +@Api("客户产线代码") +public class MesCustomer extends BaseBean { + @Column(name="CUSTOMER_CODE") + @ApiParam("客户代码") + private String CUSTOMER_CODE; + + @Column(name="CUSTOMER_NAME") + @ApiParam("客户名称") + private String CUSTOMER_NAME; + + @Column(name="BRIEF_TEXT") + @ApiParam("客户简称") + private String BRIEF_TEXT; + + @Column(name="ADDRESS") + @ApiParam("客户地址") + private String ADDRESS; + + @Column(name="CONTACT") + @ApiParam("客户联系人") + private String CONTACT; + + @Column(name="TELEPHONE") + @ApiParam("客户电话") + private String TELEPHONE; +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPlanOrder.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPlanOrder.java index b017d0b..f560afe 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPlanOrder.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPlanOrder.java @@ -1,6 +1,8 @@ package cn.estsh.i3plus.pojo.mes.bean; import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import cn.estsh.i3plus.pojo.base.enumutil.MesEnumUtil; +import com.fasterxml.jackson.annotation.JsonFormat; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; @@ -11,6 +13,9 @@ import org.hibernate.annotations.DynamicUpdate; import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Table; +import javax.persistence.Transient; +import java.util.Arrays; +import java.util.List; /** * @Description: @@ -43,6 +48,10 @@ public class MesPlanOrder extends BaseBean { @ApiParam("物料号") private String partNo; + @Column(name="PART_NAME_RDD") + @ApiParam("物料名称") + private String partNameRdd; + @Column(name="PLAN_QTY") @ApiParam("计划数量") private Double planQty; @@ -83,6 +92,41 @@ public class MesPlanOrder extends BaseBean { @ApiParam("备注") private String memo; + /********************** 冗余字段 *********************************/ + @Transient + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") + @ApiParam(value="创建日期查询用，查询结束日期",example = "2018-12-31 23:59:59") + public String startTimeStart; + + + @Transient + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") + @ApiParam(value="创建日期查询用，查询结束日期",example = "2018-12-31 23:59:59") + public String startTimeEnd; + + + @Transient + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") + @ApiParam(value="计划结束日期查询用，查询结束日期",example = "2018-12-31 23:59:59") + public String endTimeStart; + + @Transient + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") + @ApiParam(value="计划结束日期查询用，查询结束日期",example = "2018-12-31 23:59:59") + public String endTimeEnd; + + public List planTypeEnum; + + public List planOrderStatusEnum; + + public List getPlanTypeEnum() { + return Arrays.asList(MesEnumUtil.PLAN_ORDER_TYPE.values()); + } + + public List getPlanOrderStatusEnum() { + return Arrays.asList(MesEnumUtil.PLAN_ORDER_STATUS.values()); + } + public double getPlanQtyVal() { return this.planQty == null ? 0.0d : this.planQty; } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueOrderDetail.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueOrderDetail.java index a2a12af..8afd878 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueOrderDetail.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueOrderDetail.java @@ -39,9 +39,9 @@ public class MesQueueOrderDetail extends BaseBean { @ApiParam("产品条码") private String serialNumber; - @Column(name="DETAIL_SEQ") + @Column(name="SEQ") @ApiParam("队列明细序号") - private Double detailSeq; + private Double seq; @Column(name="QTY") @ApiParam("数量") @@ -59,8 +59,8 @@ public class MesQueueOrderDetail extends BaseBean { @ApiParam("产品类型") private String produceCategory; - public double getDetailSeqVal() { - return this.detailSeq == null ? 0.0d : this.detailSeq; + public double getSeqVal() { + return this.seq == null ? 0.0d : this.seq; } public double getQtyVal() { diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesPlanOrderModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesPlanOrderModel.java new file mode 100644 index 0000000..d55141f --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesPlanOrderModel.java @@ -0,0 +1,14 @@ +package cn.estsh.i3plus.pojo.mes.model; + +import cn.estsh.i3plus.pojo.mes.bean.MesPart; +import cn.estsh.i3plus.pojo.mes.bean.MesWorkOrder; + +/** + * @Description: + * @Reference: + * @Author: Crish + * @CreateDate:2019-04-18-14:16 + * @Modify: + **/ +public class MesPlanOrderModel extends MesWorkOrder { +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesCustomerRepository.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesCustomerRepository.java new file mode 100644 index 0000000..7bea331 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesCustomerRepository.java @@ -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.MesCustomer; +import org.springframework.stereotype.Repository; + +/** + * @Description: + * @Reference: + * @Author: Crish + * @CreateDate:2019-04-22-16:12 + * @Modify: + **/ +@Repository +public interface MesCustomerRepository extends BaseRepository { + +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java new file mode 100644 index 0000000..a05974a --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java @@ -0,0 +1,79 @@ +package cn.estsh.i3plus.pojo.mes.sqlpack; + +import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import cn.estsh.i3plus.pojo.base.bean.DdlPackBean; +import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil; +import cn.estsh.i3plus.pojo.base.tool.DdlPreparedPack; +import cn.estsh.i3plus.pojo.mes.bean.MesPlanOrder; +import org.apache.commons.lang3.StringUtils; + +/** + * @Description: + * @Reference: Mes 条件封装 + * @Author: Crish + * @CreateDate:2019-04-22-14:58 + * @Modify: + **/ +public class MesHqlPack { + + /** + * 通用查询条件 + * @param organizeCode + * @return + */ + public static DdlPackBean getAllBaseData(String organizeCode) { + DdlPackBean packBean = new DdlPackBean(); + DdlPreparedPack.getStringEqualPack(organizeCode, "organizeCode", packBean); + DdlPreparedPack.getNumEqualPack(CommonEnumUtil.IS_VAILD.VAILD.getValue(), "isValid", packBean); + DdlPreparedPack.getNumEqualPack(CommonEnumUtil.IS_DEAL.NO.getValue(), "isDeleted", packBean); + return packBean; + } + + /** + * 生产计划查询条件封装 + * @param mesPlanOrder + * @return + */ + public static DdlPackBean getPlanOrderCondition(MesPlanOrder mesPlanOrder) { + DdlPackBean packBean = new DdlPackBean(); + DdlPreparedPack.getStringEqualPack(mesPlanOrder.getCustCode(), "organizeCode", packBean); + DdlPreparedPack.getNumEqualPack(CommonEnumUtil.IS_VAILD.VAILD.getValue(), "isValid", packBean); + DdlPreparedPack.getNumEqualPack(CommonEnumUtil.IS_DEAL.NO.getValue(), "isDeleted", packBean); + + if (StringUtils.isNotEmpty(mesPlanOrder.getOrderNo())) { + DdlPreparedPack.getStringEqualPack(mesPlanOrder.getOrderNo(), "orderNo", packBean); + } + if (StringUtils.isNotEmpty(mesPlanOrder.getPartNo())) { + DdlPreparedPack.getStringEqualPack(mesPlanOrder.getPartNo(), "partNo", packBean); + } + if (StringUtils.isNotEmpty(mesPlanOrder.getPlanType() + "")) { + DdlPreparedPack.getNumEqualPack(mesPlanOrder.getPlanType(), "planType", packBean); + } + + if (StringUtils.isNotEmpty(mesPlanOrder.getStatusVal() + "")) { + DdlPreparedPack.getNumEqualPack(mesPlanOrder.getStatusVal(), "status", packBean); + } + if (StringUtils.isNotEmpty(mesPlanOrder.getStatusVal() + "")) { + DdlPreparedPack.getStringEqualPack(mesPlanOrder.getCreateUser(), "createUser", packBean); + } + + DdlPreparedPack.timeBuilder( + mesPlanOrder.getStartTimeStart(), + mesPlanOrder.getStartTimeEnd(), + "startTime", packBean, true); + DdlPreparedPack.timeBuilder( + mesPlanOrder.getEndTimeStart(), + mesPlanOrder.getEndTimeEnd(), + "endTime", packBean, true); + DdlPreparedPack.timeBuilder( + mesPlanOrder.getCreateDateTimeStart(), + mesPlanOrder.getCreateDateTimeEnd(), + "createDateTime", packBean, true); + // 排序 + DdlPreparedPack.getOrderByPack(new Object[]{"2"},new String[]{mesPlanOrder.getOrderByParam()} , packBean); + DdlPreparedPack.getOrderDefault(mesPlanOrder); + return packBean; + } + + +} diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/form/FormModel.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/form/FormModel.java index 08b4fd5..e8cc46b 100644 --- a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/form/FormModel.java +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/form/FormModel.java @@ -1,9 +1,6 @@ package cn.estsh.i3plus.pojo.model.form; -import cn.estsh.i3plus.pojo.form.bean.BfButton; -import cn.estsh.i3plus.pojo.form.bean.BfLayout; -import cn.estsh.i3plus.pojo.form.bean.BfMethod; -import cn.estsh.i3plus.pojo.form.bean.BfMethodDetail; +import cn.estsh.i3plus.pojo.form.bean.*; import io.swagger.annotations.ApiParam; import lombok.Data; @@ -54,4 +51,6 @@ public class FormModel { @ApiParam(value = "元素Model") private List elementModelList; + @ApiParam(value = "表单功能明细关联属性") + private List methodDetailPropertyRefList; } diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsLotQCTransModel.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsLotQCTransModel.java new file mode 100644 index 0000000..e6a8165 --- /dev/null +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsLotQCTransModel.java @@ -0,0 +1,20 @@ +package cn.estsh.i3plus.pojo.model.wms; + +import cn.estsh.i3plus.pojo.wms.bean.WmsStockSn; +import lombok.Data; + +import java.io.Serializable; +import java.util.List; + +/** + * @Description : 散件质检明细处理model + * @Reference : + * @Author : hansen.ke + * @CreateDate : 2019-04-22 9:43 + * @Modify: + **/ +@Data +public class WmsLotQCTransModel implements Serializable { + private String orderNo; + private List wmsStockSnList; +} diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysMenu.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysMenu.java index da33264..3042a97 100644 --- a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysMenu.java +++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysMenu.java @@ -27,7 +27,9 @@ import java.util.List; @DynamicUpdate @EqualsAndHashCode(callSuper = true) //@Table(name="SYS_MENU",indexes = {@Index(name="索引名称",columnList = "列名1,列名2")}) -@Table(name="SYS_MENU") +@Table(name="SYS_MENU",indexes = { + @Index(name="index_sys_menu_parent_id",columnList = "PARENT_ID"), +}) @Api(value="系统功能",description = "系统功能") public class SysMenu extends BaseBean { diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockQuan.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockQuan.java index 325dafc..cddb417 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockQuan.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockQuan.java @@ -128,4 +128,18 @@ public class WmsStockQuan extends BaseBean { public Double getLockQty() { return this.lockQty == null ? 0 : this.lockQty; } + + public WmsStockQuan() { + } + + public WmsStockQuan(Double qty, Double failQty, Double holdQty, Double qcQty, Double rinQty, Double freezeQty, Double consignQty, Double lockQty) { + this.qty = qty; + this.failQty = failQty; + this.holdQty = holdQty; + this.qcQty = qcQty; + this.rinQty = rinQty; + this.freezeQty = freezeQty; + this.consignQty = consignQty; + this.lockQty = lockQty; + } } 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 b6a45ce..12cca86 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 @@ -1021,13 +1021,35 @@ public class WmsHqlPack { HqlPack.getStringEqualPack(wmsMoveSn.getOrderNo(), "orderNo", result); HqlPack.getStringEqualPack(wmsMoveSn.getPartNo(), "partNo", result); HqlPack.getStringLikerPack(wmsMoveSn.getPartNameRdd(), "partNameRdd", result); - + HqlPack.getStringEqualPack(wmsMoveSn.getRemark(), "remark", result); getStringBuilderPack(wmsMoveSn, result); return result.toString(); } /** + * 针对质检查询库存移动条码条件封装 + * @param sn + * @return + */ + public static DdlPackBean packHqlWmsMoveSnForQC(List orderList, String sn, String organizeCode) { + DdlPackBean result = new DdlPackBean(); + DdlPreparedPack.getStringEqualPack(sn, "sn", result); + DdlPreparedPack.getInPackList(orderList, "orderNo", result); + DdlPreparedPack.getStringNotNullPack("remark", result); + + // 判断工厂代码是否为空 + if (StringUtils.isNotBlank(organizeCode)) { + DdlPreparedPack.getStringEqualPack(organizeCode, "organizeCode", result); + } + + // 封装有效状态和删除状态 + DdlPreparedPack.getNumEqualPack(CommonEnumUtil.IS_VAILD.VAILD.getValue(), "isValid", result); + DdlPreparedPack.getNumEqualPack(CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue(), "isDeleted", result); + return result; + } + + /** * 质检单信息 查询条件封装 * * @param wmsQCMaster