From 060fa564da59a4bc2130bfa54931a4711eb1f345 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9F=AF=E8=A3=95?= Date: Mon, 13 May 2019 16:11:53 +0800 Subject: [PATCH 1/5] =?UTF-8?q?=E6=9B=B4=E6=96=B0AndonHqlPack?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../bean/MesWorkCenter.java | 7 +++ .../sqlpack/AndonHqlPack.java | 55 ++++++++++++++++++++++ 2 files changed, 62 insertions(+) diff --git a/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/bean/MesWorkCenter.java b/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/bean/MesWorkCenter.java index ab85f95..2fc7aec 100644 --- a/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/bean/MesWorkCenter.java +++ b/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/bean/MesWorkCenter.java @@ -64,4 +64,11 @@ public class MesWorkCenter extends BaseBean { @ApiParam(value ="父节点" , access ="父节点" ,example = "-1") @JsonSerialize(using = ToStringSerializer.class) private Long parentId; + + public MesWorkCenter(String organizeCode) { + this.organizeCode = organizeCode; + } + + public MesWorkCenter() { + } } 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 12b3098..34e5258 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 @@ -1,5 +1,13 @@ package cn.estsh.i3plus.pojo.andon.sqlpack; +import cn.estsh.i3plus.pojo.andon.bean.MesWorkCell; +import cn.estsh.i3plus.pojo.andon.bean.MesWorkCenter; +import cn.estsh.i3plus.pojo.base.bean.BaseBean; +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 org.apache.commons.lang3.StringUtils; + /** * @Description : 安灯对象查询封装 * @Reference : @@ -8,4 +16,51 @@ package cn.estsh.i3plus.pojo.andon.sqlpack; * @Modify: **/ public class AndonHqlPack { + /** + * 封装公用查询参数 + * + * @param bean 实体对象 + * @param hqlStr 查询语句 + * @return 封装完成的查询语句 + */ + public static DdlPackBean getStringBuilderPack(BaseBean bean, DdlPackBean hqlStr) { + + // 判断工厂代码是否为空 + if (StringUtils.isNotBlank(bean.getOrganizeCode())) { + DdlPreparedPack.getStringEqualPack(bean.getOrganizeCode(), "organizeCode", hqlStr); + } + + // 封装有效状态和删除状态 + DdlPreparedPack.getNumEqualPack(bean.getIsValid(), "isValid", hqlStr); + DdlPreparedPack.getNumEqualPack(CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue(), "isDeleted", hqlStr); + + return hqlStr; + } + + /** + * 按条件查询工作中心 + * @param mesWorkCenter + * @return + */ + public static DdlPackBean packHqlMesWorkCenter(MesWorkCenter mesWorkCenter){ + DdlPackBean result = new DdlPackBean(); + + getStringBuilderPack(mesWorkCenter, result); + + return result; + } + + /** + * 按条件查询工作单元（工位） + * @param mesWorkCell + * @return + */ + public static DdlPackBean packHqlMesWorkCell(MesWorkCell mesWorkCell){ + DdlPackBean result = new DdlPackBean(); + + DdlPreparedPack.getStringEqualPack(mesWorkCell.getWorkCenterCode(), "workCenterCode", result); + getStringBuilderPack(mesWorkCell, result); + + return result; + } } From fe23d7003fd681060e2565d01f74757f1941d93b Mon Sep 17 00:00:00 2001 From: "yihang.lv" Date: Mon, 13 May 2019 18:02:04 +0800 Subject: [PATCH 2/5] =?UTF-8?q?sweb=20po=E8=AF=A6=E6=83=85=E7=BA=A7?= =?UTF-8?q?=E8=81=94=E6=9F=A5=E8=AF=A2=E9=87=8D=E5=86=99=EF=BC=8C=E5=8F=91?= =?UTF-8?q?=E5=B8=83=E8=AE=A2=E5=8D=95=E6=8E=A5=E5=8F=A3=E9=87=8D=E5=86=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pojo/sweb/bean/SwebPurchaseOrderDetails.java | 10 +++++++-- .../i3plus/pojo/sweb/bean/SwebPurchaseOrderSn.java | 8 +++++++ .../pojo/sweb/modelbean/SwebLoginUserModel.java | 3 +++ .../sweb/modelbean/SwebPOForPubListEnterModel.java | 3 +++ .../SwebPOUpdatePublishForPublishModel.java | 25 ++++++++++++++++++++++ 5 files changed, 47 insertions(+), 2 deletions(-) create mode 100644 modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/modelbean/SwebPOUpdatePublishForPublishModel.java diff --git a/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/bean/SwebPurchaseOrderDetails.java b/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/bean/SwebPurchaseOrderDetails.java index d54f472..eb78593 100644 --- a/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/bean/SwebPurchaseOrderDetails.java +++ b/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/bean/SwebPurchaseOrderDetails.java @@ -66,8 +66,11 @@ public class SwebPurchaseOrderDetails extends BaseBean { @Column(name = "UNIT") private String unit; + /** + * 不冗余主表数据 + */ @ApiParam(value = "行项目状态", example = "1") - @Column(name = "ITEM_STATUS") + @Transient private Integer itemStatus; @Column(name = "BOX_QTY") @@ -131,7 +134,10 @@ public class SwebPurchaseOrderDetails extends BaseBean { @ApiParam("是否为钢卷料") private Integer isSteel; - @Column(name = "EXPECTED_TIME") + /** + * 不冗余主表数据 + */ + @Transient @ApiParam(value = "预计到货日期") public String expectedTime; diff --git a/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/bean/SwebPurchaseOrderSn.java b/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/bean/SwebPurchaseOrderSn.java index 4dc38bb..895d0e0 100644 --- a/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/bean/SwebPurchaseOrderSn.java +++ b/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/bean/SwebPurchaseOrderSn.java @@ -34,6 +34,14 @@ public class SwebPurchaseOrderSn extends BaseBean { @ApiParam("单据明细编号") private String orderNo; + @ApiParam("供应商编号") + @Column(name = "VENDOR_CODE") + private String vendorCode; + + @ApiParam("供应商名称") + @Column(name = "VENDOR_NAME") + private String vendorName; + @Column(name = "PART_NO") @ApiParam(value = "零件号") private String partNo; diff --git a/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/modelbean/SwebLoginUserModel.java b/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/modelbean/SwebLoginUserModel.java index 3594480..1c9cb27 100644 --- a/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/modelbean/SwebLoginUserModel.java +++ b/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/modelbean/SwebLoginUserModel.java @@ -20,6 +20,9 @@ public class SwebLoginUserModel implements Serializable { @ApiParam(value = "用户ID") private Long id; + @ApiParam(value = "用户code（供应商编号）") + private String code; + @ApiParam(value = "用户名") private String userName; diff --git a/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/modelbean/SwebPOForPubListEnterModel.java b/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/modelbean/SwebPOForPubListEnterModel.java index fc22889..4f50d7f 100644 --- a/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/modelbean/SwebPOForPubListEnterModel.java +++ b/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/modelbean/SwebPOForPubListEnterModel.java @@ -23,6 +23,9 @@ public class SwebPOForPubListEnterModel extends BaseBean { @ApiParam(value = "订单类型", example = "1") public Integer orderType; + @ApiParam(value = "订单状态", example = "10") + public Integer orderStatus; + @ApiParam(value = "预计到货日期开始日期") public String expectedTimeStart; diff --git a/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/modelbean/SwebPOUpdatePublishForPublishModel.java b/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/modelbean/SwebPOUpdatePublishForPublishModel.java new file mode 100644 index 0000000..31ee5c5 --- /dev/null +++ b/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/modelbean/SwebPOUpdatePublishForPublishModel.java @@ -0,0 +1,25 @@ +package cn.estsh.i3plus.pojo.sweb.modelbean; + +import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import cn.estsh.i3plus.pojo.base.bean.ListPager; +import io.swagger.annotations.ApiParam; +import lombok.Data; + +import java.util.List; + +/** + * @Description : 待发布订单列表发布输入模型 + * @Reference : + * @Author : jack.lv + * @CreateDate : 2019-05-13 13:13 + * @Modify: + **/ +@Data +public class SwebPOUpdatePublishForPublishModel extends BaseBean { + + @ApiParam(value = "拆分请求时间数量列表", example = "1") + private List reqTimeList; + + @ApiParam(value = "列表项", example = "1") + private SwebPOForPubListResultItemModel item; +} From f844f89f5d7f4ee1b7d527575455058a6dba21d1 Mon Sep 17 00:00:00 2001 From: "yiming.gu" Date: Mon, 13 May 2019 18:25:16 +0800 Subject: [PATCH 3/5] =?UTF-8?q?andon=E6=96=B0=E5=A2=9E=E7=8F=AD=E6=AC=A1?= =?UTF-8?q?=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cn.estsh.i3plus.pojo.andon/bean/MesShift.java | 46 ++++++++++++++++++++++ .../repository/MesShiftRepository.java | 16 ++++++++ 2 files changed, 62 insertions(+) create mode 100644 modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/bean/MesShift.java create mode 100644 modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/repository/MesShiftRepository.java diff --git a/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/bean/MesShift.java b/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/bean/MesShift.java new file mode 100644 index 0000000..43cfce1 --- /dev/null +++ b/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/bean/MesShift.java @@ -0,0 +1,46 @@ +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.Table; + +/** + * @Description :mes系统业务动作 + * @Reference : + * @Author : crish + * @CreateDate : 2019-04-19 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name="MES_SHIFT") +@Api("班次信息") +public class MesShift extends BaseBean { + @Column(name="SHIFT_CODE") + @ApiParam("班次代码") + private String shiftCode; + + @Column(name="SHIFT_NAME") + @ApiParam("班次名称") + private String shiftName; + + @Column(name="START_TIME") + @ApiParam("开班时间") + private String startTime; + + @Column(name="WORK_TIMES") + @ApiParam("作业时长") + private String workTimes; +} diff --git a/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/repository/MesShiftRepository.java b/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/repository/MesShiftRepository.java new file mode 100644 index 0000000..9ddbf9e --- /dev/null +++ b/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/repository/MesShiftRepository.java @@ -0,0 +1,16 @@ +package cn.estsh.i3plus.pojo.andon.repository; + +import cn.estsh.i3plus.pojo.andon.bean.MesShift; +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import org.springframework.stereotype.Repository; + +/** + * @Description: + * @Reference: + * @Author: Crish + * @CreateDate:2019-04-19-13:53 + * @Modify: + **/ +@Repository +public interface MesShiftRepository extends BaseRepository { +} From 0e090c7e08733ae374eccbcee42d3d09f4fa7ebf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9F=AF=E8=A3=95?= Date: Mon, 13 May 2019 18:27:36 +0800 Subject: [PATCH 4/5] =?UTF-8?q?=E4=BC=98=E5=8C=96POJO?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../bean/AndonAlarmCause.java | 4 ++ .../bean/AndonEventCause.java | 4 ++ .../bean/AndonEventMethod.java | 46 ++++++++++++++++++++++ .../sqlpack/AndonHqlPack.java | 31 +++++++++++++++ 4 files changed, 85 insertions(+) create mode 100644 modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/bean/AndonEventMethod.java diff --git a/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/bean/AndonAlarmCause.java b/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/bean/AndonAlarmCause.java index 5487c78..5299981 100644 --- a/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/bean/AndonAlarmCause.java +++ b/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/bean/AndonAlarmCause.java @@ -39,4 +39,8 @@ public class AndonAlarmCause extends BaseBean { @Column(name = "PARENT_AC_CODE") @ApiParam(value = "父阶原因代码") private String parentAcCode; + + @Column(name = "ALARM_CODE") + @ApiParam(value = "安灯类型") + private String alarmCode; } diff --git a/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/bean/AndonEventCause.java b/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/bean/AndonEventCause.java index 1ed305d..c91b9b9 100644 --- a/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/bean/AndonEventCause.java +++ b/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/bean/AndonEventCause.java @@ -39,4 +39,8 @@ public class AndonEventCause extends BaseBean { @Column(name = "PARENT_EC_CODE") @ApiParam(value = "父阶原因代码") private String parentEcCode; + + @Column(name = "ALARM_CODE") + @ApiParam(value = "安灯类型") + private String alarmCode; } diff --git a/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/bean/AndonEventMethod.java b/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/bean/AndonEventMethod.java new file mode 100644 index 0000000..f214629 --- /dev/null +++ b/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/bean/AndonEventMethod.java @@ -0,0 +1,46 @@ +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.Table; + +/** + * @Description : ANDON_事件处理方法 + * @Reference : + * @Author : hansen.ke + * @CreateDate : 2019-05-13 17:16 + * @Modify: + **/ +@Data +@Entity +@Table(name="ANDON_EVENT_METHOD") +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Api("ANDON_事件处理方法") +public class AndonEventMethod extends BaseBean { + + @Column(name = "EM_CODE") + @ApiParam(value = "事件方法代码") + private String emCode; + + @Column(name = "EM_NAME") + @ApiParam(value = "事件方法描述") + private String emName; + + @Column(name = "PARENT_EM_CODE") + @ApiParam(value = "父阶方法代码") + private String parentEmCode; + + @Column(name = "ALARM_CODE") + @ApiParam(value = "安灯类型") + private String alarmCode; +} 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 34e5258..db59c17 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 @@ -1,5 +1,7 @@ package cn.estsh.i3plus.pojo.andon.sqlpack; +import cn.estsh.i3plus.pojo.andon.bean.AndonAlarmCause; +import cn.estsh.i3plus.pojo.andon.bean.MesEquipment; import cn.estsh.i3plus.pojo.andon.bean.MesWorkCell; import cn.estsh.i3plus.pojo.andon.bean.MesWorkCenter; import cn.estsh.i3plus.pojo.base.bean.BaseBean; @@ -63,4 +65,33 @@ public class AndonHqlPack { return result; } + + /** + * 按条件查询设备 + * @param mesEquipment + * @return + */ + public static DdlPackBean packHqlMesEquipment(MesEquipment mesEquipment){ + DdlPackBean result = new DdlPackBean(); + + DdlPreparedPack.getStringEqualPack(mesEquipment.getWorkCenterCode(), "workCenterCode", result); + DdlPreparedPack.getStringEqualPack(mesEquipment.getWorkCellCode(), "workCellCode", result); + getStringBuilderPack(mesEquipment, result); + + return result; + } + + /** + * 按条件查询ANDON呼叫原因 + * @param andonAlarmCause + * @return + */ + public static DdlPackBean packHqlAndonAlarmCause(AndonAlarmCause andonAlarmCause){ + DdlPackBean result = new DdlPackBean(); + + DdlPreparedPack.getStringEqualPack(andonAlarmCause.getAlarmCode(), "alarmCode", result); + getStringBuilderPack(andonAlarmCause, result); + + return result; + } } From 4895b3ae85db5038a137a7bfd7db69d113ba4305 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9F=AF=E8=A3=95?= Date: Mon, 13 May 2019 19:23:15 +0800 Subject: [PATCH 5/5] =?UTF-8?q?ANDON=E5=AE=9E=E4=BD=93=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cn.estsh.i3plus.pojo.andon/bean/MesShift.java | 13 +++++++++++++ .../sqlpack/AndonHqlPack.java | 19 +++++++++++++++---- 2 files changed, 28 insertions(+), 4 deletions(-) diff --git a/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/bean/MesShift.java b/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/bean/MesShift.java index 43cfce1..533c56a 100644 --- a/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/bean/MesShift.java +++ b/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/bean/MesShift.java @@ -28,6 +28,11 @@ import javax.persistence.Table; @Table(name="MES_SHIFT") @Api("班次信息") public class MesShift extends BaseBean { + + @Column(name = "WORK_CENTER_CODE") + @ApiParam("工作中心") + private String workCenterCode; + @Column(name="SHIFT_CODE") @ApiParam("班次代码") private String shiftCode; @@ -43,4 +48,12 @@ public class MesShift extends BaseBean { @Column(name="WORK_TIMES") @ApiParam("作业时长") private String workTimes; + + public MesShift() { + } + + public MesShift(String workCenterCode,String organizeCode) { + this.workCenterCode = workCenterCode; + this.organizeCode = organizeCode; + } } 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 db59c17..098f73b 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 @@ -1,9 +1,6 @@ package cn.estsh.i3plus.pojo.andon.sqlpack; -import cn.estsh.i3plus.pojo.andon.bean.AndonAlarmCause; -import cn.estsh.i3plus.pojo.andon.bean.MesEquipment; -import cn.estsh.i3plus.pojo.andon.bean.MesWorkCell; -import cn.estsh.i3plus.pojo.andon.bean.MesWorkCenter; +import cn.estsh.i3plus.pojo.andon.bean.*; import cn.estsh.i3plus.pojo.base.bean.BaseBean; import cn.estsh.i3plus.pojo.base.bean.DdlPackBean; import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil; @@ -82,6 +79,20 @@ public class AndonHqlPack { } /** + * 按条件查询班次 + * @param mesShift + * @return + */ + public static DdlPackBean packHqlMesShift(MesShift mesShift){ + DdlPackBean result = new DdlPackBean(); + + DdlPreparedPack.getStringEqualPack(mesShift.getWorkCenterCode(), "workCenterCode", result); + getStringBuilderPack(mesShift, result); + + return result; + } + + /** * 按条件查询ANDON呼叫原因 * @param andonAlarmCause * @return