From c8a9edab64406633226cf9b77e145c548fc0ca3e Mon Sep 17 00:00:00 2001 From: jiajack Date: Tue, 28 May 2019 15:52:38 +0800 Subject: [PATCH 1/7] =?UTF-8?q?=E8=B4=A8=E9=87=8F=E5=88=A4=E5=AE=9A?= =?UTF-8?q?=E4=B8=9A=E5=8A=A1=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/base/enumutil/MesEnumUtil.java | 37 ++++++++++++++++++++++ .../i3plus/pojo/mes/pcn/model/ButtonBean.java | 2 +- 2 files changed, 38 insertions(+), 1 deletion(-) 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 09be175..b600f3a 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 @@ -10,6 +10,43 @@ import com.fasterxml.jackson.annotation.JsonFormat; * @Modify: **/ public class MesEnumUtil { + + /** + * 质量状态 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum PASS_FAIL{ + + PASS(1,"合格"), + FAIL(2,"不合格"); + + private int value; + private String description; + + PASS_FAIL(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; + } + } + /** * MesMethod实体对应的methodType值 * 10. diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/ButtonBean.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/ButtonBean.java index 95e07f3..5919ee5 100644 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/ButtonBean.java +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/ButtonBean.java @@ -7,7 +7,7 @@ import java.io.Serializable; @Data public class ButtonBean implements Serializable { - @ApiParam(value = "按钮名称") + @ApiParam(value = "按钮代码") private String buttonCode; @ApiParam(value = "按钮名称") From ef09b0f41b02d77bd1b32a0b3a35e202c8c13764 Mon Sep 17 00:00:00 2001 From: "yiming.gu" Date: Wed, 29 May 2019 11:25:44 +0800 Subject: [PATCH 2/7] =?UTF-8?q?model=E5=8F=96=E6=B6=88=E5=AF=B9mes?= =?UTF-8?q?=E3=80=81andon=E7=9A=84=E5=BC=95=E7=94=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/mes/pcn/bean/MesRouteProcess.java | 61 ++++++++++++++++++++++ .../pcn/repository/MesRouteProcessRepository.java | 16 ++++++ modules/i3plus-pojo-model/pom.xml | 8 --- .../i3plus/pojo/model/andon/SysOrganizeModel.java | 23 -------- 4 files changed, 77 insertions(+), 31 deletions(-) create mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesRouteProcess.java create mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesRouteProcessRepository.java delete mode 100644 modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/andon/SysOrganizeModel.java diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesRouteProcess.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesRouteProcess.java new file mode 100644 index 0000000..6dd7933 --- /dev/null +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesRouteProcess.java @@ -0,0 +1,61 @@ +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") +@Api("流程工序关系") +public class MesRouteProcess extends BaseBean { + @Column(name = "ROUTE_CODE") + @ApiParam("流程代码") + private String routeCode; + + @Column(name = "PROCESS_CODE") + @ApiParam("工序代码") + private String processCode; + + @Column(name = "NEXT_PROCESS") + @ApiParam("下一工序") + private String nextProcess; + + @Column(name = "REPAIR_PROCESS") + @ApiParam("维修工序") + private String repairProcess; + + @Column(name = "SEQ") + @ApiParam("顺序") + private Integer seq; + + @Column(name = "IS_NECESSARY") + @ApiParam("是否必须") + private Integer isNecessary; + + public int getSeqVal() { + return this.seq == null ? 0 : this.seq; + } + + public int getIsNecessaryVal() { + return this.isNecessary == null ? 0 : this.isNecessary; + } +} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesRouteProcessRepository.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesRouteProcessRepository.java new file mode 100644 index 0000000..5749bbd --- /dev/null +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesRouteProcessRepository.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.MesRouteProcess; +import org.springframework.stereotype.Repository; + +/** + * @Description : + * @Reference : + * @Author : jack.jia + * @CreateDate : 2019-04-02 + * @Modify: + **/ +@Repository +public interface MesRouteProcessRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-model/pom.xml b/modules/i3plus-pojo-model/pom.xml index 1374838..642c9a6 100644 --- a/modules/i3plus-pojo-model/pom.xml +++ b/modules/i3plus-pojo-model/pom.xml @@ -42,14 +42,6 @@ i3plus.pojo i3plus-pojo-form - - i3plus.pojo - i3plus-pojo-mes - - - i3plus.pojo - i3plus-pojo-andon - diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/andon/SysOrganizeModel.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/andon/SysOrganizeModel.java deleted file mode 100644 index 7a9f6e0..0000000 --- a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/andon/SysOrganizeModel.java +++ /dev/null @@ -1,23 +0,0 @@ -package cn.estsh.i3plus.pojo.model.andon; - -import cn.estsh.i3plus.pojo.andon.bean.MesArea; -import cn.estsh.i3plus.pojo.platform.bean.SysOrganize; -import io.swagger.annotations.ApiParam; - -import javax.persistence.Transient; -import java.util.List; - -public class SysOrganizeModel extends SysOrganize{ - - @Transient - @ApiParam(value ="子集列表") - private List childTreeList; - - public List getChildTreeList() { - return childTreeList; - } - - public void setChildTreeList(List childTreeList) { - this.childTreeList = childTreeList; - } -} From a558020d3242f01b5d57aa802151fbfec6a7174e Mon Sep 17 00:00:00 2001 From: "yiming.gu" Date: Wed, 29 May 2019 11:27:17 +0800 Subject: [PATCH 3/7] =?UTF-8?q?pcn=E6=96=B0=E5=A2=9E=E5=B0=81=E8=A3=85?= =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E6=9D=A1=E4=BB=B6sqlpack?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/mes/pcn/sqlpack/MesHqlPack.java | 29 ++++++++++++++++++++++ 1 file changed, 29 insertions(+) create mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/sqlpack/MesHqlPack.java diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/sqlpack/MesHqlPack.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/sqlpack/MesHqlPack.java new file mode 100644 index 0000000..e5253fc --- /dev/null +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/sqlpack/MesHqlPack.java @@ -0,0 +1,29 @@ +package cn.estsh.i3plus.pojo.mes.pcn.sqlpack; + +import cn.estsh.i3plus.pojo.base.bean.DdlPackBean; +import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil; +import cn.estsh.i3plus.pojo.base.tool.DdlPreparedPack; + +/** + * @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; + } +} From ee1806025cc517046955f5e0b10d5f01ed272355 Mon Sep 17 00:00:00 2001 From: Silliter Date: Wed, 29 May 2019 11:34:56 +0800 Subject: [PATCH 4/7] =?UTF-8?q?=E5=BC=80=E5=8F=91andon=E5=91=BC=E5=8F=AB?= =?UTF-8?q?=E5=81=9C=E6=AD=A2=E4=BA=A7=E7=BA=BF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../bean/AndonStopLineConfig.java | 56 ++++++++++++++++++++++ .../repository/IAndonStopLineCfgRepository.java | 16 +++++++ .../sqlpack/AndonHqlPack.java | 17 +++++++ 3 files changed, 89 insertions(+) create mode 100644 modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/bean/AndonStopLineConfig.java create mode 100644 modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/repository/IAndonStopLineCfgRepository.java diff --git a/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/bean/AndonStopLineConfig.java b/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/bean/AndonStopLineConfig.java new file mode 100644 index 0000000..9cd1a6f --- /dev/null +++ b/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/bean/AndonStopLineConfig.java @@ -0,0 +1,56 @@ +package cn.estsh.i3plus.pojo.andon.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.Index; +import javax.persistence.Table; + +/** + * @Description : 安灯停线配置数据 + * @Reference : + * @Author : silliter.yuan + * @CreateDate : 2019-05-29 17:16 + * @Modify: + **/ +@Data +@Entity +@Table(name="ANDON_STOP_LINE_CFG", indexes = { + @Index(columnList = "WORK_CENTER_CODE", name = "ANDON_INDEX_WORK_CENTER_CODE"), + @Index(columnList = "WORK_CELL_CODE", name = "ANDON_INDEX_WORK_CELL_CODE"), + @Index(columnList = "ORGANIZE_CODE", name = "ANDON_INDEX_ORGANIZE_CODE"), + @Index(columnList = "ALARM_CODE", name = "ANDON_INDEX_ALARM_CODE") +}) +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Api("安灯队列") +public class AndonStopLineConfig extends BaseBean { + + @Column(name = "ALARM_CODE") + @ApiParam(value = "安灯类型") + private String alarmCode; + + @Column(name = "WORK_CENTER_CODE") + @ApiParam(value = "工作中心代码") + private String workCenterCode; + + @Column(name = "WORK_CENTER_NAME_RDD") + @ApiParam(value = "工作中心名称") + private String workCenterNameRdd; + + @Column(name = "WORK_CELL_NAME_RDD") + @ApiParam(value = "工作单元名称") + private String workCellNameRdd; + + @Column(name = "WORK_CELL_CODE") + @ApiParam(value = "工作单元代码") + private String workCellCode; +} diff --git a/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/repository/IAndonStopLineCfgRepository.java b/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/repository/IAndonStopLineCfgRepository.java new file mode 100644 index 0000000..4042df9 --- /dev/null +++ b/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/repository/IAndonStopLineCfgRepository.java @@ -0,0 +1,16 @@ +package cn.estsh.i3plus.pojo.andon.repository; + +import cn.estsh.i3plus.pojo.andon.bean.AndonStopLineConfig; +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import org.springframework.stereotype.Repository; + +/** + * @Description : 对象持久层仓用方法控制（ANDON_停线配置） + * @Reference : + * @Author : silliter.yuan + * @CreateDate : 2019-05-29 11:05 + * @Modify: + **/ +@Repository +public interface IAndonStopLineCfgRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/sqlpack/AndonHqlPack.java b/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/sqlpack/AndonHqlPack.java index 74ddb8a..cf4522c 100644 --- a/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/sqlpack/AndonHqlPack.java +++ b/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/sqlpack/AndonHqlPack.java @@ -347,4 +347,21 @@ public class AndonHqlPack { return result; } + + /** + * 安灯停线配置信息封装 + * @param stopLineConfig + * @return + */ + public static DdlPackBean packAndonStopLineCfg(AndonStopLineConfig stopLineConfig) { + DdlPackBean result = new DdlPackBean(); + + DdlPreparedPack.getStringEqualPack(stopLineConfig.getAlarmCode(), "alarmCode", result); + DdlPreparedPack.getStringEqualPack(stopLineConfig.getWorkCellCode(), "workCellCode", result); + DdlPreparedPack.getStringEqualPack(stopLineConfig.getWorkCenterCode(), "workCenterCode", result); + + getStringBuilderPack(stopLineConfig, result); + + return result; + } } From 9eb6e82306533b8d5a480efcda111cd3f17b8dae Mon Sep 17 00:00:00 2001 From: Silliter Date: Wed, 29 May 2019 11:47:46 +0800 Subject: [PATCH 5/7] =?UTF-8?q?=E5=BC=80=E5=8F=91andon=E5=91=BC=E5=8F=AB?= =?UTF-8?q?=E5=81=9C=E6=AD=A2=E4=BA=A7=E7=BA=BF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/cn/estsh/i3plus/pojo/base/enumutil/AndonEnumUtil.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/AndonEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/AndonEnumUtil.java index d98d25d..96bc964 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/AndonEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/AndonEnumUtil.java @@ -49,14 +49,15 @@ public class AndonEnumUtil { /** * 按灯业务状态 - * 安灯状态=10，工号 =20 ，读取状态=30 + * 安灯状态=10，工号 =20 ，读取状态=30, 停线=40 */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum ALARM_BUSI_FLAG{ ALARM_FLAG("10","安灯呼叫标识"), USER_CODE("20","用户工号"), - READ_FLAG("30", "安灯读取状态"); + READ_FLAG("30", "安灯读取状态"), + STOP_FLAG("40", "停线状态"); private String value; private String description; From 8a298687c2fa07a24ff0f89e9c39b1dd94113357 Mon Sep 17 00:00:00 2001 From: Silliter Date: Wed, 29 May 2019 13:38:25 +0800 Subject: [PATCH 6/7] =?UTF-8?q?=E5=BC=80=E5=8F=91andon=E5=91=BC=E5=8F=AB?= =?UTF-8?q?=E5=81=9C=E6=AD=A2=E4=BA=A7=E7=BA=BF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../sqlpack/AndonHqlPack.java | 1 + .../i3plus/pojo/base/enumutil/AndonEnumUtil.java | 27 ++++++++++++++++++++++ 2 files changed, 28 insertions(+) diff --git a/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/sqlpack/AndonHqlPack.java b/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/sqlpack/AndonHqlPack.java index cf4522c..3a8daf1 100644 --- a/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/sqlpack/AndonHqlPack.java +++ b/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/sqlpack/AndonHqlPack.java @@ -53,6 +53,7 @@ public class AndonHqlPack { DdlPreparedPack.getStringEqualPack(andonPLC.getChannelName(), "channelName", result); DdlPreparedPack.getStringEqualPack(andonPLC.getTagName(), "tagName", result); DdlPreparedPack.getStringEqualPack(andonPLC.getTagAddress(), "tagAddress", result); + DdlPreparedPack.getStringEqualPack(andonPLC.getTagBusinessType(), "tagBusinessType", result); DdlPreparedPack.getStringEqualPack(andonPLC.getTagType(), "tagType", result); DdlPreparedPack.getStringEqualPack(andonPLC.getAlarmCode(), "alarmCode", result); DdlPreparedPack.getStringEqualPack(andonPLC.getGroupNo(), "groupNo", result); diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/AndonEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/AndonEnumUtil.java index 96bc964..7a0e241 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/AndonEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/AndonEnumUtil.java @@ -253,4 +253,31 @@ public class AndonEnumUtil { return tmp; } } + + /** + * 按灯停线标识 + * 1-停止产线，0-启动产线 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum STOP_LINE_FLAG{ + + STOP("1","停止产线"), + RESTART("0","启动产线"); + + private String value; + private String description; + + STOP_LINE_FLAG(String value, String description) { + this.value = value; + this.description = description; + } + + public String getValue() { + return value; + } + + public String getDescription() { + return description; + } + } } From ca0a671e92e0aac563b8b9a60c9d1432200790f7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=88=98=E6=95=8F?= <962239776@qq.com> Date: Wed, 29 May 2019 15:59:38 +0800 Subject: [PATCH 7/7] #4337 --- .../src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 02f9b9f..74de1b5 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 @@ -1551,7 +1551,7 @@ public class WmsHqlPack { */ public static DdlPackBean packEngineScriptPersistence(EngineScriptPersistence scriptPersistence) { DdlPackBean packBean = new DdlPackBean(); - DdlPreparedPack.getStringEqualPack(scriptPersistence.getScriptNo(), "scriptNo", packBean); + DdlPreparedPack.getStringLikerPack(scriptPersistence.getScriptNo(), "scriptNo", packBean); DdlPreparedPack.getStringRightLikerPack(scriptPersistence.getScriptName(), "scriptName", packBean); DdlPreparedPack.getNumEqualPack(scriptPersistence.getScriptType(), "scriptType", packBean); DdlPreparedPack.getNumEqualPack(scriptPersistence.getLanguageType(), "languageType", packBean);