~admin/HangZhouMes.git

			@@ -85,6 +85,10 @@
			@Value("${mes.glassGap}")
			private Integer glassGap;

			@Value("${mes.xMaxSize}")
			private Integer xMaxSize;


			private String d01GlassId = "";
			private String d04GlassId = "";

			@@ -245,6 +249,11 @@
			Date startDate = new Date();
			log.info("大理片笼空车进片任务开始执行时间：{}", startDate);
			PlcParameterObject plcMesObject = S7object.getinstance().PlcMesObject;
			String e02State = plcMesObject.getPlcParameter("E02State").getAddress();
			if (REQUEST_WORD.equals(e02State)) {
			log.info("出片忙碌，结束出片任务");
			return;
			}
			String mesToPLCAddress = plcMesObject.getPlcParameter("MESToPLC").getAddress();
			List<BigStorageCageOutTask> outingList = bigStorageCageOutTaskService.list(new LambdaQueryWrapper<BigStorageCageOutTask>().eq(BigStorageCageOutTask::getTaskState, Const.BIG_STORAGE_OUT_NEW));
			Assert.isTrue(CollectionUtils.isEmpty(outingList), "有正在执行出片的任务，结束当前出片线程");
			@@ -308,10 +317,18 @@
			List<BigStorageCageDetails> list = bigStorageCageDetailsService.list(new LambdaQueryWrapper<BigStorageCageDetails>()
			.eq(BigStorageCageDetails::getSlot, first.getSlot()).eq(BigStorageCageDetails::getState, Const.GLASS_STATE_IN));
			List<BigStorageCageOutTask> outTasks = list.stream().map(e -> new BigStorageCageOutTask(e.getGlassId(), first.getSlot(), second.getSlot(),
			slotWidth, 0, 0, 1)).collect(Collectors.toList());
			e.getWidth() * 10, e.getHeight() * 10, 0, 0, 1)).collect(Collectors.toList());
			bigStorageCageOutTaskService.saveBatch(outTasks);
			S7object.getinstance().plccontrol.writeWord(mesToPLCAddress, 1);
			log.info("已向plc发送出片任务确认，地址为：{}", mesToPLCAddress);

			//向plc写入确认字
			int returnData = 0;
			int count = 1;
			while (returnData == 0) {
			log.info("已向plc第{}次送协议", count);
			S7object.getinstance().plccontrol.writeWord(mesToPLCAddress, 1);
			returnData = S7object.getinstance().plccontrol.readWord(mesToPLCAddress, 1).get(0);
			log.info("已向plc第{}次发送出片任务确认，地址为：{},写入的内容为{}", count++, mesToPLCAddress, returnData);
			}
			Date endDate = new Date();
			log.info("大理片笼出片任务结束时间：{}，共耗时：{}ms,结束扫码任务", endDate, endDate.getTime() - startDate.getTime());
			return;
			@@ -459,7 +476,15 @@
			}
			//向plc发送进片确认
			if (flag) {
			S7object.getinstance().plccontrol.writeWord(mesAddress, 1);
			//向plc写入确认字
			int returnData = 0;
			int count = 1;
			while (returnData == 0) {
			S7object.getinstance().plccontrol.writeWord(mesAddress, 1);
			returnData = S7object.getinstance().plccontrol.readWord(mesAddress, 1).get(0);
			log.info("进卧转立第{}次发送确认字完成，地址为：{},写入的内容为{}", count++, mesAddress, returnData);

			}
			}
			//记录无法放下玻璃，后续判断启动
			return flag;
			@@ -566,8 +591,13 @@
			s7control.writeWord(plcMesObject.getPlcParameter("StartAddToImport" + i).getAddress(), taskList.get(i - 1).getLine());
			s7control.writeWord(plcMesObject.getPlcParameter("TargetAddToImport" + i).getAddress(), taskList.get(i - 1).getTargetSlot());
			}
			s7control.writeWord(outLine, 2);
			log.info("送片任务已发送完成，任务线路为：{}，启动地址为{},确认字为{}", line, outLine, 2);
			int returnData = 0;
			int count = 1;
			while (returnData == 0) {
			s7control.writeWord(outLine, 2);
			returnData = s7control.readWord(outLine, 1).get(0);
			log.info("已向plc第{}次发送出片任务确认，地址为：{},写入的内容为{}", count++, outLine, returnData);
			}
			}

			private <T extends BigStorageCageBaseInfo> Boolean computeOutGlassInfo(List<T> list, Boolean isTempering, String mesToPLCAddress) {
			@@ -575,17 +605,25 @@
			List<BigStorageCageOutTask> bigStorageCageOutTaskList = new ArrayList<>();
			//打车剩余尺寸
			Integer remainWidth = carWidth;
			int maxX = 0;
			for (T e : list) {
			if (bigStorageCageOutTaskList.size() >= outCarMaxSize \|\| e.getWidth() > remainWidth) {
			break;
			}
			remainWidth = remainWidth - (int) e.getWidth() - glassGap;
			if (isTempering) {
			bigStorageCageOutTaskList.add(new BigStorageCageOutTask(e.getGlassId(), e.getSlot(), Const.TEMPERING_OUT_TARGET_POSITION,
			(int) e.getWidth() * 10, 0, 0, 1));
			int minLength = Math.min((int) e.getWidth(), (int) e.getHeight());
			if (maxX + minLength <= xMaxSize) {
			bigStorageCageOutTaskList.add(new BigStorageCageOutTask(e.getGlassId(), e.getSlot(), Const.TEMPERING_OUT_TARGET_POSITION,
			e.getWidth() * 10, e.getHeight() * 10, 0, 0, 1));
			maxX = Math.max(maxX, e.getXCoordinate());
			} else {
			break;
			}

			} else {
			bigStorageCageOutTaskList.add(new BigStorageCageOutTask(e.getGlassId(), e.getSlot(), Const.ARTIFICIAL_OUT_TARGET_POSITION,
			(int) e.getWidth() * 10, 0, 0, 1));
			e.getWidth() * 10, e.getHeight(), 0, 0, 1));
			}

			}
			@@ -599,8 +637,14 @@
			.in(BigStorageCageDetails::getGlassId, glassIds));
			//更新笼子内格子的剩余尺寸
			updateSlotRemain(list, glassIds);
			S7object.getinstance().plccontrol.writeWord(mesToPLCAddress, 1);
			log.info("已向plc发送出片任务确认，地址为：{}", mesToPLCAddress);

			int returnData = 0;
			int count = 1;
			while (returnData == 0) {
			S7object.getinstance().plccontrol.writeWord(mesToPLCAddress, 1);
			returnData = S7object.getinstance().plccontrol.readWord(mesToPLCAddress, 1).get(0);
			log.info("已向plc第{}次发送出片任务确认，地址为：{},写入的内容为{}", count++, mesToPLCAddress, returnData);
			}
			return Boolean.TRUE;
			}