~admin/HangZhouMes.git

			@@ -4,7 +4,6 @@
			import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
			import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
			import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
			import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
			import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
			import com.github.yulichang.toolkit.JoinWrappers;
			import com.github.yulichang.wrapper.MPJLambdaWrapper;
			@@ -132,7 +131,7 @@
			judgeGlassTypeStatus(d01Id, Const.A09_OUT_TARGET_POSITION, mesD01Address);
			edgGlassTaskInfoService.update(new LambdaUpdateWrapper<EdgGlassTaskInfo>()
			.set(EdgGlassTaskInfo::getStatus, Const.EDG_GLASS_SUCCESS).eq(EdgGlassTaskInfo::getGlassId, d01Id));
			d01GlassId = d01Id;
			// d01GlassId = d01Id;
			}
			}
			// 状态为0不操作（D01送片，0不操作，1允许送片），请求字为1，卧转立未启动
			@@ -141,7 +140,7 @@
			judgeGlassTypeStatus(d04Id, Const.A10_OUT_TARGET_POSITION, mesD04Address);
			edgGlassTaskInfoService.update(new LambdaUpdateWrapper<EdgGlassTaskInfo>()
			.set(EdgGlassTaskInfo::getStatus, Const.EDG_GLASS_SUCCESS).eq(EdgGlassTaskInfo::getGlassId, d04Id));
			d04GlassId = d04Id;
			// d04GlassId = d04Id;
			}
			}
			Date endDate = new Date();
			@@ -152,6 +151,13 @@
			public void plcToHomeEdgFreeCarTask() {
			Date startDate = new Date();
			log.info("大理片笼空车进片任务开始执行时间：{}", startDate);
			PlcParameterObject plcMesObject = S7object.getinstance().PlcMesObject;
			String mesD03Address = plcMesObject.getPlcParameter("MESToD03").getValue();
			String mesD05Address = plcMesObject.getPlcParameter("MESToD05").getValue();
			log.info("MESToD03:{},MESToD05:{}", mesD03Address, mesD05Address);
			if ("2".equals(mesD03Address) \|\| "2".equals(mesD05Address)) {
			log.info("有启动信号，MESToD03:{},MESToD05:{}", mesD03Address, mesD05Address);
			}
			PlcParameterObject plcParameterObject = S7object.getinstance().PlcMesObject;
			String e01Status = plcParameterObject.getPlcParameter("E01State").getValue();
			String d03ToMES = plcParameterObject.getPlcParameter("D03ToMES").getValue();
			@@ -311,21 +317,23 @@
			//玻璃到齐包括已出片的
			//到齐，将玻璃小片数据存入钢化小片表，逻辑生成出片任务结束
			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())
			.orderBy(Boolean.TRUE, sequenceOrder, GlassInfo::getTemperingFeedSequence));
			if (CollectionUtils.isNotEmpty(temperingGlassInfos)) {
			temperingGlassInfoService.saveBatch(temperingGlassInfos);
			computeOutMoreGlassInfo(temperingGlassInfoList, Boolean.TRUE, mesToPLCAddress);
			Date endDate = new Date();
			log.info("大理片笼出片任务结束时间：{}，共耗时：{}ms,结束扫码任务", endDate, endDate.getTime() - startDate.getTime());
			return;
			if(redisUtil.getCacheObject("temperingengineerId").equals(item.getEngineerId())){
			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())
			.orderBy(Boolean.TRUE, sequenceOrder, GlassInfo::getTemperingFeedSequence));
			if (CollectionUtils.isNotEmpty(temperingGlassInfos)) {
			temperingGlassInfoService.saveBatch(temperingGlassInfos);
			computeOutMoreGlassInfo(temperingGlassInfoList, Boolean.TRUE, mesToPLCAddress);
			Date endDate = new Date();
			log.info("大理片笼出片任务结束时间：{}，共耗时：{}ms,结束扫码任务", endDate, endDate.getTime() - startDate.getTime());
			return;
			}
			}
			}
			}
			@@ -594,7 +602,11 @@
			if (glassCount < inCarMaxSize) {
			addFeedTask(glassId, line, Const.BIG_STORAGE_IN_WAIT, widthFirst, heightFirst);
			} else {
			addFeedTask(glassId, line, Const.BIG_STORAGE_IN_RUN, widthFirst, heightFirst);
			if (glassCount < inCarMaxSize + 1) {
			addFeedTask(glassId, line, Const.BIG_STORAGE_IN_RUN, widthFirst, heightFirst);
			} else {
			return Boolean.FALSE;
			}
			}
			} else {
			flag = Boolean.FALSE;
			@@ -605,12 +617,20 @@
			if (remainWidth >= widthFirst) {
			if (remainWidth - widthFirst - glassGap >= widthSecond) {
			if (glassCount < inCarMaxSize) {
			addFeedTask(glassId, line, Const.BIG_STORAGE_IN_WAIT, widthFirst, heightSecond);
			addFeedTask(glassId, line, Const.BIG_STORAGE_IN_WAIT, widthFirst, heightFirst);
			} else {
			addFeedTask(glassId, line, Const.BIG_STORAGE_IN_RUN, widthFirst, heightSecond);
			if (glassCount < inCarMaxSize + 1) {
			addFeedTask(glassId, line, Const.BIG_STORAGE_IN_RUN, widthFirst, heightFirst);
			} else {
			return Boolean.FALSE;
			}
			}
			} else {
			addFeedTask(glassId, line, Const.BIG_STORAGE_IN_RUN, widthFirst, heightSecond);
			if (glassCount < inCarMaxSize + 1) {
			addFeedTask(glassId, line, Const.BIG_STORAGE_IN_RUN, widthFirst, heightFirst);
			} else {
			return Boolean.FALSE;
			}
			}
			} else {
			flag = Boolean.FALSE;
			@@ -644,6 +664,8 @@
			bigStorageCageFeedTask.setWidth(width);
			bigStorageCageFeedTask.setHeight(height);
			bigStorageCageFeedTask.setCreateTime(new Date());
			//删除理片笼表拿走/破损数据数据
			damageService.deleteByGlassId(glassId);
			return bigStorageCageFeedTaskService.save(bigStorageCageFeedTask);
			}