~zhoushihao/YiWuProject.git

			@@ -1,8 +1,10 @@
			package com.mes.hollow.service.impl;

			import cn.hutool.core.collection.CollectionUtil;
			import cn.smallbun.screw.core.util.StringUtils;
			import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
			import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
			import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
			import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
			import com.mes.common.config.Const;
			import com.mes.glassinfo.entity.GlassInfo;
			@@ -12,6 +14,7 @@
			import com.mes.hollow.entity.HollowFormulaDetails;
			import com.mes.hollow.entity.HollowGlassOutRelationInfo;
			import com.mes.hollow.entity.dto.*;
			import com.mes.hollow.entity.request.HollowHistoryTaskRequest;
			import com.mes.hollow.entity.request.HollowTaskRequest;
			import com.mes.hollow.mapper.HollowGlassOutRelationInfoMapper;
			import com.mes.hollow.service.HollowBigStorageCageDetailsService;
			@@ -20,6 +23,7 @@
			import com.mes.hollow.service.HollowGlassRelationInfoService;
			import com.mes.hollowqueue.entity.HollowGlassQueueInfo;
			import com.mes.hollowqueue.service.HollowGlassQueueInfoService;
			import com.mes.tools.DateUtil;
			import com.mes.utils.Blank;
			import com.mes.utils.RedisUtil;
			import freemarker.template.Configuration;
			@@ -308,6 +312,23 @@
			return "success";
			}

			@Override
			public Page<HollowGlassOutRelationInfo> queryHollowHistoryTask(HollowHistoryTaskRequest request) {
			Page<HollowGlassOutRelationInfo> page = new Page<>(request.getPageNo(), request.getPageSize());
			if (null == request.getBeginDate()) {
			request.setBeginDate(DateUtil.getBeginDate());
			request.setEndDate(DateUtil.getEndDate());
			}
			LambdaQueryWrapper<HollowGlassOutRelationInfo> wrapper = new LambdaQueryWrapper<HollowGlassOutRelationInfo>()
			.eq(HollowGlassOutRelationInfo::getCell, request.getCell())
			.like(StringUtils.isNotBlank(request.getFlowCardId()), HollowGlassOutRelationInfo::getFlowCardId, request.getFlowCardId())
			.in(CollectionUtil.isNotEmpty(request.getIsForceList()), HollowGlassOutRelationInfo::getIsForce, request.getIsForceList())
			.in(CollectionUtil.isNotEmpty(request.getStateList()), HollowGlassOutRelationInfo::getState, request.getStateList())
			.between(HollowGlassOutRelationInfo::getCreateTime, request.getBeginDate(), request.getEndDate())
			.orderByDesc(HollowGlassOutRelationInfo::getCreateTime);
			return this.page(page, wrapper);
			}


			private HollowGlassOutRelationInfo childrenTask(HollowTaskRequest request, int isForce) {
			GlassInfo glassInfo = glassInfoService.getOne(new LambdaQueryWrapper<GlassInfo>().eq(GlassInfo::getFlowCardId, request.getFlowCardId()).last("limit 1"));