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

Merge remote-tracking branch 'remotes/origin/dev' into test

Browse Source
yun-zuoyi
jimmy.zeng 6 years ago
parent ef40914935 3711873c29
commit 483ea59142
11 changed files with 315 additions and 32 deletions
Show Stats Download Patch File Download Diff File

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

@ -752,6 +752,42 @@ public class MesEnumUtil {
}
/**
* 系统配置表枚举
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum CONFIG_TYPE {
FASTDFS_SAVE_PATH(10, "savePath");
private int value;
private String description;
CONFIG_TYPE(int value, String description) {
this.value = value;
this.description = description;
}
public int getValue() {
return value;
}
public String getDescription() {
return description;
}
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;
}
}
/**
* 事件类型枚举
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)

24
modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesESOP.java
Unescape Escape View File

@ -62,4 +62,28 @@ public class MesESOP extends BaseBean {
@Column(name="SOP_URL")
@ApiParam("SOP_URL")
private String sopUrl;
@Column(name="GROUP_NAME")
@ApiParam("GROUP_NAME")
private String groupName;
@Column(name="FILE_ORIGIN_NAME")
@ApiParam("FILE_ORIGIN_NAME")
private String fileOriginName;
@Column(name="FILE_SIZE")
@ApiParam("FILE_SIZE")
private String fileSize;
@Column(name="FILE_TYPE_ID")
@ApiParam("FILE_TYPE_ID")
private String fileTypeId;
@Column(name="FILE_TYPE_NAME")
@ApiParam("FILE_TYPE_NAME")
private String fileTypeName;
@Column(name="SYNC_TAG")
@ApiParam("SYNC_TAG")
private Integer syncTag=0;
}

47
modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesLabelTemplate.java
Unescape Escape View File

@ -0,0 +1,47 @@
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.*;
/**
* @Description : 打印模板
* @Reference :
* @Author : siliter
* @CreateDate : 2019-03-18 11:00
* @Modify:
**/
@Data
@Entity
@DynamicInsert
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
@Table(name="Mes_LABEL_TEMPLATE")
@Api(value="打印模板",description = "打印模板")
public class MesLabelTemplate extends BaseBean {
private static final long serialVersionUID = 5371856566557305323L;
@Column(name="TEMPLATE_CODE")
@ApiParam(value ="模板代码")
private String templateCode;
@Column(name="TEMPLATE_NAME")
@ApiParam(value ="模板名称")
private String templateName;
@Lob
@Column(name="TEMPLATE_CONTENT")
@ApiParam(value ="模板内容")
private String templateContent;
// 参数拼接，多参数都好分隔，后台在做处理
@ApiParam(value ="模板参数拼接")
@Transient
private String paramsPack;
}

54
modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesLabelTemplateParam.java
Unescape Escape View File

@ -0,0 +1,54 @@
package cn.estsh.i3plus.pojo.mes.pcn.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.*;
/**
* @Description : 打印模板参数
* @Reference :
* @Author : siliter
* @CreateDate : 2019-03-18 11:00
* @Modify:
**/
@Data
@Entity
@DynamicInsert
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
@Table(name="Mes_LABEL_TEMPLATE_PARAM")
@Api(value="打印模板参数",description = "打印模板参数")
public class MesLabelTemplateParam extends BaseBean {
private static final long serialVersionUID = 6476163540527157643L;
@Column(name="TEMPLATE_ID")
@ApiParam(value ="模板ID" , access ="模板ID" ,example = "-1")
@JsonSerialize(using = ToStringSerializer.class)
private Long templateId;
@Column(name="TEMPLATE_CODE")
@ApiParam(value ="模板代码")
private String templateCode;
@Column(name="TEMPLATE_PARAM")
@ApiParam(value ="模板参数")
private String templateParam;
@Lob
@Column(name="TEMPLATE_PARAM_TEXT")
@ApiParam(value ="模板参数描述")
private String templateParamText;
// 参数拼接，多参数都好分隔，后台在做处理
@ApiParam(value ="模板参数值")
@Transient
private String templateParamValue;
}

31
modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/FastDfsDownloadModel.java
Unescape Escape View File

@ -0,0 +1,31 @@
package cn.estsh.i3plus.pojo.mes.pcn.model;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiParam;
import lombok.AllArgsConstructor;
import lombok.Data;
import lombok.NoArgsConstructor;
/**
* @Author: Wynne.Lu
* @CreateDate: 2019/8/19 7:00 PM
* @Description:
**/
@Data
@NoArgsConstructor
@AllArgsConstructor
@Api("FastDfs文件model")
public class FastDfsDownloadModel {
@ApiParam("部分相对路径")
private String dirPath;
@ApiParam("文件名称")
private String fileName;
@ApiParam("文件字节")
private byte[] fileByte;
}

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

