From 4aeb3e87088be598e644796f2bafbe707bfb04fb Mon Sep 17 00:00:00 2001
From: ZengTao <2773468879@qq.com>
Date: 星期三, 21 八月 2024 15:14:15 +0800
Subject: [PATCH] 修改标签样式，修改大理片查询磨边队列sql，防止在卧转立前将玻璃放到另一条线进片时出现问题
---
UI-Project/src/views/UnLoadGlass/PrintCustomLabelSemi1.vue | 11 ++++++++---
UI-Project/src/views/UnLoadGlass/loadmachinerack.vue | 2 ++
hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/job/PlcStorageCageTask.java | 2 +-
3 files changed, 11 insertions(+), 4 deletions(-)
diff --git a/UI-Project/src/views/UnLoadGlass/PrintCustomLabelSemi1.vue b/UI-Project/src/views/UnLoadGlass/PrintCustomLabelSemi1.vue
index 9e204b5..2927b8f 100644
--- a/UI-Project/src/views/UnLoadGlass/PrintCustomLabelSemi1.vue
+++ b/UI-Project/src/views/UnLoadGlass/PrintCustomLabelSemi1.vue
@@ -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; /* 娣诲姞鍒嗛〉绗︼紝鍦ㄦ瘡涓猵rint-page div涔嬪悗鍒嗛〉 */
+ }
div {
page-break-inside: avoid;
}
diff --git a/UI-Project/src/views/UnLoadGlass/loadmachinerack.vue b/UI-Project/src/views/UnLoadGlass/loadmachinerack.vue
index 00c35d1..a0ecc55 100644
--- a/UI-Project/src/views/UnLoadGlass/loadmachinerack.vue
+++ b/UI-Project/src/views/UnLoadGlass/loadmachinerack.vue
@@ -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)
diff --git a/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/job/PlcStorageCageTask.java b/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/job/PlcStorageCageTask.java
index db4f8c6..93bf20e 100644
--- a/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/job/PlcStorageCageTask.java
+++ b/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/job/PlcStorageCageTask.java
@@ -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銆佽幏鍙栧崸杞珛鍓╀綑瀹藉害
--
Gitblit v1.8.0