44273 生产工单页面增加上/下线时间查询条件

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<MesWorkOrder> 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 ");
     }
 

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";
     //执行结束日期