YiWuProject.git

			@@ -145,6 +145,7 @@
			}
			LambdaQueryWrapper<BigStorageCageFeedTask> wrapper = new LambdaQueryWrapper<BigStorageCageFeedTask>()
			.eq(BigStorageCageFeedTask::getTaskType, Const.BIG_STORAGE_IN_RUN)
			.and(e -> e.isNull(BigStorageCageFeedTask::getTargetSlot).or().eq(BigStorageCageFeedTask::getTargetSlot, Const.OUT_TARGET_POSITION_ZERO))
			.eq(BigStorageCageFeedTask::getTaskState, Const.BIG_STORAGE_IN_UP);
			//获取可以启动卧转立的任务线路
			List<BigStorageCageFeedTask> feedTaskList = bigStorageCageFeedTaskService.list(wrapper);
			@@ -169,7 +170,7 @@
			// log.info("两条线都存在进片任务，结束任务");
			// return;
			// }
			//获取两条线卧转立是否有玻璃，且任务状态都为2
			//获取两条线卧转立是否有玻璃，且任务状态为1/2
			List<Integer> lineList = bigStorageCageFeedTaskService.querySitToUpGlass();
			if (CollectionUtils.isEmpty(lineList)) {
			Date endDate = new Date();
			@@ -263,23 +264,27 @@
			return;
			}
			//钢化优先：获取理片笼玻璃小片破损表数量判断笼内版图是否到齐
			TemperingLayoutDTO temperingLayoutDTO = bigStorageCageDetailsService.temperingIsAll();
			if (null != temperingLayoutDTO) {
			//玻璃到齐
			List<TemperingLayoutDTO> temperingLayoutDTOList = bigStorageCageDetailsService.temperingIsAll();
			if (CollectionUtils.isNotEmpty(temperingLayoutDTOList)) {
			//玻璃到齐包括已出片的
			//到齐，将玻璃小片数据存入钢化小片表，逻辑生成出片任务结束
			List<TemperingGlassInfo> temperingGlassInfos = glassInfoService.selectJoinList(TemperingGlassInfo.class, JoinWrappers.lambda(GlassInfo.class)
			.selectAll(GlassInfo.class)
			.select("-1 as state")
			.selectAs(BigStorageCageDetails::getSlot, TemperingGlassInfo::getSlot)
			.innerJoin(BigStorageCageDetails.class, BigStorageCageDetails::getGlassId, GlassInfo::getGlassId)
			.eq(BigStorageCageDetails::getState, Const.GLASS_STATE_IN)
			.eq(GlassInfo::getTemperingLayoutId, temperingLayoutDTO.getTemperingLayoutId())
			.eq(GlassInfo::getEngineerId, temperingLayoutDTO.getEngineerId()));
			temperingGlassInfoService.saveBatch(temperingGlassInfos);
			computeOutGlassInfo(temperingGlassInfoList, Boolean.TRUE, mesToPLCAddress);
			Date endDate = new Date();
			log.info("大理片笼出片任务结束时间：{}，共耗时：{}ms,结束扫码任务", endDate, endDate.getTime() - startDate.getTime());
			return;
			for (TemperingLayoutDTO item : temperingLayoutDTOList) {
			List<TemperingGlassInfo> temperingGlassInfos = glassInfoService.selectJoinList(TemperingGlassInfo.class, JoinWrappers.lambda(GlassInfo.class)
			.selectAll(GlassInfo.class)
			.select("-1 as state")
			.selectAs(BigStorageCageDetails::getSlot, TemperingGlassInfo::getSlot)
			.innerJoin(BigStorageCageDetails.class, BigStorageCageDetails::getGlassId, GlassInfo::getGlassId)
			.eq(BigStorageCageDetails::getState, Const.GLASS_STATE_IN)
			.eq(GlassInfo::getTemperingLayoutId, item.getTemperingLayoutId())
			.eq(GlassInfo::getEngineerId, item.getEngineerId()));
			if (CollectionUtils.isNotEmpty(temperingGlassInfos)) {
			temperingGlassInfoService.saveBatch(temperingGlassInfos);
			computeOutGlassInfo(temperingGlassInfoList, Boolean.TRUE, mesToPLCAddress);
			Date endDate = new Date();
			log.info("大理片笼出片任务结束时间：{}，共耗时：{}ms,结束扫码任务", endDate, endDate.getTime() - startDate.getTime());
			return;
			}
			}
			}
			//未到齐执行内部调度任务
			TemperingLayoutDTO temperingOccupySlot = bigStorageCageDetailsService.queryTemperingOccupySlot();
			@@ -318,14 +323,13 @@
			.eq(BigStorageCageFeedTask::getTaskState, Const.BIG_STORAGE_IN_DAMAGE));
			if (CollectionUtils.isNotEmpty(inDamageTaskInfoList)) {
			bigStorageCageFeedTaskService.remove(new LambdaQueryWrapper<BigStorageCageFeedTask>().eq(BigStorageCageFeedTask::getTaskState, Const.BIG_STORAGE_IN_DAMAGE));
			//todo:将破损信息新增入破损表
			for (BigStorageCageFeedTask bigStorageCageFeedTask:inDamageTaskInfoList
			) {
			Damage damage=new Damage();
			//将破损信息新增入破损表
			for (BigStorageCageFeedTask bigStorageCageFeedTask : inDamageTaskInfoList) {
			Damage damage = new Damage();
			damage.setGlassId(bigStorageCageFeedTask.getGlassId());
			damage.setLine(bigStorageCageFeedTask.getLine());
			damage.setWorkingProcedure("冷加工");
			damage.setRemark("");
			damage.setRemark("进笼前卧转立");
			damage.setStatus(2);
			damageService.insertDamage(damage);
			}
			@@ -337,14 +341,13 @@
			bigStorageCageOutTaskService.remove(new LambdaQueryWrapper<BigStorageCageOutTask>().eq(BigStorageCageOutTask::getTaskState, Const.BIG_STORAGE_IN_DAMAGE));
			List<String> glassIdList = outDamageTaskInfoList.stream().map(BigStorageCageOutTask::getGlassId).collect(Collectors.toList());
			temperingGlassInfoService.remove(new LambdaQueryWrapper<TemperingGlassInfo>().in(TemperingGlassInfo::getGlassId, glassIdList));
			//todo:将破损信息新增入破损表
			for (BigStorageCageOutTask bigStorageCageOutTask:outDamageTaskInfoList
			) {
			Damage damage=new Damage();
			//将破损信息新增入破损表
			for (BigStorageCageOutTask bigStorageCageOutTask : outDamageTaskInfoList) {
			Damage damage = new Damage();
			damage.setGlassId(bigStorageCageOutTask.getGlassId());
			damage.setLine(bigStorageCageOutTask.getEndSlot());
			damage.setWorkingProcedure("冷加工");
			damage.setRemark("");
			damage.setRemark("出片后卧转立");
			damage.setStatus(2);
			damageService.insertDamage(damage);
			}
			@@ -379,27 +382,29 @@
			Boolean flag = Boolean.TRUE;
			//2、获取卧转立
			Integer widthFirst = Math.max(edgGlassTaskInfoList.get(0).getWidth() / 10, edgGlassTaskInfoList.get(0).getHeight() / 10);
			Integer heightFirst = Math.min(edgGlassTaskInfoList.get(0).getWidth() / 10, edgGlassTaskInfoList.get(0).getHeight() / 10);
			if (edgGlassTaskInfoList.size() == 1) {
			if (remainWidth >= widthFirst) {
			if (glassCount < inCarMaxSize) {
			addFeedTask(glassId, line, Const.BIG_STORAGE_IN_WAIT, widthFirst);
			addFeedTask(glassId, line, Const.BIG_STORAGE_IN_WAIT, widthFirst, heightFirst);
			} else {
			addFeedTask(glassId, line, Const.BIG_STORAGE_IN_RUN, widthFirst);
			addFeedTask(glassId, line, Const.BIG_STORAGE_IN_RUN, widthFirst, heightFirst);
			}
			} else {
			flag = Boolean.FALSE;
			}
			} else {
			Integer widthSecond = Math.max(edgGlassTaskInfoList.get(1).getWidth() / 10, edgGlassTaskInfoList.get(1).getHeight() / 10);
			Integer heightSecond = Math.min(edgGlassTaskInfoList.get(1).getWidth() / 10, edgGlassTaskInfoList.get(1).getHeight() / 10);
			if (remainWidth >= widthFirst) {
			if (remainWidth - widthFirst - glassGap >= widthSecond) {
			if (glassCount < inCarMaxSize) {
			addFeedTask(glassId, line, Const.BIG_STORAGE_IN_WAIT, widthFirst);
			addFeedTask(glassId, line, Const.BIG_STORAGE_IN_WAIT, widthFirst, heightSecond);
			} else {
			addFeedTask(glassId, line, Const.BIG_STORAGE_IN_RUN, widthFirst);
			addFeedTask(glassId, line, Const.BIG_STORAGE_IN_RUN, widthFirst, heightSecond);
			}
			} else {
			addFeedTask(glassId, line, Const.BIG_STORAGE_IN_RUN, widthFirst);
			addFeedTask(glassId, line, Const.BIG_STORAGE_IN_RUN, widthFirst, heightSecond);
			}
			} else {
			flag = Boolean.FALSE;
			@@ -416,13 +421,14 @@
			/**
			* 添加任务信息
			*/
			private Boolean addFeedTask(String glassId, Integer line, Integer taskType, Integer width) {
			private Boolean addFeedTask(String glassId, Integer line, Integer taskType, Integer width, Integer height) {
			BigStorageCageFeedTask bigStorageCageFeedTask = new BigStorageCageFeedTask();
			bigStorageCageFeedTask.setGlassId(glassId);
			bigStorageCageFeedTask.setTaskState(Const.BIG_STORAGE_IN_NEW);
			bigStorageCageFeedTask.setLine(line);
			bigStorageCageFeedTask.setTaskType(taskType);
			bigStorageCageFeedTask.setWidth(width);
			bigStorageCageFeedTask.setHeight(height);
			bigStorageCageFeedTask.setCreateTime(new Date());
			return bigStorageCageFeedTaskService.save(bigStorageCageFeedTask);
			}
			@@ -434,7 +440,8 @@
			*/
			public Integer getStartLine() {
			List<BigStorageCageFeedTask> taskList = bigStorageCageFeedTaskService.list(new LambdaQueryWrapper<BigStorageCageFeedTask>()
			.inSql(BigStorageCageFeedTask::getId, "select min(id) from big_storage_cage_feed_task where task_state = 2 group by line"));
			.inSql(BigStorageCageFeedTask::getId, "select min(id) from big_storage_cage_feed_task where task_state = 2" +
			"and (target_slot = 0 or target_slot is null) group by line"));
			Assert.isFalse(CollectionUtils.isEmpty(taskList), "卧转立两条线都没有玻璃进片任务");
			Map<String, Integer> taskMap = taskList.stream().collect(Collectors.toMap(BigStorageCageFeedTask::getGlassId,
			BigStorageCageFeedTask::getLine));
			@@ -453,6 +460,7 @@
			//1、获取任务表中的所有玻璃（指定线路且已经进卧转立完成）
			List<BigStorageCageFeedTask> taskList = bigStorageCageFeedTaskService.list(new LambdaQueryWrapper<BigStorageCageFeedTask>()
			.eq(BigStorageCageFeedTask::getLine, line)
			.and(e -> e.isNull(BigStorageCageFeedTask::getTargetSlot).or().eq(BigStorageCageFeedTask::getTargetSlot, Const.OUT_TARGET_POSITION_ZERO))
			.in(BigStorageCageFeedTask::getTaskState, Const.BIG_STORAGE_IN_UP_ALL)
			.orderByAsc(BigStorageCageFeedTask::getId));
			//2、去笼子内查找是否可以继续存放的笼子
			@@ -519,7 +527,7 @@
			//打车剩余尺寸
			Integer remainWidth = carWidth;
			for (T e : list) {
			if (bigStorageCageOutTaskList.size() > outCarMaxSize \|\| e.getWidth() > remainWidth) {
			if (bigStorageCageOutTaskList.size() >= outCarMaxSize \|\| e.getWidth() > remainWidth) {
			break;
			}
			remainWidth = remainWidth - (int) e.getWidth() - glassGap;
			@@ -550,14 +558,14 @@
			/**
			* 更新笼子内格子的剩余尺寸
			*
			* @param list
			* @param taskGlassIds
			* @param list 笼内可以出笼的玻璃信息
			* @param taskGlassIds 本次任务出去的玻璃ids
			* @param <T>
			*/
			public <T extends BigStorageCageBaseInfo> void updateSlotRemain(List<T> list, List<String> taskGlassIds) {
			//获取需要出去（包括待出去的）的所有玻璃格子号
			List<Integer> slotList = list.stream().map(T::getSlot).distinct().collect(Collectors.toList());
			//获取待出去的玻璃信息（等下车出去的玻璃）
			//获取待出去的玻璃信息（等待本次任务结束后下车出去的玻璃）
			Map<Integer, Double> slotRemainMap = list.stream().filter(e -> !taskGlassIds.contains(e.getGlassId()))
			.collect(Collectors.groupingBy(T::getSlot, Collectors.summingDouble(item -> item.getWidth() + glassGap)));
			if (CollectionUtils.isNotEmpty(slotRemainMap)) {
			@@ -578,6 +586,9 @@
			public Boolean computeIsRun(int line, String glassId) {
			//获取卧转立剩余宽度
			BigStorageDTO sitToUpRemainWidth = bigStorageCageFeedTaskService.querySitToUpRemainWidth(line);
			if (sitToUpRemainWidth.getGlassCount() == 0) {
			return Boolean.FALSE;
			}
			//获取玻璃信息
			GlassInfo glassInfo = glassInfoService.getOne(new LambdaQueryWrapper<GlassInfo>().eq(GlassInfo::getGlassId, glassId));
			return sitToUpRemainWidth.getWidth() < glassInfo.getWidth();