YiWuProject.git

			@@ -544,7 +544,7 @@
			//1、获取任务表中相邻玻璃
			List<EdgGlassTaskInfo> edgGlassTaskInfoList = edgGlassTaskInfoService.list(new LambdaQueryWrapper<EdgGlassTaskInfo>()
			.eq(EdgGlassTaskInfo::getLine, line)
			.apply("time >= (select time from edg_glass_task_info where glass_id = '" + glassId + "')")
			.apply("time >= (select time from edg_glass_task_info where glass_id = '" + glassId + "' and deleted = 0)")
			.orderByAsc(EdgGlassTaskInfo::getTime));
			Assert.isFalse(CollectionUtils.isEmpty(edgGlassTaskInfoList), "识别玻璃信息未出现在尺寸表中,获取相邻两块玻璃失败");
			//2、获取卧转立剩余宽度
			@@ -713,7 +713,7 @@
			while (returnData == 0) {
			s7control.writeWord(outLine, 2);
			returnData = s7control.readWord(outLine, 1).get(0);
			log.info("已向plc第{}次发送送片任务确认，地址为：{},写入的内容为{}", count++, outLine, returnData);
			log.info("已向plc第{}次发送进片任务确认，地址为：{},写入的内容为{}", count++, outLine, returnData);
			}
			}

			@@ -823,13 +823,13 @@
			bigStorageCageDetailsService.update(new LambdaUpdateWrapper<BigStorageCageDetails>()
			.set(BigStorageCageDetails::getState, Const.GLASS_STATE_OUT_ING)
			.in(BigStorageCageDetails::getGlassId, glassIds));
			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);
			}
			// 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;
			}