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
于学杰 6 years ago
parent fcefe8de38 9a6b1c4bf1
commit 75bb3f4780
15 changed files with 456 additions and 55 deletions
Show Stats Download Patch File Download Diff File

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

@ -35,5 +35,8 @@ public class MesWorkOrderButtonModel implements Serializable {
@ApiParam("关闭按钮")
private boolean closeButton;
@ApiParam("完成按钮")
private boolean completeButton;
}

5
modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesDatasource.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;
/**
* @Author: Wynne.Lu
@ -63,4 +64,8 @@ public class MesDatasource extends BaseBean {
@ApiParam("数据库名称")
private String dsDbName;
@Transient
@ApiParam("设备名称")
private String equipmentName;
}

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

@ -0,0 +1,64 @@
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;
import javax.persistence.Transient;
/**
* @Description :设备周期作业计划
* @Reference :
* @Author : wangjie
* @CreateDate : 2019-10-11
* @Modify:
**/
@Data
@Entity
@DynamicInsert
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
@Table(name="MES_EQU_TASK_PLAN")
@Api("设备周期作业计划")
public class MesEquTaskPlan extends BaseBean {
@Column(name="EQUIPMENT_CODE")
@ApiParam("设备代码")
private String equipmentCode;
@Column(name="EQUIPMENT_NAME")
@ApiParam("设备名称")
private String equipmentName;
@Column(name="TASK_TYPE")
@ApiParam("作业类型")
private Integer taskType;
@Column(name="TASK_CYCLE")
@ApiParam("周期(天)")
private Integer taskCycle;
@Column(name="LAST_TIME")
@ApiParam("上一执行时间")
private String lastTime;
@Column(name="DAYS_IN_ADVANCE")
@ApiParam("创建提前天数")
private String daysInAdvance;
@Transient
@ApiParam(value="生产线")
private String workCenterCode;
@Transient
@ApiParam(value="设备类别")
private String equipmentCategory;
}

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

