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

PLC DB 设备故障 过程质量检测

Browse Source
yun-zuoyi
jokelone 6 years ago
parent d814887570
commit 104d308d30
16 changed files with 637 additions and 5 deletions
Show Stats Download Patch File Download Diff File

2
modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/codemaker/SnowflakeIdMaker.java
Unescape Escape View File

@ -20,7 +20,7 @@ import java.net.NetworkInterface;
* @CreateDate : 2018-09-11 16:35
* @Modify:
**/
public class SnowflakeIdMaker {
public class SnowflakeIdMaker {
public static final Logger LOGGER = LoggerFactory.getLogger(SnowflakeIdMaker.class);

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

@ -0,0 +1,95 @@
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: joke.wang
* @CreateDate: 2019\10\12 16:33
* @Modify:
**/
@Data
@Entity
@DynamicInsert
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
@Table(name="MES_QC_CHECK_DATA")
@Api("质量过程检测数据")
public class MesQcCheckData extends BaseBean {
@Column(name = "CHECK_ID")
@ApiParam("检测id")
private String checkId;
@Column(name = "PART_NO")
@ApiParam("物料编码")
private String partNo;
@Column(name = "WORK_CENTER_CODE")
@ApiParam("工作中心代码")
private String workCenterCode;
@Column(name = "WORK_CELL_CODE")
@ApiParam("工作单元代码")
private String workCellCode;
@Column(name = "CHECK_TYPE")
@ApiParam("检测类型")
private String checkType;
@Column(name = "CHECK_ITEM")
@ApiParam("检测项")
private String checkItem;
@Column(name = "CHECK_STANDARD")
@ApiParam("检测标准")
private String checkStandard;
@Column(name = "CHECK_GUIDE")
@ApiParam("检测指导")
private String checkGuide;
@Column(name = "CHECK_FREQUENCY")
@ApiParam("频率")
private String checkFrequency;
@Column(name = "CHECK_VALUE")
@ApiParam("检测值")
private String checkValue;
@Column(name = "CHECK_RESULT")
@ApiParam("判定结果")
private String checkResult;
@Column(name = "SN")
@ApiParam("产品条码")
private String sn;
@Column(name = "QTY")
@ApiParam("产品数量")
private String qty;
@Column(name = "MEMO")
@ApiParam("备注")
private String memo;
@Column(name = "ORDER_NO")
@ApiParam("工单号")
private String orderNo;
@Column(name = "CUST_CODE")
@ApiParam("客户代码")
private String custCode;
}

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

@ -0,0 +1,14 @@
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.MesQcCheckData;
/**
* @Description:
* @Reference:
* @Author: joke.wang
* @CreateDate: 2019\10\12 16:43
* @Modify:
**/
public interface MesQcCheckDataRepository extends BaseRepository<MesQcCheckData, Long> {
}

8
modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesDb.java → modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesDatasource.java
Unescape Escape View File

@ -23,9 +23,9 @@ import javax.persistence.Table;
@DynamicInsert
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
@Table(name = "MES_DB")
@Table(name = "MES_DATASOURCE")
@Api("地址清单")
public class MesDb extends BaseBean {
public class MesDatasource extends BaseBean {
@Column(name = "DS_CODE")
@ApiParam("数据源代码")
@ -59,4 +59,8 @@ public class MesDb extends BaseBean {
@ApiParam("设备代码")
private String equipmentCode;
@Column(name = "DS_DB_NAME")
@ApiParam("数据库名称")
private String dsDbName;
}

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

@ -0,0 +1,42 @@
package cn.estsh.i3plus.pojo.mes.bean;
import cn.estsh.i3plus.pojo.base.bean.BaseBean;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiParam;
import lombok.Data;
import lombok.EqualsAndHashCode;
import org.hibernate.annotations.DynamicInsert;
import org.hibernate.annotations.DynamicUpdate;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Table;
/**
* @Description:
* @Reference:
* @Author: joke.wang
* @CreateDate: 2019\10\10 0010 11:56
* @Modify:
**/
@Data
@Entity
@DynamicInsert
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
@Table(name = "MES_FAULT_CAUSE")
@Api("PLC配置表")
public class MesFaultCause extends BaseBean {
@Column(name = "FC_CODE")
@ApiParam("故障原因代码")
private String fcCode;
@Column(name = "FC_NAME")
@ApiParam("故障原因描述")
private String fcName;
@Column(name = "PARENT_FC_CODE")
@ApiParam("父阶原因代码")
private String parentFcCode;
}

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

@ -0,0 +1,42 @@
package cn.estsh.i3plus.pojo.mes.bean;
import cn.estsh.i3plus.pojo.base.bean.BaseBean;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiParam;
import lombok.Data;
import lombok.EqualsAndHashCode;
import org.hibernate.annotations.DynamicInsert;
import org.hibernate.annotations.DynamicUpdate;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Table;
/**
* @Description:
* @Reference:
* @Author: joke.wang
* @CreateDate: 2019\10\10 0010 11:53
* @Modify:
**/
@Data
@Entity
@DynamicInsert
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
@Table(name = "MES_FAULT_METHOD")
@Api("PLC配置表")
public class MesFaultMethod extends BaseBean {
@Column(name = "FM_CODE")
@ApiParam("故障方法代码")
private String fmCode;
@Column(name = "FM_NAME")
@ApiParam("故障方法描述")
private String fmName;
@Column(name = "PARENT_FM_CODE")
@ApiParam("父阶故障代码")
private String parentFmCode;
}

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

@ -0,0 +1,42 @@
package cn.estsh.i3plus.pojo.mes.bean;
import cn.estsh.i3plus.pojo.base.bean.BaseBean;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiParam;
import lombok.Data;
import lombok.EqualsAndHashCode;
import org.hibernate.annotations.DynamicInsert;
import org.hibernate.annotations.DynamicUpdate;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Table;
/**
* @Description:
* @Reference:
* @Author: joke.wang
* @CreateDate: 2019\10\10 0010 11:42
* @Modify:
**/
@Data
@Entity
@DynamicInsert
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
@Table(name = "MES_FAULT_PHENOMENON")
@Api("PLC配置表")
public class MesFaultPhenomenon extends BaseBean {
@Column(name = "FP_CODE")
@ApiParam("故障现象代码")
private String fpCode;
@Column(name = "FP_NAME")
@ApiParam("故障现象描述")
private String fpName;
@Column(name = "PARENT_FP_CODE")
@ApiParam("父阶现象代码")
private String parentFpCode;
}

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

@ -0,0 +1,95 @@
package cn.estsh.i3plus.pojo.mes.bean;
import cn.estsh.i3plus.pojo.base.bean.BaseBean;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiParam;
import lombok.Data;
import lombok.EqualsAndHashCode;
import org.hibernate.annotations.DynamicInsert;
import org.hibernate.annotations.DynamicUpdate;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Table;
/**
* @Description:
* @Reference:
* @Author: joke.wang
* @CreateDate:2019\10\9 0009
* @Modify:
**/
@Data
@Entity
@DynamicInsert
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
@Table(name = "MES_PLC")
@Api("PLC配置表")
public class MesPlc extends BaseBean {
@Column(name = "PLC_CODE")
@ApiParam("PLC代码")
private String plcCode;
@Column(name = "PLC_NAME")
@ApiParam("PLC名称")
private String plcName;
@Column(name = "PLC_MODEL")
@ApiParam("PLC型号")
private String plcModel;
@Column(name = "PLC_IP")
@ApiParam("PLC IP")
private String plcIp;
@Column(name = "CHANNEL")
@ApiParam("通道")
private String channel;
@Column(name = "TAG_NAME")
@ApiParam("标签名称")
private String tagName;
@Column(name = "TAG_ADDRESS")
@ApiParam("标签地址")
private String tagAddress;
@Column(name = "DATA_TYPE")
@ApiParam("标签数据类型")
private String dataType;
@Column(name = "GROUP_NAME")
@ApiParam("分组名称")
private String groupName;
@Column(name = "EQU_CODE")
@ApiParam("设备代码")
private String equCode;
@Column(name = "WORK_CENTER_CODE")
@ApiParam("工作中心")
private String workCenterCode;
@Column(name = "WORK_CELL_CODE")
@ApiParam("工作单元")
private String workCellCode;
@Column(name = "ENABLED")
@ApiParam("是否启用 0 false 1 true")
private Integer enabled;
@Column(name = "PLC_CFG")
@ApiParam("PLC的值的设定")
private String plcCfg;
@Column(name = "ANALYSIS_RULE")
@ApiParam("解析规则")
private String analysisRule;
@Column(name = "IS_ANALYSIS")
@ApiParam("是否解析")
private String isAnalysis;
}

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

@ -0,0 +1,63 @@
package cn.estsh.i3plus.pojo.mes.bean;
import cn.estsh.i3plus.pojo.base.bean.BaseBean;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiParam;
import lombok.Data;
import lombok.EqualsAndHashCode;
import org.hibernate.annotations.DynamicInsert;
import org.hibernate.annotations.DynamicUpdate;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Table;
/**
* @Description:
* @Reference:
* @Author: joke.wang
* @CreateDate: 2019\10\12 14:46
* @Modify:
**/
@Data
@Entity
@DynamicInsert
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
@Table(name="MES_QC_CHECK_STANDARD")
@Api("质量检测标准")
public class MesQcCheckStandard extends BaseBean {
@Column(name = "PART_NO")
@ApiParam("物料编码")
private String partNo;
@Column(name = "WORK_CENTER_CODE")
@ApiParam("工作中心代码")
private String workCenterCode;
@Column(name = "WORK_CELL_CODE")
@ApiParam("工作单元代码")
private String workCellCode;
@Column(name = "CHECK_TYPE")
@ApiParam("检测类型")
private Integer checkType;
@Column(name = "CHECK_ITEM")
@ApiParam("检测项")
private String checkItem;
@Column(name = "CHECK_STANDARD")
@ApiParam("检测标准")
private String checkStandard;
@Column(name = "CHECK_GUIDE")
@ApiParam("检测指导")
private String checkGuide;
@Column(name = "CHECK_FREQUENCY")
@ApiParam("频率")
private String checkFrequency;
}

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

@ -0,0 +1,15 @@
package cn.estsh.i3plus.pojo.mes.repository;
import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
import cn.estsh.i3plus.pojo.mes.bean.MesDatasource;
/**
* @Description:
* @Reference:
* @Author: joke.wang
* @CreateDate:2019\10\9
* @Modify:
**/
public interface MesDatasourceRepository extends BaseRepository<MesDatasource,Long> {
}

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

@ -0,0 +1,14 @@
package cn.estsh.i3plus.pojo.mes.repository;
import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
import cn.estsh.i3plus.pojo.mes.bean.MesFaultCause;
/**
* @Description:
* @Reference:
* @Author: joke.wang
* @CreateDate: 2019\10\10 0010 13:08
* @Modify:
**/
public interface MesFaultCauseRepository extends BaseRepository<MesFaultCause, Long> {
}

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

@ -0,0 +1,14 @@
package cn.estsh.i3plus.pojo.mes.repository;
import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
import cn.estsh.i3plus.pojo.mes.bean.MesFaultMethod;
/**
* @Description:
* @Reference:
* @Author: joke.wang
* @CreateDate: 2019\10\10 0010 13:07
* @Modify:
**/
public interface MesFaultMethodRepository extends BaseRepository<MesFaultMethod, Long> {
}

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

@ -0,0 +1,14 @@
package cn.estsh.i3plus.pojo.mes.repository;
import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
import cn.estsh.i3plus.pojo.mes.bean.MesFaultPhenomenon;
/**
* @Description:
* @Reference:
* @Author: joke.wang
* @CreateDate: 2019\10\10 0010 13:05
* @Modify:
**/
public interface MesFaultPhenomenonRepository extends BaseRepository<MesFaultPhenomenon, Long> {
}

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

@ -0,0 +1,14 @@
package cn.estsh.i3plus.pojo.mes.repository;
import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
import cn.estsh.i3plus.pojo.mes.bean.MesPlc;
/**
* @Description:
* @Reference:
* @Author: joke.wang
* @CreateDate:2019\10\9 0009 11:16
* @Modify:
**/
public interface MesPlcRepository extends BaseRepository<MesPlc, Long> {
}

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

@ -0,0 +1,14 @@
package cn.estsh.i3plus.pojo.mes.repository;
import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
import cn.estsh.i3plus.pojo.mes.bean.MesQcCheckStandard;
/**
* @Description:
* @Reference:
* @Author: joke.wang
* @CreateDate: 2019\10\12 0012 14:58
* @Modify:
**/
public interface MesQcCheckStandardRepository extends BaseRepository<MesQcCheckStandard, Long> {
}

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

@ -129,7 +129,11 @@ public class MesHqlPack {
if (!StringUtils.isEmpty(mesPart.getCategoryCode3())) {
DdlPreparedPack.getStringEqualPack(mesPart.getCategoryCode3(), "categoryCode3", packBean);
}
if (StringUtils.isNotEmpty(mesPart.getProduceCategoryCode()) && mesPart.getProduceCategoryCode().toUpperCase().equals("WXJ")) {
DdlPreparedPack.getStringEqualPack("WXJ", "produceCategoryCode", packBean);
} else {
DdlPreparedPack.getStringNoEqualPack("WXJ", "produceCategoryCode", packBean);
}
DdlPreparedPack.getOrderDefault(mesPart);
DdlPreparedPack.getOrderByPack(new Object[]{"2"}, new String[]{mesPart.getOrderByParam()}, packBean);
return packBean;
@ -1144,7 +1148,6 @@ public class MesHqlPack {
return packBean;
}
/**
* Mes条码生成规则
*
@ -1254,4 +1257,151 @@ public class MesHqlPack {
return packBean;
}
<<<<<<< Updated upstream
=======
/**
* MES Plc设备信息配置查询条件封装
* @param mesPlc
* @param organizeCode
* @return
*/
public static DdlPackBean getMesPlc(MesPlc mesPlc, String organizeCode) {
DdlPackBean packBean = getAllBaseDataByNormalPro(mesPlc, organizeCode);
if (StringUtils.isNotEmpty(mesPlc.getPlcCode())) {
DdlPreparedPack.getStringEqualPack(mesPlc.getPlcCode(), "plcCode", packBean);
}
if (StringUtils.isNotEmpty(mesPlc.getPlcName())) {
DdlPreparedPack.getStringEqualPack(mesPlc.getPlcName(), "plcName", packBean);
}
if (StringUtils.isNotEmpty(mesPlc.getChannel())) {
DdlPreparedPack.getStringEqualPack(mesPlc.getChannel(), "channel", packBean);
}
if (StringUtils.isNotEmpty(mesPlc.getTagAddress())) {
DdlPreparedPack.getStringEqualPack(mesPlc.getTagAddress(), "tagAddress", packBean);
}
if (StringUtils.isNotEmpty(mesPlc.getEquCode())) {
DdlPreparedPack.getStringEqualPack(mesPlc.getEquCode(), "equCode", packBean);
}
if (StringUtils.isNotEmpty(mesPlc.getWorkCenterCode())) {
DdlPreparedPack.getStringEqualPack(mesPlc.getWorkCenterCode(), "workCenterCode", packBean);
}
if (StringUtils.isNotEmpty(mesPlc.getPlcCode())) {
DdlPreparedPack.getStringEqualPack(mesPlc.getWorkCellCode(), "workCellCode", packBean);
}
return packBean;
}
/**
* MES DB地址清单查询条件封装
* @param mesDatasource
* @param organizeCode
* @return
*/
public static DdlPackBean getMesDatasource(MesDatasource mesDatasource, String organizeCode) {
DdlPackBean packBean = getAllBaseDataByNormalPro(mesDatasource, organizeCode);
if (StringUtils.isNotEmpty(mesDatasource.getDsCode())) {
DdlPreparedPack.getStringEqualPack(mesDatasource.getDsCode(), "dsCode", packBean);
}
if (StringUtils.isNotEmpty(mesDatasource.getDsName())) {
DdlPreparedPack.getStringEqualPack(mesDatasource.getDsName(), "dsName", packBean);
}
if (StringUtils.isNotEmpty(mesDatasource.getDsType())) {
DdlPreparedPack.getStringEqualPack(mesDatasource.getDsType(), "dsType", packBean);
}
if (StringUtils.isNotEmpty(mesDatasource.getDsDbName())) {
DdlPreparedPack.getStringEqualPack(mesDatasource.getDsDbName(), "dsDbName", packBean);
}
if (StringUtils.isNotEmpty(mesDatasource.getEquCode())) {
DdlPreparedPack.getStringEqualPack(mesDatasource.getEquCode(), "equCode", packBean);
}
return packBean;
}
/**
* MES 设备故障处理方法查询条件封装
* @param mesFaultMethod
* @param organizeCode
* @return
*/
public static DdlPackBean getMesFaultMethod(MesFaultMethod mesFaultMethod, String organizeCode) {
DdlPackBean packBean = getAllBaseDataByNormalPro(mesFaultMethod, organizeCode);
if (StringUtils.isNotEmpty(mesFaultMethod.getFmCode())) {
DdlPreparedPack.getStringEqualPack(mesFaultMethod.getFmCode(), "fmCode", packBean);
}
if (StringUtils.isNotEmpty(mesFaultMethod.getFmName())) {
DdlPreparedPack.getStringEqualPack(mesFaultMethod.getFmName(), "fmName", packBean);
}
if (StringUtils.isNotEmpty(mesFaultMethod.getParentFmCode())) {
DdlPreparedPack.getStringEqualPack(mesFaultMethod.getParentFmCode(), "parentFmCode", packBean);
}
return packBean;
}
/**
* MES 设备故障原因查询条件封装
* @param mesFaultCause
* @param organizeCode
* @return
*/
public static DdlPackBean getMesFaultCause(MesFaultCause mesFaultCause, String organizeCode) {
DdlPackBean packBean = getAllBaseDataByNormalPro(mesFaultCause, organizeCode);
if (StringUtils.isNotEmpty(mesFaultCause.getFcCode())) {
DdlPreparedPack.getStringEqualPack(mesFaultCause.getFcCode(), "fcCode", packBean);
}
if (StringUtils.isNotEmpty(mesFaultCause.getFcName())) {
DdlPreparedPack.getStringEqualPack(mesFaultCause.getFcName(), "fcName", packBean);
}
if (StringUtils.isNotEmpty(mesFaultCause.getParentFcCode())) {
DdlPreparedPack.getStringEqualPack(mesFaultCause.getParentFcCode(), "parentFcCode", packBean);
}
return packBean;
}
/**
* MES 设备故障现象查询条件封装
* @param mesFaultPhenomenon
* @param organizeCode
* @return
*/
public static DdlPackBean getMesFaultPhenomenon(MesFaultPhenomenon mesFaultPhenomenon, String organizeCode) {
DdlPackBean packBean = getAllBaseDataByNormalPro(mesFaultPhenomenon, organizeCode);
if (StringUtils.isNotEmpty(mesFaultPhenomenon.getFpCode())) {
DdlPreparedPack.getStringEqualPack(mesFaultPhenomenon.getFpCode(), "fpCode", packBean);
}
if (StringUtils.isNotEmpty(mesFaultPhenomenon.getFpName())) {
DdlPreparedPack.getStringEqualPack(mesFaultPhenomenon.getFpName(), "fpName", packBean);
}
if (StringUtils.isNotEmpty(mesFaultPhenomenon.getParentFpCode())) {
DdlPreparedPack.getStringEqualPack(mesFaultPhenomenon.getParentFpCode(), "parentFpCode", packBean);
}
return packBean;
}
/**
* MES 过程质量检验查询条件封装
* @param mesQcCheckStandard
* @param organizeCode
* @return
*/
public static DdlPackBean getMesQcCheckStandard(MesQcCheckStandard mesQcCheckStandard, String organizeCode) {
DdlPackBean packBean = getAllBaseDataByNormalPro(mesQcCheckStandard, organizeCode);
if (StringUtils.isNotEmpty(mesQcCheckStandard.getPartNo())) {
DdlPreparedPack.getStringEqualPack(mesQcCheckStandard.getPartNo(), "partNo", packBean);
}
if (StringUtils.isNotEmpty(mesQcCheckStandard.getWorkCellCode())) {
DdlPreparedPack.getStringEqualPack(mesQcCheckStandard.getWorkCellCode(), "workCellCode", packBean);
}
if (StringUtils.isNotEmpty(mesQcCheckStandard.getWorkCenterCode())) {
DdlPreparedPack.getStringEqualPack(mesQcCheckStandard.getWorkCenterCode(), "workCenterCode", packBean);
}
if (null == mesQcCheckStandard.getCheckType()) {
DdlPreparedPack.getNumberBiggerEqualPack(mesQcCheckStandard.getCheckType(), "checkType", packBean);
}
if (StringUtils.isNotEmpty(mesQcCheckStandard.getCheckItem())) {
DdlPreparedPack.getStringEqualPack(mesQcCheckStandard.getCheckItem(), "checkItem", packBean);
}
return packBean;
}
>>>>>>> Stashed changes
}

Write Preview
Loading…
Cancel
Save