北京麦格纳看板

modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java

@@ -48,7 +48,6 @@ public class WmsHqlPack {
             DdlPreparedPack.getStringEqualPack(bean.getOrganizeCode(), "organizeCode", hqlStr);
         }
 
-
         DdlPreparedPack.getStringEqualPack(bean.getCreateUser(), "createUser", hqlStr);
         if (StringUtils.isNotBlank(bean.getCreateDateTimeStart()) && StringUtils.isNotBlank(bean.getCreateDateTimeEnd())) {
             DdlPreparedPack.timeBuilder(bean.getCreateDateTimeStart(), bean.getCreateDateTimeEnd(), "createDatetime", hqlStr, true);
@@ -2817,7 +2816,10 @@ public class WmsHqlPack {
 
         DdlPreparedPack.getStringLikerPack(wmsShift.getShiftNo(), "shiftNo", result);
         DdlPreparedPack.getStringLikerPack(wmsShift.getShiftName(), "shiftName", result);
-
+        if (wmsShift.isStartTimeAndEndTime() && !StringUtil.isEmpty(wmsShift.getStartTime())) {
+            result.setWhereAppend(result.getWhereAppend() + " and model.startTime<='" + wmsShift.getStartTime() + "'");
+            result.setWhereAppend(result.getWhereAppend() + " and model.endTime>='" + wmsShift.getStartTime() + "'");
+        }
         getStringBuilderPack(wmsShift, result);
 
         return result;
@@ -3526,4 +3528,21 @@ public class WmsHqlPack {
 
         return result;
     }
+
+
+    /**
+     * 领料时长分区分页查询条件
+     *
+     * @param wmsPickingWindowTime
+     * @return
+     */
+    public static DdlPackBean packHqlWmsPickingWindowTime(WmsPickingWindowTime wmsPickingWindowTime) {
+        DdlPackBean result = new DdlPackBean();
+
+        DdlPreparedPack.getStringLikerPack(wmsPickingWindowTime.getShiftNo(), "shiftNo", result);
+
+        getStringBuilderPack(wmsPickingWindowTime, result);
+
+        return result;
+    }
 }