From ac41c050a5d332b60506ec90759c12ce3edf9b0f Mon Sep 17 00:00:00 2001 From: "jhforever.wang@estsh.com" Date: Wed, 11 Dec 2024 18:22:21 +0800 Subject: [PATCH] =?UTF-8?q?44273=20=E7=94=9F=E4=BA=A7=E5=B7=A5=E5=8D=95?= =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E5=A2=9E=E5=8A=A0=E4=B8=8A/=E4=B8=8B?= =?UTF-8?q?=E7=BA=BF=E6=97=B6=E9=97=B4=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 --- .../serviceimpl/base/MesWorkOrderService.java | 21 ++++++++++++++++++--- .../i3plus/ext/mes/pojo/util/MesExtConstWords.java | 4 ++++ 2 files changed, 22 insertions(+), 3 deletions(-) diff --git a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesWorkOrderService.java b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesWorkOrderService.java index b2d624b..a500ca9 100644 --- a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesWorkOrderService.java +++ b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesWorkOrderService.java @@ -292,9 +292,24 @@ public class MesWorkOrderService extends BaseMesService implements DdlPreparedPack.getInPackList(Arrays.stream(bean.getWorkOrderStatusQuery().split(MesExtConstWords.COMMA)).map(Integer::parseInt).collect(Collectors.toList()), MesExtConstWords.WORK_ORDER_STATUS, packBean); } else DdlPreparedPack.getNumEqualPack(bean.getWorkOrderStatus(), MesExtConstWords.WORK_ORDER_STATUS, packBean); DdlPreparedPack.getNumEqualPack(bean.getWorkOrderType(), MesExtConstWords.WORK_ORDER_TYPE, packBean); - DdlPreparedPack.timeBuilder(bean.getCreateDateTimeStart(), bean.getCreateDateTimeEnd(), MesExtConstWords.CREATE_DATE_TIME, packBean, false); - DdlPreparedPack.timeBuilder(bean.getStartTimeStart(), bean.getStartTimeEnd(), MesExtConstWords.PLAN_START_TIME, packBean, false); - DdlPreparedPack.timeBuilder(bean.getEndTimeStart(), bean.getEndTimeEnd(), MesExtConstWords.PLAN_END_TIME, packBean, false); + if (!StringUtils.isEmpty(bean.getCreateDateTimeStart()) || !StringUtils.isEmpty(bean.getCreateDateTimeEnd())) { + DdlPreparedPack.timeBuilder(bean.getCreateDateTimeStart(), bean.getCreateDateTimeEnd(), MesExtConstWords.CREATE_DATE_TIME, packBean, false); + } + if (!StringUtils.isEmpty(bean.getStartTimeStart()) || !StringUtils.isEmpty(bean.getStartTimeEnd())) { + DdlPreparedPack.timeBuilder(bean.getStartTimeStart(), bean.getStartTimeEnd(), MesExtConstWords.PLAN_START_TIME, packBean, false); + } + if (!StringUtils.isEmpty(bean.getEndTimeStart()) || !StringUtils.isEmpty(bean.getEndTimeEnd())) { + DdlPreparedPack.timeBuilder(bean.getEndTimeStart(), bean.getEndTimeEnd(), MesExtConstWords.PLAN_END_TIME, packBean, false); + } + if (!StringUtils.isEmpty(bean.getEndTimeStart()) || !StringUtils.isEmpty(bean.getEndTimeEnd())) { + DdlPreparedPack.timeBuilder(bean.getEndTimeStart(), bean.getEndTimeEnd(), MesExtConstWords.PLAN_END_TIME, packBean, false); + } + if (!StringUtils.isEmpty(bean.getOnlineTimeStart()) || !StringUtils.isEmpty(bean.getOnlineTimeEnd())) { + DdlPreparedPack.timeBuilder(bean.getOnlineTimeStart(), bean.getOnlineTimeEnd(), MesExtConstWords.ONLINE_TIME, packBean, false); + } + if (!StringUtils.isEmpty(bean.getOfflineTimeStart()) || !StringUtils.isEmpty(bean.getOfflineTimeEnd())) { + DdlPreparedPack.timeBuilder(bean.getOfflineTimeStart(), bean.getOfflineTimeEnd(), MesExtConstWords.OFFLINE_TIME, packBean, false); + } packBean.setOrderByStr(" order by workOrderSeq desc, createDatetime desc, productSeq asc, workOrderNo asc "); } diff --git a/modules/i3plus-ext-mes-pojo/src/main/java/cn/estsh/i3plus/ext/mes/pojo/util/MesExtConstWords.java b/modules/i3plus-ext-mes-pojo/src/main/java/cn/estsh/i3plus/ext/mes/pojo/util/MesExtConstWords.java index 93621e6..042ebcd 100644 --- a/modules/i3plus-ext-mes-pojo/src/main/java/cn/estsh/i3plus/ext/mes/pojo/util/MesExtConstWords.java +++ b/modules/i3plus-ext-mes-pojo/src/main/java/cn/estsh/i3plus/ext/mes/pojo/util/MesExtConstWords.java @@ -159,6 +159,10 @@ public class MesExtConstWords { public static final String PLAN_START_TIME = "planStartTime"; //计划结束时间 public static final String PLAN_END_TIME = "planEndTime"; + //上线时间 + public static final String ONLINE_TIME = "onlineTime"; + //下线时间 + public static final String OFFLINE_TIME = "offlineTime"; //执行开始日期 public static final String BEGIN_DATE = "beginDate"; //执行结束日期