From da30bfc3795305f0bbd400d196bcf4c30612c37f Mon Sep 17 00:00:00 2001
From: wangfei <3597712270@qq.com>
Date: 星期三, 10 十二月 2025 17:01:33 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10105/r/YiWuProject
---
UI-Project/src/views/StockBasicData/stockBasicyiwu.vue | 1
UI-Project/src/views/hollow/hellowslicecagehistory.vue | 2
UI-Project/src/views/hollow/hollowaluminumtwo.vue | 3 -
UI-Project/src/views/hollow/hollowequipment.vue | 12 +++++-
UI-Project/src/views/largescreendisplay/productionstatistics.vue | 1
hangzhoumesParent/moduleService/TemperingGlassModule/src/main/java/com/mes/job/TemperingTask.java | 2
UI-Project/src/views/hollow/hollowequipmenthree.vue | 8 ++++
hangzhoumesParent/moduleService/hollowGlassModule/src/main/java/com/mes/hollow/service/impl/HollowBigStorageCageDetailsServiceImpl.java | 11 +++++
UI-Project/src/views/Returns/upreturnhistory.vue | 2
UI-Project/src/views/hollow/hollowequipmenttwo.vue | 9 ++++
UI-Project/src/views/largescreendisplay/statistics.vue | 1
UI-Project/src/views/GlassStorage/rawhistory.vue | 2
UI-Project/src/views/StockBasicData/stockBasicData.vue | 1
UI-Project/src/views/hollow/hollowaluminumthree.vue | 1
UI-Project/src/views/largescreendisplay/timeaxis.vue | 1
UI-Project/src/lang/en.js | 1
UI-Project/src/lang/py.js | 1
UI-Project/src/lang/zh.js | 1
hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/bigstorage/service/impl/BigStorageCageDetailsServiceImpl.java | 13 +++++-
UI-Project/src/views/Slicecage/slicecagehistory.vue | 2
UI-Project/src/views/Returns/upreturns.vue | 1
UI-Project/src/views/Slicecage/slicecage.vue | 2
UI-Project/src/views/hollow/hellowquipthreehistory.vue | 2
hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/job/OpcPlcStorageCageNewTask.java | 6 +-
hangzhoumesParent/moduleService/hollowGlassModule/src/main/java/com/mes/job/OpcPlcStorageCageHollowTask.java | 4 +-
UI-Project/src/views/Returns/upreturnhistory2.vue | 2
UI-Project/src/views/hollow/hellowquiptwohistory.vue | 2
UI-Project/src/views/hollow/hellowquiphistory.vue | 2
UI-Project/src/views/hollow/hollowaluminum.vue | 1
UI-Project/src/lang/kr.js | 1
30 files changed, 67 insertions(+), 31 deletions(-)
diff --git a/UI-Project/src/lang/en.js b/UI-Project/src/lang/en.js
index e041c92..6b838e0 100644
--- a/UI-Project/src/lang/en.js
+++ b/UI-Project/src/lang/en.js
@@ -592,6 +592,7 @@
serialnumber: 'Order serial number',
inproductname: 'Please enter a product name',
productname: 'Product name',
+ engineername: 'Engineer name',
serial: 'Process validation number',
slicemarker: 'Frame marker (position)',
numberpatches: 'Number of patches',
diff --git a/UI-Project/src/lang/kr.js b/UI-Project/src/lang/kr.js
index d90fc9c..9e255b4 100644
--- a/UI-Project/src/lang/kr.js
+++ b/UI-Project/src/lang/kr.js
@@ -590,6 +590,7 @@
building: '瓯措 氩堩樃',
serialnumber: '欤茧 氩堩樃',
productname: '鞝滍拡 鞚措',
+ engineername: '瓿奠爼氇呾弓',
inproductname: '鞝滍拡 鞚措鞚� 鞛呺牓頃橃嫮鞁滌槫.',
serial: '頂勲靹胳姢 頇曥澑 氩堩樃',
slicemarker: '霠堨澊鞏� 氩堩樃',
diff --git a/UI-Project/src/lang/py.js b/UI-Project/src/lang/py.js
index 2a73923..08e5366 100644
--- a/UI-Project/src/lang/py.js
+++ b/UI-Project/src/lang/py.js
@@ -539,6 +539,7 @@
building: '妤煎彿',
serialnumber: '璁㈠崟搴忓彿',
productname: '浜у搧鍚嶇О',
+ engineername: '宸ョ▼鍚嶇О',
inproductname: '璇疯緭鍏ヤ骇鍝佸悕绉�',
serial: '宸ヨ壓纭搴忓彿',
slicemarker: '鐗囨爣璁帮紙浣嶇疆锛�',
diff --git a/UI-Project/src/lang/zh.js b/UI-Project/src/lang/zh.js
index 175fc1a..5045db1 100644
--- a/UI-Project/src/lang/zh.js
+++ b/UI-Project/src/lang/zh.js
@@ -598,6 +598,7 @@
building: '妤煎彿',
serialnumber: '璁㈠崟搴忓彿',
productname: '浜у搧鍚嶇О',
+ engineername: '宸ョ▼鍚嶇О',
inproductname: '璇疯緭鍏ヤ骇鍝佸悕绉�',
serial: '宸ヨ壓纭搴忓彿',
slicemarker: '灞傚彿',
diff --git a/UI-Project/src/views/GlassStorage/rawhistory.vue b/UI-Project/src/views/GlassStorage/rawhistory.vue
index 3d680f6..cb0e5ee 100644
--- a/UI-Project/src/views/GlassStorage/rawhistory.vue
+++ b/UI-Project/src/views/GlassStorage/rawhistory.vue
@@ -338,7 +338,7 @@
const defaultTime = ref<[Date, Date]>([new Date(), new Date()]);
function parseAndSetTime() {
const backendTime = new Date(getglobalDate);
- const oneWeekAgo = new Date(backendTime.getTime() - 7 * 24 * 60 * 60 * 1000); // 鍑忓幓7澶�
+ const oneWeekAgo = new Date(backendTime.getTime() - 0 * 24 * 60 * 60 * 1000); // 鍑忓幓7澶�
oneWeekAgo.setHours(0, 0, 0, 0);
timeRange.value = [formatTimestamp(oneWeekAgo), formatTimestamp(backendTime)];
window.localStorage.setItem('startTime', formatTimestamp(oneWeekAgo))
diff --git a/UI-Project/src/views/Returns/upreturnhistory.vue b/UI-Project/src/views/Returns/upreturnhistory.vue
index 93e34c7..176e47f 100644
--- a/UI-Project/src/views/Returns/upreturnhistory.vue
+++ b/UI-Project/src/views/Returns/upreturnhistory.vue
@@ -269,7 +269,7 @@
]
function parseAndSetTime() {
const backendTime = new Date(getglobalDate);
- const oneWeekAgo = new Date(backendTime.getTime() - 7 * 24 * 60 * 60 * 1000); // 鍑忓幓7澶�
+ const oneWeekAgo = new Date(backendTime.getTime() - 0 * 24 * 60 * 60 * 1000); // 鍑忓幓7澶�
oneWeekAgo.setHours(0, 0, 0, 0);
timeRange.value = [formatTimestamp(oneWeekAgo), formatTimestamp(backendTime)];
window.localStorage.setItem('startTime', formatTimestamp(oneWeekAgo))
diff --git a/UI-Project/src/views/Returns/upreturnhistory2.vue b/UI-Project/src/views/Returns/upreturnhistory2.vue
index 72b09e2..bf63c9f 100644
--- a/UI-Project/src/views/Returns/upreturnhistory2.vue
+++ b/UI-Project/src/views/Returns/upreturnhistory2.vue
@@ -271,7 +271,7 @@
const defaultTime = ref<[Date, Date]>([new Date(), new Date()]);
function parseAndSetTime() {
const backendTime = new Date(getglobalDate);
-const oneWeekAgo = new Date(backendTime.getTime() - 7 * 24 * 60 * 60 * 1000); // 鍑忓幓7澶�
+const oneWeekAgo = new Date(backendTime.getTime() - 0 * 24 * 60 * 60 * 1000); // 鍑忓幓7澶�
oneWeekAgo.setHours(0, 0, 0, 0);
timeRange.value = [formatTimestamp(oneWeekAgo), formatTimestamp(backendTime)];
window.localStorage.setItem('startTime', formatTimestamp(oneWeekAgo))
diff --git a/UI-Project/src/views/Returns/upreturns.vue b/UI-Project/src/views/Returns/upreturns.vue
index 5299e90..1209c8b 100644
--- a/UI-Project/src/views/Returns/upreturns.vue
+++ b/UI-Project/src/views/Returns/upreturns.vue
@@ -3,7 +3,6 @@
import { useRouter } from "vue-router"
import { ElMessage, ElMessageBox } from 'element-plus'
import { useI18n } from 'vue-i18n'
-import { host, WebSocketHost } from '@/utils/constants'
import request from "@/utils/request"
import { closeWebSocket, initializeWebSocket } from '@/utils/WebSocketService';
const router = useRouter()
diff --git a/UI-Project/src/views/Slicecage/slicecage.vue b/UI-Project/src/views/Slicecage/slicecage.vue
index 5d0d667..573de12 100644
--- a/UI-Project/src/views/Slicecage/slicecage.vue
+++ b/UI-Project/src/views/Slicecage/slicecage.vue
@@ -1660,7 +1660,7 @@
<el-table ref="table" style="margin-top: 20px;height: 600px;"
:data="tableDatagh" :header-cell-style="{background:'#F2F3F5 ',color:'#1D2129'}">
<el-table-column prop="engineerId" fixed align="center" :label="$t('searchOrder.projectnumber')" min-width="100"/>
- <el-table-column prop="engineerName" fixed align="center" :label="$t('large.productname')" min-width="120"/>
+ <el-table-column prop="engineerName" fixed align="center" :label="$t('large.engineername')" min-width="120"/>
<el-table-column prop="thickness" align="center" :label="$t('basicData.thickness')" min-width="100" />
<el-table-column prop="filmsId" align="center" :label="$t('basicData.coatingtypes')" min-width="100" />
<el-table-column prop="temperingLayoutId" align="center" :label="$t('searchOrder.layoutnumber')" min-width="100" />
diff --git a/UI-Project/src/views/Slicecage/slicecagehistory.vue b/UI-Project/src/views/Slicecage/slicecagehistory.vue
index 51a439a..494016d 100644
--- a/UI-Project/src/views/Slicecage/slicecagehistory.vue
+++ b/UI-Project/src/views/Slicecage/slicecagehistory.vue
@@ -476,7 +476,7 @@
const defaultTime = ref<[Date, Date]>([new Date(), new Date()]);
function parseAndSetTime() {
const backendTime = new Date(getglobalDate);
- const oneWeekAgo = new Date(backendTime.getTime() - 7 * 24 * 60 * 60 * 1000); // 鍑忓幓7澶�
+ const oneWeekAgo = new Date(backendTime.getTime() - 0 * 24 * 60 * 60 * 1000); // 鍑忓幓7澶�
oneWeekAgo.setHours(0, 0, 0, 0);
timeRange.value = [formatTimestamp(oneWeekAgo), formatTimestamp(backendTime)];
window.localStorage.setItem('startTime', formatTimestamp(oneWeekAgo))
diff --git a/UI-Project/src/views/StockBasicData/stockBasicData.vue b/UI-Project/src/views/StockBasicData/stockBasicData.vue
index 82724c8..b43c2da 100644
--- a/UI-Project/src/views/StockBasicData/stockBasicData.vue
+++ b/UI-Project/src/views/StockBasicData/stockBasicData.vue
@@ -1,7 +1,6 @@
<script setup>
import {onBeforeUnmount, onMounted, onUnmounted, reactive, ref} from "vue";
import {useRouter} from "vue-router"
-import {host, WebSocketHost} from '@/utils/constants'
import request from "@/utils/request"
import {closeWebSocket, initializeWebSocket} from '@/utils/WebSocketService';
import {ElMessage, ElMessageBox} from 'element-plus'
diff --git a/UI-Project/src/views/StockBasicData/stockBasicyiwu.vue b/UI-Project/src/views/StockBasicData/stockBasicyiwu.vue
index dc4ced8..fbceb0b 100644
--- a/UI-Project/src/views/StockBasicData/stockBasicyiwu.vue
+++ b/UI-Project/src/views/StockBasicData/stockBasicyiwu.vue
@@ -1,7 +1,6 @@
<script setup>
import { onBeforeUnmount, onMounted, onUnmounted, reactive, ref } from 'vue'
import { useRouter } from 'vue-router'
-import { host, WebSocketHost } from '@/utils/constants'
import request from '@/utils/request'
import { closeWebSocket, initializeWebSocket } from '@/utils/WebSocketService'
// import { ref } from 'vue'
diff --git a/UI-Project/src/views/hollow/hellowquiphistory.vue b/UI-Project/src/views/hollow/hellowquiphistory.vue
index 6230357..1b7243e 100644
--- a/UI-Project/src/views/hollow/hellowquiphistory.vue
+++ b/UI-Project/src/views/hollow/hellowquiphistory.vue
@@ -645,7 +645,7 @@
const defaultTime = ref<[Date, Date]>([new Date(), new Date()]);
function parseAndSetTime() {
const backendTime = new Date(getglobalDate);
-const oneWeekAgo = new Date(backendTime.getTime() - 7 * 24 * 60 * 60 * 1000); // 鍑忓幓7澶�
+const oneWeekAgo = new Date(backendTime.getTime() - 0 * 24 * 60 * 60 * 1000); // 鍑忓幓7澶�
oneWeekAgo.setHours(0, 0, 0, 0);
timeRange.value = [formatTimestamp(oneWeekAgo), formatTimestamp(backendTime)];
window.localStorage.setItem('startTime', formatTimestamp(oneWeekAgo))
diff --git a/UI-Project/src/views/hollow/hellowquipthreehistory.vue b/UI-Project/src/views/hollow/hellowquipthreehistory.vue
index 7c9bf45..63999d3 100644
--- a/UI-Project/src/views/hollow/hellowquipthreehistory.vue
+++ b/UI-Project/src/views/hollow/hellowquipthreehistory.vue
@@ -457,7 +457,7 @@
const defaultTime = ref<[Date, Date]>([new Date(), new Date()]);
function parseAndSetTime() {
const backendTime = new Date(getglobalDate);
-const oneWeekAgo = new Date(backendTime.getTime() - 7 * 24 * 60 * 60 * 1000); // 鍑忓幓7澶�
+const oneWeekAgo = new Date(backendTime.getTime() - 0 * 24 * 60 * 60 * 1000); // 鍑忓幓7澶�
oneWeekAgo.setHours(0, 0, 0, 0);
timeRange.value = [formatTimestamp(oneWeekAgo), formatTimestamp(backendTime)];
window.localStorage.setItem('startTime', formatTimestamp(oneWeekAgo))
diff --git a/UI-Project/src/views/hollow/hellowquiptwohistory.vue b/UI-Project/src/views/hollow/hellowquiptwohistory.vue
index 9765d91..f081dd3 100644
--- a/UI-Project/src/views/hollow/hellowquiptwohistory.vue
+++ b/UI-Project/src/views/hollow/hellowquiptwohistory.vue
@@ -457,7 +457,7 @@
const defaultTime = ref<[Date, Date]>([new Date(), new Date()]);
function parseAndSetTime() {
const backendTime = new Date(getglobalDate);
-const oneWeekAgo = new Date(backendTime.getTime() - 7 * 24 * 60 * 60 * 1000); // 鍑忓幓7澶�
+const oneWeekAgo = new Date(backendTime.getTime() - 0 * 24 * 60 * 60 * 1000); // 鍑忓幓7澶�
oneWeekAgo.setHours(0, 0, 0, 0);
timeRange.value = [formatTimestamp(oneWeekAgo), formatTimestamp(backendTime)];
window.localStorage.setItem('startTime', formatTimestamp(oneWeekAgo))
diff --git a/UI-Project/src/views/hollow/hellowslicecagehistory.vue b/UI-Project/src/views/hollow/hellowslicecagehistory.vue
index 11769d4..2dc38c0 100644
--- a/UI-Project/src/views/hollow/hellowslicecagehistory.vue
+++ b/UI-Project/src/views/hollow/hellowslicecagehistory.vue
@@ -483,7 +483,7 @@
const defaultTime = ref<[Date, Date]>([new Date(), new Date()]);
function parseAndSetTime() {
const backendTime = new Date(getglobalDate);
-const oneWeekAgo = new Date(backendTime.getTime() - 7 * 24 * 60 * 60 * 1000); // 鍑忓幓7澶�
+const oneWeekAgo = new Date(backendTime.getTime() - 0 * 24 * 60 * 60 * 1000); // 鍑忓幓7澶�
oneWeekAgo.setHours(0, 0, 0, 0);
timeRange.value = [formatTimestamp(oneWeekAgo), formatTimestamp(backendTime)];
window.localStorage.setItem('startTime', formatTimestamp(oneWeekAgo))
diff --git a/UI-Project/src/views/hollow/hollowaluminum.vue b/UI-Project/src/views/hollow/hollowaluminum.vue
index 413fa9b..230c72f 100644
--- a/UI-Project/src/views/hollow/hollowaluminum.vue
+++ b/UI-Project/src/views/hollow/hollowaluminum.vue
@@ -2,7 +2,6 @@
import { onBeforeUnmount, onMounted, ref, nextTick } from "vue";
import { useRouter } from "vue-router";
import { ElMessage, ElMessageBox } from 'element-plus'
-import { host, WebSocketHost } from '@/utils/constants';
import { initializeWebSocket, closeWebSocket } from '@/utils/WebSocketService';
import { useI18n } from 'vue-i18n';
import request from '@/utils/request';
diff --git a/UI-Project/src/views/hollow/hollowaluminumthree.vue b/UI-Project/src/views/hollow/hollowaluminumthree.vue
index c0614f2..2c1a55e 100644
--- a/UI-Project/src/views/hollow/hollowaluminumthree.vue
+++ b/UI-Project/src/views/hollow/hollowaluminumthree.vue
@@ -2,7 +2,6 @@
import { onBeforeUnmount, onMounted, ref, nextTick } from "vue";
import { useRouter } from "vue-router";
import { ElMessage, ElMessageBox } from 'element-plus'
-import { host, WebSocketHost } from '@/utils/constants';
import { initializeWebSocket, closeWebSocket } from '@/utils/WebSocketService';
import { useI18n } from 'vue-i18n';
import request from '@/utils/request';
diff --git a/UI-Project/src/views/hollow/hollowaluminumtwo.vue b/UI-Project/src/views/hollow/hollowaluminumtwo.vue
index 311f9aa..25da8f4 100644
--- a/UI-Project/src/views/hollow/hollowaluminumtwo.vue
+++ b/UI-Project/src/views/hollow/hollowaluminumtwo.vue
@@ -1,8 +1,7 @@
<script setup>
import { onBeforeUnmount, onMounted, ref, nextTick } from "vue";
import { useRouter } from "vue-router";
-import { ElMessage, ElMessageBox } from 'element-plus'
-import { host, WebSocketHost } from '@/utils/constants';
+import { ElMessage, ElMessageBox } from 'element-plus';
import { initializeWebSocket, closeWebSocket } from '@/utils/WebSocketService';
import { useI18n } from 'vue-i18n';
import request from '@/utils/request';
diff --git a/UI-Project/src/views/hollow/hollowequipment.vue b/UI-Project/src/views/hollow/hollowequipment.vue
index bac2e30..7f4dd08 100644
--- a/UI-Project/src/views/hollow/hollowequipment.vue
+++ b/UI-Project/src/views/hollow/hollowequipment.vue
@@ -992,9 +992,8 @@
</template>
<script setup>
import { ElMessage, ElMessageBox } from 'element-plus'
-import { onBeforeUnmount, onMounted, onUnmounted, ref, reactive, watch, computed, getCurrentInstance } from "vue";
+import { onBeforeUnmount, onMounted, onUnmounted, ref, reactive, watch, computed, getCurrentInstance ,toRaw } from "vue";
import request from "@/utils/request"
-import { host, WebSocketHost } from '@/utils/constants'
import { closeWebSocket, initializeWebSocket } from '@/utils/WebSocketService';
import { useI18n } from 'vue-i18n'
const { t } = useI18n()
@@ -1469,6 +1468,9 @@
function nestedTableRowClassName(parentRow, row) {
if (parentRow.isThroughSlot == true) {
return 'row-red-background';
+ }
+ if (row.row?.sumCount !== undefined && row.row?.pairCount !== undefined && row.row.sumCount !== row.row.pairCount) {
+ return 'sum-equal-pair-row' // 杩斿洖鑷畾涔夌被鍚�
}
return '';
}
@@ -1952,6 +1954,7 @@
value: null,
size: null
})
+
</script>
<style scoped>
#dt {
@@ -2014,4 +2017,9 @@
.el-loading-mask {
z-index: 2000 !important;
}
+/* 鏍稿績3锛氭坊鍔犺鍙樿壊鏍峰紡锛岄�氳繃:deep绌块�弒coped */
+:deep(.sum-equal-pair-row) {
+ background-color: #fdf2e8 !important; /* 娴呮搴曡壊锛屽彲鑷淇敼 */
+ color: #e64340 !important; /* 鏂囧瓧鑹诧紝鍙�� */
+}
</style>
\ No newline at end of file
diff --git a/UI-Project/src/views/hollow/hollowequipmenthree.vue b/UI-Project/src/views/hollow/hollowequipmenthree.vue
index e98ff56..cb8eb99 100644
--- a/UI-Project/src/views/hollow/hollowequipmenthree.vue
+++ b/UI-Project/src/views/hollow/hollowequipmenthree.vue
@@ -799,6 +799,9 @@
if (parentRow.isThroughSlot == true) {
return 'row-red-background';
}
+ if (row.row?.sumCount !== undefined && row.row?.pairCount !== undefined && row.row.sumCount !== row.row.pairCount) {
+ return 'sum-equal-pair-row' // 杩斿洖鑷畾涔夌被鍚�
+ }
return '';
}
const fetchFlowCardsearch = async () => {
@@ -1259,4 +1262,9 @@
.el-loading-mask {
z-index: 2000 !important;
}
+/* 鏍稿績3锛氭坊鍔犺鍙樿壊鏍峰紡锛岄�氳繃:deep绌块�弒coped */
+:deep(.sum-equal-pair-row) {
+ background-color: #fdf2e8 !important; /* 娴呮搴曡壊锛屽彲鑷淇敼 */
+ color: #e64340 !important; /* 鏂囧瓧鑹诧紝鍙�� */
+}
</style>
\ No newline at end of file
diff --git a/UI-Project/src/views/hollow/hollowequipmenttwo.vue b/UI-Project/src/views/hollow/hollowequipmenttwo.vue
index 283009d..bdf6f2d 100644
--- a/UI-Project/src/views/hollow/hollowequipmenttwo.vue
+++ b/UI-Project/src/views/hollow/hollowequipmenttwo.vue
@@ -514,7 +514,6 @@
import { onBeforeUnmount, onMounted, onUnmounted, ref, reactive, watch, computed, getCurrentInstance } from "vue";
import request from "@/utils/request"
import requestErp from "@/utils/requestErp"
-import { host, WebSocketHost } from '@/utils/constants'
import { closeWebSocket, initializeWebSocket } from '@/utils/WebSocketService'
import PrintCustomLabelXJ from './PrintCustomLabelTwo.vue'
import { useI18n } from 'vue-i18n'
@@ -785,6 +784,9 @@
function nestedTableRowClassName(parentRow, row) {
if (parentRow.isThroughSlot == true) {
return 'row-red-background';
+ }
+ if (row.row?.sumCount !== undefined && row.row?.pairCount !== undefined && row.row.sumCount !== row.row.pairCount) {
+ return 'sum-equal-pair-row' // 杩斿洖鑷畾涔夌被鍚�
}
return '';
}
@@ -1285,4 +1287,9 @@
.el-loading-mask {
z-index: 2000 !important;
}
+/* 鏍稿績3锛氭坊鍔犺鍙樿壊鏍峰紡锛岄�氳繃:deep绌块�弒coped */
+:deep(.sum-equal-pair-row) {
+ background-color: #fdf2e8 !important; /* 娴呮搴曡壊锛屽彲鑷淇敼 */
+ color: #e64340 !important; /* 鏂囧瓧鑹诧紝鍙�� */
+}
</style>
\ No newline at end of file
diff --git a/UI-Project/src/views/largescreendisplay/productionstatistics.vue b/UI-Project/src/views/largescreendisplay/productionstatistics.vue
index ad46a8c..3aca05f 100644
--- a/UI-Project/src/views/largescreendisplay/productionstatistics.vue
+++ b/UI-Project/src/views/largescreendisplay/productionstatistics.vue
@@ -53,7 +53,6 @@
import { useI18n } from 'vue-i18n'
import { useRouter } from "vue-router"
import request from "@/utils/request"
-import { host, WebSocketHost } from '@/utils/constants'
import { onBeforeUnmount, onMounted, onUnmounted, reactive, ref } from "vue";
import { closeWebSocket, initializeWebSocket } from '@/utils/WebSocketService';
import { ElMessage, ElMessageBox } from 'element-plus'
diff --git a/UI-Project/src/views/largescreendisplay/statistics.vue b/UI-Project/src/views/largescreendisplay/statistics.vue
index 98ce258..ef1843e 100644
--- a/UI-Project/src/views/largescreendisplay/statistics.vue
+++ b/UI-Project/src/views/largescreendisplay/statistics.vue
@@ -45,7 +45,6 @@
import { useI18n } from 'vue-i18n'
import { useRouter } from "vue-router"
import request from "@/utils/request"
-import { host, WebSocketHost } from '@/utils/constants'
import { onBeforeUnmount, onMounted, onUnmounted, reactive, ref , nextTick} from "vue";
import { closeWebSocket, initializeWebSocket } from '@/utils/WebSocketService';
import { ElMessage, ElMessageBox } from 'element-plus'
diff --git a/UI-Project/src/views/largescreendisplay/timeaxis.vue b/UI-Project/src/views/largescreendisplay/timeaxis.vue
index 206da1e..9b83411 100644
--- a/UI-Project/src/views/largescreendisplay/timeaxis.vue
+++ b/UI-Project/src/views/largescreendisplay/timeaxis.vue
@@ -35,7 +35,6 @@
import { useI18n } from 'vue-i18n'
import { useRouter, useRoute } from "vue-router"
import request from "@/utils/request"
-import { host, WebSocketHost } from '@/utils/constants'
import { onBeforeUnmount, onMounted, onUnmounted, reactive, ref } from "vue";
import { closeWebSocket, initializeWebSocket } from '@/utils/WebSocketService';
import { ElMessage, ElMessageBox } from 'element-plus'
diff --git a/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/bigstorage/service/impl/BigStorageCageDetailsServiceImpl.java b/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/bigstorage/service/impl/BigStorageCageDetailsServiceImpl.java
index 073cc6c..9905baf 100644
--- a/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/bigstorage/service/impl/BigStorageCageDetailsServiceImpl.java
+++ b/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/bigstorage/service/impl/BigStorageCageDetailsServiceImpl.java
@@ -605,7 +605,7 @@
Set<String> projectNoSet = projectList.stream()
.map(OptimizeProject::getProjectNo)
.collect(Collectors.toSet());
- List<OptimizeProject> resultList= new ArrayList<>();
+ List<OptimizeProject> resultList = new ArrayList<>();
for (TemperingGlassCountDTO dto : temperingGlassCountDTOS) {
if (projectNoSet.contains(dto.getEngineerId())) {
OptimizeProject project = new OptimizeProject();
@@ -625,6 +625,15 @@
@Override
public List<BigCageDetailsVO> queryVerticalSheetCageDetailsList(BigCageDetailsRequest request) {
- return baseMapper.queryVerticalSheetCageDetailsList(request);
+ List<BigCageDetailsVO> cageDetails = baseMapper.queryVerticalSheetCageDetailsList(request);
+ if (!(com.baomidou.mybatisplus.core.toolkit.StringUtils.isBlank(request.getFlowCardId()) &&
+ com.baomidou.mybatisplus.core.toolkit.StringUtils.isBlank(request.getFilmsId()) &&
+ com.baomidou.mybatisplus.core.toolkit.StringUtils.isBlank(request.getEngineerId()) &&
+ com.baomidou.mybatisplus.core.toolkit.StringUtils.isBlank(request.getGlassId()))) {
+ cageDetails = cageDetails.stream()
+ .filter(detail -> detail.getGlassId() != null)
+ .collect(Collectors.toList());
+ }
+ return cageDetails;
}
}
diff --git a/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/job/OpcPlcStorageCageNewTask.java b/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/job/OpcPlcStorageCageNewTask.java
index d37db06..dc3aaba 100644
--- a/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/job/OpcPlcStorageCageNewTask.java
+++ b/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/job/OpcPlcStorageCageNewTask.java
@@ -927,7 +927,7 @@
damage.setWorkingProcedure("澶х悊鐗囩");
damage.setRemark("杩涚鍓嶅崸杞珛");
damage.setStatus(1);
- damage.setType(item.getTaskState());
+ damage.setType(Const.GLASS_STATE_DAMAGE);
damageService.insertDamage(damage);
slotList.add(item.getTargetSlot());
}
@@ -952,7 +952,7 @@
damage.setWorkingProcedure("閽㈠寲鍓�");
damage.setRemark("杩涚鍚庡崸杞珛");
damage.setStatus(1);
- damage.setType(item.getTaskState());
+ damage.setType(Const.GLASS_STATE_DAMAGE);
damageService.insertDamage(damage);
slotList.add(item.getTargetSlot());
slotList.add(item.getStartSlot());
@@ -1026,7 +1026,7 @@
// if (!THROUGH_SLOT.equals(list.get(0).getSlot())) {
// 涓存椂瑙ｅ喅鏂规:鍑虹墖鏃惰�冭檻鐜荤拑纰版挒锛屾敼涓轰竴鐗囦竴鍑�
// 鐣岄潰鍏抽棴璋冨害寮�鍏� !Const.BIG_STORAGE_BEFORE_DISPATCH.equals(taskType)
- if (list.get(0).getSlot() >= 500 && list.get(0).getThickness() > 7) {
+ if (list.get(0).getSlot() >= 500 && list.get(0).getThickness() > 8) {
outGlassList = list.subList(0, 1);
} else {
List<String> glassIdList = bigStorageGlassRelationInfoService.queryNeedOutGlassId(
diff --git a/hangzhoumesParent/moduleService/TemperingGlassModule/src/main/java/com/mes/job/TemperingTask.java b/hangzhoumesParent/moduleService/TemperingGlassModule/src/main/java/com/mes/job/TemperingTask.java
index 48ff215..63ee9ba 100644
--- a/hangzhoumesParent/moduleService/TemperingGlassModule/src/main/java/com/mes/job/TemperingTask.java
+++ b/hangzhoumesParent/moduleService/TemperingGlassModule/src/main/java/com/mes/job/TemperingTask.java
@@ -154,7 +154,7 @@
damage.setWorkingProcedure("閽㈠寲");
damage.setRemark("閽㈠寲");
damage.setStatus(1);
- damage.setType(e.getState());
+ damage.setType(Const.GLASS_STATE_DAMAGE);
return damage;
}).collect(Collectors.toList());
damageService.batchInsertDamage(damageList);
diff --git a/hangzhoumesParent/moduleService/hollowGlassModule/src/main/java/com/mes/hollow/service/impl/HollowBigStorageCageDetailsServiceImpl.java b/hangzhoumesParent/moduleService/hollowGlassModule/src/main/java/com/mes/hollow/service/impl/HollowBigStorageCageDetailsServiceImpl.java
index 4c08be8..32ab6a6 100644
--- a/hangzhoumesParent/moduleService/hollowGlassModule/src/main/java/com/mes/hollow/service/impl/HollowBigStorageCageDetailsServiceImpl.java
+++ b/hangzhoumesParent/moduleService/hollowGlassModule/src/main/java/com/mes/hollow/service/impl/HollowBigStorageCageDetailsServiceImpl.java
@@ -154,7 +154,16 @@
@Override
public List<HollowBigCageDetailsVO> queryVerticalSheetCageDetailsList(HollowBigCageDetailsRequest request) {
- return baseMapper.queryVerticalSheetCageDetailsList(request);
+ List<HollowBigCageDetailsVO> cageDetails = baseMapper.queryVerticalSheetCageDetailsList(request);
+ if (!(com.baomidou.mybatisplus.core.toolkit.StringUtils.isBlank(request.getFlowCardId()) &&
+ com.baomidou.mybatisplus.core.toolkit.StringUtils.isBlank(request.getFilmsId()) &&
+ com.baomidou.mybatisplus.core.toolkit.StringUtils.isBlank(request.getEngineerId()) &&
+ com.baomidou.mybatisplus.core.toolkit.StringUtils.isBlank(request.getGlassId()))) {
+ cageDetails = cageDetails.stream()
+ .filter(detail -> detail.getGlassId() != null)
+ .collect(Collectors.toList());
+ }
+ return cageDetails;
}
private List<HollowBigStorageAndDetailsDTO> hollowBigStorageCageDetailsChild(String glassId, Integer deviceId, Integer slot, int state) {
diff --git a/hangzhoumesParent/moduleService/hollowGlassModule/src/main/java/com/mes/job/OpcPlcStorageCageHollowTask.java b/hangzhoumesParent/moduleService/hollowGlassModule/src/main/java/com/mes/job/OpcPlcStorageCageHollowTask.java
index 3f8fe30..a9fd872 100644
--- a/hangzhoumesParent/moduleService/hollowGlassModule/src/main/java/com/mes/job/OpcPlcStorageCageHollowTask.java
+++ b/hangzhoumesParent/moduleService/hollowGlassModule/src/main/java/com/mes/job/OpcPlcStorageCageHollowTask.java
@@ -993,7 +993,7 @@
damage.setWorkingProcedure("纾ㄨ竟");
damage.setRemark("杩涚鍓嶅崸杞珛");
damage.setStatus(1);
- damage.setType(item.getTaskState());
+ damage.setType(Const.GLASS_STATE_DAMAGE);
damageService.insertDamage(damage);
slotList.add(item.getTargetSlot());
}
@@ -1018,7 +1018,7 @@
damage.setWorkingProcedure("涓┖鍓�");
damage.setRemark("杩涚鍚庡崸杞珛");
damage.setStatus(1);
- damage.setType(item.getTaskState());
+ damage.setType(Const.GLASS_STATE_DAMAGE);
damageService.insertDamage(damage);
slotList.add(item.getTargetSlot());
slotList.add(item.getStartSlot());
--
Gitblit v1.8.0