diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/bean/BaseConstWords.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/bean/BaseConstWords.java index f5011e7..560b296 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/bean/BaseConstWords.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/bean/BaseConstWords.java @@ -30,4 +30,6 @@ public class BaseConstWords { public static final String DICTIONARY_EMPLOYEE_TYPE ="EMPLOYEE_TYPE"; // 系统参数配置 PROPERTIES public static final String DICTIONARY_PROPERTIES ="PROPERTIES"; + // 打印模板分组 + public static final String DICTIONARY_LABEL_TEMPLATE_GROUP ="LABEL_TEMPLATE_GROUP"; } diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/ImppEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/ImppEnumUtil.java index 67009bb..561ce58 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/ImppEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/ImppEnumUtil.java @@ -1161,7 +1161,7 @@ public class ImppEnumUtil { @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum DICTIONARY_GROUP { SYSTEM(1, "系统字典"), - EXTERNAL(2, "外部人员"); + EXTERNAL(2, "业务字典"); private int value; private String description; 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 c73775b..d48d08c 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 @@ -12,6 +12,156 @@ import com.fasterxml.jackson.annotation.JsonFormat; public class MesEnumUtil { /** + * mes设备类型 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum MES_EQUIPMENT_TYPE { + + PHYSICAL(10, "物理设备"), + LOGIC(20, "逻辑设备"); + + private int value; + private String description; + + MES_EQUIPMENT_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; + } + } + + /** + * mes设备连接类型 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum MES_EQUIPMENT_CONNECT_TYPE { + + PLC(10, "PLC"), + DB(20, "DB"), + OTHER(30, "其他"); + + private int value; + private String description; + + MES_EQUIPMENT_CONNECT_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; + } + } + + /** + * mes设备状态 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum MES_EQUIPMENT_STATUS { + + INUSE(10, "在用"), + SPARE(20, "备用"), + FAULT(30, "故障"), + SERVICE(40, "检修"), + STOPUSING(50, "停用"); + + private int value; + private String description; + + MES_EQUIPMENT_STATUS(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; + } + } + + /** + * mes设备类别 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum MES_EQUIPMENT_CATEGORY { + + A("A", "A"), + B("B", "B"), + C("C", "C"), + D("D", "D"); + + private String value; + private String description; + + MES_EQUIPMENT_CATEGORY(String value, String description) { + this.value = value; + this.description = description; + } + + public String getValue() { + return value; + } + + public String getDescription() { + return description; + } + + public static String valueOfDescription(String val) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].value.equals(val)) { + tmp = values()[i].description; + } + } + return tmp; + } + } + + /** * mes按钮状态配置 判断符号 */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesDb.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesDb.java index e86de81..113151d 100644 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesDb.java +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesDb.java @@ -55,8 +55,8 @@ public class MesDb extends BaseBean { @ApiParam("密码") private String dsPassword; - @Column(name="EQU_CODE") + @Column(name="EQUIPMENT_CODE") @ApiParam("设备代码") - private String equCode; + private String equipmentCode; } diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesEquipment.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesEquipment.java index e6dd7ba..b41bde8 100644 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesEquipment.java +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesEquipment.java @@ -41,19 +41,39 @@ public class MesEquipment extends BaseBean { @Column(name="STATUS") @ApiParam("设备状态") - private String status; + private Integer status; - @Column(name="WORK_CELL_CODE") - @ApiParam("工作单元代码") - private String workCellCode; + @Column(name="EQUIPMENT_TYPE") + @ApiParam("设备类型") + private Integer equipmentType; - @Column(name="WORK_CENTER_CODE") - @ApiParam("工作中心代码") - private String workCenterCode; + @Column(name="EQUIPMENT_CATEGORY") + @ApiParam("设备类别") + private String equipmentCategory; - @Column(name="AREA_CODE") - @ApiParam("区域代码") - private String areaCode; + @Column(name="EQUIPMENT_MODEL") + @ApiParam("型号") + private String equipmentModel; + + @Column(name="EQUIPMENT_SPEC") + @ApiParam("规格") + private String equipmentSpec; + + @Column(name="EQUIPMENT_MAKER") + @ApiParam("制造商") + private String equipmentMaker; + + @Column(name="RELEASE_DATE") + @ApiParam("出厂日期") + private String releaseDate; + + @Column(name="RECEIVE_DATE") + @ApiParam("接收日期") + private String receiveDate; + + @Column(name="ENABLE_DATE") + @ApiParam("启用日期") + private String enableDate; @Column(name="CONNECT_TYPE") @ApiParam("连接类型") diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPlc.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPlc.java index f25e3b5..756aea5 100644 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPlc.java +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPlc.java @@ -63,9 +63,9 @@ public class MesPlc extends BaseBean { @ApiParam("分组名称") private String groupName; - @Column(name = "EQU_CODE") + @Column(name="EQUIPMENT_CODE") @ApiParam("设备代码") - private String equCode; + private String equipmentCode; @Column(name = "WORK_CENTER_CODE") @ApiParam("工作中心") diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesWcEquipment.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesWcEquipment.java index 11e5acd..e86a851 100644 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesWcEquipment.java +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesWcEquipment.java @@ -34,8 +34,8 @@ public class MesWcEquipment extends BaseBean { @ApiParam("工作单元代码") private String workCellCode; - @Column(name="EQU_CODE") + @Column(name="EQUIPMENT_CODE") @ApiParam("设备代码") - private String equCode; + private String equipmentCode; } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesDb.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesDb.java index de939b5..3f9c070 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesDb.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesDb.java @@ -55,8 +55,8 @@ public class MesDb extends BaseBean { @ApiParam("密码") private String dsPassword; - @Column(name = "EQU_CODE") + @Column(name = "EQUIPMENT_CODE") @ApiParam("设备代码") - private String equCode; + private String equipmentCode; } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEquipment.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEquipment.java index 069b395..f7f03b2 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEquipment.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEquipment.java @@ -17,7 +17,7 @@ import javax.persistence.Table; import javax.persistence.Transient; /** - * @Description :生产区域 + * @Description :生产设备 * @Reference : * @Author : jack.jia * @CreateDate : 2019-04-02 @@ -41,19 +41,39 @@ public class MesEquipment extends BaseBean { @Column(name="STATUS") @ApiParam("设备状态") - private String status; + private Integer status; - @Column(name="WORK_CELL_CODE") - @ApiParam("工作单元代码") - private String workCellCode; + @Column(name="EQUIPMENT_TYPE") + @ApiParam("设备类型") + private Integer equipmentType; - @Column(name="WORK_CENTER_CODE") - @ApiParam("工作中心代码") - private String workCenterCode; + @Column(name="EQUIPMENT_CATEGORY") + @ApiParam("设备类别") + private String equipmentCategory; - @Column(name="AREA_CODE") - @ApiParam("区域代码") - private String areaCode; + @Column(name="EQUIPMENT_MODEL") + @ApiParam("型号") + private String equipmentModel; + + @Column(name="EQUIPMENT_SPEC") + @ApiParam("规格") + private String equipmentSpec; + + @Column(name="EQUIPMENT_MAKER") + @ApiParam("制造商") + private String equipmentMaker; + + @Column(name="RELEASE_DATE") + @ApiParam("出厂日期") + private String releaseDate; + + @Column(name="RECEIVE_DATE") + @ApiParam("接收日期") + private String receiveDate; + + @Column(name="ENABLE_DATE") + @ApiParam("启用日期") + private String enableDate; @Column(name="CONNECT_TYPE") @ApiParam("连接类型") @@ -63,6 +83,18 @@ public class MesEquipment extends BaseBean { @ApiParam(value ="名称") private String name; + @Transient + @ApiParam(value ="生产线") + private String workCenterCode; + + @Transient + @ApiParam(value ="工位") + private String workCellCode; + + @Transient + @ApiParam(value ="区域") + private String areaCode; + // 默认值 -1 @Transient @ApiParam(value ="父节点" , access ="父节点" ,example = "-1") diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWcEquipment.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWcEquipment.java index d79594c..1a228bf 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWcEquipment.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWcEquipment.java @@ -35,8 +35,8 @@ public class MesWcEquipment extends BaseBean { @ApiParam("工作单元代码") private String workCellCode; - @Column(name="EQU_CODE") + @Column(name="EQUIPMENT_CODE") @ApiParam("设备代码") - private String equCode; + private String equipmentCode; } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesEquipmentModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesEquipmentModel.java new file mode 100644 index 0000000..26675c1 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesEquipmentModel.java @@ -0,0 +1,48 @@ +package cn.estsh.i3plus.pojo.mes.model; + +import io.swagger.annotations.ApiParam; +import lombok.Data; + +import java.io.Serializable; + +@Data +public class MesEquipmentModel implements Serializable { + @ApiParam(value ="id") + private Long id; + + @ApiParam("设备代码") + private String equipmentCode; + + @ApiParam("设备名称") + private String equipmentName; + + @ApiParam("设备状态") + private Integer status; + + @ApiParam(value ="生产线") + private String workCenterCode; + + @ApiParam(value ="工位") + private String workCellCode; + + @ApiParam(value ="区域") + private String areaCode; + + @ApiParam(value ="设备工位关联ID") + private Long wcId; + + public MesEquipmentModel() { + + } + + public MesEquipmentModel(Long wcId, Long id, String equipmentCode, String equipmentName, Integer status, String workCenterCode, String workCellCode, String areaCode) { + this.wcId = wcId; + this.id = id; + this.equipmentCode = equipmentCode; + this.equipmentName = equipmentName; + this.status = status; + this.workCenterCode = workCenterCode; + this.workCellCode = workCellCode; + this.areaCode = areaCode; + } +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesWcEquipmentRepository.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesWcEquipmentRepository.java new file mode 100644 index 0000000..1186132 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesWcEquipmentRepository.java @@ -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.MesWcEquipment; +import org.springframework.stereotype.Repository; + +/** + * @Description : + * @Reference : + * @Author : wangjie + * @CreateDate : 2019-10-09 + * @Modify: + **/ +@Repository +public interface MesWcEquipmentRepository 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 index be9bc53..7d31328 100644 --- 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 @@ -6,7 +6,7 @@ import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil; import cn.estsh.i3plus.pojo.base.enumutil.MesEnumUtil; import cn.estsh.i3plus.pojo.base.tool.DdlPreparedPack; import cn.estsh.i3plus.pojo.mes.bean.*; -import org.apache.commons.lang3.StringUtils; +import org.springframework.util.StringUtils; /** * @Description: @@ -32,16 +32,16 @@ public class MesHqlPack { public static DdlPackBean getMesPcnByCondition(MesPcn mesPcn, String organizeCode) { DdlPackBean packBean = getAllBaseData(organizeCode); - if (StringUtils.isNotEmpty(mesPcn.getConnectIp())) { + if (!StringUtils.isEmpty(mesPcn.getConnectIp())) { DdlPreparedPack.getStringLikerPack(mesPcn.getConnectIp(), "connectIp", packBean); } - if (StringUtils.isNotEmpty(mesPcn.getPcnName())) { + if (!StringUtils.isEmpty(mesPcn.getPcnName())) { DdlPreparedPack.getStringLikerPack(mesPcn.getPcnName(), "pcnName", packBean); } - if (StringUtils.isNotEmpty(mesPcn.getPcnCode())) { + if (!StringUtils.isEmpty(mesPcn.getPcnCode())) { DdlPreparedPack.getStringLikerPack(mesPcn.getPcnCode(), "pcnCode", packBean); } - if (StringUtils.isNotEmpty(mesPcn.getAreaCode())) { + if (!StringUtils.isEmpty(mesPcn.getAreaCode())) { DdlPreparedPack.getStringLikerPack(mesPcn.getAreaCode(), "areaCode", packBean); } if (mesPcn.getIsValid() != null) { @@ -62,23 +62,23 @@ public class MesHqlPack { DdlPreparedPack.getNumEqualPack(CommonEnumUtil.IS_VAILD.VAILD.getValue(), "isValid", packBean); DdlPreparedPack.getNumEqualPack(CommonEnumUtil.IS_DEAL.NO.getValue(), "isDeleted", packBean); - if (StringUtils.isNotEmpty(mesPlanOrder.getOrderNo())) { + if (!StringUtils.isEmpty(mesPlanOrder.getOrderNo())) { DdlPreparedPack.getStringLikerPack(mesPlanOrder.getOrderNo(), "orderNo", packBean); } - if (StringUtils.isNotEmpty(mesPlanOrder.getPartNo())) { + if (!StringUtils.isEmpty(mesPlanOrder.getPartNo())) { DdlPreparedPack.getStringLikerPack(mesPlanOrder.getPartNo(), "partNo", packBean); } - if (StringUtils.isNotEmpty(mesPlanOrder.getPlanType() + "") && mesPlanOrder.getPlanTypeVal() != 0) { + if (!StringUtils.isEmpty(mesPlanOrder.getPlanType() + "") && mesPlanOrder.getPlanTypeVal() != 0) { DdlPreparedPack.getNumEqualPack(mesPlanOrder.getPlanType(), "planType", packBean); } - if (StringUtils.isNotEmpty(mesPlanOrder.getStatus() + "") && mesPlanOrder.getStatusVal() != 0) { + if (!StringUtils.isEmpty(mesPlanOrder.getStatus() + "") && mesPlanOrder.getStatusVal() != 0) { DdlPreparedPack.getNumEqualPack(mesPlanOrder.getStatus(), "status", packBean); } - if (StringUtils.isNotEmpty(mesPlanOrder.getCreateUser())) { + if (!StringUtils.isEmpty(mesPlanOrder.getCreateUser())) { DdlPreparedPack.getStringLikerPack(mesPlanOrder.getCreateUser(), "createUser", packBean); } - if (StringUtils.isNotEmpty(mesPlanOrder.getCustOrderNo())) { + if (!StringUtils.isEmpty(mesPlanOrder.getCustOrderNo())) { DdlPreparedPack.getStringLikerPack(mesPlanOrder.getCustOrderNo(), "custOrderNo", packBean); } @@ -114,19 +114,19 @@ public class MesHqlPack { DdlPreparedPack.getNumEqualPack(CommonEnumUtil.IS_VAILD.VAILD.getValue(), "isValid", packBean); DdlPreparedPack.getNumEqualPack(CommonEnumUtil.IS_DEAL.NO.getValue(), "isDeleted", packBean); - if (StringUtils.isNotEmpty(mesPart.getPartNo())) { + if (!StringUtils.isEmpty(mesPart.getPartNo())) { DdlPreparedPack.getStringLikerPack(mesPart.getPartNo(), "partNo", packBean); } - if (StringUtils.isNotEmpty(mesPart.getPartName())) { + if (!StringUtils.isEmpty(mesPart.getPartName())) { DdlPreparedPack.getStringLikerPack(mesPart.getPartName(), "partName", packBean); } - if (StringUtils.isNotEmpty(mesPart.getCategoryCode1())) { + if (!StringUtils.isEmpty(mesPart.getCategoryCode1())) { DdlPreparedPack.getStringEqualPack(mesPart.getCategoryCode1(), "categoryCode1", packBean); } - if (StringUtils.isNotEmpty(mesPart.getCategoryCode2())) { + if (!StringUtils.isEmpty(mesPart.getCategoryCode2())) { DdlPreparedPack.getStringEqualPack(mesPart.getCategoryCode2(), "categoryCode2", packBean); } - if (StringUtils.isNotEmpty(mesPart.getCategoryCode3())) { + if (!StringUtils.isEmpty(mesPart.getCategoryCode3())) { DdlPreparedPack.getStringEqualPack(mesPart.getCategoryCode3(), "categoryCode3", packBean); } @@ -143,31 +143,31 @@ public class MesHqlPack { */ public static DdlPackBean getWorkOrderCondition(MesWorkOrder mesWorkOrder, String organizeCode) { DdlPackBean packBean = getAllBaseData(organizeCode); - if (StringUtils.isNotEmpty(mesWorkOrder.getOrderNo())) { + if (!StringUtils.isEmpty(mesWorkOrder.getOrderNo())) { DdlPreparedPack.getStringLikerPack(mesWorkOrder.getOrderNo(), "orderNo", packBean); } - if (StringUtils.isNotEmpty(mesWorkOrder.getPartNo())) { + if (!StringUtils.isEmpty(mesWorkOrder.getPartNo())) { DdlPreparedPack.getStringLikerPack(mesWorkOrder.getPartNo(), "partNo", packBean); } - if (StringUtils.isNotEmpty(mesWorkOrder.getWorkOrderStatus() + "") && mesWorkOrder.getWorkOrderStatusVal() != 0) { + if (!StringUtils.isEmpty(mesWorkOrder.getWorkOrderStatus() + "") && mesWorkOrder.getWorkOrderStatusVal() != 0) { DdlPreparedPack.getNumEqualPack(mesWorkOrder.getWorkOrderStatus(), "workOrderStatus", packBean); } - if (StringUtils.isNotEmpty(mesWorkOrder.getWorkCenterCode())) { + if (!StringUtils.isEmpty(mesWorkOrder.getWorkCenterCode())) { DdlPreparedPack.getStringEqualPack(mesWorkOrder.getWorkCenterCode(), "workCenterCode", packBean); } if (mesWorkOrder.getApprovalStatus() != null) { DdlPreparedPack.getNumEqualPack(mesWorkOrder.getApprovalStatus(), "approvalStatus", packBean); } - if (StringUtils.isNotEmpty(mesWorkOrder.getWorkOrderType() + "") && mesWorkOrder.getWorkOrderTypeVal() != 0) { + if (!StringUtils.isEmpty(mesWorkOrder.getWorkOrderType() + "") && mesWorkOrder.getWorkOrderTypeVal() != 0) { DdlPreparedPack.getNumEqualPack(mesWorkOrder.getWorkOrderType(), "workOrderType", packBean); } - if (StringUtils.isNotEmpty(mesWorkOrder.getCustOrderNo())) { + if (!StringUtils.isEmpty(mesWorkOrder.getCustOrderNo())) { DdlPreparedPack.getStringLikerPack(mesWorkOrder.getCustOrderNo(), "custOrderNo", packBean); } - if (StringUtils.isNotEmpty(mesWorkOrder.getPlanOrderNo())) { + if (!StringUtils.isEmpty(mesWorkOrder.getPlanOrderNo())) { DdlPreparedPack.getStringLikerPack(mesWorkOrder.getPlanOrderNo(), "planOrderNo", packBean); } - if (StringUtils.isNotEmpty(mesWorkOrder.getCreateUser())) { + if (!StringUtils.isEmpty(mesWorkOrder.getCreateUser())) { DdlPreparedPack.getStringLikerPack(mesWorkOrder.getCreateUser(), "createUser", packBean); } if (mesWorkOrder.getIsValid() != null) { @@ -200,15 +200,15 @@ public class MesHqlPack { */ public static DdlPackBean getQueueOrder(MesQueueOrder mesQueueOrder, String organizeCode) { DdlPackBean packBean = getAllBaseData(organizeCode); - if (StringUtils.isNotEmpty(mesQueueOrder.getCustFlagNoStart())) { + if (!StringUtils.isEmpty(mesQueueOrder.getCustFlagNoStart())) { DdlPreparedPack.getStringBiggerPack(mesQueueOrder.getCustFlagNoStart(), "custFlagNo", packBean); } - if (StringUtils.isNotEmpty(mesQueueOrder.getCustFlagNoEnd() + "")) { + if (!StringUtils.isEmpty(mesQueueOrder.getCustFlagNoEnd() + "")) { DdlPreparedPack.getStringSmallerPack(mesQueueOrder.getCustFlagNoEnd(), "custFlagNo", packBean); } - if (StringUtils.isNotEmpty(mesQueueOrder.getOrderNo() + "")) { + if (!StringUtils.isEmpty(mesQueueOrder.getOrderNo() + "")) { DdlPreparedPack.getStringLikerPack(mesQueueOrder.getOrderNo(), "orderNo", packBean); } @@ -253,7 +253,7 @@ public class MesHqlPack { */ public static DdlPackBean getMesArea(MesArea mesArea, String organizeCode) { DdlPackBean packBean = getAllBaseDataByNormalPro(mesArea, organizeCode); - if (StringUtils.isNotEmpty(mesArea.getAreaCode())) { + if (!StringUtils.isEmpty(mesArea.getAreaCode())) { DdlPreparedPack.getStringEqualPack(mesArea.getAreaCode(), "areaCode", packBean); } @@ -281,13 +281,13 @@ public class MesHqlPack { */ public static DdlPackBean getMesWorkCell(MesWorkCell mesWorkCell, String organizeCode) { DdlPackBean packBean = getAllBaseDataByNormalPro(mesWorkCell, organizeCode); - if (StringUtils.isNotEmpty(mesWorkCell.getWorkCenterCode())) { + if (!StringUtils.isEmpty(mesWorkCell.getWorkCenterCode())) { DdlPreparedPack.getStringEqualPack(mesWorkCell.getWorkCenterCode(), "workCenterCode", packBean); } - if (StringUtils.isNotEmpty(mesWorkCell.getAreaCode())) { + if (!StringUtils.isEmpty(mesWorkCell.getAreaCode())) { DdlPreparedPack.getStringEqualPack(mesWorkCell.getAreaCode(), "areaCode", packBean); } - if (StringUtils.isNotEmpty(mesWorkCell.getWorkCellCode())) { + if (!StringUtils.isEmpty(mesWorkCell.getWorkCellCode())) { DdlPreparedPack.getStringEqualPack(mesWorkCell.getWorkCellCode(), "workCellCode", packBean); } @@ -295,24 +295,6 @@ public class MesHqlPack { } /** - * MES设备信息查询条件封装 - * - * @param mesEquipment - * @return - */ - public static DdlPackBean getMesEquipment(MesEquipment mesEquipment, String organizeCode) { - DdlPackBean packBean = getAllBaseDataByNormalPro(mesEquipment, organizeCode); - if (StringUtils.isNotEmpty(mesEquipment.getWorkCellCode())) { - DdlPreparedPack.getStringEqualPack(mesEquipment.getWorkCellCode(), "workCellCode", packBean); - } - if (StringUtils.isNotEmpty(mesEquipment.getEquipmentCode())) { - DdlPreparedPack.getStringEqualPack(mesEquipment.getEquipmentCode(), "equipmentCode", packBean); - } - - return packBean; - } - - /** * 流程查询条件封装 * * @param mesRoute @@ -350,13 +332,13 @@ public class MesHqlPack { */ public static DdlPackBean getMesShift(MesShift shift, String organizeCode) { DdlPackBean packBean = getAllBaseDataByNormalPro(shift, organizeCode); - if (StringUtils.isNotEmpty(shift.getShiftCode())) { + if (!StringUtils.isEmpty(shift.getShiftCode())) { DdlPreparedPack.getStringLikerPack(shift.getShiftCode(), "shiftCode", packBean); } - if (StringUtils.isNotEmpty(shift.getShiftName())) { + if (!StringUtils.isEmpty(shift.getShiftName())) { DdlPreparedPack.getStringLikerPack(shift.getShiftName(), "shiftName", packBean); } - if (StringUtils.isNotEmpty(shift.getWorkCenterCode())) { + if (!StringUtils.isEmpty(shift.getWorkCenterCode())) { DdlPreparedPack.getStringEqualPack(shift.getWorkCenterCode(), "workCenterCode", packBean); } @@ -373,10 +355,10 @@ public class MesHqlPack { public static DdlPackBean getMesShiftGroup(MesShiftGroup shiftGroup, String organizeCode) { DdlPackBean packBean = getAllBaseDataByNormalPro(shiftGroup, organizeCode); - if (StringUtils.isNotEmpty(shiftGroup.getGroupCode())) { + if (!StringUtils.isEmpty(shiftGroup.getGroupCode())) { DdlPreparedPack.getStringLikerPack(shiftGroup.getGroupCode(), "groupCode", packBean); } - if (StringUtils.isNotEmpty(shiftGroup.getGroupName())) { + if (!StringUtils.isEmpty(shiftGroup.getGroupName())) { DdlPreparedPack.getStringLikerPack(shiftGroup.getGroupName(), "groupName", packBean); } return packBean; @@ -390,10 +372,10 @@ public class MesHqlPack { */ public static DdlPackBean getMesShiftRest(MesShiftRest shiftRest, String organizeCode) { DdlPackBean packBean = getAllBaseDataByNormalPro(shiftRest, organizeCode); - if (StringUtils.isNotEmpty(shiftRest.getWorkCenterCode())) { + if (!StringUtils.isEmpty(shiftRest.getWorkCenterCode())) { DdlPreparedPack.getStringEqualPack(shiftRest.getWorkCenterCode(), "workCenterCode", packBean); } - if (StringUtils.isNotEmpty(shiftRest.getShiftCode())) { + if (!StringUtils.isEmpty(shiftRest.getShiftCode())) { DdlPreparedPack.getStringEqualPack(shiftRest.getShiftCode(), "shiftCode", packBean); } @@ -408,10 +390,10 @@ public class MesHqlPack { */ public static DdlPackBean getMesScrap(MesScrap mesScrap, String organizeCode) { DdlPackBean packBean = getAllBaseData(organizeCode); - if (StringUtils.isNotEmpty(mesScrap.getScrapCode())) { + if (!StringUtils.isEmpty(mesScrap.getScrapCode())) { DdlPreparedPack.getStringLikerPack(mesScrap.getScrapCode(), "scrapCode", packBean); } - if (StringUtils.isNotEmpty(mesScrap.getScrapName())) { + if (!StringUtils.isEmpty(mesScrap.getScrapName())) { DdlPreparedPack.getStringLikerPack(mesScrap.getScrapName(), "scrapName", packBean); } if (mesScrap.getIsValid() != null) { @@ -446,10 +428,10 @@ public class MesHqlPack { */ public static DdlPackBean getMesConfig(MesConfig mesConfig, String organizeCode) { DdlPackBean packBean = getAllBaseData(organizeCode); - if (StringUtils.isNotEmpty(mesConfig.getCfgCode())) { + if (!StringUtils.isEmpty(mesConfig.getCfgCode())) { DdlPreparedPack.getStringLikerPack(mesConfig.getCfgCode(), "cfgCode", packBean); } - if (StringUtils.isNotEmpty(mesConfig.getCfgName())) { + if (!StringUtils.isEmpty(mesConfig.getCfgName())) { DdlPreparedPack.getStringLikerPack(mesConfig.getCfgName(), "cfgName", packBean); } if (mesConfig.getIsValid() != null) { @@ -466,10 +448,10 @@ public class MesHqlPack { */ public static DdlPackBean getMesRepair(MesRepair mesRepair, String organizeCode) { DdlPackBean packBean = getAllBaseData(organizeCode); - if (StringUtils.isNotEmpty(mesRepair.getRepairCode())) { + if (!StringUtils.isEmpty(mesRepair.getRepairCode())) { DdlPreparedPack.getStringLikerPack(mesRepair.getRepairCode(), "repairCode", packBean); } - if (StringUtils.isNotEmpty(mesRepair.getRepairName())) { + if (!StringUtils.isEmpty(mesRepair.getRepairName())) { DdlPreparedPack.getStringLikerPack(mesRepair.getRepairName(), "repairName", packBean); } if (mesRepair.getRepairType() != null) { @@ -503,10 +485,10 @@ public class MesHqlPack { public static DdlPackBean getMesESOP(MesESOP mesESOP, String organizeCode) { DdlPackBean packBean = getAllBaseDataByNormalPro(mesESOP, organizeCode); - if (StringUtils.isNotEmpty(mesESOP.getWorkCenterCode())) { + if (!StringUtils.isEmpty(mesESOP.getWorkCenterCode())) { DdlPreparedPack.getStringEqualPack(mesESOP.getWorkCenterCode(), "workCenterCode", packBean); } - if (StringUtils.isNotEmpty(mesESOP.getPartNo())) { + if (!StringUtils.isEmpty(mesESOP.getPartNo())) { DdlPreparedPack.getStringLikerPack(mesESOP.getPartNo(), "partNo", packBean); } @@ -639,13 +621,13 @@ public class MesHqlPack { */ public static DdlPackBean getMesEventAction(MesEventAction mesEventAction, String organizeCode) { DdlPackBean packBean = getAllBaseDataByNormalPro(mesEventAction, organizeCode); - if (StringUtils.isNotEmpty(mesEventAction.getOrganizeCode())) { + if (!StringUtils.isEmpty(mesEventAction.getOrganizeCode())) { DdlPreparedPack.getStringEqualPack(mesEventAction.getOrganizeCode(), "organizeCode", packBean); } - if (StringUtils.isNotEmpty(mesEventAction.getEventCode())) { + if (!StringUtils.isEmpty(mesEventAction.getEventCode())) { DdlPreparedPack.getStringLikerPack(mesEventAction.getEventCode(), "eventCode", packBean); } - if (StringUtils.isNotEmpty(mesEventAction.getActionCode())) { + if (!StringUtils.isEmpty(mesEventAction.getActionCode())) { DdlPreparedPack.getStringLikerPack(mesEventAction.getActionCode(), "actionCode", packBean); } @@ -661,10 +643,10 @@ public class MesHqlPack { */ public static DdlPackBean getMesProcess(MesProcess process, String organizeCode) { DdlPackBean packBean = getAllBaseDataByNormalPro(process, organizeCode); - if (StringUtils.isNotEmpty(process.getProcessCode())) { + if (!StringUtils.isEmpty(process.getProcessCode())) { DdlPreparedPack.getStringLikerPack(process.getProcessCode(), "processCode", packBean); } - if (StringUtils.isNotEmpty(process.getProcessName())) { + if (!StringUtils.isEmpty(process.getProcessName())) { DdlPreparedPack.getStringLikerPack(process.getProcessName(), "processName", packBean); } @@ -679,13 +661,13 @@ public class MesHqlPack { */ public static DdlPackBean getMesStep(MesStep step, String organizeCode) { DdlPackBean packBean = getAllBaseDataByNormalPro(step, organizeCode); - if (StringUtils.isNotEmpty(step.getStepCode())) { + if (!StringUtils.isEmpty(step.getStepCode())) { DdlPreparedPack.getStringLikerPack(step.getStepCode(), "stepCode", packBean); } - if (StringUtils.isNotEmpty(step.getStepName())) { + if (!StringUtils.isEmpty(step.getStepName())) { DdlPreparedPack.getStringLikerPack(step.getStepName(), "stepName", packBean); } - if (StringUtils.isNotEmpty(step.getStepType())) { + if (!StringUtils.isEmpty(step.getStepType())) { DdlPreparedPack.getStringLikerPack(step.getStepType(), "stepType", packBean); } @@ -700,13 +682,13 @@ public class MesHqlPack { */ public static DdlPackBean getMesStepParam(MesStepParam stepParam, String organizeCode) { DdlPackBean packBean = getAllBaseDataByNormalPro(stepParam, organizeCode); - if (StringUtils.isNotEmpty(stepParam.getStepCode())) { + if (!StringUtils.isEmpty(stepParam.getStepCode())) { DdlPreparedPack.getStringEqualPack(stepParam.getStepCode(), "stepCode", packBean); } - if (StringUtils.isNotEmpty(stepParam.getParamCode())) { + if (!StringUtils.isEmpty(stepParam.getParamCode())) { DdlPreparedPack.getStringLikerPack(stepParam.getParamCode(), "paramCode", packBean); } - if (StringUtils.isNotEmpty(stepParam.getParamName())) { + if (!StringUtils.isEmpty(stepParam.getParamName())) { DdlPreparedPack.getStringLikerPack(stepParam.getParamName(), "paramName", packBean); } @@ -721,16 +703,16 @@ public class MesHqlPack { */ public static DdlPackBean getMesRouteProcessCell(MesRouteProcessCell routeProcessCell, String organizeCode) { DdlPackBean packBean = getAllBaseDataByNormalPro(routeProcessCell, organizeCode); - if (StringUtils.isNotEmpty(routeProcessCell.getRouteCode())) { + if (!StringUtils.isEmpty(routeProcessCell.getRouteCode())) { DdlPreparedPack.getStringEqualPack(routeProcessCell.getRouteCode(), "routeCode", packBean); } - if (StringUtils.isNotEmpty(routeProcessCell.getProcessCode())) { + if (!StringUtils.isEmpty(routeProcessCell.getProcessCode())) { DdlPreparedPack.getStringEqualPack(routeProcessCell.getProcessCode(), "processCode", packBean); } - if (StringUtils.isNotEmpty(routeProcessCell.getWorkCellCode())) { + if (!StringUtils.isEmpty(routeProcessCell.getWorkCellCode())) { DdlPreparedPack.getStringEqualPack(routeProcessCell.getWorkCellCode(), "workCellCode", packBean); } - if (StringUtils.isNotEmpty(routeProcessCell.getWorkCenterCode())) { + if (!StringUtils.isEmpty(routeProcessCell.getWorkCenterCode())) { DdlPreparedPack.getStringEqualPack(routeProcessCell.getWorkCenterCode(), "workCenterCode", packBean); } @@ -745,13 +727,13 @@ public class MesHqlPack { */ public static DdlPackBean getMesBom(MesBom bom, String organizeCode) { DdlPackBean packBean = getAllBaseDataByNormalPro(bom, organizeCode); - if (StringUtils.isNotEmpty(bom.getPartNo())) { + if (!StringUtils.isEmpty(bom.getPartNo())) { DdlPreparedPack.getStringLikerPack(bom.getPartNo(), "partNo", packBean); } - if (StringUtils.isNotEmpty(bom.getItemPartNo())) { + if (!StringUtils.isEmpty(bom.getItemPartNo())) { DdlPreparedPack.getStringLikerPack(bom.getItemPartNo(), "itemPartNo", packBean); } - if (StringUtils.isNotEmpty(bom.getBomVersion())) { + if (!StringUtils.isEmpty(bom.getBomVersion())) { DdlPreparedPack.getStringLikerPack(bom.getBomVersion(), "bomVersion", packBean); } @@ -791,10 +773,10 @@ public class MesHqlPack { */ public static DdlPackBean getMesCustomer(MesCustomer customer, String organizeCode) { DdlPackBean packBean = getAllBaseDataByNormalPro(customer, organizeCode); - if (StringUtils.isNotEmpty(customer.getCustomerCode())) { + if (!StringUtils.isEmpty(customer.getCustomerCode())) { DdlPreparedPack.getStringLikerPack(customer.getCustomerCode(), "customerCode", packBean); } - if (StringUtils.isNotEmpty(customer.getCustomerName())) { + if (!StringUtils.isEmpty(customer.getCustomerName())) { DdlPreparedPack.getStringLikerPack(customer.getCustomerName(), "customerName", packBean); } @@ -809,10 +791,10 @@ public class MesHqlPack { */ public static DdlPackBean getMesCustProdLine(MesCustProdLine custProdLine, String organizeCode) { DdlPackBean packBean = getAllBaseDataByNormalPro(custProdLine, organizeCode); - if (StringUtils.isNotEmpty(custProdLine.getCustProdLineCode())) { + if (!StringUtils.isEmpty(custProdLine.getCustProdLineCode())) { DdlPreparedPack.getStringLikerPack(custProdLine.getCustProdLineCode(), "custProdLineCode", packBean); } - if (StringUtils.isNotEmpty(custProdLine.getCustProdLineName())) { + if (!StringUtils.isEmpty(custProdLine.getCustProdLineName())) { DdlPreparedPack.getStringLikerPack(custProdLine.getCustProdLineName(), "custProdLineName", packBean); } @@ -827,13 +809,13 @@ public class MesHqlPack { */ public static DdlPackBean getMesCustomerPart(MesCustomerPart customerPart, String organizeCode) { DdlPackBean packBean = getAllBaseDataByNormalPro(customerPart, organizeCode); - if (StringUtils.isNotEmpty(customerPart.getCustomerCode())) { + if (!StringUtils.isEmpty(customerPart.getCustomerCode())) { DdlPreparedPack.getStringEqualPack(customerPart.getCustomerCode(), "customerCode", packBean); } - if (StringUtils.isNotEmpty(customerPart.getPartNo())) { + if (!StringUtils.isEmpty(customerPart.getPartNo())) { DdlPreparedPack.getStringLikerPack(customerPart.getPartNo(), "partNo", packBean); } - if (StringUtils.isNotEmpty(customerPart.getCustomerPartNo())) { + if (!StringUtils.isEmpty(customerPart.getCustomerPartNo())) { DdlPreparedPack.getStringLikerPack(customerPart.getCustomerPartNo(), "customerPartNo", packBean); } @@ -874,10 +856,10 @@ public class MesHqlPack { */ public static DdlPackBean getMesProdCfgType(MesProdCfgType prodCfgType, String organizeCode) { DdlPackBean packBean = getAllBaseDataByNormalPro(prodCfgType, organizeCode); - if (StringUtils.isNotEmpty(prodCfgType.getProdCfgTypeCode())) { + if (!StringUtils.isEmpty(prodCfgType.getProdCfgTypeCode())) { DdlPreparedPack.getStringLikerPack(prodCfgType.getProdCfgTypeCode(), "prodCfgTypeCode", packBean); } - if (StringUtils.isNotEmpty(prodCfgType.getProdCfgTypeName())) { + if (!StringUtils.isEmpty(prodCfgType.getProdCfgTypeName())) { DdlPreparedPack.getStringLikerPack(prodCfgType.getProdCfgTypeName(), "prodCfgTypeName", packBean); } @@ -902,13 +884,13 @@ public class MesHqlPack { public static DdlPackBean getMesProdCfg(MesProdCfg prodCfg, String organizeCode) { DdlPackBean packBean = getAllBaseDataByNormalPro(prodCfg, organizeCode); - if (StringUtils.isNotEmpty(prodCfg.getProdCfgCode())) { + if (!StringUtils.isEmpty(prodCfg.getProdCfgCode())) { DdlPreparedPack.getStringLikerPack(prodCfg.getProdCfgCode(), "prodCfgCode", packBean); } - if (StringUtils.isNotEmpty(prodCfg.getProdCfgName())) { + if (!StringUtils.isEmpty(prodCfg.getProdCfgName())) { DdlPreparedPack.getStringLikerPack(prodCfg.getProdCfgName(), "prodCfgName", packBean); } - if (StringUtils.isNotEmpty(prodCfg.getProdCfgTypeCode())) { + if (!StringUtils.isEmpty(prodCfg.getProdCfgTypeCode())) { DdlPreparedPack.getStringEqualPack(prodCfg.getProdCfgTypeCode(), "prodCfgTypeCode", packBean); } @@ -923,10 +905,10 @@ public class MesHqlPack { */ public static DdlPackBean getMesProdCfgDetail(MesProdCfgDetail prodCfgDetail, String organizeCode) { DdlPackBean packBean = getAllBaseDataByNormalPro(prodCfgDetail, organizeCode); - if (StringUtils.isNotEmpty(prodCfgDetail.getProdCfgCode())) { + if (!StringUtils.isEmpty(prodCfgDetail.getProdCfgCode())) { DdlPreparedPack.getStringEqualPack(prodCfgDetail.getProdCfgCode(), "prodCfgCode", packBean); } - if (StringUtils.isNotEmpty(prodCfgDetail.getPartNo())) { + if (!StringUtils.isEmpty(prodCfgDetail.getPartNo())) { DdlPreparedPack.getStringLikerPack(prodCfgDetail.getPartNo(), "partNo", packBean); } @@ -941,19 +923,19 @@ public class MesHqlPack { */ public static DdlPackBean getMesPart(MesPart part, String organizeCode) { DdlPackBean packBean = getAllBaseDataByNormalPro(part, organizeCode); - if (StringUtils.isNotEmpty(part.getPartNo())) { + if (!StringUtils.isEmpty(part.getPartNo())) { DdlPreparedPack.getStringLikerPack(part.getPartNo(), "partNo", packBean); } - if (StringUtils.isNotEmpty(part.getPartName())) { + if (!StringUtils.isEmpty(part.getPartName())) { DdlPreparedPack.getStringLikerPack(part.getPartName(), "partName", packBean); } - if (StringUtils.isNotEmpty(part.getCategoryCode1())) { + if (!StringUtils.isEmpty(part.getCategoryCode1())) { DdlPreparedPack.getStringEqualPack(part.getCategoryCode1(), "categoryCode1", packBean); } - if (StringUtils.isNotEmpty(part.getCategoryCode2())) { + if (!StringUtils.isEmpty(part.getCategoryCode2())) { DdlPreparedPack.getStringEqualPack(part.getCategoryCode2(), "categoryCode2", packBean); } - if (StringUtils.isNotEmpty(part.getCategoryCode3())) { + if (!StringUtils.isEmpty(part.getCategoryCode3())) { DdlPreparedPack.getStringEqualPack(part.getCategoryCode3(), "categoryCode3", packBean); } @@ -968,10 +950,10 @@ public class MesHqlPack { */ public static DdlPackBean getMesPartCategory(MesPartCategory partCategory, String organizeCode) { DdlPackBean packBean = getAllBaseDataByNormalPro(partCategory, organizeCode); - if (StringUtils.isNotEmpty(partCategory.getCategoryCode())) { + if (!StringUtils.isEmpty(partCategory.getCategoryCode())) { DdlPreparedPack.getStringLikerPack(partCategory.getCategoryCode(), "categoryCode", packBean); } - if (StringUtils.isNotEmpty(partCategory.getCategoryName())) { + if (!StringUtils.isEmpty(partCategory.getCategoryName())) { DdlPreparedPack.getStringLikerPack(partCategory.getCategoryName(), "categoryName", packBean); } @@ -986,13 +968,13 @@ public class MesHqlPack { */ public static DdlPackBean getMesPackSpec(MesPackSpec packSpec, String organizeCode) { DdlPackBean packBean = getAllBaseDataByNormalPro(packSpec, organizeCode); - if (StringUtils.isNotEmpty(packSpec.getSpecCode())) { + if (!StringUtils.isEmpty(packSpec.getSpecCode())) { DdlPreparedPack.getStringLikerPack(packSpec.getSpecCode(), "specCode", packBean); } - if (StringUtils.isNotEmpty(packSpec.getSpecName())) { + if (!StringUtils.isEmpty(packSpec.getSpecName())) { DdlPreparedPack.getStringLikerPack(packSpec.getSpecName(), "specName", packBean); } - if (StringUtils.isNotEmpty(packSpec.getParentSpec())) { + if (!StringUtils.isEmpty(packSpec.getParentSpec())) { DdlPreparedPack.getStringEqualPack(packSpec.getParentSpec(), "parentSpec", packBean); } @@ -1007,10 +989,10 @@ public class MesHqlPack { */ public static DdlPackBean getMesProduceCategory(MesProduceCategory produceCategory, String organizeCode) { DdlPackBean packBean = getAllBaseDataByNormalPro(produceCategory, organizeCode); - if (StringUtils.isNotEmpty(produceCategory.getProduceCategoryCode())) { + if (!StringUtils.isEmpty(produceCategory.getProduceCategoryCode())) { DdlPreparedPack.getStringLikerPack(produceCategory.getProduceCategoryCode(), "produceCategoryCode", packBean); } - if (StringUtils.isNotEmpty(produceCategory.getProduceCategoryName())) { + if (!StringUtils.isEmpty(produceCategory.getProduceCategoryName())) { DdlPreparedPack.getStringLikerPack(produceCategory.getProduceCategoryName(), "produceCategoryName", packBean); } @@ -1025,7 +1007,7 @@ public class MesHqlPack { */ public static DdlPackBean getMesKpsnRule(MesKpsnRule kpsnRule, String organizeCode) { DdlPackBean packBean = getAllBaseDataByNormalPro(kpsnRule, organizeCode); - if (StringUtils.isNotEmpty(kpsnRule.getPartNo())) { + if (!StringUtils.isEmpty(kpsnRule.getPartNo())) { DdlPreparedPack.getStringLikerPack(kpsnRule.getPartNo(), "partNo", packBean); } @@ -1040,10 +1022,10 @@ public class MesHqlPack { */ public static DdlPackBean getMesPartScheduleBom(MesPartScheduleBom partScheduleBom, String organizeCode) { DdlPackBean packBean = getAllBaseDataByNormalPro(partScheduleBom, organizeCode); - if (StringUtils.isNotEmpty(partScheduleBom.getPartNo())) { + if (!StringUtils.isEmpty(partScheduleBom.getPartNo())) { DdlPreparedPack.getStringLikerPack(partScheduleBom.getPartNo(), "partNo", packBean); } - if (StringUtils.isNotEmpty(partScheduleBom.getItemPartNo())) { + if (!StringUtils.isEmpty(partScheduleBom.getItemPartNo())) { DdlPreparedPack.getStringLikerPack(partScheduleBom.getItemPartNo(), "itemPartNo", packBean); } @@ -1058,10 +1040,10 @@ public class MesHqlPack { */ public static DdlPackBean getMesObjectDao(MesObjectDao objectDao, String organizeCode) { DdlPackBean packBean = getAllBaseDataByNormalPro(objectDao, organizeCode); - if (StringUtils.isNotEmpty(objectDao.getObjectCode())) { + if (!StringUtils.isEmpty(objectDao.getObjectCode())) { DdlPreparedPack.getStringLikerPack(objectDao.getObjectCode(), "objectCode", packBean); } - if (StringUtils.isNotEmpty(objectDao.getDaoClass())) { + if (!StringUtils.isEmpty(objectDao.getDaoClass())) { DdlPreparedPack.getStringLikerPack(objectDao.getDaoClass(), "daoClass", packBean); } @@ -1076,10 +1058,10 @@ public class MesHqlPack { */ public static DdlPackBean getMesPcnSyncCfg(MesPcnSyncCfg pcnSyncCfg, String organizeCode) { DdlPackBean packBean = getAllBaseDataByNormalPro(pcnSyncCfg, organizeCode); - if (StringUtils.isNotEmpty(pcnSyncCfg.getObjectCode())) { + if (!StringUtils.isEmpty(pcnSyncCfg.getObjectCode())) { DdlPreparedPack.getStringLikerPack(pcnSyncCfg.getObjectCode(), "objectCode", packBean); } - if (StringUtils.isNotEmpty(pcnSyncCfg.getPcnCode())) { + if (!StringUtils.isEmpty(pcnSyncCfg.getPcnCode())) { DdlPreparedPack.getStringLikerPack(pcnSyncCfg.getPcnCode(), "pcnCode", packBean); } if (null != pcnSyncCfg.getSyncType()) { @@ -1097,10 +1079,10 @@ public class MesHqlPack { */ public static DdlPackBean getMesWorkCellParamCfg(MesWorkCellParamCfg workCellParamCfg, String organizeCode) { DdlPackBean packBean = getAllBaseDataByNormalPro(workCellParamCfg, organizeCode); - if (StringUtils.isNotEmpty(workCellParamCfg.getWorkCellCode())) { + if (!StringUtils.isEmpty(workCellParamCfg.getWorkCellCode())) { DdlPreparedPack.getStringLikerPack(workCellParamCfg.getWorkCellCode(), "workCellCode", packBean); } - if (StringUtils.isNotEmpty(workCellParamCfg.getParamCode())) { + if (!StringUtils.isEmpty(workCellParamCfg.getParamCode())) { DdlPreparedPack.getStringLikerPack(workCellParamCfg.getParamCode(), "paramCode", packBean); } @@ -1115,7 +1097,7 @@ public class MesHqlPack { */ public static DdlPackBean getMesWorkCellParam(MesWorkCellParam workCellParam, String organizeCode) { DdlPackBean packBean = getAllBaseDataByNormalPro(workCellParam, organizeCode); - if (StringUtils.isNotEmpty(workCellParam.getParamCode())) { + if (!StringUtils.isEmpty(workCellParam.getParamCode())) { DdlPreparedPack.getStringLikerPack(workCellParam.getParamCode(), "paramCode", packBean); } if (null != workCellParam.getParamType()) { @@ -1136,7 +1118,7 @@ public class MesHqlPack { */ public static DdlPackBean getMesWorkCellPoint(MesWorkCellPoint workCellPoint, String organizeCode) { DdlPackBean packBean = getAllBaseDataByNormalPro(workCellPoint, organizeCode); - if (StringUtils.isNotEmpty(workCellPoint.getWorkCellCode())) { + if (!StringUtils.isEmpty(workCellPoint.getWorkCellCode())) { DdlPreparedPack.getStringEqualPack(workCellPoint.getWorkCellCode(), "workCellCode", packBean); } return packBean; @@ -1150,13 +1132,13 @@ public class MesHqlPack { */ public static DdlPackBean getMesPLCConfigure(MesPLCConfigure plcConfigure, String organizeCode) { DdlPackBean packBean = getAllBaseDataByNormalPro(plcConfigure, organizeCode); - if (StringUtils.isNotEmpty(plcConfigure.getAreaCode())) { + if (!StringUtils.isEmpty(plcConfigure.getAreaCode())) { DdlPreparedPack.getStringEqualPack(plcConfigure.getAreaCode(), "areaCode", packBean); } - if (StringUtils.isNotEmpty(plcConfigure.getWorkCenterCode())) { + if (!StringUtils.isEmpty(plcConfigure.getWorkCenterCode())) { DdlPreparedPack.getStringEqualPack(plcConfigure.getWorkCenterCode(), "workCenterCode", packBean); } - if (StringUtils.isNotEmpty(plcConfigure.getWorkCellCode())) { + if (!StringUtils.isEmpty(plcConfigure.getWorkCellCode())) { DdlPreparedPack.getStringEqualPack(plcConfigure.getWorkCellCode(), "workCellCode", packBean); } return packBean; @@ -1172,13 +1154,13 @@ public class MesHqlPack { */ public static DdlPackBean getMesNumberRule(MesNumberRule numberRule, String organizeCode) { DdlPackBean packBean = getAllBaseDataByNormalPro(numberRule, organizeCode); - if (StringUtils.isNotEmpty(numberRule.getRuleCode())) { + if (!StringUtils.isEmpty(numberRule.getRuleCode())) { DdlPreparedPack.getStringLikerPack(numberRule.getRuleCode(), "ruleCode", packBean); } - if (StringUtils.isNotEmpty(numberRule.getNumberRule())) { + if (!StringUtils.isEmpty(numberRule.getNumberRule())) { DdlPreparedPack.getStringLikerPack(numberRule.getNumberRule(), "numberRule", packBean); } - if (StringUtils.isNotEmpty(numberRule.getPrefix())) { + if (!StringUtils.isEmpty(numberRule.getPrefix())) { DdlPreparedPack.getNumEqualPack(numberRule.getPrefix(), "prefix", packBean); } if (null != numberRule.getIsCycle()) { @@ -1244,7 +1226,7 @@ public class MesHqlPack { */ public static DdlPackBean getMesButtonStatus(MesButtonStatus buttonStatus, String organizeCode) { DdlPackBean packBean = getAllBaseDataByNormalPro(buttonStatus, organizeCode); - if (StringUtils.isNotEmpty(buttonStatus.getButtonCode())) { + if (!StringUtils.isEmpty(buttonStatus.getButtonCode())) { DdlPreparedPack.getStringLikerPack(buttonStatus.getButtonCode(), "buttonCode", packBean); } packBean.setOrderByStr(buttonStatus.orderBy()); @@ -1260,10 +1242,10 @@ public class MesHqlPack { public static DdlPackBean getApprovalData(MesWorkOrder mesWorkOrder, String organizeCode) { DdlPackBean packBean = MesHqlPack.getAllBaseData(organizeCode); DdlPreparedPack.getStringEqualPack(mesWorkOrder.getWorkCenterCode(), "workCenterCode", packBean); - if (!org.springframework.util.StringUtils.isEmpty(mesWorkOrder.getOrderNo())) { + if (!StringUtils.isEmpty(mesWorkOrder.getOrderNo())) { DdlPreparedPack.getStringEqualPack(mesWorkOrder.getOrderNo(), "orderNo", packBean); } - if (!org.springframework.util.StringUtils.isEmpty(mesWorkOrder.getPartNo())) { + if (!StringUtils.isEmpty(mesWorkOrder.getPartNo())) { DdlPreparedPack.getStringEqualPack(mesWorkOrder.getPartNo(), "partNo", packBean); } DdlPreparedPack.getNumEqualPack(MesEnumUtil.WORK_ORDER_APPROVAL_STATUS.WAIT_APPROVAL.getValue(), "approvalStatus", packBean); @@ -1271,4 +1253,5 @@ public class MesHqlPack { DdlPreparedPack.getOrderByPack(new String[]{String.valueOf(CommonEnumUtil.ASC_OR_DESC.ASC.getValue())}, new String[]{"startTime", "shiftCode"}, packBean); return packBean; } + } diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/platform/LabelTemplatePagerModel.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/platform/LabelTemplatePagerModel.java new file mode 100644 index 0000000..7234ef7 --- /dev/null +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/platform/LabelTemplatePagerModel.java @@ -0,0 +1,23 @@ +package cn.estsh.i3plus.pojo.model.platform; + +import cn.estsh.i3plus.pojo.base.common.Pager; +import cn.estsh.i3plus.pojo.platform.bean.SysLabelTemplate; +import lombok.Data; +import java.io.Serializable; + +/** + * @Description : 打印模板封装model + * @Reference : + * @Author : yunhao + * @CreateDate : 2019-10-09 14:15 + * @Modify: + **/ +@Data +public class LabelTemplatePagerModel implements Serializable { + + private static final long serialVersionUID = 8331125246534692455L; + + private SysLabelTemplate labelTemplate; + + private Pager pager; +} diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysLabelTemplate.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysLabelTemplate.java index 63e0250..f52be12 100644 --- a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysLabelTemplate.java +++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysLabelTemplate.java @@ -7,9 +7,11 @@ import lombok.Data; import lombok.EqualsAndHashCode; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; -import org.hibernate.annotations.Type; - -import javax.persistence.*; +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.Lob; +import javax.persistence.Table; +import javax.persistence.Transient; import java.util.List; /** @@ -37,6 +39,16 @@ public class SysLabelTemplate extends BaseBean { @ApiParam(value ="模板名称") private String templateName; + //枚举 CommonEnumUtil.SOFT_TYPE + @Column(name="TEMPLATE_SOFT_TYPE") + @ApiParam(value ="模板所属模块") + private Integer templateSoftType; + + //枚举 CommonEnumUtil.SOFT_TYPE + @Column(name="TEMPLATE_GROUP_ID") + @ApiParam(value ="模板分组") + private Integer templateGroupId; + @Lob @Column(name="TEMPLATE_CONTENT") @ApiParam(value ="模板内容") diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysLocaleResource.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysLocaleResource.java index 8289035..0e39670 100644 --- a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysLocaleResource.java +++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysLocaleResource.java @@ -65,5 +65,5 @@ public class SysLocaleResource extends BaseBean { //系统自带需要有初始化表，只能修改value，无法删除。 @Column(name="is_system") @ApiParam(value = "是否系统参数",example = "2") - private Integer isSystem = 2; + private Integer isSystem; } diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/sqlpack/CoreHqlPack.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/sqlpack/CoreHqlPack.java index 4beffc1..572f63f 100644 --- a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/sqlpack/CoreHqlPack.java +++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/sqlpack/CoreHqlPack.java @@ -4,11 +4,32 @@ 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.base.tool.HqlPack; -import cn.estsh.i3plus.pojo.platform.bean.*; +import cn.estsh.i3plus.pojo.platform.bean.SysBarcodeRule; +import cn.estsh.i3plus.pojo.platform.bean.SysConfig; +import cn.estsh.i3plus.pojo.platform.bean.SysDepartment; +import cn.estsh.i3plus.pojo.platform.bean.SysDictionary; +import cn.estsh.i3plus.pojo.platform.bean.SysFile; +import cn.estsh.i3plus.pojo.platform.bean.SysLabelTemplate; +import cn.estsh.i3plus.pojo.platform.bean.SysLabelTemplateParam; +import cn.estsh.i3plus.pojo.platform.bean.SysLocaleLanguage; +import cn.estsh.i3plus.pojo.platform.bean.SysLocaleResource; +import cn.estsh.i3plus.pojo.platform.bean.SysMenu; +import cn.estsh.i3plus.pojo.platform.bean.SysMessage; +import cn.estsh.i3plus.pojo.platform.bean.SysOrderNoRule; +import cn.estsh.i3plus.pojo.platform.bean.SysOrganize; +import cn.estsh.i3plus.pojo.platform.bean.SysPosition; +import cn.estsh.i3plus.pojo.platform.bean.SysRefUserDepartment; +import cn.estsh.i3plus.pojo.platform.bean.SysRefUserMessage; +import cn.estsh.i3plus.pojo.platform.bean.SysRefUserRole; +import cn.estsh.i3plus.pojo.platform.bean.SysRole; +import cn.estsh.i3plus.pojo.platform.bean.SysTask; +import cn.estsh.i3plus.pojo.platform.bean.SysTaskCycle; +import cn.estsh.i3plus.pojo.platform.bean.SysTaskPlan; +import cn.estsh.i3plus.pojo.platform.bean.SysTool; +import cn.estsh.i3plus.pojo.platform.bean.SysToolType; +import cn.estsh.i3plus.pojo.platform.bean.SysUser; +import cn.estsh.i3plus.pojo.platform.bean.SysUserInfo; import org.apache.commons.lang3.StringUtils; - -import java.text.SimpleDateFormat; -import java.util.Date; import java.util.List; import java.util.stream.Collectors; @@ -849,17 +870,19 @@ public class CoreHqlPack { * @param sysLabelTemplate * @return */ - public static String packHqlSysLabelTemplate(SysLabelTemplate sysLabelTemplate) { - StringBuffer result = new StringBuffer(); + public static DdlPackBean packHqlSysLabelTemplate(SysLabelTemplate sysLabelTemplate) { + DdlPackBean ddlPackBean = new DdlPackBean(); // hql拼接 - HqlPack.getStringLikerPack(sysLabelTemplate.getTemplateName(),"templateName",result); - HqlPack.getStringEqualPack(sysLabelTemplate.getTemplateCode(),"templateCode",result); + DdlPreparedPack.getStringLikerPack(sysLabelTemplate.getTemplateName(), "templateName", ddlPackBean); + DdlPreparedPack.getStringEqualPack(sysLabelTemplate.getTemplateCode(), "templateCode", ddlPackBean); + DdlPreparedPack.getNumEqualPack(sysLabelTemplate.getTemplateGroupId(), "templateGroupId", ddlPackBean); + DdlPreparedPack.getNumEqualPack(sysLabelTemplate.getTemplateSoftType(), "templateSoftType", ddlPackBean); // 添加默认排序 - HqlPack.getOrderDefault(sysLabelTemplate); + ddlPackBean.setOrderByStr(sysLabelTemplate.orderBy()); - return result.toString(); + return ddlPackBean; } public static DdlPackBean packBeanSysLabelTemplate(SysLabelTemplate sysLabelTemplate) { diff --git a/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitSchedule.java b/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitSchedule.java index 3f0cee2..fc7c6fc 100644 --- a/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitSchedule.java +++ b/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitSchedule.java @@ -69,6 +69,10 @@ public class BsSuitSchedule extends BaseBean { @ApiParam(value = "任务周期表达式表达式") private String taskCycleExecuteRdd; + @Column(name = "SUIT_PARAM") + @ApiParam(value = "适配参数") + private String suitParam; + @Column(name = "LAST_EXECUTE_DATE_TIME") @ApiParam(value = "最后一次执行时间") private String lastExecuteDateTime; diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPartRelation.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPartRelation.java index b31d80a..1d29b77 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPartRelation.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPartRelation.java @@ -1,6 +1,8 @@ package cn.estsh.i3plus.pojo.wms.bean; +import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn; import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import cn.estsh.i3plus.pojo.base.enumutil.WmsEnumUtil; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; @@ -46,6 +48,7 @@ public class WmsPartRelation extends BaseBean { @Column(name = "ASSOCIATE_TYPE") @ApiParam(value = "关联类型") + @AnnoOutputColumn(refClass = WmsEnumUtil.PART_ASSOCIATE_TYPE.class, refForeignKey = "value", value = "description") private Integer associateType; } diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsProductReturnMovement.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsProductReturnMovement.java index 9122049..f6db3d7 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsProductReturnMovement.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsProductReturnMovement.java @@ -56,5 +56,9 @@ public class WmsProductReturnMovement implements Serializable{ @AnnoOutputColumn private String planTime; + @ApiParam("移动类型") + @AnnoOutputColumn + public Integer moveType; + } diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsSnOperateRecord.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsSnOperateRecord.java index 8cd1f53..de87da0 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsSnOperateRecord.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsSnOperateRecord.java @@ -1,6 +1,8 @@ package cn.estsh.i3plus.pojo.wms.bean; +import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn; import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import cn.estsh.i3plus.pojo.base.enumutil.WmsEnumUtil; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; @@ -70,6 +72,7 @@ public class WmsSnOperateRecord extends BaseBean { @Column(name = "OPERATE_TYPE") @ApiParam(value = "操作类型") + @AnnoOutputColumn(refClass = WmsEnumUtil.SN_OPERATE_TYPE.class, refForeignKey = "value", value = "description") private Integer operateType; } diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockSn.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockSn.java index 8ccbb2b..d391703 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockSn.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockSn.java @@ -244,6 +244,18 @@ public class WmsStockSn extends BaseBean { private String snapshotTime; @Transient + @ApiParam(value = "模板编号") + private String templateNo; + + @Transient + @ApiParam(value = "客户物料号") + private String customerPartNo; + + @Transient + @ApiParam(value = "箱号") + private String boxNo; + + @Transient private Integer isSnapshot; public WmsStockSn() { 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 ed8a060..01911a3 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 @@ -2426,7 +2426,7 @@ public class WmsHqlPack { } /** - * 接口映射分页查询条件 + * 打印机管理信息分页查询条件 * * @param wmsPrinterConfigure * @return @@ -2441,4 +2441,22 @@ public class WmsHqlPack { return result; } + + /** + * 待打印队列信息分页查询条件 + * + * @param wmsPrintingQueue + * @return + */ + public static DdlPackBean packHqlwmsPrintingQueueByPrintNo(WmsPrintingQueue wmsPrintingQueue) { + DdlPackBean result = new DdlPackBean(); + + DdlPreparedPack.getStringLikerPack(wmsPrintingQueue.getPrintNo(), "printNo", result); + DdlPreparedPack.getNumEqualPack(WmsEnumUtil.ETC_PRINT_STATUS.NOT_HIT.getValue(), "printStatus", result); + DdlPreparedPack.getNumEqualPack(WmsEnumUtil.PRINT_TYPE.SN.getValue(), "printType", result); + + getStringBuilderPack(wmsPrintingQueue, result); + + return result; + } }