@ -25,7 +25,7 @@ import javax.persistence.Table;
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
@Table(name = "MES_FAULT_CAUSE")
@Api("PLC配置表")
@Api("mes设备故障原因表")
public class MesFaultCause extends BaseBean {
@Column(name = "FC_CODE")

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

@ -25,7 +25,7 @@ import javax.persistence.Table;
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
@Table(name = "MES_FAULT_METHOD")
@Api("PLC配置表")
@Api("mes设备故障方法表")
public class MesFaultMethod extends BaseBean {
@Column(name = "FM_CODE")

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

@ -25,7 +25,7 @@ import javax.persistence.Table;
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
@Table(name = "MES_FAULT_PHENOMENON")
@Api("PLC配置表")
@Api("mes设备故障现象表")
public class MesFaultPhenomenon extends BaseBean {
@Column(name = "FP_CODE")

9
modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPlc.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:
@ -70,11 +71,11 @@ public class MesPlc extends BaseBean {
private String equipmentCode;
@Column(name = "WORK_CENTER_CODE")
@ApiParam("工作中心")
@ApiParam("生产线")
private String workCenterCode;
@Column(name = "WORK_CELL_CODE")
@ApiParam("工作单元")
@ApiParam("工位")
private String workCellCode;
@Column(name = "PLC_CFG")
@ -88,4 +89,8 @@ public class MesPlc extends BaseBean {
@Column(name = "IS_ANALYSIS")
@ApiParam("是否解析")
private String isAnalysis;
@Transient
@ApiParam("设备名称")
private String equipmentName;
}

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

@ -0,0 +1,98 @@
package cn.estsh.i3plus.pojo.mes.model;
import io.swagger.annotations.ApiParam;
import lombok.Data;
import java.io.Serializable;
/**
* @Description:
* @Reference:
* @Author: joke.wang
* @CreateDate: 2019\10\15 17:20
* @Modify:
**/
@Data
public class MesDatasourceModel implements Serializable {
@ApiParam("id")
private Long id;
@ApiParam("设备代码")
private String equipmentCode;
@ApiParam("设备名称")
private String equipmentName;
@ApiParam( "有效性")
public Integer isValid;
@ApiParam( "是否已删除")
public Integer isDeleted;
@ApiParam( "创建用户")
public String createUser;
@ApiParam( "创建日期")
public String createDatetime;
@ApiParam( "修改人")
public String modifyUser;
@ApiParam( "修改日期")
public String modifyDatetime;
@ApiParam("组织代码")
public String organizeCode;
@ApiParam("数据源代码")
private String dsCode;
@ApiParam("数据源名称")
private String dsName;
@ApiParam("数据源类型")
private String dsType;
@ApiParam("主机")
private String dsHost;
@ApiParam("端口")
private Integer dsPort;
@ApiParam("用户名")
private String dsUser;
@ApiParam("密码")
private String dsPassword;
@ApiParam("数据库名称")
private String dsDbName;
public MesDatasourceModel() {
}
public MesDatasourceModel(Long id, String equipmentCode, String equipmentName, Integer isValid, Integer isDeleted, String createUser, String createDatetime,
String modifyUser, String modifyDatetime, String organizeCode, String dsCode, String dsName, String dsType,
String dsHost, Integer dsPort, String dsUser, String dsPassword, String dsDbName) {
this.id = id;
this.equipmentCode = equipmentCode;
this.equipmentName = equipmentName;
this.isValid = isValid;
this.isDeleted = isDeleted;
this.createUser = createUser;
this.createDatetime = createDatetime;
this.modifyUser = modifyUser;
this.modifyDatetime = modifyDatetime;
this.organizeCode = organizeCode;
this.dsCode = dsCode;
this.dsName = dsName;
this.dsType = dsType;
this.dsHost = dsHost;
this.dsPort = dsPort;
this.dsUser = dsUser;
this.dsPassword = dsPassword;
this.dsDbName = dsDbName;
}
}

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

@ -0,0 +1,87 @@
package cn.estsh.i3plus.pojo.mes.model;
import io.swagger.annotations.ApiParam;
import lombok.Data;
import java.io.Serializable;
@Data
public class MesEquTaskPlanModel implements Serializable {
@ApiParam("id")
private Long id;
@ApiParam("设备代码")
private String equipmentCode;
@ApiParam("设备名称")
private String equipmentName;
@ApiParam("作业类型")
private Integer taskType;
@ApiParam("周期(天)")
private Integer taskCycle;
@ApiParam("上一执行时间")
private String lastTime;
@ApiParam("创建提前天数")
private String daysInAdvance;
@ApiParam("生产线")
private String workCenterCode;
@ApiParam("设备类别")
private String equipmentCategory;
@ApiParam("组织代码")
public String organizeCode;
@ApiParam("有效性")
public Integer isValid;
@ApiParam("是否已删除")
public Integer isDeleted;
@ApiParam("创建用户")
public String createUser;
@ApiParam("创建日期")
public String createDatetime;
@ApiParam("修改人")
public String modifyUser;
@ApiParam("修改日期")
public String modifyDatetime;
@ApiParam("作业类型")
private String taskTypeName;
@ApiParam("设备类别")
private String equipmentCategoryName;
public MesEquTaskPlanModel() {
}
public MesEquTaskPlanModel(Long id, String equipmentCode, String equipmentName, Integer taskType, Integer taskCycle, String lastTime, String daysInAdvance, String workCenterCode, String equipmentCategory, String organizeCode, Integer isValid, Integer isDeleted, String createUser, String createDatetime, String modifyUser, String modifyDatetime) {
this.id = id;
this.equipmentCode = equipmentCode;
this.equipmentName = equipmentName;
this.taskType = taskType;
this.taskCycle = taskCycle;
this.lastTime = lastTime;
this.daysInAdvance = daysInAdvance;
this.workCenterCode = workCenterCode;
this.equipmentCategory = equipmentCategory;
this.organizeCode = organizeCode;
this.isValid = isValid;
this.isDeleted = isDeleted;
this.createUser = createUser;
this.createDatetime = createDatetime;
this.modifyUser = modifyUser;
this.modifyDatetime = modifyDatetime;
}
}

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

@ -20,7 +20,7 @@ public class MesEquTaskStandardModel implements Serializable {
private Integer taskType;
@ApiParam("操作项")
private Integer actionItem;
private String actionItem;
@ApiParam("操作标准")
private String actionStandard;
@ -31,33 +31,42 @@ public class MesEquTaskStandardModel implements Serializable {
@ApiParam("生产线")
private String workCenterCode;
@ApiParam(value ="组织代码")
@ApiParam("设备类别")
private String equipmentCategory;
@ApiParam("组织代码")
public String organizeCode;
@ApiParam(value = "有效性")
@ApiParam("有效性")
public Integer isValid;
@ApiParam(value = "是否已删除")
@ApiParam("是否已删除")
public Integer isDeleted;
@ApiParam(value = "创建用户")
@ApiParam("创建用户")
public String createUser;
@ApiParam(value = "创建日期")
@ApiParam("创建日期")
public String createDatetime;
@ApiParam(value = "修改人")
@ApiParam("修改人")
public String modifyUser;
@ApiParam(value = "修改日期")
@ApiParam("修改日期")
public String modifyDatetime;
@ApiParam("作业类型")
private String taskTypeName;
@ApiParam("设备类别")
private String equipmentCategoryName;
public MesEquTaskStandardModel() {
}
public MesEquTaskStandardModel(Long id, String equipmentCode, String equipmentName, Integer taskType, Integer actionItem, String actionStandard, String actionGuide, String workCenterCode, String organizeCode, Integer isValid, Integer isDeleted, String createUser, String createDatetime, String modifyUser, String modifyDatetime) {
public MesEquTaskStandardModel(Long id, String equipmentCode, String equipmentName, Integer taskType, String actionItem, String actionStandard, String actionGuide, String workCenterCode, String equipmentCategory, String organizeCode, Integer isValid, Integer isDeleted, String createUser, String createDatetime, String modifyUser, String modifyDatetime) {
this.id = id;
this.equipmentCode = equipmentCode;
this.equipmentName = equipmentName;
@ -66,6 +75,7 @@ public class MesEquTaskStandardModel implements Serializable {
this.actionStandard = actionStandard;
this.actionGuide = actionGuide;
this.workCenterCode = workCenterCode;
this.equipmentCategory = equipmentCategory;
this.organizeCode = organizeCode;
this.isValid = isValid;
this.isDeleted = isDeleted;

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

@ -85,6 +85,18 @@ public class MesEquipmentModel implements Serializable {
@ApiParam( "修改日期")
public String modifyDatetime;
@ApiParam("设备状态")
private String statusName;
@ApiParam("设备类型")
private String equipmentTypeName;
@ApiParam("设备类别")
private String equipmentCategoryName;
@ApiParam("连接类型")
private String connectTypeName;
public MesEquipmentModel() {

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

@ -0,0 +1,122 @@
package cn.estsh.i3plus.pojo.mes.model;
import io.swagger.annotations.ApiParam;
import lombok.Data;
import java.io.Serializable;
/**
* @Description:
* @Reference:
* @Author: joke.wang
* @CreateDate: 2019\10\15 15:58
* @Modify:
**/
@Data
public class MesPlcModel implements Serializable {
@ApiParam("id")
private Long id;
@ApiParam("设备代码")
private String equipmentCode;
@ApiParam("设备名称")
private String equipmentName;
@ApiParam( "有效性")
public Integer isValid;
@ApiParam( "是否已删除")
public Integer isDeleted;
@ApiParam( "创建用户")
public String createUser;
@ApiParam( "创建日期")
public String createDatetime;
@ApiParam( "修改人")
public String modifyUser;
@ApiParam( "修改日期")
public String modifyDatetime;
@ApiParam("组织代码")
public String organizeCode;
@ApiParam("PLC代码")
private String plcCode;
@ApiParam("PLC名称")
private String plcName;
@ApiParam("PLC型号")
private String plcModel;
@ApiParam("PLC IP")
private String plcIp;
@ApiParam("通道")
private String channel;
@ApiParam("标签名称")
private String tagName;
@ApiParam("标签地址")
private String tagAddress;
@ApiParam("标签数据类型")
private String dataType;
@ApiParam("分组名称")
private String groupName;
@ApiParam("生产线")
private String workCenterCode;
@ApiParam("工位")
private String workCellCode;
@ApiParam("PLC的值的设定")
private String plcCfg;
@ApiParam("解析规则")
private String analysisRule;
@ApiParam("是否解析")
private String isAnalysis;
public MesPlcModel(){
}
public MesPlcModel(Long id, String equipmentCode, String equipmentName, Integer isValid, Integer isDeleted, String createUser, String createDatetime,
String modifyUser, String modifyDatetime, String organizeCode, String plcCode, String plcName, String plcModel,
String plcIp, String channel, String tagName, String tagAddress, String dataType, String groupName,
String workCenterCode, String workCellCode, String plcCfg, String analysisRule, String isAnalysis){
this.id = id;
this.equipmentCode = equipmentCode;
this.equipmentName = equipmentName;
this.isValid = isValid;
this.isDeleted = isDeleted;
this.createUser = createUser;
this.createDatetime = createDatetime;
this.modifyUser = modifyUser;
this.modifyDatetime = modifyDatetime;
this.organizeCode = organizeCode;
this.plcCode = plcCode;
this.plcName = plcName;
this.plcModel = plcModel;
this.plcIp = plcIp;
this.channel = channel;
this.tagName = tagName;
this.tagAddress = tagAddress;
this.dataType = dataType;
this.groupName = groupName;
this.workCenterCode = workCenterCode;
this.workCellCode = workCellCode;
this.plcCfg = plcCfg;
this.analysisRule = analysisRule;
this.isAnalysis = isAnalysis;
}
}

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

@ -44,5 +44,8 @@ public class MesWorkOrderButtonModel implements Serializable {
@ApiParam("关闭按钮")
private boolean closeButton;
@ApiParam("完成按钮")
private boolean completeButton;
}

16
modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesEquTaskPlanRepository.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.MesEquTaskPlan;
import org.springframework.stereotype.Repository;
/**
* @Description :
* @Reference :
* @Author : 王杰
* @CreateDate : 2019-10-11
* @Modify:
**/
@Repository
public interface MesEquTaskPlanRepository extends BaseRepository<MesEquTaskPlan, Long> {
}

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

@ -1266,16 +1266,16 @@ public class MesHqlPack {
public static DdlPackBean getMesPlc(MesPlc mesPlc, String organizeCode) {
DdlPackBean packBean = getAllBaseDataByNormalPro(mesPlc, organizeCode);
if (!StringUtils.isEmpty(mesPlc.getPlcCode())) {
DdlPreparedPack.getStringEqualPack(mesPlc.getPlcCode(), "plcCode", packBean);
DdlPreparedPack.getStringLikerPack(mesPlc.getPlcCode(), "plcCode", packBean);
}
if (!StringUtils.isEmpty(mesPlc.getPlcName())) {
DdlPreparedPack.getStringEqualPack(mesPlc.getPlcName(), "plcName", packBean);
DdlPreparedPack.getStringLikerPack(mesPlc.getPlcName(), "plcName", packBean);
}
if (!StringUtils.isEmpty(mesPlc.getChannel())) {
DdlPreparedPack.getStringEqualPack(mesPlc.getChannel(), "channel", packBean);
DdlPreparedPack.getStringLikerPack(mesPlc.getChannel(), "channel", packBean);
}
if (!StringUtils.isEmpty(mesPlc.getTagAddress())) {
DdlPreparedPack.getStringEqualPack(mesPlc.getTagAddress(), "tagAddress", packBean);
DdlPreparedPack.getStringLikerPack(mesPlc.getTagAddress(), "tagAddress", packBean);
}
if (!StringUtils.isEmpty(mesPlc.getWorkCenterCode())) {
DdlPreparedPack.getStringEqualPack(mesPlc.getWorkCenterCode(), "workCenterCode", packBean);
@ -1295,13 +1295,13 @@ public class MesHqlPack {
public static DdlPackBean getMesDatasource(MesDatasource mesDatasource, String organizeCode) {
DdlPackBean packBean = getAllBaseDataByNormalPro(mesDatasource, organizeCode);
if (!StringUtils.isEmpty(mesDatasource.getDsCode())) {
DdlPreparedPack.getStringEqualPack(mesDatasource.getDsCode(), "dsCode", packBean);
DdlPreparedPack.getStringLikerPack(mesDatasource.getDsCode(), "dsCode", packBean);
}
if (!StringUtils.isEmpty(mesDatasource.getDsType())) {
DdlPreparedPack.getStringEqualPack(mesDatasource.getDsType(), "dsType", packBean);
DdlPreparedPack.getStringLikerPack(mesDatasource.getDsType(), "dsType", packBean);
}
if (!StringUtils.isEmpty(mesDatasource.getDsDbName())) {
DdlPreparedPack.getStringEqualPack(mesDatasource.getDsDbName(), "dsDbName", packBean);
DdlPreparedPack.getStringLikerPack(mesDatasource.getDsDbName(), "dsDbName", packBean);
}
return packBean;
}
@ -1315,19 +1315,13 @@ public class MesHqlPack {
public static DdlPackBean getMesFaultMethod(MesFaultMethod mesFaultMethod, String organizeCode) {
DdlPackBean packBean = getAllBaseDataByNormalPro(mesFaultMethod, organizeCode);
if (!StringUtils.isEmpty(mesFaultMethod.getFmCode())) {
DdlPreparedPack.getStringEqualPack(mesFaultMethod.getFmCode(), "fmCode", packBean);
DdlPreparedPack.getStringLikerPack(mesFaultMethod.getFmCode(), "fmCode", packBean);
}
if (!StringUtils.isEmpty(mesFaultMethod.getFmName())) {
DdlPreparedPack.getStringEqualPack(mesFaultMethod.getFmName(), "fmName", packBean);
}
if (!StringUtils.isEmpty(mesFaultMethod.getFmCode())) {
DdlPreparedPack.getStringEqualPack(mesFaultMethod.getFmCode(), "fmCode", packBean);
}
if (!StringUtils.isEmpty(mesFaultMethod.getFmName())) {
DdlPreparedPack.getStringEqualPack(mesFaultMethod.getFmName(), "fmName", packBean);
DdlPreparedPack.getStringLikerPack(mesFaultMethod.getFmName(), "fmName", packBean);
}
if (!StringUtils.isEmpty(mesFaultMethod.getParentFmCode())) {
DdlPreparedPack.getStringEqualPack(mesFaultMethod.getParentFmCode(), "parentFmCode", packBean);
DdlPreparedPack.getStringLikerPack(mesFaultMethod.getParentFmCode(), "parentFmCode", packBean);
}
return packBean;
}
@ -1341,19 +1335,13 @@ public class MesHqlPack {
public static DdlPackBean getMesFaultCause(MesFaultCause mesFaultCause, String organizeCode) {
DdlPackBean packBean = getAllBaseDataByNormalPro(mesFaultCause, organizeCode);
if (!StringUtils.isEmpty(mesFaultCause.getFcCode())) {
DdlPreparedPack.getStringEqualPack(mesFaultCause.getFcCode(), "fcCode", packBean);
DdlPreparedPack.getStringLikerPack(mesFaultCause.getFcCode(), "fcCode", packBean);
}
if (!StringUtils.isEmpty(mesFaultCause.getFcName())) {
DdlPreparedPack.getStringEqualPack(mesFaultCause.getFcName(), "fcName", packBean);
}
if (!StringUtils.isEmpty(mesFaultCause.getFcCode())) {
DdlPreparedPack.getStringEqualPack(mesFaultCause.getFcCode(), "fcCode", packBean);
}
if (!StringUtils.isEmpty(mesFaultCause.getFcName())) {
DdlPreparedPack.getStringEqualPack(mesFaultCause.getFcName(), "fcName", packBean);
DdlPreparedPack.getStringLikerPack(mesFaultCause.getFcName(), "fcName", packBean);
}
if (!StringUtils.isEmpty(mesFaultCause.getParentFcCode())) {
DdlPreparedPack.getStringEqualPack(mesFaultCause.getParentFcCode(), "parentFcCode", packBean);
DdlPreparedPack.getStringLikerPack(mesFaultCause.getParentFcCode(), "parentFcCode", packBean);
}
return packBean;
}
@ -1367,19 +1355,13 @@ public class MesHqlPack {
public static DdlPackBean getMesFaultPhenomenon(MesFaultPhenomenon mesFaultPhenomenon, String organizeCode) {
DdlPackBean packBean = getAllBaseDataByNormalPro(mesFaultPhenomenon, organizeCode);
if (!StringUtils.isEmpty(mesFaultPhenomenon.getFpCode())) {
DdlPreparedPack.getStringEqualPack(mesFaultPhenomenon.getFpCode(), "fpCode", packBean);
}
if (!StringUtils.isEmpty(mesFaultPhenomenon.getFpName())) {
DdlPreparedPack.getStringEqualPack(mesFaultPhenomenon.getFpName(), "fpName", packBean);
}
if (!StringUtils.isEmpty(mesFaultPhenomenon.getFpCode())) {
DdlPreparedPack.getStringEqualPack(mesFaultPhenomenon.getFpCode(), "fpCode", packBean);
DdlPreparedPack.getStringLikerPack(mesFaultPhenomenon.getFpCode(), "fpCode", packBean);
}
if (!StringUtils.isEmpty(mesFaultPhenomenon.getFpName())) {
DdlPreparedPack.getStringEqualPack(mesFaultPhenomenon.getFpName(), "fpName", packBean);
DdlPreparedPack.getStringLikerPack(mesFaultPhenomenon.getFpName(), "fpName", packBean);
}
if (!StringUtils.isEmpty(mesFaultPhenomenon.getParentFpCode())) {
DdlPreparedPack.getStringEqualPack(mesFaultPhenomenon.getParentFpCode(), "parentFpCode", packBean);
DdlPreparedPack.getStringLikerPack(mesFaultPhenomenon.getParentFpCode(), "parentFpCode", packBean);
}
return packBean;
}
@ -1398,12 +1380,6 @@ public class MesHqlPack {
if (!StringUtils.isEmpty(mesQcCheckStandard.getWorkCellCode())) {
DdlPreparedPack.getStringEqualPack(mesQcCheckStandard.getWorkCellCode(), "workCellCode", packBean);
}
if (!StringUtils.isEmpty(mesQcCheckStandard.getPartNo())) {
DdlPreparedPack.getStringEqualPack(mesQcCheckStandard.getPartNo(), "partNo", packBean);
}
if (!StringUtils.isEmpty(mesQcCheckStandard.getWorkCellCode())) {
DdlPreparedPack.getStringEqualPack(mesQcCheckStandard.getWorkCellCode(), "workCellCode", packBean);
}
if (!StringUtils.isEmpty(mesQcCheckStandard.getWorkCenterCode())) {
DdlPreparedPack.getStringEqualPack(mesQcCheckStandard.getWorkCenterCode(), "workCenterCode", packBean);
}
@ -1411,7 +1387,7 @@ public class MesHqlPack {
DdlPreparedPack.getNumberBiggerEqualPack(mesQcCheckStandard.getCheckType(), "checkType", packBean);
}
if (!StringUtils.isEmpty(mesQcCheckStandard.getCheckItem())) {
DdlPreparedPack.getStringEqualPack(mesQcCheckStandard.getCheckItem(), "checkItem", packBean);
DdlPreparedPack.getStringLikerPack(mesQcCheckStandard.getCheckItem(), "checkItem", packBean);
}
return packBean;
}

Write Preview
Loading…
Cancel
Save