~zhoushihao/YiWuProject.git

			@@ -12,12 +12,14 @@
			import com.mes.hollow.service.HollowGlassOutRelationInfoService;
			import com.mes.hollowqueue.entity.HollowGlassQueueInfo;
			import com.mes.hollowqueue.service.HollowGlassQueueInfoService;
			import com.mes.utils.RedisUtil;
			import lombok.extern.slf4j.Slf4j;
			import org.springframework.beans.BeanUtils;
			import org.springframework.stereotype.Service;

			import javax.annotation.Resource;
			import java.util.ArrayList;
			import java.util.Date;
			import java.util.List;
			import java.util.stream.Collectors;

			@@ -38,6 +40,9 @@
			@Resource
			HollowGlassQueueInfoService hollowGlassQueueInfoService;

			@Resource
			RedisUtil redisUtil;

			@Override
			public HollowGlassOutRelationInfo receiveTask(String flowCardId, int cell, int totalPairQuantity) {
			return childrenTask(flowCardId,cell,totalPairQuantity,0);
			@@ -46,6 +51,12 @@
			@Override
			public HollowGlassOutRelationInfo forceOutGlass(String flowCardId, int cell, int totalPairQuantity) {
			return childrenTask(flowCardId,cell,totalPairQuantity,1);
			}

			@Override
			public Boolean dispatchHollowSwitch(Boolean flag) {
			redisUtil.setCacheObject("dispatchHollowSwitch", flag);
			return redisUtil.getCacheObject("dispatchHollowSwitch");
			}


			@@ -71,6 +82,8 @@
			BeanUtils.copyProperties(queue, queueInfo);
			queueInfo.setState(Const.TEMPERING_NEW);
			queueInfo.setCell(cell);
			queueInfo.setCreateTime(new Date());
			queueInfo.setUpdateTime(new Date());
			hollowQueues.add(queueInfo);
			if (queue.getIsPair() == 1){
			isPairCount -=1;