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 18c9e29..caa2b5d 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 @@ -1333,7 +1333,11 @@ public class MesEnumUtil { MES_DATA_OBJECT(220, "数据对象"), MES_OBJECT_CFG(230, "对象结构"), MES_WC_CHECK(240, "开线检查"), - MES_QC_CHECK_STANDARD(250, "质量检测标准"); + MES_QC_CHECK_STANDARD(250, "质量检测标准"), + MES_FAULT_CAUSE(260,"设备故障原因"), + MES_FAULT_METHOD(270,"设备故障处理措施"), + MES_FAULT_PHENOMENON(280,"设备故障现象"); + private int value; private String description; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProduceCtgyPicture.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProduceCtgyPicture.java index 5ebbca0..bd45841 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProduceCtgyPicture.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProduceCtgyPicture.java @@ -42,6 +42,6 @@ public class MesProduceCtgyPicture extends BaseBean { private Long fileId; @Transient - @ApiParam("文件名称") - private String fileName; + @ApiParam("文件原名称") + private String fileOriginName; } 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 6f6a532..368abef 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 @@ -5,6 +5,7 @@ import cn.estsh.i3plus.pojo.base.bean.DdlPackBean; 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.base.util.StringUtil; import cn.estsh.i3plus.pojo.mes.bean.*; import org.springframework.util.StringUtils; @@ -1848,14 +1849,20 @@ public class MesHqlPack { if (mesProduceSn.getQcStatus() != null) { DdlPreparedPack.getNumEqualPack(mesProduceSn.getQcStatus(), "qcStatus", packBean); } + if (!StringUtil.isEmpty(mesProduceSn.getOutWorkCenterStartTime())) { + DdlPreparedPack.getStringSmallerPack(mesProduceSn.getOutWorkCenterStartTime(), "outWorkCenterTime", packBean); + } + if (!StringUtil.isEmpty(mesProduceSn.getOutWorkCenterEndTime())) { + DdlPreparedPack.getStringBiggerPack(mesProduceSn.getOutWorkCenterEndTime(), "outWorkCenterTime", packBean); +// DdlPreparedPack.timeBuilder( +// mesProduceSn.getOutWorkCenterStartTime(), +// mesProduceSn.getOutWorkCenterEndTime(), +// "outWorkCenterTime", packBean, true); + } DdlPreparedPack.timeBuilder( mesProduceSn.getCreateDateTimeStart(), mesProduceSn.getCreateDateTimeEnd(), "createDatetime", packBean, true); - DdlPreparedPack.timeBuilder( - mesProduceSn.getOutWorkCenterStartTime(), - mesProduceSn.getOutWorkCenterEndTime(), - "outWorkCenterTime", packBean, true); return packBean; }