From 7c647c7844ac9412531764bf86958c6411067229 Mon Sep 17 00:00:00 2001 From: "yiming.gu" Date: Wed, 15 May 2019 13:13:53 +0800 Subject: [PATCH 01/11] =?UTF-8?q?1=E3=80=81=E7=8F=AD=E6=AC=A1pojo=E4=BF=AE?= =?UTF-8?q?=E6=94=B9=202=E3=80=81andon=E9=A1=B9=E7=9B=AE=E6=96=B0=E5=A2=9E?= =?UTF-8?q?=E7=BB=84=E7=BB=87=E6=A8=A1=E5=9E=8B=E5=9F=BA=E7=A1=80=E6=95=B0?= =?UTF-8?q?=E6=8D=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../model/ProdOrgModel.java | 63 +++++++++++++++ .../sqlpack/AndonHqlPack.java | 89 ++++++++++++++++++++-- .../i3plus/pojo/base/enumutil/AndonEnumUtil.java | 38 +++++++++ .../cn/estsh/i3plus/pojo/mes/bean/MesShift.java | 6 +- .../estsh/i3plus/pojo/mes/model/ProdOrgModel.java | 2 +- .../estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java | 20 +++++ modules/i3plus-pojo-model/pom.xml | 4 + .../i3plus/pojo/model/andon/SysOrganizeModel.java | 23 ++++++ pom.xml | 6 ++ 9 files changed, 241 insertions(+), 10 deletions(-) create mode 100644 modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/model/ProdOrgModel.java create mode 100644 modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/andon/SysOrganizeModel.java diff --git a/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/model/ProdOrgModel.java b/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/model/ProdOrgModel.java new file mode 100644 index 0000000..5df7d8d --- /dev/null +++ b/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/model/ProdOrgModel.java @@ -0,0 +1,63 @@ +package cn.estsh.i3plus.pojo.andon.model; + +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.Entity; + +/** + * @Description: + * @Reference: + * @Author: yiming.gu + * @CreateDate:2019-04-18-14:16 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Api("组织模型") +public class ProdOrgModel extends BaseBean { + + @ApiParam("区域名称") + private String areaName; + + @ApiParam("区域代码") + private String areaCode; + + @ApiParam("工作中心代码") + private String workCenterCode; + + @ApiParam("工作中心名称") + private String workCenterName; + + @ApiParam("ERP工作中心") + private String erpWorkCenter; + + @ApiParam("工作版本") + private String workVer; + + @ApiParam("工作单元代码") + private String workCellCode; + + @ApiParam("工作单元名称") + private String workCellName; + + @ApiParam("设备代码") + private String equipmentCode; + + @ApiParam("设备名称") + private String equipmentName; + + @ApiParam("设备状态") + private String status; + + @ApiParam("当前级") + private Integer level; +} 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 033dbdb..21fe103 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,13 +1,5 @@ package cn.estsh.i3plus.pojo.andon.sqlpack; -import cn.estsh.i3plus.pojo.andon.bean.AndonPLC; -import cn.estsh.i3plus.pojo.base.bean.BaseBean; -import cn.estsh.i3plus.pojo.base.bean.DdlPackBean; -import cn.estsh.i3plus.pojo.base.enumutil.AndonEnumUtil; -import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil; -import cn.estsh.i3plus.pojo.base.tool.DdlPreparedPack; -import org.apache.commons.lang3.StringUtils; - import cn.estsh.i3plus.pojo.andon.bean.*; import cn.estsh.i3plus.pojo.base.bean.BaseBean; import cn.estsh.i3plus.pojo.base.bean.DdlPackBean; @@ -183,4 +175,85 @@ public class AndonHqlPack { return result; } + + /** + * 通用查询条件 + * @param organizeCode + * @return + */ + public static DdlPackBean getAllBaseDataByNormalPro(BaseBean baseBean, String organizeCode) { + DdlPackBean packBean = new DdlPackBean(); + DdlPreparedPack.getStringEqualPack(organizeCode, "organizeCode", packBean); + DdlPreparedPack.getNumEqualPack(baseBean.getIsValid(), "isValid", packBean); + DdlPreparedPack.getNumEqualPack(CommonEnumUtil.IS_DEAL.NO.getValue(), "isDeleted", packBean); + return packBean; + } + + /** + * MES区域信息查询条件封装 + * @param mesArea + * @return + */ + public static DdlPackBean getMesArea(MesArea mesArea, String organizeCode) { + DdlPackBean packBean = getAllBaseDataByNormalPro(mesArea, organizeCode); + if (StringUtils.isNotEmpty(mesArea.getAreaCode())) { + DdlPreparedPack.getStringEqualPack(mesArea.getAreaCode(), "areaCode", packBean); + } + + return packBean; + } + + /** + * MES工作中心信息查询条件封装 + * @param mesWorkCenter + * @return + */ + public static DdlPackBean getMesWorkCenter(MesWorkCenter mesWorkCenter, String organizeCode) { + DdlPackBean packBean = getAllBaseDataByNormalPro(mesWorkCenter, organizeCode); + if (StringUtils.isNotEmpty(mesWorkCenter.getWorkCenterCode())) { + DdlPreparedPack.getStringEqualPack(mesWorkCenter.getWorkCenterCode(), "workCenterCode", packBean); + } + if (StringUtils.isNotEmpty(mesWorkCenter.getAreaCode())){ + DdlPreparedPack.getStringEqualPack(mesWorkCenter.getAreaCode(), "areaCode", packBean); + } + + return packBean; + } + + /** + * MES工作单元信息查询条件封装 + * @param mesWorkCell + * @return + */ + public static DdlPackBean getMesWorkCell(MesWorkCell mesWorkCell, String organizeCode) { + DdlPackBean packBean = getAllBaseDataByNormalPro(mesWorkCell, organizeCode); + if (StringUtils.isNotEmpty(mesWorkCell.getWorkCenterCode())) { + DdlPreparedPack.getStringEqualPack(mesWorkCell.getWorkCenterCode(), "workCenterCode", packBean); + } + if (StringUtils.isNotEmpty(mesWorkCell.getAreaCode())){ + DdlPreparedPack.getStringEqualPack(mesWorkCell.getAreaCode(), "areaCode", packBean); + } + if (StringUtils.isNotEmpty(mesWorkCell.getWorkCellCode())){ + DdlPreparedPack.getStringEqualPack(mesWorkCell.getWorkCellCode(), "workCellCode", packBean); + } + + return packBean; + } + + /** + * 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; + } } 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 da0802d..f50b5d1 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 @@ -185,4 +185,42 @@ public class AndonEnumUtil { return tmp; } } + + /** + * 组织模型树形菜单level + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum PROD_ORG_LEVEL{ + + LEVEL_ONE(1,"一级目录"), + LEVEL_TWO(2,"二级目录"), + LEVEL_THREE(3,"三级目录"), + LEVEL_FOUR(4,"四级目录"); + + private int value; + private String description; + + PROD_ORG_LEVEL(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; + } + } } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesShift.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesShift.java index ccb818d..9c4f50a 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesShift.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesShift.java @@ -28,6 +28,10 @@ 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; @@ -42,5 +46,5 @@ public class MesShift extends BaseBean { @Column(name="WORK_TIMES") @ApiParam("作业时长") - private String workTimes; + private Double workTimes; } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/ProdOrgModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/ProdOrgModel.java index 56d40ff..b4a23a6 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/ProdOrgModel.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/ProdOrgModel.java @@ -22,7 +22,7 @@ import javax.persistence.Entity; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) -@Api("生产区域") +@Api("组织模型") public class ProdOrgModel extends BaseBean { @ApiParam("区域名称") 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 d7242d7..7a4c160 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 @@ -265,4 +265,24 @@ public class MesHqlPack { return packBean; } + + /** + * MES班次信息查询条件封装 + * @param shift + * @return + */ + public static DdlPackBean getMesShift(MesShift shift, String organizeCode) { + DdlPackBean packBean = getAllBaseDataByNormalPro(shift, organizeCode); + if (StringUtils.isNotEmpty(shift.getShiftCode())){ + DdlPreparedPack.getStringEqualPack(shift.getShiftCode(), "shiftCode", packBean); + } + if (StringUtils.isNotEmpty(shift.getShiftName())){ + DdlPreparedPack.getStringEqualPack(shift.getShiftName(), "shiftName", packBean); + } + if (StringUtils.isNotEmpty(shift.getWorkCenterCode())){ + DdlPreparedPack.getStringEqualPack(shift.getWorkCenterCode(), "workCenterCode", packBean); + } + + return packBean; + } } diff --git a/modules/i3plus-pojo-model/pom.xml b/modules/i3plus-pojo-model/pom.xml index 7250b00..1374838 100644 --- a/modules/i3plus-pojo-model/pom.xml +++ b/modules/i3plus-pojo-model/pom.xml @@ -46,6 +46,10 @@ 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 new file mode 100644 index 0000000..7a9f6e0 --- /dev/null +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/andon/SysOrganizeModel.java @@ -0,0 +1,23 @@ +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; + } +} diff --git a/pom.xml b/pom.xml index 1ce4f37..8975679 100644 --- a/pom.xml +++ b/pom.xml @@ -123,6 +123,12 @@ ${project.version} + + i3plus.pojo + i3plus-pojo-andon + ${project.version} + + com.fasterxml.jackson.core From 791d6084bca9f077125604702b1420c5502c9606 Mon Sep 17 00:00:00 2001 From: Silliter Date: Wed, 15 May 2019 13:44:28 +0800 Subject: [PATCH 02/11] =?UTF-8?q?=E5=AE=89=E7=81=AF=E7=9C=8B=E6=9D=BF?= =?UTF-8?q?=E5=BC=80=E5=8F=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/cn.estsh.i3plus.pojo.andon/bean/AndonManageQueue.java | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/bean/AndonManageQueue.java b/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/bean/AndonManageQueue.java index 7928693..083ce7a 100644 --- a/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/bean/AndonManageQueue.java +++ b/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/bean/AndonManageQueue.java @@ -207,6 +207,10 @@ public class AndonManageQueue extends BaseBean { @ApiParam(value = "停机具体原因") private String haltDesc; + @Transient + @ApiParam(value = "停机具体原因") + private Long execptionTime; + // 是否转呼 public Integer getIsShiftCall() { return this.isShiftCall == null ? 0 : this.isShiftCall; From ad28d11486a43fe3a0f618bce4bb98e6b6c798bc Mon Sep 17 00:00:00 2001 From: Silliter Date: Wed, 15 May 2019 14:07:47 +0800 Subject: [PATCH 03/11] =?UTF-8?q?=E5=AE=89=E7=81=AF=E9=A1=B9=E7=9B=AE?= =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/cn.estsh.i3plus.pojo.andon/bean/AndonManageQueue.java | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/bean/AndonManageQueue.java b/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/bean/AndonManageQueue.java index 083ce7a..769d648 100644 --- a/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/bean/AndonManageQueue.java +++ b/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/bean/AndonManageQueue.java @@ -208,9 +208,13 @@ public class AndonManageQueue extends BaseBean { private String haltDesc; @Transient - @ApiParam(value = "停机具体原因") + @ApiParam(value = "异常时长", example = "0") private Long execptionTime; + @Transient + @ApiParam(value = "响应时长", example = "0") + private Long signTime; + // 是否转呼 public Integer getIsShiftCall() { return this.isShiftCall == null ? 0 : this.isShiftCall; From b90139312cb2dadcaff69e0c4d59eb26556fa15f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=88=98=E6=95=8F?= <962239776@qq.com> Date: Wed, 15 May 2019 14:27:06 +0800 Subject: [PATCH 04/11] =?UTF-8?q?=E6=9D=A1=E7=A0=81=E7=AE=A1=E6=8E=A7?= =?UTF-8?q?=E6=9E=9A=E4=B8=BE=E6=B7=BB=E5=8A=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/base/enumutil/WmsEnumUtil.java | 34 ++++++++++++++++++++++ 1 file changed, 34 insertions(+) diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java index e8a6b83..a11ca7c 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java @@ -2331,4 +2331,38 @@ public class WmsEnumUtil { return tmp; } } + + /** + * 是否条码管控（用于物料） + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum IS_SN_CONTROL { + SN_CONTROL(1, "条码管控"), NOT_SN_CONTROL(2, "非条码管控"); + + private int value; + private String description; + + IS_SN_CONTROL(int value, String description) { + this.value = value; + this.description = description; + } + + public int getValue() { + return value; + } + + public String getDescription() { + return description; + } + + public static String valueOf(int val) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].value == val) { + tmp = values()[i].description; + } + } + return tmp; + } + } } From d3be2fb6dfb3530334079e59d2c9f3c2a4cd5f60 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9F=AF=E8=A3=95?= Date: Wed, 15 May 2019 15:13:12 +0800 Subject: [PATCH 05/11] =?UTF-8?q?ANDON=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../bean/AndonManageQueue.java | 11 +++++++ .../bean/AndonManageRecord.java | 7 +++++ .../sqlpack/AndonHqlPack.java | 34 ++++++++++++++++++++++ 3 files changed, 52 insertions(+) diff --git a/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/bean/AndonManageQueue.java b/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/bean/AndonManageQueue.java index 769d648..0d455ec 100644 --- a/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/bean/AndonManageQueue.java +++ b/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/bean/AndonManageQueue.java @@ -88,12 +88,23 @@ public class AndonManageQueue extends BaseBean { private Integer priorityLevel; @Column(name="CALL_TIME",updatable = false) + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") @ApiParam(value = "呼叫时间") @AnnoOutputColumn(hidden = true) public String callTime; @Transient @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") + @ApiParam(value="呼叫时间，查询开始时间") + public String callTimeStart; + + @Transient + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") + @ApiParam(value="呼叫时间，查询结束时间") + public String callTimeEnd; + + @Transient + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") @ApiParam(value="呼叫时间",example = "2018-01-01 01:00:00") @AnnoOutputColumn(hidden = true) public String callTimeStr; diff --git a/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/bean/AndonManageRecord.java b/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/bean/AndonManageRecord.java index bdc2403..5148f5a 100644 --- a/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/bean/AndonManageRecord.java +++ b/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/bean/AndonManageRecord.java @@ -216,4 +216,11 @@ public class AndonManageRecord extends BaseBean { public Integer getPriorityLevel() { return this.priorityLevel == null ? 0 : this.priorityLevel; } + + public AndonManageRecord() { + } + + public AndonManageRecord(String andonOrderNo) { + this.andonOrderNo = andonOrderNo; + } } 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 cbdd59b..543a790 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 @@ -170,10 +170,44 @@ public class AndonHqlPack { DdlPreparedPack.getStringEqualPack(andonManageQueue.getWorkCenterCode(), "workCenterCode", result); DdlPreparedPack.getStringEqualPack(andonManageQueue.getEquipmentCode(), "equipmentCode", result); DdlPreparedPack.getStringEqualPack(andonManageQueue.getAlarmCode(), "alarmCode", result); + DdlPreparedPack.getStringEqualPack(andonManageQueue.getActionCode(), "actionCode", result); DdlPreparedPack.getInPackArray(obj, "statusCode", result); getStringBuilderPack(andonManageQueue, result); + if(andonManageQueue.getCallTimeStart() != null || andonManageQueue.getCallTimeEnd() != null){ + DdlPreparedPack.timeBuilder(andonManageQueue.getCallTimeStart(), andonManageQueue.getCallTimeEnd(), "callTime", result, true); + } + + // 根据优先级倒序，序号升序排序 + DdlPreparedPack.getOrderByPack(new Object[]{2, 1}, + new String[]{"priorityLevel", "seq"}, result); + + return result; + } + + /** + * 按条件查询按灯记录信息 + * @param andonManageRecord + * @return + */ + public static DdlPackBean packHqlAndonManageRecord(AndonManageRecord andonManageRecord, Object[] obj){ + DdlPackBean result = new DdlPackBean(); + + DdlPreparedPack.getStringEqualPack(andonManageRecord.getAndonOrderNo(), "andonOrderNo", result); + DdlPreparedPack.getStringEqualPack(andonManageRecord.getWorkCellCode(), "workCellCode", result); + DdlPreparedPack.getStringEqualPack(andonManageRecord.getWorkCenterCode(), "workCenterCode", result); + DdlPreparedPack.getStringEqualPack(andonManageRecord.getEquipmentCode(), "equipmentCode", result); + DdlPreparedPack.getStringEqualPack(andonManageRecord.getAlarmCode(), "alarmCode", result); + DdlPreparedPack.getStringEqualPack(andonManageRecord.getActionCode(), "actionCode", result); + DdlPreparedPack.getInPackArray(obj, "statusCode", result); + + getStringBuilderPack(andonManageRecord, result); + + // 根据优先级倒序，序号升序排序 + DdlPreparedPack.getOrderByPack(new Object[]{2, 1}, + new String[]{"priorityLevel", "seq"}, result); + return result; } From aafa463afc68d46e79613d1243a5b6856b06ee68 Mon Sep 17 00:00:00 2001 From: "wei.peng" Date: Wed, 15 May 2019 13:53:29 +0800 Subject: [PATCH 06/11] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E8=8B=B1=E6=96=87?= =?UTF-8?q?=E7=9A=84=E6=97=B6=E5=80=99=E5=AD=97=E6=AE=B5=E9=95=BF=E5=BA=A6?= =?UTF-8?q?=E4=B8=8D=E5=A4=9F=EF=BC=8C=E4=BF=AE=E6=94=B9=E5=AD=97=E6=AE=B5?= =?UTF-8?q?=E7=B1=BB=E5=9E=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/cn/estsh/i3plus/pojo/platform/bean/SysLocaleResource.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 ff23075..81adc82 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 @@ -55,7 +55,7 @@ public class SysLocaleResource extends BaseBean { @ApiParam(value = "资源KEY",example = "格式A.B，全部大写，参考命名规范开发文档") private String resourceKey; - @Column(name="resource_value") + @Column(name="resource_value",columnDefinition="TEXT") @ApiParam(value = "资源Value",example = "通过resourceType，languageId和key获取") private String resourceValue; From 7db7dee50c697ed71d974973f42325aa8bf0d0fd Mon Sep 17 00:00:00 2001 From: "yihang.lv" Date: Wed, 15 May 2019 16:23:46 +0800 Subject: [PATCH 07/11] =?UTF-8?q?sweb=20=E8=AE=A2=E5=8D=95=E5=8F=91?= =?UTF-8?q?=E5=B8=83=E7=8A=B6=E6=80=81=E5=8F=96=E5=AD=90=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cn/estsh/i3plus/pojo/sweb/bean/SwebPurchaseOrder.java | 4 ---- .../cn/estsh/i3plus/pojo/sweb/sqlpack/SwebHqlPack.java | 14 +++++++++++++- 2 files changed, 13 insertions(+), 5 deletions(-) diff --git a/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/bean/SwebPurchaseOrder.java b/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/bean/SwebPurchaseOrder.java index add54ef..fe4aff9 100644 --- a/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/bean/SwebPurchaseOrder.java +++ b/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/bean/SwebPurchaseOrder.java @@ -50,10 +50,6 @@ public class SwebPurchaseOrder extends BaseBean { @Column(name = "ORDER_TYPE") private Integer orderType; - @ApiParam(value = "订单状态", example = "1") - @Column(name = "ORDER_STATUS") - private Integer orderStatus; - @Column(name = "PARENT_PACKAGE_NO") @ApiParam("上级包装编号") private String parentPackageNo; diff --git a/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/sqlpack/SwebHqlPack.java b/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/sqlpack/SwebHqlPack.java index 47cea81..b6d87d0 100644 --- a/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/sqlpack/SwebHqlPack.java +++ b/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/sqlpack/SwebHqlPack.java @@ -3,6 +3,7 @@ package cn.estsh.i3plus.pojo.sweb.sqlpack; 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.enumutil.SwebEnumUtil; import cn.estsh.i3plus.pojo.base.tool.DdlPreparedPack; import cn.estsh.i3plus.pojo.sweb.bean.*; import cn.estsh.i3plus.pojo.sweb.modelbean.SwebPOForPubListEnterModel; @@ -46,7 +47,6 @@ public class SwebHqlPack { DdlPackBean result = new DdlPackBean(); DdlPreparedPack.getStringEqualPack(purchaseOrder.getOrderNo(), "orderNo", result); DdlPreparedPack.getStringEqualPack(purchaseOrder.getVendorCode(), "vendorCode", result); - DdlPreparedPack.getNumEqualPack(purchaseOrder.getOrderStatus(), "orderStatus", result); DdlPreparedPack.timeBuilder(purchaseOrder.getExpectedTimeStart(), purchaseOrder.getExpectedTimeEnd(), "expectedTime", result, false); DdlPreparedPack.getNumEqualPack(purchaseOrder.getOrderType(), "orderType", result); @@ -139,4 +139,16 @@ public class SwebHqlPack { DdlPreparedPack.getNumEqualPack(details.getOrderType(), "orderType", result); return buildHql(details, result); } + + /** + * 判断订单详情表是否有非新建状态的订单 where sql + * @param details + * @return + */ + public static DdlPackBean getPODetailsNotCreateStatusWhereHql(SwebPurchaseOrderDetails details) { + DdlPackBean result = new DdlPackBean(); + DdlPreparedPack.getStringEqualPack(details.getOrderNo(), "orderNo", result); + DdlPreparedPack.getNumNOEqualPack(SwebEnumUtil.ORDER_DETAILS_STATUS.CREATE.getValue(), "itemStatus", result); + return buildHql(details, result); + } } From c1949e099c084ce6060a0cbe538a1f971690c637 Mon Sep 17 00:00:00 2001 From: Silliter Date: Wed, 15 May 2019 18:48:22 +0800 Subject: [PATCH 08/11] =?UTF-8?q?=E5=BC=80=E5=8F=91=E5=AE=89=E7=81=AF?= =?UTF-8?q?=E5=91=BC=E5=8F=AB=E5=8D=87=E7=BA=A7=E5=AE=9A=E6=97=B6=E4=BB=BB?= =?UTF-8?q?=E5=8A=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../bean/AndonManageQueue.java | 6 +++++- .../bean/AndonManageRecord.java | 2 +- .../sqlpack/AndonHqlPack.java | 19 +++++++++++++++++++ 3 files changed, 25 insertions(+), 2 deletions(-) diff --git a/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/bean/AndonManageQueue.java b/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/bean/AndonManageQueue.java index 0d455ec..6be6a9e 100644 --- a/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/bean/AndonManageQueue.java +++ b/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/bean/AndonManageQueue.java @@ -164,7 +164,7 @@ public class AndonManageQueue extends BaseBean { @Column(name = "SC_RESPONSE_CODE") @ApiParam(value = "转呼响应方式") - private String scObjectCode; + private String scResponseCode; @Column(name = "SC_RP_LEVEL") @ApiParam(value = "转呼通知等级") @@ -226,6 +226,10 @@ public class AndonManageQueue extends BaseBean { @ApiParam(value = "响应时长", example = "0") private Long signTime; + @Column(name = "SEND_FLAG") + @ApiParam(value = "发送标志") + private String sendFlag; + // 是否转呼 public Integer getIsShiftCall() { return this.isShiftCall == null ? 0 : this.isShiftCall; diff --git a/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/bean/AndonManageRecord.java b/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/bean/AndonManageRecord.java index 5148f5a..fcc6d64 100644 --- a/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/bean/AndonManageRecord.java +++ b/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/bean/AndonManageRecord.java @@ -153,7 +153,7 @@ public class AndonManageRecord extends BaseBean { @Column(name = "SC_RESPONSE_CODE") @ApiParam(value = "转呼响应方式") - private String scObjectCode; + private String scResponseCode; @Column(name = "SC_RP_LEVEL") @ApiParam(value = "转呼通知等级") 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 543a790..31dd513 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 @@ -3,6 +3,7 @@ package cn.estsh.i3plus.pojo.andon.sqlpack; 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.AndonEnumUtil; import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil; import cn.estsh.i3plus.pojo.base.tool.DdlPreparedPack; import org.apache.commons.lang3.StringUtils; @@ -306,4 +307,22 @@ public class AndonHqlPack { return packBean; } + + /** + * 通知配置信息封装 + * @param responseCfg + * @return + */ + public static DdlPackBean packAndonAlarmResponseCfg(AndonAlarmResponseCfg responseCfg) { + DdlPackBean result = new DdlPackBean(); + + DdlPreparedPack.getStringEqualPack(responseCfg.getAlarmCode(), "alarmCode", result); + DdlPreparedPack.getStringEqualPack(responseCfg.getAndonStatus(), "andonStatus", result); + DdlPreparedPack.getNotInPackString(String.valueOf(AndonEnumUtil.ALARM_PRIORITY.FIRST.getValue()), + "rpLevel", result); + + getStringBuilderPack(responseCfg, result); + + return result; + } } From c5a4a5c023e55b3b5dacb3e06e63c1040f9877d7 Mon Sep 17 00:00:00 2001 From: "yihang.lv" Date: Wed, 15 May 2019 18:49:07 +0800 Subject: [PATCH 09/11] =?UTF-8?q?sweb=20=E8=AE=A2=E5=8D=95=E6=8C=89?= =?UTF-8?q?=E5=A4=A9=E5=8F=91=E5=B8=83?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/sweb/sqlpack/SwebHqlPack.java | 1 - 1 file changed, 1 deletion(-) diff --git a/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/sqlpack/SwebHqlPack.java b/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/sqlpack/SwebHqlPack.java index b6d87d0..7b4026d 100644 --- a/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/sqlpack/SwebHqlPack.java +++ b/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/sqlpack/SwebHqlPack.java @@ -77,7 +77,6 @@ public class SwebHqlPack { DdlPreparedPack.getStringEqualPack(model.getVendorCode(), "vendorCode", result); DdlPreparedPack.getNumEqualPack(model.getOrderType(), "orderType", result); DdlPreparedPack.getStringEqualPack(model.getPartNo(), "partNo", result); - DdlPreparedPack.timeBuilder(model.getExpectedTimeStart(), model.getExpectedTimeEnd(), "expectedTime", result, false); // 封装有效状态和删除状态 DdlPreparedPack.getNumEqualPack(CommonEnumUtil.IS_VAILD.VAILD.getValue(), "isValid", result); DdlPreparedPack.getNumEqualPack(CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue(), "isDeleted", result); From 251ce84d739fa809e5af5d7389bae91c010e0219 Mon Sep 17 00:00:00 2001 From: Silliter Date: Wed, 15 May 2019 19:13:56 +0800 Subject: [PATCH 10/11] =?UTF-8?q?=E5=BC=80=E5=8F=91=E5=AE=89=E7=81=AF?= =?UTF-8?q?=E5=91=BC=E5=8F=AB=E5=8D=87=E7=BA=A7=E5=AE=9A=E6=97=B6=E4=BB=BB?= =?UTF-8?q?=E5=8A=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn.estsh.i3plus.pojo.andon/sqlpack/AndonHqlPack.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 31dd513..f8b6377 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 @@ -318,7 +318,7 @@ public class AndonHqlPack { DdlPreparedPack.getStringEqualPack(responseCfg.getAlarmCode(), "alarmCode", result); DdlPreparedPack.getStringEqualPack(responseCfg.getAndonStatus(), "andonStatus", result); - DdlPreparedPack.getNotInPackString(String.valueOf(AndonEnumUtil.ALARM_PRIORITY.FIRST.getValue()), + DdlPreparedPack.getNumNOEqualPack(String.valueOf(AndonEnumUtil.ALARM_PRIORITY.FIRST.getValue()), "rpLevel", result); getStringBuilderPack(responseCfg, result); From c60dd62f320599e1133b594605c9fad9df36bd68 Mon Sep 17 00:00:00 2001 From: "yiming.gu" Date: Wed, 15 May 2019 20:01:12 +0800 Subject: [PATCH 11/11] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E5=B7=A5=E6=AD=A5?= =?UTF-8?q?=E3=80=81=E5=B7=A5=E5=BA=8F=E3=80=81=E5=B7=A5=E6=AD=A5=E5=8F=82?= =?UTF-8?q?=E6=95=B0=E6=9F=A5=E8=AF=A2=E6=9D=A1=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java | 56 +++++++++++++++++++++- 1 file changed, 55 insertions(+), 1 deletion(-) 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 28c0c8e..4fb3075 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 @@ -281,7 +281,7 @@ public class MesHqlPack { DdlPreparedPack.getStringEqualPack(shift.getShiftCode(), "shiftCode", packBean); } if (StringUtils.isNotEmpty(shift.getShiftName())){ - DdlPreparedPack.getStringEqualPack(shift.getShiftName(), "shiftName", packBean); + DdlPreparedPack.getStringLikerPack(shift.getShiftName(), "shiftName", packBean); } if (StringUtils.isNotEmpty(shift.getWorkCenterCode())){ DdlPreparedPack.getStringEqualPack(shift.getWorkCenterCode(), "workCenterCode", packBean); @@ -289,4 +289,58 @@ public class MesHqlPack { return packBean; } + + /** + * MES工序信息查询条件封装 + * @param process + * @return + */ + public static DdlPackBean getMesProcess(MesProcess process, String organizeCode) { + DdlPackBean packBean = getAllBaseDataByNormalPro(process, organizeCode); + if (StringUtils.isNotEmpty(process.getProcessCode())){ + DdlPreparedPack.getStringEqualPack(process.getProcessCode(), "processCode", packBean); + } + if (StringUtils.isNotEmpty(process.getProcessName())){ + DdlPreparedPack.getStringLikerPack(process.getProcessName(), "processName", packBean); + } + + return packBean; + } + + /** + * MES工步信息查询条件封装 + * @param step + * @return + */ + public static DdlPackBean getMesStep(MesStep step, String organizeCode) { + DdlPackBean packBean = getAllBaseDataByNormalPro(step, organizeCode); + if (StringUtils.isNotEmpty(step.getStepCode())){ + DdlPreparedPack.getStringEqualPack(step.getStepCode(), "stepCode", packBean); + } + if (StringUtils.isNotEmpty(step.getStepName())){ + DdlPreparedPack.getStringLikerPack(step.getStepName(), "stepName", packBean); + } + + return packBean; + } + + /** + * MES工步参数信息查询条件封装 + * @param stepParam + * @return + */ + public static DdlPackBean getMesStepParam(MesStepParam stepParam, String organizeCode) { + DdlPackBean packBean = getAllBaseDataByNormalPro(stepParam, organizeCode); + if (StringUtils.isNotEmpty(stepParam.getStepCode())){ + DdlPreparedPack.getStringEqualPack(stepParam.getStepCode(), "stepCode", packBean); + } + if (StringUtils.isNotEmpty(stepParam.getParamCode())){ + DdlPreparedPack.getStringEqualPack(stepParam.getParamCode(), "paramCode", packBean); + } + if (StringUtils.isNotEmpty(stepParam.getParamName())){ + DdlPreparedPack.getStringLikerPack(stepParam.getParamName(), "paramName", packBean); + } + + return packBean; + } }