@ -0,0 +1,17 @@
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.MesArea;
import cn.estsh.i3plus.pojo.mes.pcn.bean.MesLabelTemplateParam;
import org.springframework.stereotype.Repository;
/**
* @Description :
* @Reference :
* @Author : jack.jia
* @CreateDate : 2019-04-02
* @Modify:
**/
@Repository
public interface MesLabelTemplateParamRepository extends BaseRepository<MesLabelTemplateParam, Long> {
}

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

@ -0,0 +1,17 @@
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.MesArea;
import cn.estsh.i3plus.pojo.mes.pcn.bean.MesLabelTemplate;
import org.springframework.stereotype.Repository;
/**
* @Description :
* @Reference :
* @Author : jack.jia
* @CreateDate : 2019-04-02
* @Modify:
**/
@Repository
public interface MesLabelTemplateRepository extends BaseRepository<MesLabelTemplate, Long> {
}

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

@ -23,27 +23,27 @@ import javax.persistence.Table;
@DynamicInsert
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
@Table(name="MES_ESOP")
@Table(name = "MES_ESOP")
@Api("作业指导书信息表(ODS)")
public class MesESOP extends BaseBean {
@Column(name="PART_NO")
@Column(name = "PART_NO")
@ApiParam("零件号")
private String partNo;
@Column(name="WORK_CENTER_CODE")
@Column(name = "WORK_CENTER_CODE")
@ApiParam("工作中心代码")
private String workCenterCode;
@Column(name="WORK_CELL_CODE")
@Column(name = "WORK_CELL_CODE")
@ApiParam("工作单元代码")
private String workCellCode;
@Column(name="ROUTE_CODE")
@Column(name = "ROUTE_CODE")
@ApiParam("流程代码")
private String routeCode;
@Column(name="PROCESS_CODE")
@Column(name = "PROCESS_CODE")
@ApiParam("工序代码")
private String processCode;
@ -55,11 +55,32 @@ public class MesESOP extends BaseBean {
@ApiParam("工步序号")
private Integer stepSeq;
@Column(name="SOP_NAME")
@Column(name = "SOP_NAME")
@ApiParam("SOP名称")
private String sopName;
@Column(name="SOP_URL")
@Column(name = "SOP_URL")
@ApiParam("SOP_URL")
private String sopUrl;
private String sopUrl;
@Column(name="GROUP_NAME")
@ApiParam("GROUP_NAME")
private String groupName;
@Column(name="FILE_ORIGIN_NAME")
@ApiParam("FILE_ORIGIN_NAME")
private String fileOriginName;
@Column(name="FILE_SIZE")
@ApiParam("FILE_SIZE")
private String fileSize;
@Column(name="FILE_TYPE_ID")
@ApiParam("FILE_TYPE_ID")
private String fileTypeId;
@Column(name="FILE_TYPE_NAME")
@ApiParam("FILE_TYPE_NAME")
private String fileTypeName;
}

31
modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/FastDfsDownloadModel.java
Unescape Escape View File

@ -0,0 +1,31 @@
package cn.estsh.i3plus.pojo.mes.model;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiParam;
import lombok.AllArgsConstructor;
import lombok.Data;
import lombok.NoArgsConstructor;
/**
* @Author: Wynne.Lu
* @CreateDate: 2019/8/19 7:00 PM
* @Description:
**/
@Data
@NoArgsConstructor
@AllArgsConstructor
@Api("FastDfs文件model")
public class FastDfsDownloadModel {
@ApiParam("部分相对路径")
private String dirPath;
@ApiParam("文件名称")
private String fileName;
@ApiParam("文件字节")
private byte[] fileByte;
}

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

@ -49,6 +49,7 @@ public class MesHqlPack {
}
return packBean;
}
/**
* 生产计划查询条件封装
*
@ -376,15 +377,16 @@ public class MesHqlPack {
/******************created by wynne*************/
/**
* MES 报废信息查询
*
* @param mesScrap
* @return
*/
public static DdlPackBean getMesScrap(MesScrap mesScrap, String organizeCode) {
DdlPackBean packBean = getAllBaseData(organizeCode);
if (StringUtils.isNotEmpty(mesScrap.getScrapCode())){
if (StringUtils.isNotEmpty(mesScrap.getScrapCode())) {
DdlPreparedPack.getStringLikerPack(mesScrap.getScrapCode(), "scrapCode", packBean);
}
if (StringUtils.isNotEmpty(mesScrap.getScrapName())){
if (StringUtils.isNotEmpty(mesScrap.getScrapName())) {
DdlPreparedPack.getStringLikerPack(mesScrap.getScrapName(), "scrapName", packBean);
}
if (mesScrap.getIsValid() != null) {
@ -395,15 +397,16 @@ public class MesHqlPack {
/**
* MES PCN系统配置信息条件查询
*
* @param mesConfig
* @return
*/
public static DdlPackBean getMesConfig(MesConfig mesConfig, String organizeCode) {
DdlPackBean packBean = getAllBaseData(organizeCode);
if (StringUtils.isNotEmpty(mesConfig.getCfgCode())){
if (StringUtils.isNotEmpty(mesConfig.getCfgCode())) {
DdlPreparedPack.getStringLikerPack(mesConfig.getCfgCode(), "cfgCode", packBean);
}
if (StringUtils.isNotEmpty(mesConfig.getCfgName())){
if (StringUtils.isNotEmpty(mesConfig.getCfgName())) {
DdlPreparedPack.getStringLikerPack(mesConfig.getCfgName(), "cfgName", packBean);
}
if (mesConfig.getIsValid() != null) {
@ -414,18 +417,19 @@ public class MesHqlPack {
/**
* MES 维修信息条件查询
*
* @param mesRepair
* @return
*/
public static DdlPackBean getMesRepair(MesRepair mesRepair, String organizeCode) {
DdlPackBean packBean = getAllBaseData(organizeCode);
if (StringUtils.isNotEmpty(mesRepair.getRepairCode())){
if (StringUtils.isNotEmpty(mesRepair.getRepairCode())) {
DdlPreparedPack.getStringLikerPack(mesRepair.getRepairCode(), "repairCode", packBean);
}
if (StringUtils.isNotEmpty(mesRepair.getRepairName())){
if (StringUtils.isNotEmpty(mesRepair.getRepairName())) {
DdlPreparedPack.getStringLikerPack(mesRepair.getRepairName(), "repairName", packBean);
}
if (mesRepair.getRepairType() != null){
if (mesRepair.getRepairType() != null) {
DdlPreparedPack.getNumEqualPack(mesRepair.getRepairType(), "repairType", packBean);
}
if (mesRepair.getIsValid() != null) {
@ -474,26 +478,27 @@ public class MesHqlPack {
return packBean;
}
public static DdlPackBean getMesEventByButtonCode(String buttonCode,String org){
DdlPackBean packBean=getAllBaseData(org);
DdlPreparedPack.getStringEqualPack(buttonCode,"buttonCode",packBean);
DdlPreparedPack.getStringEqualPack(CommonEnumUtil.IS_VAILD.VAILD.getValue()+"","isValid",packBean);
public static DdlPackBean getMesEventByButtonCode(String buttonCode, String org) {
DdlPackBean packBean = getAllBaseData(org);
DdlPreparedPack.getStringEqualPack(buttonCode, "buttonCode", packBean);
DdlPreparedPack.getNumEqualPack(CommonEnumUtil.IS_VAILD.VAILD.getValue(), "isValid", packBean);
return packBean;
}
public static DdlPackBean getMesEventByEventCode(String eventCode,String org){
DdlPackBean packBean=getAllBaseData(org);
DdlPreparedPack.getStringEqualPack(eventCode,"eventCode",packBean);
DdlPreparedPack.getStringEqualPack(CommonEnumUtil.IS_VAILD.VAILD.getValue()+"","isValid",packBean);
public static DdlPackBean getMesEventByEventCode(String eventCode, String org) {
DdlPackBean packBean = getAllBaseData(org);
DdlPreparedPack.getStringEqualPack(eventCode, "eventCode", packBean);
DdlPreparedPack.getNumEqualPack(CommonEnumUtil.IS_VAILD.VAILD.getValue(), "isValid", packBean);
return packBean;
}
public static DdlPackBean getMesActionByActionCode(MesAction mesAction,String organizeCode){
DdlPackBean packBean=getAllBaseDataByNormalPro(mesAction,organizeCode);
DdlPreparedPack.getStringEqualPack(mesAction.getActionCode(),"actionCode",packBean);
public static DdlPackBean getMesActionByActionCode(MesAction mesAction, String organizeCode) {
DdlPackBean packBean = getAllBaseDataByNormalPro(mesAction, organizeCode);
DdlPreparedPack.getStringEqualPack(mesAction.getActionCode(), "actionCode", packBean);
return packBean;
}
/**
* 动作分页获取封装
*
@ -511,9 +516,8 @@ public class MesHqlPack {
DdlPreparedPack.getStringLikerPack(mesAction.getActionName(), "actionName", packBean);
}
if (mesAction.getActionType() != null && StringUtils.isNotEmpty(mesAction.getActionType() + "")) {
DdlPreparedPack.getStringEqualPack(mesAction.getActionType() + "", "actionType", packBean);
}
DdlPreparedPack.getNumEqualPack(mesAction.getActionType(), "actionType", packBean);
return packBean;
}
@ -548,6 +552,7 @@ public class MesHqlPack {
}
return packBean;
}
/**
* 事件动作分页获取封装
*

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

@ -25,7 +25,7 @@ import javax.persistence.Table;
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
@Table(name="BAS_VENDOR")
@Api("供应商")
@Api("供应商信息")
public class BasVendor extends BaseBean{
private static final long serialVersionUID = 9214639813072592779L;

Write Preview
Loading…
Cancel
Save