YiWuProject.git

			@@ -127,6 +127,7 @@
			</div>
			</div>
			<div style="width: 20px" v-if="index%2===0"></div>
			<div class="print-page" v-else></div>
			</template>
			</div>

			@@ -152,10 +153,11 @@

			#entirety{
			text-align: center;
			width: 48%;
			height: 160px;
			width: 46%;
			height: 170px;
			border: black 1px;
			word-wrap: break-word;
			margin-left: 10px;
			}

			.row1 {
			@@ -192,7 +194,7 @@
			height: 50px;
			font-weight: bold;
			font-size: 12pt;
			margin-left: 20px;
			/* margin-left: 20px; */
			}
			.row5 span {
			font-size: 12pt;
			@@ -209,6 +211,9 @@


			@media print {
			.print-page {
			page-break-after: always; /* 添加分页符，在每个print-page div之后分页 */
			}
			div {
			page-break-inside: avoid;
			}

			@@ -320,6 +320,8 @@
			let content = doc.createElement("div");
			content.id = printId;

			alert(/Chrome/.test(userAgent) && !/Edge/.test(userAgent));

			// 样式控制与打印无关的元素隐藏
			let style = doc.createElement("style");
			console.log("style1:"+style.innerHTML)

			@@ -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 + "' and deleted = 0)")
			.apply("time >= (select time from edg_glass_task_info where line='" + line + "' and glass_id = '" + glassId + "' and deleted = 0)")
			.orderByAsc(EdgGlassTaskInfo::getTime));
			Assert.isFalse(CollectionUtils.isEmpty(edgGlassTaskInfoList), "识别玻璃信息未出现在尺寸表中,获取相邻两块玻璃失败");
			//2、获取卧转立剩余宽度

	UI-Project/src/views/UnLoadGlass/PrintCustomLabelSemi1.vue	11 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	UI-Project/src/views/UnLoadGlass/loadmachinerack.vue	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/job/PlcStorageCageTask.java	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史