From cfd9f0b05e4e9b46c4d72ec5cefd3c04648648ea Mon Sep 17 00:00:00 2001
From: zhoushihao <zsh19950802@163.com>
Date: 星期一, 02 九月 2024 08:11:23 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
UI-Project/src/views/Returns/returns.vue | 3
UI-Project/src/views/Identify/identify.vue | 115 ++---
hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/job/DownLoadCacheGlassTask.java | 14
hangzhoumesParent/common/servicebase/src/main/java/com/mes/pp/entity/request/Reportingdamage.java | 4
hangzhoumesParent/JsonFile/PlcCacheVerticalGlass.json | 2
hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/job/PlcSlicecage.java | 9
hangzhoumesParent/common/servicebase/src/main/java/com/mes/order/entity/Orderdetail.java | 36 +
hangzhoumesParent/moduleService/CacheGlassModule/src/test/java/com/mes/CacheGlassModuleApplicationTest.java | 2
hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/job/PlcStorageCageTask.java | 38 +
hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/bigstorage/entity/BigStorageCageDetails.java | 12
hangzhoumesParent/moduleService/TemperingGlassModule/src/main/java/com/mes/temperingglass/controller/TemperingGlassInfoController.java | 14
UI-Project/src/views/largescreen/largescreen.vue | 156 +++++--
hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/test/java/com/mes/CacheVerticalGlassModuleApplicationTest.java | 16
UI-Project/src/lang/zh.js | 9
hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/bigstorage/service/impl/BigStorageCageDetailsServiceImpl.java | 7
hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/bigstorage/controller/BigStorageCageDetailsController.java | 19
hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/resources/application.yml | 4
hangzhoumesParent/common/servicebase/src/main/java/com/mes/damage/service/DamageService.java | 2
hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/job/Downpush.java | 12
hangzhoumesParent/moduleService/TemperingGlassModule/src/main/java/com/mes/job/PlcTemperingGlassTask.java | 20
hangzhoumesParent/common/servicebase/src/main/java/com/mes/damage/controller/DamageController.java | 2
UI-Project/src/views/Slicecage/slicecage.vue | 4
hangzhoumesParent/common/servicebase/src/main/java/com/mes/damage/service/impl/DamageServiceImpl.java | 29
hangzhoumesParent/common/servicebase/src/main/java/com/mes/temperingglass/mapper/TemperingGlassInfoMapper.java | 12
UI-Project/src/views/PurchaseReturn/purchaseStorage.vue | 145 ++----
UI-Project/src/main.js | 2
hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downworkstation/controller/DownWorkstationController.java | 20
hangzhoumesParent/common/servicebase/src/main/java/com/mes/temperingglass/service/impl/TemperingGlassInfoServiceImpl.java | 42 -
UI-Project/src/views/PurchaseReturn/purchaseReturn.vue | 445 ++++++++++++++++----
hangzhoumesParent/moduleService/TemperingGlassModule/src/main/java/com/mes/job/PlcScreenTask.java | 6
30 files changed, 785 insertions(+), 416 deletions(-)
diff --git a/UI-Project/src/lang/zh.js b/UI-Project/src/lang/zh.js
index 7c79146..d365f5b 100644
--- a/UI-Project/src/lang/zh.js
+++ b/UI-Project/src/lang/zh.js
@@ -104,7 +104,8 @@
},
order:{
dilapidation:'鐮存崯',
- Takeaway:'浜哄伐鎷胯蛋',
+ takeaway:'浜哄伐鎷胯蛋',
+ takeon:'鎽嗙墖瀹屾垚',
},
searchOrder:{
cageinformation:'鐞嗙墖绗间俊鎭�',
@@ -263,6 +264,8 @@
height:'楂�',
thickness:'鍘�',
glasstakeout:'鐜荤拑鎷胯蛋娓呭崟',
+ layoutID:'鐗堝浘ID',
+ glassID:'鐜荤拑ID',
},
reportWork:{
lowerbit:'涓嬬墖浣�',
@@ -455,6 +458,10 @@
projectnumber: '宸ョ▼鍙�',
right: '姝ｅ父',
stop: '缁堟',
+ inquire: '鏌ヨ',
+ starttime :'寮�濮嬫椂闂�',
+ endtime :'缁撴潫鏃堕棿',
+ loading :'姝ｅ湪涓婄墖锛�',
},
reportmanage:{
productiontime :'鐢熶骇鏃堕棿',
diff --git a/UI-Project/src/main.js b/UI-Project/src/main.js
index 30b5a74..166ffa7 100644
--- a/UI-Project/src/main.js
+++ b/UI-Project/src/main.js
@@ -23,7 +23,7 @@
app.use(VXETable)
app.use(pinia)
app.use(router)
-app.use(ElementPlus)
+// app.use(ElementPlus)
app.use(ElementPlus,{
locale: zhCn,
})
diff --git a/UI-Project/src/views/Identify/identify.vue b/UI-Project/src/views/Identify/identify.vue
index cfac9d0..8d2760c 100644
--- a/UI-Project/src/views/Identify/identify.vue
+++ b/UI-Project/src/views/Identify/identify.vue
@@ -11,8 +11,8 @@
@current-change="handleCurrentChange"
/>
</div>
- <el-card style="flex: 1;margin-left: 10px;margin-top: 10px;margin-right: 10px;height: 600px;" v-loading="loading">
- <el-scrollbar height="550px" width="1200px" style="background-color: #e9e9eb;">
+ <el-card style="flex: 1;margin-left: 10px;margin-top: 10px;margin-right: 10px;height: 800px;" v-loading="loading">
+ <el-scrollbar height="750px" width="1400px" style="background-color: #e9e9eb;">
<div style="position: relative;">
<div
v-for="(rect, index) in adjustedRects"
@@ -35,12 +35,12 @@
</div>
</el-scrollbar>
<el-dialog v-model="blind" top="30vh" width="15%" style="text-align: center;" @close="handleDialogClose">
- <el-button type="warning" plain :icon="Delete" @click="handleDamage(currentGlassId)" style="width: 140px;margin-left: 10px;">
+ <el-button :disabled="currentGlassRect?.glass_state === 8" type="warning" plain :icon="Delete" @click="handleDamage(currentGlassId)" style="width: 140px;margin-left: 10px;">
{{ $t('order.dilapidation') }}
</el-button>
- <el-button type="danger" plain @click="handleManualTake(currentGlassId)" style="width: 140px;margin-top: 10px;">
+ <el-button :disabled="currentGlassRect?.glass_state === 9" type="danger" plain @click="handleManualTake(currentGlassId)" style="width: 140px;margin-top: 10px;">
<el-icon class="el-icon--right"><Upload /></el-icon>
- {{ $t('order.Takeaway') }}</el-button>
+ {{ $t('order.takeaway') }}</el-button>
</el-dialog>
</el-card>
</template>
@@ -60,6 +60,7 @@
const glass_id = ref();
const inputValue = ref('');
const currentGlassId = ref(null); // 瀛樺偍褰撳墠鐐瑰嚮鐭╁舰鐨� glass_id
+const currentstate = ref(null);
const adjustedRects = ref([]);
const raw = ref([]);
let webSocket: WebSocket | null = null;
@@ -68,12 +69,15 @@
const currentPage = ref(1);
const disabled = false;
const size = 'small';
-const rawData = ref([]);
+const rawData = ref([]);
// const handleBind = (row) => {
// blind.value = true; // 鎵撳紑缁戝畾鏋跺瓙瀵硅瘽妗�
// };
// 鏄剧ず瀵硅瘽妗嗗苟璁剧疆褰撳墠 glass_id
-function showDialog(glassId: number) {
+const currentGlassRect = computed(() => {
+ return adjustedRects.value.find(rect => rect.glass_id === currentGlassId.value);
+});
+function showDialog(glassId: number) {
currentGlassId.value = glassId;
blind.value = true;
adjustedRects.value = adjustedRects.value.map(rect =>
@@ -103,7 +107,7 @@
// window.location.reload()
blind.value = false;
updateRectStatus(currentGlassId.value, 8);
- } else {
+ } else {
// 璇锋眰澶辫触锛屾樉绀洪敊璇秷鎭�
ElMessage.error(response.msg);
}
@@ -131,7 +135,7 @@
// window.location.reload()
blind.value = false;
updateRectStatus(currentGlassId.value, 9);
- } else {
+ } else {
// 璇锋眰澶辫触锛屾樉绀洪敊璇秷鎭�
ElMessage.error(response.msg);
}
@@ -146,20 +150,19 @@
var url="/cacheGlass/taskCache/cutTerritory?current="+inputValue.value;
const response = await request.post(url)
if (response.code === 200) {
- console.log(response.data);
-
const rawRects = response.data[0];
rawData.value = response.data;
totalPages.value = rawData.value.length;
const scaleFactor = 1621.78/6000;
+ const scaleFactory = 750/3300;
adjustedRects.value = rawRects.map(rect => ({
...rect,
x_axis: (6000 -(rect.x_axis + rect.width)) * scaleFactor,
- y_axis: rect.y_axis * 0.17,
+ y_axis: rect.y_axis * scaleFactory,
width: rect.width * scaleFactor ,
widtha: rect.width ,
heighta: rect.height ,
- height: rect.height * 0.165 ,
+ height: rect.height * scaleFactory,
glass_state: rect.glass_state
}));
// 濡傛灉WebSocket宸茶繛鎺ワ紝鍒欏叧闂�
@@ -177,36 +180,35 @@
currentPage.value = val;
const page = currentPage.value - 1
const scaleFactor = 1621.78/6000;
+ const scaleFactory = 750/3300;
adjustedRects.value = rawData.value[page]?.map(rect => ({
// adjustedRects.value = rawRects.map(rect => ({
...rect,
x_axis: (6000 -(rect.x_axis + rect.width)) * scaleFactor,
- y_axis: rect.y_axis * 0.17,
+ y_axis: rect.y_axis * scaleFactory,
width: rect.width * scaleFactor ,
widtha: rect.width ,
heighta: rect.height ,
- height: rect.height * 0.165 ,
+ height: rect.height * scaleFactory,
glass_state: rect.glass_state
- }));
+ }));
};
-function getRectColor(state: number): string {
- switch (state) {
- case 0:
- return '#e1f3d8';
- case 100:
- return '#c8c9cc';
- case 110:
- return '#b3e19d';
- case 120:
- return '#f89898';
- case 8:
- return '#911005';
- case 9:
- return '#f3d19e';
- // default:
- // return '#911005'; // 榛樿棰滆壊
- }
-}
+function getRectColor(state: number): string {
+ switch (state) {
+ case 0:
+ return '#e1f3d8';
+ case 100:
+ return '#c8c9cc';
+ case 110:
+ return '#b3e19d';
+ case 120:
+ return '#f89898';
+ case 8:
+ return '#911005';
+ case 9:
+ return '#f3d19e';
+ }
+}
// 鏇存柊鐭╁舰鐘舵��
function updateRectStatus(glassId: string, status: number) {
adjustedRects.value.forEach(rect => {
@@ -215,50 +217,25 @@
}
});
}
-// const connectWebSocket = () => {
-// if (!webSocket) {
-// const socketUrl = `ws://${WebSocketHost}:${host}/api/cacheGlass/api/talk/cacheGlass`;
-// webSocket = new WebSocket(socketUrl);
-// webSocket.onmessage = (event) => {
-// const data = JSON.parse(event.data);
-// const scaleFactor = 1621.78/6000;
-// adjustedRects.value = data.currentCutTerritory[0].map(rect => ({
-// ...rect,
-// x_axis: (6000 -(rect.x_axis + rect.width)) * scaleFactor,
-// y_axis: rect.y_axis * 0.17,
-// width: rect.width * scaleFactor ,
-// widtha: rect.width ,
-// heighta: rect.height ,
-// height: rect.height * 0.165 ,
-// glass_state: rect.glass_state,
-// isActive: false
-// }));
-// };
-// webSocket.onerror = (error) => {
-// console.error('WebSocket Error:', error);
-// };
-// webSocket.onclose = () => {
-// console.log('WebSocket Connection Closed');
-// // 鍙互閫夋嫨閲嶆柊杩炴帴
-// };
-// }
-// };
const connectWebSocket = () => {
if (!webSocket) {
const socketUrl = `ws://${WebSocketHost}:${host}/api/cacheGlass/api/talk/cacheGlass`;
webSocket = new WebSocket(socketUrl);
webSocket.onmessage = (event) => {
const data = JSON.parse(event.data);
- const scaleFactor = 1621.78 / 6000;
+ const scaleFactor = 1621.78/6000;
+ const scaleFactory = 750/3300;
+ if (data.currentCutTerritory && data.currentCutTerritory.length > 0) {
const newRects = data.currentCutTerritory[0].map(rect => {
const existingRect = adjustedRects.value.find(r => r.glass_id === rect.glass_id);
+
if (existingRect) {
return {
...existingRect,
x_axis: (6000 - (rect.x_axis + rect.width)) * scaleFactor,
- y_axis: rect.y_axis * 0.17,
+ y_axis: rect.y_axis * scaleFactory,
width: rect.width * scaleFactor,
- height: rect.height * 0.165,
+ height: rect.height * scaleFactory,
widtha: rect.width,
heighta: rect.height,
glass_state: rect.glass_state,
@@ -269,9 +246,9 @@
return {
...rect,
x_axis: (6000 - (rect.x_axis + rect.width)) * scaleFactor,
- y_axis: rect.y_axis * 0.17,
+ y_axis: rect.y_axis * scaleFactory,
width: rect.width * scaleFactor,
- height: rect.height * 0.165,
+ height: rect.height * scaleFactory,
widtha: rect.width,
heighta: rect.height,
glass_state: rect.glass_state,
@@ -281,10 +258,12 @@
}
});
adjustedRects.value = newRects;
+ } else if (data.currentCutTerritory == '') {
+ adjustedRects.value = [];
+ }
};
}
};
-
onMounted(() => {
// 鍒濆鏃讹紝濡傛灉杈撳叆妗嗕负绌猴紝鍒欒繛鎺ebSocket
if (!inputValue.value) {
diff --git a/UI-Project/src/views/PurchaseReturn/purchaseReturn.vue b/UI-Project/src/views/PurchaseReturn/purchaseReturn.vue
index fdfcfd0..fe85ccf 100644
--- a/UI-Project/src/views/PurchaseReturn/purchaseReturn.vue
+++ b/UI-Project/src/views/PurchaseReturn/purchaseReturn.vue
@@ -1,5 +1,5 @@
-<script setup>
-import {Search} from "@element-plus/icons-vue";
+<script setup lang="ts">
+import {Search ,Delete, Upload,Edit} from "@element-plus/icons-vue";
import {reactive} from "vue";
import request from "@/utils/request"
import { ref, onMounted, onBeforeUnmount,nextTick } from 'vue';
@@ -21,6 +21,15 @@
const dialogVisible = ref(false)
const width = ref();
const height = ref();
+const currentRect = ref(null);
+const canSelectProject1 = ref(true);
+const canSelectProject2 = ref(true);
+const canSelectProjecta = ref(true);
+const cantakea = ref(true);
+const cantakeb = ref(true);
+const canona = ref(true);
+const canonb = ref(true);
+const canSelectProjectb = ref(true);
const adjustedRects1 = ref([]);
const adjustedRects2 = ref([]);
const adjustedRectsa = ref([]);
@@ -85,9 +94,16 @@
};
const socketUrl = `ws://${WebSocketHost}:${host}/api/temperingGlass/api/talk/temperingGlass`;
const handleMessage = (data) => {
+ // 杩涚倝涓彸
if (data.intoGlass2 && data.intoGlass2.length > 0) {
+ // 鎻愬彇鏂扮殑鐭╁舰ID
+ const newGlassIds = new Set(data.intoGlass2[0].map(rect => rect.glassId));
+ // 杩囨护鍑哄凡瀛樺湪鐨勭煩褰�
+ const existingRects = adjustedRects2.value.filter(rect => newGlassIds.has(rect.glassId));
+ // 璁＄畻鏂扮殑鐭╁舰
const newRects = data.intoGlass2[0].map(rect => {
const scaleFactor = 794.67/5087;
+ const scaleFactorY = 430/2800;
let adjustedWidth, adjustedHeight, adjustedWidtha, adjustedHeighta,widtha,heighta;;
let newX = rect.yCoordinate;
if (rect.width < rect.height) {
@@ -99,13 +115,13 @@
}
if (rect.angle === 0) {
adjustedWidth = widtha * scaleFactor;
- adjustedHeight = heighta * 0.1;
+ adjustedHeight = heighta * scaleFactorY;
// adjustedWidtha = widtha;
// adjustedHeighta = heighta;
newX = 5087 - (rect.yCoordinate + widtha);
} else {
adjustedWidth = heighta * scaleFactor;
- adjustedHeight = widtha * 0.1;
+ adjustedHeight = widtha * scaleFactorY;
// adjustedWidtha = widtha;
// adjustedHeighta = heighta;
newX = 5087 - (rect.yCoordinate + heighta);
@@ -113,25 +129,32 @@
return {
...rect,
xcoordinate: newX * scaleFactor,
- ycoordinate: rect.xCoordinate * 0.1,
+ ycoordinate: rect.xCoordinate * scaleFactorY,
width: adjustedWidth,
height: adjustedHeight,
widtha: rect.width,
heighta: rect.height,
}
- });
- // 鍚堝苟鏂版棫鐭╁舰锛屼繚鐣� isActive 鐘舵��
- adjustedRects2.value = adjustedRects2.value.map(oldRect => {
+ });
+ // 鍚堝苟鏂版棫鐭╁舰锛屽苟淇濈暀 isActive 鐘舵��
+ adjustedRects2.value = existingRects.map(oldRect => {
const newRect = newRects.find(r => r.glassId === oldRect.glassId);
if (newRect) {
return { ...oldRect, ...newRect, isActive: oldRect.isActive };
}
- return oldRect; // 濡傛灉鏃х煩褰㈠湪鏂版暟鎹腑涓嶅瓨鍦紝鍒欎繚鐣欏師鏍�
- }).concat(newRects.filter(r => !adjustedRects2.value.some(o => o.glassId === r.glassId)));
+ return oldRect; // 濡傛灉鏃х煩褰㈠湪鏂版暟鎹腑涓嶅瓨鍦紝浣嗕繚鐣欏湪newGlassIds涓紝鍒欎繚鐣欏師鏍�
+ }).concat(newRects.filter(r => !existingRects.some(o => o.glassId === r.glassId)));
+ }
+ else if (data.intoGlass2 == null) {
+ adjustedRects2.value = []
}
+ // 杩涚倝涓乏
if (data.intoGlass && data.intoGlass.length > 0) {
+ const newGlassIds = new Set(data.intoGlass[0].map(rect => rect.glassId));
+ const existingRects = adjustedRects1.value.filter(rect => newGlassIds.has(rect.glassId));
const newRects = data.intoGlass[0].map(rect => {
- const scaleFactor = 794.67/5087;
+ const scaleFactor = 810.89/5087;
+ const scaleFactorY = 430/2800;
let adjustedWidth, adjustedHeight, adjustedWidtha, adjustedHeighta,widtha,heighta;;
let newX = rect.yCoordinate;
if (rect.width < rect.height) {
@@ -143,13 +166,13 @@
}
if (rect.angle === 0) {
adjustedWidth = widtha * scaleFactor;
- adjustedHeight = heighta * 0.1;
+ adjustedHeight = heighta * scaleFactorY;
// adjustedWidtha = widtha;
// adjustedHeighta = heighta;
newX = 5087 - (rect.yCoordinate + widtha);
} else {
adjustedWidth = heighta * scaleFactor;
- adjustedHeight = widtha * 0.1;
+ adjustedHeight = widtha * scaleFactorY;
// adjustedWidtha = widtha;
// adjustedHeighta = heighta;
newX = 5087 - (rect.yCoordinate + heighta);
@@ -157,26 +180,32 @@
return {
...rect,
xcoordinate: newX * scaleFactor,
- ycoordinate: rect.xCoordinate * 0.1,
+ ycoordinate: rect.xCoordinate * scaleFactorY,
width: adjustedWidth,
height: adjustedHeight,
widtha: rect.width,
heighta: rect.height,
}
- });
- // 鍚堝苟鏂版棫鐭╁舰锛屼繚鐣� isActive 鐘舵��
- adjustedRects1.value = adjustedRects1.value.map(oldRect => {
+ });
+ // 鍚堝苟鏂版棫鐭╁舰锛屽苟淇濈暀 isActive 鐘舵��
+ adjustedRects1.value = existingRects.map(oldRect => {
const newRect = newRects.find(r => r.glassId === oldRect.glassId);
if (newRect) {
return { ...oldRect, ...newRect, isActive: oldRect.isActive };
}
- return oldRect; // 濡傛灉鏃х煩褰㈠湪鏂版暟鎹腑涓嶅瓨鍦紝鍒欎繚鐣欏師鏍�
- }).concat(newRects.filter(r => !adjustedRects1.value.some(o => o.glassId === r.glassId)));
+ return oldRect; // 濡傛灉鏃х煩褰㈠湪鏂版暟鎹腑涓嶅瓨鍦紝浣嗕繚鐣欏湪newGlassIds涓紝鍒欎繚鐣欏師鏍�
+ }).concat(newRects.filter(r => !existingRects.some(o => o.glassId === r.glassId)));
+ }
+ else if (data.overGlass == null) {
+ adjustedRects1.value = []
}
if (data.waitingGlass && data.waitingGlass.length > 0) {
+ const newGlassIds = new Set(data.waitingGlass[0].map(rect => rect.glassId));
+ const existingRects = adjustedRectsa.value.filter(rect => newGlassIds.has(rect.glassId));
const newRects = data.waitingGlass[0].map(rect => {
- const scaleFactor = 1621.78/5190;
- let adjustedWidth, adjustedHeight, adjustedWidtha, adjustedHeighta,widtha,heighta;;
+ const scaleFactor = 1390/5190;
+ const scaleFactorY = 750/2800;
+ let adjustedWidth, adjustedHeight, adjustedWidtha, adjustedHeighta,widtha,heighta;;
let newX = rect.yCoordinate;
if (rect.width < rect.height) {
widtha = rect.height;
@@ -187,13 +216,13 @@
}
if (rect.angle === 0) {
adjustedWidth = widtha * scaleFactor;
- adjustedHeight = heighta * 0.16;
+ adjustedHeight = heighta * scaleFactorY;
// adjustedWidtha = widtha;
// adjustedHeighta = heighta;
newX = 5190 - (rect.yCoordinate + widtha);
} else {
adjustedWidth = heighta * scaleFactor;
- adjustedHeight = widtha * 0.16;
+ adjustedHeight = widtha * scaleFactorY;
// adjustedWidtha = widtha;
// adjustedHeighta = heighta;
newX = 5190 - (rect.yCoordinate + heighta);
@@ -201,26 +230,34 @@
return {
...rect,
x: newX * scaleFactor,
- y: rect.xCoordinate * 0.16,
+ y: rect.xCoordinate * scaleFactorY,
width: adjustedWidth,
height: adjustedHeight,
widtha: rect.width,
heighta: rect.height,
}
- });
- // 鍚堝苟鏂版棫鐭╁舰锛屼繚鐣� isActive 鐘舵��
- adjustedRectsa.value = adjustedRectsa.value.map(oldRect => {
+ });
+ // 鍚堝苟鏂版棫鐭╁舰锛屽苟淇濈暀 isActive 鐘舵��
+ adjustedRectsa.value = existingRects.map(oldRect => {
const newRect = newRects.find(r => r.glassId === oldRect.glassId);
if (newRect) {
return { ...oldRect, ...newRect, isActive: oldRect.isActive };
}
- return oldRect; // 濡傛灉鏃х煩褰㈠湪鏂版暟鎹腑涓嶅瓨鍦紝鍒欎繚鐣欏師鏍�
- }).concat(newRects.filter(r => !adjustedRectsa.value.some(o => o.glassId === r.glassId)));
+ return oldRect; // 濡傛灉鏃х煩褰㈠湪鏂版暟鎹腑涓嶅瓨鍦紝浣嗕繚鐣欏湪newGlassIds涓紝鍒欎繚鐣欏師鏍�
+ }).concat(newRects.filter(r => !existingRects.some(o => o.glassId === r.glassId)));
+ }
+ else if (data.waitingGlass == null) {
+ adjustedRectsa.value = []
}
if (data.outGlass && data.outGlass.length > 0) {
+ // 鎻愬彇鏂扮殑鐭╁舰ID
+ const newGlassIds = new Set(data.outGlass[0].map(rect => rect.glassId));
+ // 杩囨护鍑哄凡瀛樺湪鐨勭煩褰�
+ const existingRects = adjustedRectsb.value.filter(rect => newGlassIds.has(rect.glassId));
+ // 璁＄畻鏂扮殑鐭╁舰
const newRects = data.outGlass[0].map(rect => {
- const scaleFactor = 1621.78/5190;
- const scaleFactory = 550/2800;
+ const scaleFactor = 1390/5190;
+ const scaleFactory = 750/2800;
let adjustedWidth, adjustedHeight, adjustedWidtha, adjustedHeighta,widtha,heighta,newY;
let newX = rect.yCoordinate;
if (rect.width < rect.height) {
@@ -254,37 +291,92 @@
widtha: rect.width,
heighta: rect.height,
}
- });
- // 鍚堝苟鏂版棫鐭╁舰锛屼繚鐣� isActive 鐘舵��
- adjustedRectsb.value = adjustedRectsb.value.map(oldRect => {
+ });
+
+ // 鍚堝苟鏂版棫鐭╁舰锛屽苟淇濈暀 isActive 鐘舵��
+ adjustedRectsb.value = existingRects.map(oldRect => {
const newRect = newRects.find(r => r.glassId === oldRect.glassId);
if (newRect) {
return { ...oldRect, ...newRect, isActive: oldRect.isActive };
}
- return oldRect; // 濡傛灉鏃х煩褰㈠湪鏂版暟鎹腑涓嶅瓨鍦紝鍒欎繚鐣欏師鏍�
- }).concat(newRects.filter(r => !adjustedRectsb.value.some(o => o.glassId === r.glassId)));
+ return oldRect; // 濡傛灉鏃х煩褰㈠湪鏂版暟鎹腑涓嶅瓨鍦紝浣嗕繚鐣欏湪newGlassIds涓紝鍒欎繚鐣欏師鏍�
+ }).concat(newRects.filter(r => !existingRects.some(o => o.glassId === r.glassId)));
+ }
+ else if (data.outGlass == null) {
+ adjustedRectsb.value = []
}
};
onMounted(() => {
initializeWebSocket(socketUrl, handleMessage);
});
-function updateRectColors() {
+function updateRectColorsa() {
adjustedRectsa.value.forEach(rect => {
if (rect.glassId === glassId) {
- rect.state = 5;
+ rect.state = 8;
+ }
+ });
+}
+function updateoutColorsa() {
+ adjustedRectsa.value.forEach(rect => {
+ if (rect.glassId === glassId) {
+ rect.state = 9;
+ }
+ });
+}
+function updateonColorsa() {
+ adjustedRectsa.value.forEach(rect => {
+ if (rect.glassId === glassId) {
+ rect.state = 1;
+ }
+ });
+}
+function updateRectColorsb() {
+ adjustedRectsb.value.forEach(rect => {
+ if (rect.glassId === glassId) {
+ rect.state = 8;
+ }
+ });
+}
+function updateoutColorsb() {
+ adjustedRectsb.value.forEach(rect => {
+ if (rect.glassId === glassId) {
+ rect.state = 9;
+ }
+ });
+}
+function updateonColorsb() {
+ adjustedRectsb.value.forEach(rect => {
+ if (rect.glassId === glassId) {
+ rect.state = 3;
+ }
+ });
+}
+function updateRectColors1() {
+ adjustedRects1.value.forEach(rect => {
+ if (rect.glassId === glassId) {
+ rect.state = 8;
+ }
+ });
+}
+function updateRectColors2() {
+ adjustedRects2.value.forEach(rect => {
+ if (rect.glassId === glassId) {
+ rect.state = 8;
}
});
}
function getRectColora(state) {
switch (state) {
case 0:
- return '#7AC5CD';
- case 1:
+ return '#7AC5CD';
+ case 1:
return '#95d475';
- case -1:
- return '#CDAF95';
- case 5:
- return '#911005';
+ case -1:
+ return '#CDAF95';
+ case 8:
+ return '#911005';
+ case 9:
+ return '#4682B4';
}
}
function getRectColorb(state) {
@@ -293,8 +385,10 @@
return '#eebe77';
case 4:
return '#CD6090';
- case 5:
- return '#911005';
+ case 8:
+ return '#911005';
+ case 9:
+ return '#4682B4';
}
}
function showDialog1(rect) {
@@ -305,6 +399,12 @@
currentGlassId.value = rect.glassId;
currenttemperingFeedSequence.value = rect.temperingFeedSequence;
blind1.value = true;
+ currentRect.value = rect;
+ if (currentRect.value.state == 8) {
+ canSelectProject1.value = false;
+ } else if (currentRect.value.state !== 8) {
+ canSelectProject1.value = true;
+ }
}
function showDialog2(rect) {
const index = adjustedRects2.value.findIndex(r => r.glassId === rect.glassId);
@@ -314,6 +414,12 @@
currentGlassId.value = rect.glassId;
currenttemperingFeedSequence.value = rect.temperingFeedSequence;
blind2.value = true;
+ currentRect.value = rect;
+ if (currentRect.value.state == 8) {
+ canSelectProject2.value = false;
+ } else if (currentRect.value.state !== 8) {
+ canSelectProject2.value = true;
+ }
}
function showDialoga(rect) {
const index = adjustedRectsa.value.findIndex(r => r.glassId === rect.glassId);
@@ -322,7 +428,23 @@
}
currentGlassId.value = rect.glassId;
currenttemperingFeedSequence.value = rect.temperingFeedSequence;
- blinda.value = true;
+ blinda.value = true;
+ currentRect.value = rect;
+ if (currentRect.value.state == 8) {
+ canSelectProjecta.value = false;
+ } else if (currentRect.value.state !== 8) {
+ canSelectProjecta.value = true;
+ }
+ if (currentRect.value.state == 9) {
+ cantakea.value = false;
+ } else if (currentRect.value.state !== 9) {
+ cantakea.value = true;
+ }
+ if (currentRect.value.state == 1) {
+ canona.value = false;
+ } else if (currentRect.value.state == 0) {
+ canona.value = true;
+ }
}
function showDialogb(rect) {
const index = adjustedRectsb.value.findIndex(r => r.glassId === rect.glassId);
@@ -332,6 +454,22 @@
currentGlassId.value = rect.glassId;
currenttemperingFeedSequence.value = rect.temperingFeedSequence;
blindb.value = true;
+ currentRect.value = rect;
+ if (currentRect.value.state == 8) {
+ canSelectProjectb.value = false;
+ } else if (currentRect.value.state !== 8) {
+ canSelectProjectb.value = true;
+ }
+ if (currentRect.value.state == 9) {
+ cantakeb.value = false;
+ } else if (currentRect.value.state !== 9) {
+ cantakeb.value = true;
+ }
+ if (currentRect.value.state == 3) {
+ canonb.value = false;
+ } else if (currentRect.value.state !== 3) {
+ canonb.value = true;
+ }
}
const handleDialogClose1 = () => {
adjustedRects1.value.forEach(rect => {
@@ -364,13 +502,13 @@
glassId: currentGlassId.value,
// temperingFeedSequence: currenttemperingFeedSequence.value,
line: 4001,
- status: 2,
+ status: 8,
workingProcedure: '閽㈠寲',
})
if (response.code == 200) {
- ElMessage.success(response.message);
+ ElMessage.success('鎴愬姛锛�');
blind1.value = false;
- updateRectColors();
+ updateRectColors1();
} else {
// 璇锋眰澶辫触锛屾樉绀洪敊璇秷鎭�
ElMessage.error(response.message);
@@ -385,15 +523,14 @@
try {
const response = await request.post('/temperingGlass/temperingGlassInfo/updateTemperingState', {
glassId: currentGlassId.value,
- // temperingFeedSequence: currenttemperingFeedSequence.value,
line: 4001,
- status: 2,
+ status: 8,
workingProcedure: '閽㈠寲',
})
if (response.code == 200) {
- ElMessage.success(response.message);
+ ElMessage.success('鎴愬姛锛�');
blind2.value = false;
- updateRectColors();
+ updateRectColors2();
} else {
// 璇锋眰澶辫触锛屾樉绀洪敊璇秷鎭�
ElMessage.error(response.message);
@@ -404,19 +541,19 @@
console.error(error);
}
}
+// 杩涚倝鍓嶇牬鎹�
const handleDamagea = async () => {
try {
const response = await request.post('/temperingGlass/temperingGlassInfo/updateTemperingState', {
glassId: currentGlassId.value,
- // temperingFeedSequence: currenttemperingFeedSequence.value,
line: 4001,
- status: 2,
+ status: 8,
workingProcedure: '閽㈠寲',
})
if (response.code == 200) {
- ElMessage.success(response.message);
+ ElMessage.success('鎴愬姛锛�');
blinda.value = false;
- updateRectColors();
+ updateRectColorsa();
} else {
// 璇锋眰澶辫触锛屾樉绀洪敊璇秷鎭�
ElMessage.error(response.message);
@@ -427,19 +564,19 @@
console.error(error);
}
}
-const handleDamageb = async () => {
+// 杩涚倝鍓嶄汉宸ユ嬁璧�
+const takeouta = async () => {
try {
const response = await request.post('/temperingGlass/temperingGlassInfo/updateTemperingState', {
glassId: currentGlassId.value,
- // temperingFeedSequence: currenttemperingFeedSequence.value,
line: 4001,
- status: 2,
+ status: 9,
workingProcedure: '閽㈠寲',
})
if (response.code == 200) {
- ElMessage.success(response.message);
- blindb.value = false;
- updateRectColors();
+ ElMessage.success('鎴愬姛锛�');
+ blinda.value = false;
+ updateoutColorsa();
} else {
// 璇锋眰澶辫触锛屾樉绀洪敊璇秷鎭�
ElMessage.error(response.message);
@@ -448,6 +585,98 @@
catch (error) {
// 澶勭悊閿欒
console.error(error);
+ }
+}
+// 杩涚倝鍓嶆斁鍥�
+const takeona = async () => {
+ try {
+ const response = await request.post('/temperingGlass/temperingGlassInfo/updateTemperingState', {
+ glassId: currentGlassId.value,
+ line: 4001,
+ status: 1,
+ workingProcedure: '閽㈠寲',
+ })
+ if (response.code == 200) {
+ ElMessage.success('鎴愬姛锛�');
+ blinda.value = false;
+ updateonColorsa();
+ } else {
+ // 璇锋眰澶辫触锛屾樉绀洪敊璇秷鎭�
+ ElMessage.error(response.message);
+ }
+}
+catch (error) {
+ // 澶勭悊閿欒
+ console.error(error);
+ }
+}
+// 宸插嚭鐐夌牬鎹�
+const handleDamageb = async () => {
+ try {
+ const response = await request.post('/temperingGlass/temperingGlassInfo/updateTemperingState', {
+ glassId: currentGlassId.value,
+ line: 4001,
+ status: 8,
+ workingProcedure: '閽㈠寲',
+ })
+ if (response.code == 200) {
+ ElMessage.success('鎴愬姛锛�');
+ blindb.value = false;
+ updateRectColorsb();
+ } else {
+ // 璇锋眰澶辫触锛屾樉绀洪敊璇秷鎭�
+ ElMessage.error(response.message);
+ }
+}
+catch (error) {
+ // 澶勭悊閿欒
+ // console.error(error);
+ }
+}
+// 宸插嚭鐐変汉宸ユ嬁璧�
+const takeoutb = async () => {
+ try {
+ const response = await request.post('/temperingGlass/temperingGlassInfo/updateTemperingState', {
+ glassId: currentGlassId.value,
+ line: 4001,
+ status: 9,
+ workingProcedure: '閽㈠寲',
+ })
+ if (response.code == 200) {
+ ElMessage.success('鎴愬姛锛�');
+ blindb.value = false;
+ updateoutColorsb();
+ } else {
+ // 璇锋眰澶辫触锛屾樉绀洪敊璇秷鎭�
+ ElMessage.error(response.message);
+ }
+}
+catch (error) {
+ // 澶勭悊閿欒
+ // console.error(error);
+ }
+}
+// 宸插嚭鐐夋斁鍥�
+const takeonb = async () => {
+ try {
+ const response = await request.post('/temperingGlass/temperingGlassInfo/updateTemperingState', {
+ glassId: currentGlassId.value,
+ line: 4001,
+ status: 3,
+ workingProcedure: '閽㈠寲',
+ })
+ if (response.code == 200) {
+ ElMessage.success('鎴愬姛锛�');
+ blindb.value = false;
+ updateonColorsb();
+ } else {
+ // 璇锋眰澶辫触锛屾樉绀洪敊璇秷鎭�
+ ElMessage.error(response.message);
+ }
+}
+catch (error) {
+ // 澶勭悊閿欒
+ // console.error(error);
}
}
onBeforeUnmount(() => {
@@ -463,11 +692,11 @@
<el-button id="searchButton" type="info" @click="dialogFormVisiblec = true;dialogFormVisibleb = false;dialogFormVisible = false;dialogFormVisiblea = false">{{ $t('processCard.print') }}</el-button>
<div v-if="dialogFormVisible" >
<el-card style="flex: 1;margin-left: 10px;margin-top: 10px;margin-right: 10px;height: 600px;" v-loading="loading">
-<div style="width: 49%;float: left;background-color: #f4f4f5;height: 550px;">
+<div style="width: 50%;float: left;background-color: #f4f4f5;height: 430px;">
<div v-if="adjustedRects1.length > 0">
<!-- <div style="text-align: center;">鐐夊彿锛歿{ engineerIdDisplay }}-{{ adjustedRects[0].temperingLayoutId }}</div> -->
<div style="text-align: center;"> 鐐夊彿锛歿{ adjustedRects1[0].engineerId }}-{{ adjustedRects1[0].temperingLayoutId }} </div>
- <el-scrollbar height="550px" style="background-color: #e9e9eb;">
+ <el-scrollbar height="430px" style="background-color: #e9e9eb;">
<div style="position: relative;max-width: 1400px;">
<div
v-for="(rect, index) in adjustedRects1"
@@ -479,23 +708,23 @@
left: `${rect.xcoordinate}px`,
width: `${rect.width}px`,
height: `${rect.height}px`,
- backgroundColor: rect.isActive ? '#ADFF2F' : rect.state === 5 ? '#911005' : 'lightblue' }"
+ backgroundColor: rect.isActive ? '#ADFF2F' : rect.state === 8 ? '#911005' : 'lightblue' }"
>
<div class="centered-text">
- <div >{{ rect.glassId }}</div>
- <div >{{ rect.flowCardId }}</div>
- <div>{{ rect.widtha }}*{{ rect.heighta }}</div>
+ <div style="font-size: 15px;font-weight: bold;">{{ rect.glassId }}</div>
+ <div style="font-size: 15px;font-weight: bold;">{{ rect.flowCardId }}</div>
+ <div style="font-size: 30px;font-weight: bold;">{{ rect.widtha }}*{{ rect.heighta }}</div>
</div>
</div>
</div>
</el-scrollbar>
</div>
</div>
-<div style="width: 49%;float: right;background-color: #f4f4f5;height: 550px;">
+<div style="width: 49%;float: right;background-color: #f4f4f5;height: 430px;">
<div v-if="adjustedRects2.length > 0">
<div style="text-align: center;"> 鐐夊彿锛歿{ adjustedRects2[0].engineerId }}-{{ adjustedRects2[0].temperingLayoutId }} </div>
<!-- <div style="text-align: center;">鐐夊彿锛歿{ engineerIdDisplay2 }}-{{ adjustedRects[0].temperingLayoutId }}</div> -->
- <el-scrollbar height="550px" style="background-color: #e9e9eb;">
+ <el-scrollbar height="430px" style="background-color: #e9e9eb;">
<div style="position: relative;max-width: 1400px;">
<div
v-for="(rect, index) in adjustedRects2"
@@ -507,12 +736,12 @@
left: `${rect.xcoordinate}px`,
width: `${rect.width}px`,
height: `${rect.height}px`,
- backgroundColor: rect.isActive ? '#ADFF2F' : rect.state === 5 ? '#911005' : 'lightblue' }"
+ backgroundColor: rect.isActive ? '#ADFF2F' : rect.state === 8 ? '#911005' : 'lightblue' }"
>
<div class="centered-text">
- <div >{{ rect.glassId }}</div>
- <div >{{ rect.flowCardId }}</div>
- <div>{{ rect.widtha }}*{{ rect.heighta }}</div>
+ <div style="font-size: 15px;font-weight: bold;">{{ rect.glassId }}</div>
+ <div style="font-size: 15px;font-weight: bold;">{{ rect.flowCardId }}</div>
+ <div style="font-size: 30px;font-weight: bold;">{{ rect.widtha }}*{{ rect.heighta }}</div>
</div>
</div>
</div>
@@ -523,11 +752,11 @@
</div>
<div v-if="dialogFormVisiblea">
<!-- 杩涚倝鍓� -->
- <el-card style="flex: 1;margin-left: 10px;margin-top: 10px;margin-right: 10px;height: 600px;" v-loading="loading">
+ <el-card style="flex: 1;margin-left: 10px;margin-top: 10px;margin-right: 10px;height: 800px;" v-loading="loading">
<div v-if="adjustedRectsa.length > 0">
<div style="text-align: center;"> 鐐夊彿锛歿{ adjustedRectsa[0].engineerId }}-{{ adjustedRectsa[0].temperingLayoutId }} </div>
<!-- <div style="text-align: center;">鐐夊彿锛歿{ engineerIdDisplaya }}-{{ adjustedRects[0].temperingLayoutId }}</div> -->
- <el-scrollbar height="550px" style="background-color: #e9e9eb;">
+ <el-scrollbar height="750px" style="background-color: #e9e9eb;">
<div style="position: relative;max-width: 1400px;">
<div
v-for="(rect, index) in adjustedRectsa"
@@ -538,9 +767,9 @@
width: `${rect.width}px`, height: `${rect.height}px`,
backgroundColor: rect.isActive ? '#ADFF2F' : getRectColora(rect.state) }">
<div class="centered-text">
- <div>{{ rect.glassId }}</div>
- <div >{{ rect.flowCardId }}</div>
- <div>{{ rect.widtha }}*{{ rect.heighta }}</div>
+ <div style="font-size: 15px;font-weight: bold;">{{ rect.glassId }}</div>
+ <div style="font-size: 15px;font-weight: bold;">{{ rect.flowCardId }}</div>
+ <div style="font-size: 30px;font-weight: bold;">{{ rect.widtha }}*{{ rect.heighta }}</div>
</div>
</div>
</div>
@@ -550,11 +779,11 @@
</div>
<div v-if="dialogFormVisibleb">
<!-- 宸插嚭鐐� -->
- <el-card style="flex: 1;margin-left: 10px;margin-top: 10px;margin-right: 10px;height: 600px;" v-loading="loading">
+ <el-card style="flex: 1;margin-left: 10px;margin-top: 10px;margin-right: 10px;height: 800px;" v-loading="loading">
<div v-if="adjustedRectsb.length > 0">
<div style="text-align: center;"> 鐐夊彿锛歿{ adjustedRectsb[0].engineerId }}-{{ adjustedRectsb[0].temperingLayoutId }} </div>
<!-- <div style="text-align: center;">鐐夊彿锛歿{ engineerIdDisplayb }}-{{ adjustedRects[0].temperingLayoutId }}</div> -->
- <el-scrollbar height="550px" style="background-color: #e9e9eb;">
+ <el-scrollbar height="750px" style="background-color: #e9e9eb;">
<div style="position: relative;max-width: 1400px;">
<div
v-for="(rect, index) in adjustedRectsb"
@@ -566,9 +795,9 @@
backgroundColor: rect.isActive ? '#ADFF2F' : getRectColorb(rect.state) }">
<!-- backgroundColor: rect.state === 4 ? '#911005' : '#f8e3c5' }"> -->
<div class="centered-text">
- <div >{{ rect.glassId }}</div>
- <div >{{ rect.flowCardId }}</div>
- <div>{{ rect.widtha }}*{{ rect.heighta }}</div>
+ <div style="font-size: 15px;font-weight: bold;">{{ rect.glassId }}</div>
+ <div style="font-size: 15px;font-weight: bold;">{{ rect.flowCardId }}</div>
+ <div style="font-size: 30px;font-weight: bold;">{{ rect.widtha }}*{{ rect.heighta }}</div>
</div>
</div>
</div>
@@ -578,49 +807,69 @@
</div>
<div v-if="dialogFormVisiblec">
<!-- 鎵撳嵃 -->
- <el-card style="flex: 1;margin-left: 10px;margin-top: 10px;margin-right: 10px;height: 600px;" v-loading="loading">
+ <el-card style="flex: 1;margin-left: 10px;margin-top: 10px;margin-right: 10px;height: 800px;" v-loading="loading">
<div style="display: flex; flex-direction: row; align-items: center; margin-top: 5px;margin-left: 10px;">
<el-input :placeholder="$t('processCard.projectnumber')" v-model="engineerId" autocomplete="off" style="width: 300px;"/>
<el-button type="primary" style="margin-left: 10px;" @click="selectReportData()">{{ $t('processCard.inquire') }}</el-button>
<el-button type="info" style="margin-left: 10px;" @click="printing()">{{ $t('processCard.printing') }}</el-button>
</div>
-
+
<el-card style="flex: 1;margin-left: 10px;margin-top: 15px;" v-loading="loading">
<div style="width: 98%; height: calc(100% - 35px); overflow-y: auto;">
<el-table
- height="350"
+ height="600"
ref="table"
:header-cell-style="{background:'#F2F3F5 ',color:'#1D2129'}"
:data="tableData"
>
<el-table-column prop="engineerId" :label="$t('processCard.project')" width="200" align="center"/>
- <el-table-column prop="workingProcedure" :label="$t('processCard.awayprocess')" align="center"/>
- <el-table-column prop="deviceName" :label="$t('processCard.awayequipment')" align="center"/>
- <el-table-column prop="teamsGroupsName" :label="$t('processCard.awayteam')" align="center"/>
+ <el-table-column prop="temperingLayoutId" :label="$t('processCard.layoutID')" align="center"/>
+ <el-table-column prop="temperingFeedSequence" :label="$t('processCard.temperingfeed')" align="center"/>
+ <el-table-column prop="glassId" :label="$t('processCard.glassID')" align="center"/>
+ <el-table-column prop="width" :label="$t('processCard.width')" align="center"/>
+ <el-table-column prop="height" :label="$t('processCard.height')" align="center"/>
+ <el-table-column prop="thickness" :label="$t('processCard.thickness')" align="center"/>
</el-table>
</div>
</el-card>
</el-card>
</div>
+<!-- 杩涚倝涓� -->
<el-dialog v-model="blind1" top="30vh" width="15%" style="text-align: center;" @close="handleDialogClose1">
- <el-button type="warning" plain :icon="Delete" @click="handleDamage1" style="width: 140px;margin-left: 10px;">
+ <el-button :disabled="!canSelectProject1" type="warning" plain :icon="Delete" @click="handleDamage1" style="width: 150px;margin-left: 10px;">
{{ $t('order.dilapidation') }}
</el-button>
</el-dialog>
<el-dialog v-model="blind2" top="30vh" width="15%" style="text-align: center;" @close="handleDialogClose2">
- <el-button type="warning" plain :icon="Delete" @click="handleDamage2" style="width: 140px;margin-left: 10px;">
+ <el-button :disabled="!canSelectProject2" type="warning" plain :icon="Delete" @click="handleDamage2" style="width: 150px;margin-left: 10px;">
{{ $t('order.dilapidation') }}
</el-button>
</el-dialog>
+ <!-- 杩涚倝鍓� -->
<el-dialog v-model="blinda" top="30vh" width="15%" style="text-align: center;" @close="handleDialogClosea">
- <el-button type="warning" plain :icon="Delete" @click="handleDamagea" style="width: 140px;margin-left: 10px;">
+ <el-button type="warning" plain :icon="Delete" @click="handleDamagea" :disabled="!canSelectProjecta" style="width: 150px;margin-left: 10px;">
{{ $t('order.dilapidation') }}
+ </el-button>
+ <el-button :disabled="!cantakea" type="danger" plain @click="takeouta" style="width: 150px;margin-left: 10px;margin-top: 10px;">
+ <el-icon class="el-icon--right"><Upload /></el-icon>
+ {{ $t('order.takeaway') }}
+ </el-button>
+ <el-button type="success" plain :icon="Edit" @click="takeona" :disabled="!canona" style="width: 150px;margin-left: 10px;margin-top: 10px;">
+ {{ $t('order.takeon') }}
</el-button>
</el-dialog>
+ <!-- 宸插嚭鐐� -->
<el-dialog v-model="blindb" top="30vh" width="15%" style="text-align: center;" @close="handleDialogCloseb">
- <el-button type="warning" plain :icon="Delete" @click="handleDamageb" style="width: 140px;margin-left: 10px;">
+ <el-button :disabled="!canSelectProjectb" type="warning" plain :icon="Delete" @click="handleDamageb" style="width: 150px;margin-left: 10px;">
{{ $t('order.dilapidation') }}
</el-button>
+ <el-button :disabled="!cantakeb" type="danger" plain @click="takeoutb" style="width: 150px;margin-left: 10px;margin-top: 10px;">
+ <el-icon class="el-icon--right"><Upload /></el-icon>
+ {{ $t('order.takeaway') }}
+ </el-button>
+ <!-- <el-button type="success" plain :icon="Edit" @click="takeonb" :disabled="!canonb" style="width: 150px;margin-left: 10px;margin-top: 10px;">
+ {{ $t('order.takeon') }}
+ </el-button> -->
</el-dialog>
<el-dialog
v-model="dialogVisible"
@@ -671,7 +920,7 @@
border: 1px solid black;
background-color: #337ecc;
display:flex;
- align-items:center;
+ align-items:center;
justify-content:center;
}
#home-card {
@@ -714,7 +963,7 @@
}
.rect {
border: 1px solid black; /* 璁剧疆鐭╁舰鐨勮竟妗� */
- background-color: lightblue; /* 璁剧疆鐭╁舰鐨勮儗鏅壊 */
+ /* background-color: lightblue; 璁剧疆鐭╁舰鐨勮儗鏅壊 */
}
#rect {
position: relative; /* 纭繚绠ご鍙互鐩稿浜庣煩褰㈠畾浣� */
diff --git a/UI-Project/src/views/PurchaseReturn/purchaseStorage.vue b/UI-Project/src/views/PurchaseReturn/purchaseStorage.vue
index 7f51276..bba4ca2 100644
--- a/UI-Project/src/views/PurchaseReturn/purchaseStorage.vue
+++ b/UI-Project/src/views/PurchaseReturn/purchaseStorage.vue
@@ -11,7 +11,8 @@
const adjustedRects = ref([]);
const currentGlassId = ref(null);
const currenttemperingFeedSequence = ref(null);
-
+const currentRect = ref(null);
+const canSelectProject = ref(true);
const dialogFormVisible = ref(true)
const dialogFormVisiblea = ref(false)
const blind = ref(false)
@@ -31,12 +32,18 @@
}
let socket = null;
const socketUrl = `ws://${WebSocketHost}:${host}/api/temperingGlass/api/talk/temperingGlass`;
-// 瀹氫箟娑堟伅澶勭悊鍑芥暟锛屾洿鏂� receivedData 鍙橀噺
-const handleMessage = (data) => {
- // 鏇存柊 tableData 鐨勬暟鎹�
- if(data.overGlass!=null){
- adjustedRects.value = data.overGlass[0].map(rect => {
- const scaleFactor = 1621.78/5190;
+const handleMessage = (data) => {
+ if (data.overGlass && data.overGlass.length > 0) {
+ // 鎻愬彇鏂扮殑鐭╁舰ID
+ const newGlassIds = new Set(data.overGlass[0].map(rect => rect.glassId));
+
+ // 杩囨护鍑哄凡瀛樺湪鐨勭煩褰�
+ const existingRects = adjustedRects.value.filter(rect => newGlassIds.has(rect.glassId));
+
+ // 璁＄畻鏂扮殑鐭╁舰
+ const newRects = data.overGlass[0].map(rect => {
+ const scaleFactor = 1390/5190;
+ const scaleFactorY = 750/2800;
let adjustedWidth, adjustedHeight, adjustedWidtha, adjustedHeighta,widtha,heighta;
let newX = rect.yCoordinate;
@@ -49,91 +56,35 @@
}
if (rect.angle === 0) {
adjustedWidth = widtha * scaleFactor;
- adjustedHeight = heighta * 0.16;
- // adjustedWidtha = widtha;
- // adjustedHeighta = heighta;
- // newX = 5190 - (rect.yCoordinate + rect.width);
+ adjustedHeight = heighta * scaleFactorY;
} else {
adjustedWidth = heighta * scaleFactor;
- adjustedHeight = widtha * 0.16;
- // adjustedWidtha = heighta;
- // adjustedHeighta = widtha;
- // newX = 5190 - (rect.yCoordinate + rect.height);
+ adjustedHeight = widtha * scaleFactorY;
}
return {
...rect,
xcoordinate: newX * scaleFactor,
- ycoordinate: rect.xCoordinate * 0.16,
+ ycoordinate: rect.xCoordinate * scaleFactorY,
width: adjustedWidth,
height: adjustedHeight,
widtha: rect.width,
heighta: rect.height,
- // isActive: false,
- };
-});
+ }
+ });
+
+ // 鍚堝苟鏂版棫鐭╁舰锛屽苟淇濈暀 isActive 鐘舵��
+ adjustedRects.value = existingRects.map(oldRect => {
+ const newRect = newRects.find(r => r.glassId === oldRect.glassId);
+ if (newRect) {
+ return { ...oldRect, ...newRect, isActive: oldRect.isActive };
+ }
+ return oldRect; // 濡傛灉鏃х煩褰㈠湪鏂版暟鎹腑涓嶅瓨鍦紝浣嗕繚鐣欏湪newGlassIds涓紝鍒欎繚鐣欏師鏍�
+ }).concat(newRects.filter(r => !existingRects.some(o => o.glassId === r.glassId)));
+ }
+ else if (data.overGlass == null) {
+ adjustedRects.value = []
}
};
-// const handleMessage = (data) => {
-// // 鍋囪 data.overGlass[0] 鏄煩褰㈡暟缁�
-// const newRects = data.overGlass[0].map(newRect => ({
-// ...newRect,
-// const scaleFactor = 1621.78 / 5190;
-// let widtha, heighta, adjustedWidth, adjustedHeight;
-
-// // 浜ゆ崲瀹藉害鍜岄珮搴︼紙濡傛灉鐭╁舰鏄�滄í鍚戔�濈殑锛�
-// if (rect.width < rect.height) {
-// widtha = rect.height;
-// heighta = rect.width;
-// } else {
-// widtha = rect.width;
-// heighta = rect.height;
-// }
-
-// // 鏍规嵁瑙掑害璋冩暣瀹藉害鍜岄珮搴�
-// if (rect.angle === 0) {
-// adjustedWidth = widtha * scaleFactor;
-// adjustedHeight = heighta * 0.16;
-// } else {
-// adjustedWidth = heighta * scaleFactor;
-// adjustedHeight = widtha * 0.16;
-// }
-
-// // 娉ㄦ剰锛氳繖閲屽彲鑳介渶瑕侀噸鏂拌�冭檻 newX 鐨勮绠楁柟寮�
-// // 鏆傛椂淇濈暀涓哄師濮� yCoordinate 鐨勫鐞嗭紝浣嗛�氬父 x 鍧愭爣涓嶅簲鏉ヨ嚜 y 鍧愭爣
-// let newX = rect.yCoordinate; // 鍙兘鏄釜閿欒锛岄櫎闈炴湁鐗瑰畾鐢ㄩ��
-
-// // 杩斿洖鏂扮殑鐭╁舰瀵硅薄
-// return {
-// ...rect, // 澶嶅埗鍘熷鐭╁舰鐨勬墍鏈夊睘鎬�
-// xcoordinate: newX * scaleFactor, // 娉ㄦ剰锛氳繖閲岀殑 newX 鍙兘闇�瑕佽皟鏁�
-// ycoordinate: rect.xCoordinate * 0.16,
-// width: adjustedWidth,
-// height: adjustedHeight,
-// widtha,
-// heighta,
-// isActive: false, // 榛樿涓洪潪婵�娲荤姸鎬�
-// // 鍙互娣诲姞鍏朵粬闇�瑕佺殑灞炴��
-// }
-// }));
-
- // 浣跨敤鏂版暟鎹洿鏂� adjustedRects
- // 娉ㄦ剰锛氳繖閲屾垜浠亣璁� adjustedRects.value 涓殑鐭╁舰涔熸湁 id 灞炴��
-// adjustedRects.value = adjustedRects.value.map(oldRect => {
-// const updatedRect = newRects.find(newRect => newRect.id === oldRect.id);
-// if (updatedRect) {
-// // 濡傛灉鎵惧埌浜嗗搴旂殑鐭╁舰锛屽垯鍚堝苟灞炴�у拰淇濈暀鍘熷婵�娲荤姸鎬侊紙濡傛灉闇�瑕佺殑璇濓級
-// // 浣嗗湪杩欎釜渚嬪瓙涓紝鎴戜滑鎬绘槸灏� isActive 璁剧疆涓� false
-// return {
-// ...oldRect,
-// ...updatedRect, // 鍚堝苟鏂扮煩褰㈢殑灞炴�э紝浣嗕細瑕嗙洊 isActive
-// isActive: false, // 鎬绘槸璁剧疆涓� false锛岄櫎闈炴偍鏈夋洿澶嶆潅鐨勯�昏緫
-// };
-// }
-// // 濡傛灉娌℃湁鎵惧埌瀵瑰簲鐨勭煩褰紝鍒欎繚鐣欏師鏍�
-// return oldRect;
-// }).concat(newRects.filter(newRect => !adjustedRects.value.some(oldRect => oldRect.id === newRect.id)));
-// // concat 鐢ㄤ簬娣诲姞閭ｄ簺鍦� adjustedRects.value 涓笉瀛樺湪鐨勬柊鐭╁舰
-// };
function updateRectColors() {
adjustedRects.value.forEach(rect => {
if (rect.glassId === glassId) {
@@ -151,17 +102,28 @@
return '#911005';
}
}
-function showDialog(rect) {
- rect.isActive = true;
+function showDialog(rect) {
+ const index = adjustedRects.value.findIndex(r => r.glassId === rect.glassId);
+ if (index !== -1) {
+ adjustedRects.value[index].isActive = true;
+ }
currentGlassId.value = rect.glassId;
currenttemperingFeedSequence.value = rect.temperingFeedSequence;
- blind.value = true;
+ blind.value = true;
+ currentRect.value = rect;
+ if (currentRect.value.state == 8) {
+ canSelectProject.value = false;
+ } else if (currentRect.value.state !== 8) {
+ canSelectProject.value = true;
+ }
}
+
const handleDialogClose = () => {
adjustedRects.value.forEach(rect => {
- rect.isActive = false; // 鍏抽棴瀵硅瘽妗嗘椂閲嶇疆鎵�鏈夌煩褰㈢殑 isActive 鐘舵��
+ rect.isActive = false;
});
-};
+ blind.value = false;
+};
// 鐮存崯
const handleDamage = async () => {
try {
@@ -203,11 +165,11 @@
<template>
<div style="margin-top: 10px;">
<div>
- <el-card style="flex: 1;margin-left: 10px;margin-top: 10px;margin-right: 10px;height: 600px;" v-loading="loading">
+ <el-card style="flex: 1;margin-left: 10px;margin-top: 10px;margin-right: 10px;height: 800px;" v-loading="loading">
<!-- <el-card style="margin-left: 10px;margin-top: 10px;margin-right: 10px;" v-loading="loading"> -->
<div v-if="adjustedRects.length > 0">
<div style="text-align: center;">鐐夊彿锛歿{ adjustedRects[0].engineerId }}-{{ adjustedRects[0].temperingLayoutId }}</div>
- <el-scrollbar height="550px" width="1200px" style="background-color: #e9e9eb;">
+ <el-scrollbar height="750px" width="1400px" style="background-color: #e9e9eb;">
<div style="position: relative;">
<div
v-for="(rect, index) in adjustedRects"
@@ -219,10 +181,9 @@
backgroundColor: rect.isActive ? '#ADFF2F' : getRectColora(rect.state)
}">
<div class="centered-text">
- <div >{{ rect.glassId }}</div>
- <div >{{ rect.flowCardId }}</div>
- <div>{{ rect.widtha }}*{{ rect.heighta }}</div>
- <!-- <div style="margin-top: 25px;margin-left: -60px;">{{ rect.widtha }}*{{ rect.heighta }}</div> -->
+ <div style="font-size: 15px;font-weight: bold;">{{ rect.glassId }}</div>
+ <div style="font-size: 15px;font-weight: bold;">{{ rect.flowCardId }}</div>
+ <div style="font-size: 30px;font-weight: bold;">{{ rect.widtha }}*{{ rect.heighta }}</div>
</div>
</div>
</div>
@@ -231,7 +192,7 @@
</el-card>
</div>
<el-dialog v-model="blind" top="30vh" width="15%" style="text-align: center;" @close="handleDialogClose">
- <el-button type="warning" plain :icon="Delete" @click="handleDamage" style="width: 140px;margin-left: 10px;">
+ <el-button :disabled="!canSelectProject" type="warning" plain :icon="Delete" @click="handleDamage" style="width: 140px;margin-left: 10px;">
{{ $t('order.dilapidation') }}
</el-button>
</el-dialog>
diff --git a/UI-Project/src/views/Returns/returns.vue b/UI-Project/src/views/Returns/returns.vue
index ad2298d..a3613f2 100644
--- a/UI-Project/src/views/Returns/returns.vue
+++ b/UI-Project/src/views/Returns/returns.vue
@@ -28,14 +28,13 @@
const filmsId = ref('');
const patternThickness = ref('');
const number = ref('');
-const canSelectProject = ref(true); // 鍋囪寮�濮嬫椂鍙互閫夋嫨椤圭洰
+const canSelectProject = ref(true);
const canStartLoading = ref(false);
import { WebSocketHost ,host} from '@/utils/constants'
import request from "@/utils/request"
const ida = ref(null);
import { initializeWebSocket, closeWebSocket } from '@/utils/WebSocketService';
import { ref, onMounted, onUnmounted, onBeforeUnmount } from "vue";
-// 鍝嶅簲寮忔暟鎹�
const selectedProjectNo = ref(''); // 褰撳墠閫変腑鐨勫伐绋嬪彿
const selectedProjectNoa = ref(''); // 褰撳墠閫変腑鐨勫伐绋嬪彿
const selectedValue = ref(''); // 褰撳墠閫変腑鐨勫
diff --git a/UI-Project/src/views/Slicecage/slicecage.vue b/UI-Project/src/views/Slicecage/slicecage.vue
index 75c4a83..894ec34 100644
--- a/UI-Project/src/views/Slicecage/slicecage.vue
+++ b/UI-Project/src/views/Slicecage/slicecage.vue
@@ -1239,7 +1239,7 @@
<el-table
:data="paginatedUsers"
@row-click="handleRowClick"
- height="500"
+ height="700"
@expand-change="handleExpandChange"
row-key="id"
default-expand-all
@@ -1351,7 +1351,7 @@
<el-button style="margin-left: 10px;size: mini;" type="danger">鍋滄</el-button>
<el-button style="margin-left: 10px;size: mini;" type="primary">娣诲姞</el-button>
</div> -->
- <el-table ref="table" style="margin-top: 20px;height: 500px;"
+ <el-table ref="table" style="margin-top: 20px;height: 700px;"
:data="tableDatab" :header-cell-style="{background:'#F2F3F5 ',color:'#1D2129'}">
<!-- <el-table-column prop="id" fixed align="center" :label="$t('searchOrder.sheetID')" min-width="150"/>
-->
diff --git a/UI-Project/src/views/largescreen/largescreen.vue b/UI-Project/src/views/largescreen/largescreen.vue
index b376d15..024ff7a 100644
--- a/UI-Project/src/views/largescreen/largescreen.vue
+++ b/UI-Project/src/views/largescreen/largescreen.vue
@@ -1,30 +1,15 @@
<template>
<el-card style="flex: 1;margin-left: 1px;margin-top: 10px;margin-right: 1px;" v-loading="loading">
<el-scrollbar height="800px">
-<div id="top" style="height: 150px;display: flex;">
+ <div style="font-size: 20px;font-weight: bold;">{{ $t('large.loading') }}{{ temperingtotal }} </div>
+ <div id="top" style="height: 150px;display: flex; justify-content: center; align-items: center;">
<div class="echarts-container">
- <div v-for="(processData, index) in processesData" :key="index" class="echarts-item">
+ <div v-for="(processData, index) in processesData" :key="index" class="echarts-item" @click="showDialog">
<div :id="'pieChart_' + index" class="pie-chart"></div>
</div>
</div>
</div>
<div style="display: flex;">
-<!-- <div id="centerleft" style="margin-top: 10px;height: 240px;width: 340px;background-color: #911005;">
- <el-table height="240" ref="table" width="340px"
- @selection-change="handleSelectionChange"
- :data="tableData" :header-cell-style="{background:'#F2F3F5 ',color:'#1D2129'}">
- <el-table-column fixed prop="orderId" align="center" :label="$t('large.number')" min-width="110" />
- <el-table-column prop="project" align="center" :label="$t('large.projectname')" min-width="100" />
- <el-table-column prop="responsibleProcess" align="center" :label="$t('large.responsibleprocess')" min-width="100" />
- <el-table-column prop="breakageQuantity" align="center" :label="$t('large.numberfractions')" min-width="110" />
- <el-table-column prop="patchProcesses" align="center" :label="$t('large.process')" min-width="100" />
- <el-table-column fixed="right" :label="$t('large.operate')" align="center" width="100">
- <template #default="scope">
- <el-button size="mini" type="text" plain @click="handleBinda">{{ $t('large.mes') }}</el-button>
- </template>
- </el-table-column>
- </el-table>
-</div> -->
<div class="parter" style="margin-top: 10px;margin-left: 150px; height: 240px;width: 1000px;">
<img src="../../assets/dpxsa.png" style="margin-left: -10px; width: 100%;height: 100%;" alt="Your Image">
<div class="moving-rect lipiana" v-show="woshia"></div>
@@ -34,7 +19,6 @@
<div class="moving-rect overlaya" v-show="flake"></div>
<div class="moving-rect overlayb" v-show="flakeb"></div>
<div class="moving-rect overlayc" v-show="flakec"></div>
- <div class="moving-rect overlayd" v-show="flaked"></div>
<div class="moving-rect longa" v-show="dalipiana"></div>
<div class="moving-rect longb" v-show="dalipianb"></div>
<div class="moving-rect shangpianji" v-show="shangpian"></div>
@@ -48,7 +32,7 @@
</div>
</div>
<div id="bottom" style="margin-top: 10px;height: 190px;">
-<el-table height="390" ref="table"
+<el-table height="350" ref="table"
@selection-change="handleSelectionChange"
:data="tableDatac" :header-cell-style="{background:'#F2F3F5 ',color:'#1D2129'}">
<el-table-column prop="orderId" align="center" :label="$t('large.orderId')" min-width="50" />
@@ -79,7 +63,7 @@
</el-scrollbar>
</el-card>
<el-dialog v-model="blinda" top="5vh" width="85%">
- <el-table height="400" ref="table"
+ <el-table height="650" ref="table"
@selection-change="handleSelectionChange"
:data="tableData" :header-cell-style="{background:'#F2F3F5 ',color:'#1D2129'}">
<el-table-column prop="orderId" fixed align="center" :label="$t('large.orderId')" min-width="110" />
@@ -119,11 +103,23 @@
</div>
</template>
</el-dialog>
+<el-dialog v-model="blind" top="10vh" width="70%" >
+ <el-date-picker style="margin-left: 1px;" v-model="timeRange" type="daterange" format="YYYY/MM/DD" value-format="YYYY-MM-DD"
+ :start-placeholder="$t('large.starttime')" :end-placeholder="$t('large.endtime')" :default-time="defaultTime" />
+ <el-button type="primary" style="margin-left: 10px;margin-top: -6px;" @click="selectReportData()">{{ $t('large.inquire') }}</el-button>
+ <div style="height: 550px;display: flex;margin-top: 10px;justify-content: center; align-items: center;">
+ <div class="echarts-container">
+ <div v-for="(processData, index) in dialogprocesses" :key="index" class="echarts-item">
+ <div :id="'dialogPieChart_' + index" class="pie-chart"></div>
+ </div>
+ </div>
+ </div>
+ </el-dialog>
</template>
<script setup>
import { Delete, Upload } from '@element-plus/icons-vue'
import { ElMessage, ElMessageBox } from 'element-plus'
-import { ref, onMounted , onBeforeUnmount, reactive, computed, shallowRef, onUnmounted, watchEffect } from "vue";
+import { ref, onMounted , onBeforeUnmount, reactive, computed, shallowRef, onUnmounted, watchEffect,nextTick } from "vue";
import request from "@/utils/request"
import { WebSocketHost ,host} from '@/utils/constants'
import { initializeWebSocket, closeWebSocket } from '@/utils/WebSocketService';
@@ -135,10 +131,10 @@
const tableDatac = ref([])
const adjustedRects = ref([]);
const chartRefs = ref([]);
+const timeRange = ref([])
const flake = ref(false)
const flakeb = ref(false)
const flakec = ref(false)
-const flaked = ref(false)
const woshia = ref(false)
const woshic = ref(false)
const dalipiana = ref(false)
@@ -151,7 +147,9 @@
const xiapian4 = ref(false)
const xiapian5 = ref(false)
const xiapian6 = ref(false)
-
+const blind = ref(false)
+const temperingtotal = ref(0)
+
const thisProcess = ref(); // 鐢ㄤ簬瀛樺偍process_id鐨勫搷搴斿紡寮曠敤
// 瀹氫箟涓�涓搷搴斿紡寮曠敤鏉ュ瓨鍌ㄥ浘琛ㄥ疄渚�
const chartDom = ref(null);
@@ -162,6 +160,7 @@
await fetchFlowCardId(row.orderId);
};
const processesData = ref([]);
+const dialogprocesses = ref([]);
const fetchFlowCardId = async (orderId) => {
try {
const response = await request.post('/loadGlass/order/order/selectOrderdetail',{
@@ -213,6 +212,8 @@
tableDatac.value = data.orders[0]
socket.onmessage = (event) => {
const data = JSON.parse(event.data);
+ console.log(data.device[0]);
+
processesData.value = data.device[0].map(rect => ({
...rect,
completedQuantity: rect.completedQuantity,
@@ -235,32 +236,29 @@
flake.value = tasks.some(task => task.state == 1);
flakeb.value = tasks.some(task => task.state == 2);
flakec.value = tasks.some(task => task.state == 3);
- flaked.value = tasks.some(task => task.state == 4);
};
// 鍗у紡鐞嗙墖
const socketUrl3 = `ws://${WebSocketHost}:${host}/api/cacheGlass/api/talk/cacheGlassIsRun`;
const handleMessage3 = (data) => {
- const tasks = data.taskCaches[0];
+ const tasks = data.taskCaches[0];
woshia.value = tasks.some(task => task.line == 2001);
woshic.value = tasks.some(task => task.line == 2002);
- console.log(tasks);
-
};
// 澶х悊鐗囩
const socketUrl4 = `ws://${WebSocketHost}:${host}/api/cacheVerticalGlass/api/talk/isRun`;
const handleMessage4 = (data) => {
- const tasks = data.bigStorageCageDetailsOutTask[0];
- const taskss = data.bigStorageCageDetailsFeedTask[0];
+ const tasks = data.bigStorageCageDetailsOutTask[0];
dalipiana.value = tasks.some(task => task.slot !== null && task.slot !== undefined);
+ const taskss = data.bigStorageCageDetailsFeedTask[0];
dalipianb.value = taskss.some(task => task.slot !== null && task.slot !== undefined);
};
// 涓婄墖
const socketUrl5 = `ws://${WebSocketHost}:${host}/api/loadGlass/api/talk/loadGlassIsRun`;
const handleMessage5 = (data) => {
- if(data.engineering.length !==0 ){
- shangpian.value = true;
-}
-};
+ const tasks = data.engineering;
+ shangpian.value = tasks.some(task => task.state == 1);
+ temperingtotal.value = data.engineering[0].engineerId
+ };
// 涓嬬墖
const socketUrl6 = `ws://${WebSocketHost}:${host}/api/unLoadGlass/api/talk/unLoadGlassIsRun`;
const handleMessage6 = (data) => {
@@ -314,7 +312,49 @@
}
]
};
-
+
+ chart.setOption(options);
+});
+};
+const renderPieCharts1 = () => {
+dialogprocesses.value.forEach((data, index) => {
+ const chart = echarts.init(document.getElementById('dialogPieChart_' + index));
+ const options = {
+ title: {
+ text: `${data.thisProcess} `,
+ left: 'center',
+ },
+ tooltip: {
+ trigger: 'item',
+ },
+ series: [
+ {
+ name: `${data.thisProcess} `,
+ type: 'pie',
+ radius: ['40%', '70%'],
+ avoidLabelOverlap: false,
+ data: [
+ { value: data.completedQuantity, name: t('large.completedquantity') },
+ { value: data.breakageQuantity, name: t('large.scrapquantity') }
+ ],
+ emphasis: {
+ itemStyle: {
+ shadowBlur: 10,
+ shadowOffsetX: 0,
+ shadowColor: 'rgba(0, 0, 0, 0.5)'
+ }
+ },
+ label: {
+ show: false,
+ position: 'center',
+ },
+ labelLine: {
+ show: false
+ },
+ }
+ ]
+ };
+
chart.setOption(options);
});
};
@@ -355,8 +395,34 @@
closeWebSocket5();
closeWebSocket6();
});
-</script>
+function showDialog() {
+ blind.value = true;
+}
+// 鏌ヨ鏁版嵁
+const selectReportData = async () => {
+ const response = await request.post("/loadGlass/reporting_work/reporting-work/selectDamage", {
+ reportingWorkTime: timeRange.value[0],
+ reportingWorkTime2: timeRange.value[1],
+ })
+ if (response.code === 200) {
+ console.log(response.data);
+
+ dialogprocesses.value = response.data.map(rect => ({
+ ...rect,
+ completedQuantity: rect.completedQuantity,
+ breakageQuantity: rect.breakageQuantity,
+ thisProcess: rect.thisProcess,
+ }));
+ await nextTick();
+ renderPieCharts1();
+ ElMessage.success(response.message);
+ } else {
+ ElMessage.error(response.message);
+ }
+};
+</script>
+
<style scoped>
.echarts-container {
display: flex;
@@ -458,7 +524,7 @@
top: 9px;
left: 200px;
transform: translateX(-50%);
- animation: move-xiapianji 6s infinite;
+ animation: move-xiapianji 15s infinite;
}
@keyframes move-xiapianji {
0% {
@@ -475,7 +541,7 @@
top: 190px;
right: 530px;
transform: translateX(-50%);
- animation: move-lipiana 6s infinite;
+ animation: move-lipiana 15s infinite;
}
@keyframes move-lipiana {
0% {
@@ -492,7 +558,7 @@
top: 160px;
left: 502px;
transform: translateX(-50%);
- animation: move-lipianb 6s infinite;
+ animation: move-lipianb 15s infinite;
}
@keyframes move-lipianb {
0% {
@@ -509,7 +575,7 @@
top: 215px;
right: 490px;
transform: translateX(-50%);
- animation: move-lipianc 6s infinite;
+ animation: move-lipianc 15s infinite;
}
@keyframes move-lipianc {
0% {
@@ -526,7 +592,7 @@
top: 160px;
left: 555px;
transform: translateX(-50%);
- animation: move-lipiand 6s infinite;
+ animation: move-lipiand 15s infinite;
}
@keyframes move-lipiand {
0% {
@@ -543,7 +609,7 @@
top: 213px;
right: 800px;
transform: translateX(-50%);
- animation: move-overlaya 6s infinite;
+ animation: move-overlaya 15s infinite;
}
@keyframes move-overlaya {
0% {
@@ -560,7 +626,7 @@
top: 110px;
left: 13px;
transform: translateX(-50%);
- animation: move-overlayb 6s infinite;
+ animation: move-overlayb 15s infinite;
}
@keyframes move-overlayb {
0% {
@@ -577,7 +643,7 @@
top: 7px;
left: 13px;
transform: translateX(-50%);
- animation: move-overlayc 6s infinite;
+ animation: move-overlayc 15s infinite;
}
@keyframes move-overlayc {
0% {
@@ -594,7 +660,7 @@
top: 157px;
right: 90px;
transform: translateX(-50%);
- animation: move-shangpianji 6s infinite;
+ animation: move-shangpianji 15s infinite;
}
@keyframes move-shangpianji {
0% {
diff --git a/hangzhoumesParent/JsonFile/PlcCacheVerticalGlass.json b/hangzhoumesParent/JsonFile/PlcCacheVerticalGlass.json
index 10e8e33..a48a6d6 100644
--- a/hangzhoumesParent/JsonFile/PlcCacheVerticalGlass.json
+++ b/hangzhoumesParent/JsonFile/PlcCacheVerticalGlass.json
@@ -4,7 +4,7 @@
"dataType": "word",
"parameteInfor": [{
"codeId": "D01ID",
- "addressIndex": "0",
+ "addressIndex": "32",
"addressLenght": "32",
"ratio": "1",
"unit": ""
diff --git a/hangzhoumesParent/common/servicebase/src/main/java/com/mes/damage/controller/DamageController.java b/hangzhoumesParent/common/servicebase/src/main/java/com/mes/damage/controller/DamageController.java
index fc36b35..295e4fd 100644
--- a/hangzhoumesParent/common/servicebase/src/main/java/com/mes/damage/controller/DamageController.java
+++ b/hangzhoumesParent/common/servicebase/src/main/java/com/mes/damage/controller/DamageController.java
@@ -66,7 +66,7 @@
@ApiOperation("鎷胯蛋鏁版嵁鏌ヨ")
@PostMapping("/selectDamagePrint")
public Result selectDamagePrint(@RequestBody Damage damage) {
- List<Damage> damage2=damageService.selectDamagePrint(damage);
+ List<DamagePrint> damage2=damageService.selectDamagePrint(damage);
return Result.build(200,"鏌ヨ鎴愬姛",damage2);
}
@ApiOperation("鎷胯蛋鎵撳嵃鏌ヨ")
diff --git a/hangzhoumesParent/common/servicebase/src/main/java/com/mes/damage/service/DamageService.java b/hangzhoumesParent/common/servicebase/src/main/java/com/mes/damage/service/DamageService.java
index 528b941..5707047 100644
--- a/hangzhoumesParent/common/servicebase/src/main/java/com/mes/damage/service/DamageService.java
+++ b/hangzhoumesParent/common/servicebase/src/main/java/com/mes/damage/service/DamageService.java
@@ -36,7 +36,7 @@
*/
void batchInsertDamage(List<Damage> damageList);
- List<Damage> selectDamagePrint(Damage damage);
+ List<DamagePrint> selectDamagePrint(Damage damage);
List<DamagePrint> selectDamagePrintDetails(Damage damage);
}
diff --git a/hangzhoumesParent/common/servicebase/src/main/java/com/mes/damage/service/impl/DamageServiceImpl.java b/hangzhoumesParent/common/servicebase/src/main/java/com/mes/damage/service/impl/DamageServiceImpl.java
index c4debd3..0b93eee 100644
--- a/hangzhoumesParent/common/servicebase/src/main/java/com/mes/damage/service/impl/DamageServiceImpl.java
+++ b/hangzhoumesParent/common/servicebase/src/main/java/com/mes/damage/service/impl/DamageServiceImpl.java
@@ -145,20 +145,25 @@
}
this.saveBatch(damageList);
}
-
+ /**
+ * 鎷胯蛋鎵撳嵃鏁版嵁鏌ヨ
+ */
@Override
- public List<Damage> selectDamagePrint(Damage damage) {
- QueryWrapper<Damage> wrapper = new QueryWrapper<>();
- wrapper.select("working_procedure,engineer_id,teams_groups_name,device_name,count(glass_id)as glass_id")
- .eq("type",damage.getType())
- .eq("working_procedure",damage.getWorkingProcedure())
- .groupBy("working_procedure,engineer_id,teams_groups_name,device_name");
- if (damage.getEngineerId() != null) {
- wrapper.eq("engineer_id", damage.getEngineerId());
- }
- return this.list(wrapper);
+ public List<DamagePrint> selectDamagePrint(Damage damage) {
+ MPJQueryWrapper<Damage> listDamage=new MPJQueryWrapper<Damage>()
+ .select("t.engineer_id,t.glass_id,b.tempering_layout_id,b.tempering_feed_sequence,b.width,b.height,b.thickness")
+ .leftJoin("glass_info as b on t.glass_id=b.glass_id")
+ .eq("t.working_procedure",damage.getWorkingProcedure())
+ .eq("t.type",damage.getType());
+ // 鍔ㄦ�佹坊鍔犳潯浠讹紝褰� id 鏈夊�兼椂
+ if (damage.getEngineerId() != null) {
+ listDamage.eq("t.engineer_id", damage.getEngineerId());
+ }
+ return damageMapper.selectJoinList(DamagePrint.class,listDamage);
}
-
+ /**
+ * 鎷胯蛋鎵撳嵃鎵撳嵃璇︽儏鏌ヨ
+ */
@Override
public List<DamagePrint> selectDamagePrintDetails(Damage damage) {
List<DamagePrint> listDamage=damageMapper.selectJoinList(DamagePrint.class,new MPJQueryWrapper<Damage>()
diff --git a/hangzhoumesParent/common/servicebase/src/main/java/com/mes/order/entity/Orderdetail.java b/hangzhoumesParent/common/servicebase/src/main/java/com/mes/order/entity/Orderdetail.java
index 01258d3..b0b4078 100644
--- a/hangzhoumesParent/common/servicebase/src/main/java/com/mes/order/entity/Orderdetail.java
+++ b/hangzhoumesParent/common/servicebase/src/main/java/com/mes/order/entity/Orderdetail.java
@@ -28,6 +28,14 @@
private String project;
/**
+ * 娴佺▼鍗″彿
+ */
+ private String processId;
+ /**
+ * 璁㈠崟搴忓彿
+ */
+ private String orderNumber;
+ /**
* 浜у搧鍚嶇О
*/
private String productName;
@@ -35,30 +43,40 @@
/**
* 瀹�
*/
- private String width;
+ private double width;
/**
* 楂�
*/
- private String height;
+ private double height;
/**
* 闈㈢Н
*/
private double area;
-
-
/**
- * 鍖呰鏂瑰紡
+ * 鏁伴噺
*/
private Integer quantity;
/**
- * 鐘舵��
+ * 琛ョ墖鏁伴噺
*/
- private String processingNote;
+ private Integer numberPatches;
/**
- * 閫佽揣鏃堕棿
+ * 宸插叆鏁伴噺
*/
- private String deliveryDate;
+ private Integer receivedQuantity;
+ /**
+ * 鐢熶骇鐘舵��
+ */
+ private Integer terminationStatus;
+ /**
+ * 鍖呰鏂瑰紡
+ */
+ private String packType;
+ /**
+ * 宸ョ▼鍙�
+ */
+ private String projectNo;
diff --git a/hangzhoumesParent/common/servicebase/src/main/java/com/mes/pp/entity/request/Reportingdamage.java b/hangzhoumesParent/common/servicebase/src/main/java/com/mes/pp/entity/request/Reportingdamage.java
index cd88ede..130ce69 100644
--- a/hangzhoumesParent/common/servicebase/src/main/java/com/mes/pp/entity/request/Reportingdamage.java
+++ b/hangzhoumesParent/common/servicebase/src/main/java/com/mes/pp/entity/request/Reportingdamage.java
@@ -31,6 +31,10 @@
* 娆＄牬鏃堕棿
*/
private String reportingWorkTime;
+ /**
+ * 娆＄牬鏃堕棿2
+ */
+ private String reportingWorkTime2;
}
diff --git a/hangzhoumesParent/common/servicebase/src/main/java/com/mes/temperingglass/mapper/TemperingGlassInfoMapper.java b/hangzhoumesParent/common/servicebase/src/main/java/com/mes/temperingglass/mapper/TemperingGlassInfoMapper.java
index 65122ab..78c9c90 100644
--- a/hangzhoumesParent/common/servicebase/src/main/java/com/mes/temperingglass/mapper/TemperingGlassInfoMapper.java
+++ b/hangzhoumesParent/common/servicebase/src/main/java/com/mes/temperingglass/mapper/TemperingGlassInfoMapper.java
@@ -4,6 +4,8 @@
import com.github.yulichang.base.MPJBaseMapper;
import com.mes.temperingglass.entity.TemperingGlassInfo;
import org.apache.ibatis.annotations.Param;
+import org.apache.ibatis.annotations.Select;
+import org.apache.ibatis.annotations.Update;
import java.util.List;
@@ -19,5 +21,13 @@
public interface TemperingGlassInfoMapper extends MPJBaseMapper<TemperingGlassInfo> {
boolean saveBatch(@Param(value = "list") List<TemperingGlassInfo> list);
-
+ //缁曡繃鍏ㄥ眬閫昏緫杩涜鏌ヨ
+ @Select("SELECT * FROM tempering_glass_info " + "WHERE tempering_layout_id = #{temperingLayoutId} " + "AND engineer_id = #{engineerId} " + "ORDER BY tempering_layout_id DESC, tempering_feed_sequence ASC")
+ List<TemperingGlassInfo> selectByEngineerIdAndLayoutId(String engineerId, Integer temperingLayoutId);
+ //缁曡繃鍏ㄥ眬閫昏緫杩涜淇敼
+ @Update("UPDATE tempering_glass_info " +
+ "SET state = #{state}, " +
+ "deleted = CASE WHEN #{state} < 8 THEN 0 ELSE deleted END " +
+ "WHERE glass_id = #{glassId}")
+ Integer updateTemperingGlassInfo(TemperingGlassInfo temperingGlassInfo);
}
diff --git a/hangzhoumesParent/common/servicebase/src/main/java/com/mes/temperingglass/service/impl/TemperingGlassInfoServiceImpl.java b/hangzhoumesParent/common/servicebase/src/main/java/com/mes/temperingglass/service/impl/TemperingGlassInfoServiceImpl.java
index c400f4e..0fd9bdc 100644
--- a/hangzhoumesParent/common/servicebase/src/main/java/com/mes/temperingglass/service/impl/TemperingGlassInfoServiceImpl.java
+++ b/hangzhoumesParent/common/servicebase/src/main/java/com/mes/temperingglass/service/impl/TemperingGlassInfoServiceImpl.java
@@ -2,7 +2,6 @@
import com.baomidou.dynamic.datasource.annotation.DS;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
import com.mes.temperingglass.entity.TemperingGlassInfo;
import com.mes.temperingglass.mapper.TemperingGlassInfoMapper;
import com.mes.temperingglass.service.TemperingGlassInfoService;
@@ -36,7 +35,8 @@
QueryWrapper<TemperingGlassInfo> glassinfo = new QueryWrapper<>();
glassinfo.eq("engineer_id", glass.getEngineerId())
.eq("tempering_layout_id", glass.getTemperingLayoutId());
- return temperingMapper.selectList(glassinfo);
+ //return temperingMapper.selectList(glassinfo);
+ return temperingMapper.selectByEngineerIdAndLayoutId(glass.getEngineerId(),glass.getTemperingLayoutId());
}else {
return null;
}
@@ -45,11 +45,13 @@
@Override
public List<TemperingGlassInfo> selectIntoGlass(TemperingGlassInfo temperingGlassInfo) {
//鑾峰彇杩涚倝涓殑鐜荤拑淇℃伅
- QueryWrapper<TemperingGlassInfo> wrapper = new QueryWrapper<>();
- wrapper.eq("tempering_layout_id", temperingGlassInfo.getTemperingLayoutId())
- .eq("engineer_id", temperingGlassInfo.getEngineerId())
- .orderByAsc("tempering_layout_id","tempering_feed_sequence");
- return temperingMapper.selectList(wrapper);
+// QueryWrapper<TemperingGlassInfo> wrapper = new QueryWrapper<>();
+// wrapper.eq("tempering_layout_id", temperingGlassInfo.getTemperingLayoutId())
+// .eq("engineer_id", temperingGlassInfo.getEngineerId())
+// .orderByAsc("tempering_layout_id","tempering_feed_sequence");
+// return temperingMapper.selectList(wrapper);
+ return temperingMapper.selectByEngineerIdAndLayoutId(temperingGlassInfo.getEngineerId(),temperingGlassInfo.getTemperingLayoutId());
+
}
@Override
@@ -60,13 +62,9 @@
TemperingGlassInfo glass=temperingMapper.selectOne(wrap);
//鏍规嵁宸ョ▼鍙峰拰鐗堝浘鑾峰彇鏁版嵁
if(glass != null) {
- QueryWrapper<TemperingGlassInfo> wapper = new QueryWrapper<>();
- wapper.eq("engineer_id", glass.getEngineerId())
- .eq("tempering_layout_id", glass.getTemperingLayoutId())
- .orderByAsc("tempering_layout_id", "tempering_feed_sequence");
- return temperingMapper.selectList(wapper);
+ return temperingMapper.selectByEngineerIdAndLayoutId(glass.getEngineerId(),glass.getTemperingLayoutId());
}
- return null;
+ return null;
}
@Override
@@ -80,24 +78,22 @@
if (glassinfo == null) {
return null; // 鐩存帴杩斿洖null锛岃〃绀烘病鏈夋壘鍒扮鍚堟潯浠剁殑璁板綍
}
- QueryWrapper<TemperingGlassInfo> wrapper = new QueryWrapper<>();
- wrapper.eq("tempering_layout_id",glassinfo.getTemperingLayoutId())
- .eq("engineer_id",glassinfo.getEngineerId());
+ return temperingMapper.selectByEngineerIdAndLayoutId(glassinfo.getEngineerId(),glassinfo.getTemperingLayoutId());
- return temperingMapper.selectList(wrapper);
}
@Override
public List<TemperingGlassInfo> selectLayoutId() {
QueryWrapper<TemperingGlassInfo> wrapper = new QueryWrapper<>();
- wrapper.select("distinct tempering_layout_id,engineer_id")
+ wrapper.select("tempering_layout_id,engineer_id,max(id) as id")
.eq("state",2)
- .orderByAsc("tempering_layout_id");
+ .groupBy("tempering_layout_id,engineer_id")
+ .orderByDesc("id");
return temperingMapper.selectList(wrapper);
}
@Override
- public List<TemperingGlassInfo> selectTaskType() {
+ public List<TemperingGlassInfo> selectTaskType() {
QueryWrapper<TemperingGlassInfo> wrapper = new QueryWrapper<>();
wrapper.select("state")
.groupBy("state");
@@ -106,11 +102,7 @@
@Override
public Integer updateTemperingState(TemperingGlassInfo temperingGlassInfo) {
- UpdateWrapper<TemperingGlassInfo> wrapper = new UpdateWrapper<>();
- wrapper.eq("glass_id",temperingGlassInfo.getGlassId())
- .lt("state",6)
- .set("state", temperingGlassInfo.getState());;
- if (temperingMapper.update(null,wrapper) > 0) {
+ if (temperingMapper.updateTemperingGlassInfo(temperingGlassInfo) > 0) {
return 200;
}else {
return 100;
diff --git a/hangzhoumesParent/moduleService/CacheGlassModule/src/test/java/com/mes/CacheGlassModuleApplicationTest.java b/hangzhoumesParent/moduleService/CacheGlassModule/src/test/java/com/mes/CacheGlassModuleApplicationTest.java
index 233e6f1..ad5430b 100644
--- a/hangzhoumesParent/moduleService/CacheGlassModule/src/test/java/com/mes/CacheGlassModuleApplicationTest.java
+++ b/hangzhoumesParent/moduleService/CacheGlassModule/src/test/java/com/mes/CacheGlassModuleApplicationTest.java
@@ -149,7 +149,7 @@
arguments.put("state","8"); //鎷胯蛋锛�200/鐮存崯锛�201
arguments.put("line","1001"); //绾胯矾锛�
arguments.put("workingProcedure","璇嗗埆"); //璁惧鍚嶇О锛�
- edgStorageCageDetailsService.identWorn(arguments);
+// edgStorageCageDetailsService.identWorn(arguments);
log.info("璇嗗埆鍙般�愮牬鎹�/鎷胯蛋銆戯細{}", 1);
}
diff --git a/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/bigstorage/controller/BigStorageCageDetailsController.java b/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/bigstorage/controller/BigStorageCageDetailsController.java
index 223343a..ee43453 100644
--- a/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/bigstorage/controller/BigStorageCageDetailsController.java
+++ b/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/bigstorage/controller/BigStorageCageDetailsController.java
@@ -1,8 +1,12 @@
package com.mes.bigstorage.controller;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
import com.mes.bigstorage.entity.BigStorageCageDetails;
import com.mes.bigstorage.service.BigStorageCageDetailsService;
import com.mes.bigstorage.service.BigStorageCageService;
+import com.mes.common.config.Const;
import com.mes.common.utils.RedisUtil;
import com.mes.utils.Result;
import io.swagger.annotations.Api;
@@ -107,5 +111,20 @@
bigStorageCageDetailsService.temperingSwitch(flag);
return Result.build(200, "淇敼鎴愬姛", redisUtil.getCacheObject("temperingSwitch"));
}
+
+ @ApiOperation("娴佺▼鍗℃煡璇�")
+ @PostMapping("/selectFlowCardByCache")
+ public Result selectFlowCardByCache() {
+ List<Map<String, Object>> flowCardIdCount=bigStorageCageDetailsService.listMaps(
+ new QueryWrapper<BigStorageCageDetails>()
+ .select("flow_card_id,layer,count(*) as count")
+ .eq("state", Const.GLASS_STATE_IN)
+ .eq("tempering_layout_id",0)
+ .groupBy("flow_card_id,layer")
+ );
+ return Result.build(200, "鏌ヨ鎴愬姛", flowCardIdCount);
+ }
+
+
}
diff --git a/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/bigstorage/entity/BigStorageCageDetails.java b/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/bigstorage/entity/BigStorageCageDetails.java
index e717b46..2b2ed15 100644
--- a/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/bigstorage/entity/BigStorageCageDetails.java
+++ b/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/bigstorage/entity/BigStorageCageDetails.java
@@ -94,20 +94,26 @@
/**
* 宸ョ▼鍙�
*/
- @ApiModelProperty(value = "宸ョ▼鍙�")
+ @ApiModelProperty(value = "宸ョ▼鍙�", position = 16)
private String engineerId;
+
+ /**
+ * 宸ョ▼鍙�
+ */
+ @ApiModelProperty(value = "灞�", position = 17)
+ private String layer;
/**
* 杩涚墖浠诲姟
*/
- @ApiModelProperty(value = "杩涚墖浠诲姟", position = 16)
+ @ApiModelProperty(value = "杩涚墖浠诲姟", position = 18)
@TableField(exist = false)
private BigStorageCageFeedTask bigStorageCageFeedTask;
/**
* 鍑虹墖浠诲姟
*/
- @ApiModelProperty(value = "鍑虹墖浠诲姟", position = 17)
+ @ApiModelProperty(value = "鍑虹墖浠诲姟", position = 19)
@TableField(exist = false)
private BigStorageCageOutTask bigStorageCageOutTask;
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 a7531d2..2b910c0 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
@@ -276,10 +276,9 @@
.gt(BigStorageCage::getRemainWidth, Math.max(glassInfo.getWidth(), glassInfo.getHeight()))
.last("limit 1");
if (glassInfo.getTemperingLayoutId() == 0) {
- //todo:鍚屾祦绋嬭繘鍚屼竴鏍�
-// wrapper.eq(BigStorageCageDetails::getFlowCardId,glassInfo.getFlowCardId())
-// .eq(BigStorageCageDetails::get)
- wrapper.eq(BigStorageCageDetails::getWidth, glassInfo.getWidth()).eq(BigStorageCageDetails::getHeight, glassInfo.getHeight());
+ wrapper.eq(BigStorageCageDetails::getFlowCardId,glassInfo.getFlowCardId())
+ .eq(BigStorageCageDetails::getLayer,glassInfo.getLayer());
+// wrapper.eq(BigStorageCageDetails::getWidth, glassInfo.getWidth()).eq(BigStorageCageDetails::getHeight, glassInfo.getHeight());
} else {
wrapper.eq(BigStorageCageDetails::getTemperingFeedSequence, glassInfo.getTemperingFeedSequence() + 1);
}
diff --git a/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/job/PlcSlicecage.java b/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/job/PlcSlicecage.java
index 8f7ba74..10dbb2d 100644
--- a/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/job/PlcSlicecage.java
+++ b/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/job/PlcSlicecage.java
@@ -1,10 +1,13 @@
package com.mes.job;
import cn.hutool.json.JSONObject;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.mes.bigstorage.entity.BigStorageCageDetails;
import com.mes.bigstorage.service.BigStorageCageDetailsService;
import com.mes.bigstorage.service.BigStorageCageService;
import com.mes.common.S7object;
+import com.mes.common.config.Const;
import com.mes.common.utils.RedisUtil;
import com.mes.device.PlcParameterObject;
import com.mes.temperingglass.entity.TemperingGlassInfo;
@@ -68,11 +71,15 @@
}
jsonObject.append("temperingSwitch", temperingSwitch);
+
}
public void queryDataSource2() throws InterruptedException {
//鍑虹墖闃熷垪
- List<TemperingGlassInfo> temperingGlassInfoList= temperingGlassInfoService.list();
+ List<TemperingGlassInfo> temperingGlassInfoList= temperingGlassInfoService.list(
+ new LambdaQueryWrapper<TemperingGlassInfo>()
+ .inSql(TemperingGlassInfo::getEngineerId,"select distinct engineer_id from tempering_glass_info where state<4")
+ );
jsonObject.append("temperingGlassInfoList", temperingGlassInfoList);
}
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 c890030..ba4cbc5 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
@@ -2,6 +2,7 @@
import cn.hutool.core.lang.Assert;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
@@ -156,6 +157,16 @@
String d03ToMES = plcParameterObject.getPlcParameter("D03ToMES").getValue();
String d05ToMES = plcParameterObject.getPlcParameter("D05ToMES").getValue();
log.info("鎵ц绌鸿溅閫佺墖浠诲姟锛岃幏鍙栧埌鐨勫ぇ杞︾姸鎬佷负{}锛屽崸杞珛鐘舵�佸垎鍒负d03:{}锛宒05:{}", e01Status, d03ToMES, d05ToMES);
+ List<BigStorageCageFeedTask> bigStorageCageFeedTasks = bigStorageCageFeedTaskService.list(
+ new LambdaQueryWrapper<BigStorageCageFeedTask>()
+ .ne(BigStorageCageFeedTask::getTargetSlot, 0)
+ .lt(BigStorageCageFeedTask::getTaskState, Const.BIG_STORAGE_IN_SLOT)
+ );
+ if (bigStorageCageFeedTasks.size() > 0) {
+ Date endDate = new Date();
+ log.info("澶ц溅鏈夋鍦ㄦ墽琛岀殑浠诲姟{}锛岀粨鏉熼�佺墖浠诲姟锛屼换鍔＄粨鏉熸椂闂达細{}锛屽叡鑰楁椂锛歿}ms,缁撴潫鎵爜浠诲姟", bigStorageCageFeedTasks, endDate, endDate.getTime() - startDate.getTime());
+ return;
+ }
if (REQUEST_WORD.equals(e01Status)) {
Date endDate = new Date();
log.info("杩涚墖澶ц溅闈炵┖闂诧紝缁撴潫閫佺墖浠诲姟锛屼换鍔＄粨鏉熸椂闂达細{}锛屽叡鑰楁椂锛歿}ms,缁撴潫鎵爜浠诲姟", endDate, endDate.getTime() - startDate.getTime());
@@ -282,8 +293,12 @@
return;
}
//鏄惁鏈変汉宸ヤ笅鐗囦换鍔� 鏈夌洿鎺ュ嚭
+// List<BigStorageCageDetails> artificialList = bigStorageCageDetailsService.list(new LambdaQueryWrapper<BigStorageCageDetails>()
+// .eq(BigStorageCageDetails::getState, Const.GLASS_STATE_ARTIFICIAL).orderByDesc(BigStorageCageDetails::getWidth));
List<BigStorageCageDetails> artificialList = bigStorageCageDetailsService.list(new LambdaQueryWrapper<BigStorageCageDetails>()
- .eq(BigStorageCageDetails::getState, Const.GLASS_STATE_ARTIFICIAL).orderByDesc(BigStorageCageDetails::getWidth));
+ .eq(BigStorageCageDetails::getState, Const.GLASS_STATE_ARTIFICIAL)
+ .orderByAsc(BigStorageCageDetails::getSlot)
+ .orderByDesc(BigStorageCageDetails::getId));
if (CollectionUtils.isNotEmpty(artificialList)) {
computeOutMoreGlassInfo(artificialList, Boolean.FALSE, mesToPLCAddress);
Date endDate = new Date();
@@ -543,18 +558,19 @@
*/
public Boolean judgeGlassTypeStatus(String glassId, Integer line, String mesAddress) {
//1銆佽幏鍙栦换鍔¤〃涓浉閭荤幓鐠�
- List<EdgGlassTaskInfo> edgGlassTaskInfoList ;
- edgGlassTaskInfoList= edgGlassTaskInfoService.list(new LambdaQueryWrapper<EdgGlassTaskInfo>()
+ List<EdgGlassTaskInfo> edgGlassTaskInfoList;
+ edgGlassTaskInfoList = edgGlassTaskInfoService.list(new LambdaQueryWrapper<EdgGlassTaskInfo>()
.eq(EdgGlassTaskInfo::getLine, line)
.apply("time >= (select time from edg_glass_task_info where line='" + line + "' and glass_id = '" + glassId + "' and deleted = 0)")
.orderByAsc(EdgGlassTaskInfo::getTime));
- if(edgGlassTaskInfoList==null){
- log.info("绾胯矾锛歿}璇嗗埆鐜荤拑淇℃伅鏈嚭鐜板湪灏哄琛ㄤ腑,鑾峰彇鐩搁偦涓ゅ潡鐜荤拑澶辫触",line);
- }else{
- edgGlassTaskInfoList= edgGlassTaskInfoService.list(new LambdaQueryWrapper<EdgGlassTaskInfo>()
- .eq(EdgGlassTaskInfo::getGlassId, glassId)
- .last("limit 1"));
- log.info("鍦ㄥ昂瀵歌〃涓幏鍙栫幓鐠冧俊鎭瘂}",edgGlassTaskInfoList);
+ if (edgGlassTaskInfoList == null) {
+ log.info("绾胯矾锛歿}璇嗗埆鐜荤拑淇℃伅鏈嚭鐜板湪灏哄琛ㄤ腑,鑾峰彇鐩搁偦涓ゅ潡鐜荤拑澶辫触", line);
+ } else {
+ edgGlassTaskInfoList = edgGlassTaskInfoService.list(new QueryWrapper<EdgGlassTaskInfo>()
+ .select("Top 1 *")
+ .eq("glass_id", glassId)
+ );
+ log.info("鍦ㄥ昂瀵歌〃涓幏鍙栫幓鐠冧俊鎭瘂}", edgGlassTaskInfoList);
}
Assert.isFalse(CollectionUtils.isEmpty(edgGlassTaskInfoList), "璇嗗埆鐜荤拑淇℃伅鏈嚭鐜板湪灏哄琛ㄤ腑,鑾峰彇鐩搁偦涓ゅ潡鐜荤拑澶辫触");
//2銆佽幏鍙栧崸杞珛鍓╀綑瀹藉害
@@ -716,7 +732,7 @@
for (int i = 1; i <= taskList.size(); i++) {
s7control.writeWord(plcMesObject.getPlcParameter("StartAddToImport" + i).getAddress(), taskList.get(i - 1).getLine());
s7control.writeWord(plcMesObject.getPlcParameter("TargetAddToImport" + i).getAddress(), taskList.get(i - 1).getTargetSlot());
- log.info("鍚憄lc鍙戦�佺{}鐗囩幓鐠冨凡瀹屾垚", i);
+ log.info("鍚憄lc鍙戦�佺{}鐗囩幓鐠冨凡瀹屾垚,璧峰浣嶇疆鏄瘂}锛岀洰鏍囦綅缃槸", i, taskList.get(i - 1).getLine(), taskList.get(i - 1).getTargetSlot());
}
int returnData = 0;
int count = 1;
diff --git a/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/resources/application.yml b/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/resources/application.yml
index 99bc35f..dd5a317 100644
--- a/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/resources/application.yml
+++ b/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/resources/application.yml
@@ -3,7 +3,7 @@
spring:
profiles:
- active: dev
+ active: cz
application:
name: cacheVerticalGlass
mybatis-plus:
@@ -16,7 +16,7 @@
minCount: 20
carWidth: 5000 #澶ц溅瀹藉害
slotWidth: 5000 #澶ц溅瀹藉害
- inCarMaxSize: 1 #杩涚墖澶ц溅鏈�澶у瓨鏀剧幓鐠冩暟閲�
+ inCarMaxSize: 1 #杩涚墖澶ц溅鏈�澶у瓨鏀剧幓鐠冩暟閲�
outCarMaxSize: 2 #鍑虹墖澶ц溅鏈�澶у瓨鏀剧幓鐠冩暟閲�
glassGap: 350 #鐜荤拑闂磋窛
xMaxSize: 2800
\ No newline at end of file
diff --git a/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/test/java/com/mes/CacheVerticalGlassModuleApplicationTest.java b/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/test/java/com/mes/CacheVerticalGlassModuleApplicationTest.java
index d9a451e..ca96d50 100644
--- a/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/test/java/com/mes/CacheVerticalGlassModuleApplicationTest.java
+++ b/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/test/java/com/mes/CacheVerticalGlassModuleApplicationTest.java
@@ -1,5 +1,7 @@
package com.mes;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.mes.bigstorage.entity.BigStorageCage;
import com.mes.bigstorage.service.BigStorageCageDetailsService;
import com.mes.bigstorage.service.BigStorageCageService;
@@ -7,7 +9,10 @@
import com.mes.common.config.Const;
import com.mes.damage.entity.Damage;
import com.mes.damage.service.DamageService;
+import com.mes.edgglasstask.entity.EdgGlassTaskInfo;
+import com.mes.edgglasstask.service.EdgGlassTaskInfoService;
import com.mes.job.PlcStorageCageTask;
+import com.mes.temperingglass.entity.TemperingGlassInfo;
import lombok.extern.slf4j.Slf4j;
import org.junit.Test;
import org.junit.runner.RunWith;
@@ -37,6 +42,8 @@
BigStorageCageDetailsService bigStorageCageDetailsService;
@Autowired
DamageService damageService;
+ @Autowired
+ EdgGlassTaskInfoService edgGlassTaskInfoService;
// @Autowired
// BigStorageCageFeedTaskMapper bigStorageCageFeedTaskMapper;
@@ -167,4 +174,13 @@
plcStorageCageTask.updateOutGlassStateTask();
}
+ @Test
+ public void chaxun(){
+ List<EdgGlassTaskInfo> edgGlassTaskInfoList = edgGlassTaskInfoService.list(new QueryWrapper<EdgGlassTaskInfo>()
+ .select("Top 1 *")
+ .eq("glass_id", "P24072402|1|13")
+ );
+ log.info("鍦ㄥ昂瀵歌〃涓幏鍙栫幓鐠冧俊鎭瘂}", edgGlassTaskInfoList);
+ }
+
}
diff --git a/hangzhoumesParent/moduleService/TemperingGlassModule/src/main/java/com/mes/job/PlcScreenTask.java b/hangzhoumesParent/moduleService/TemperingGlassModule/src/main/java/com/mes/job/PlcScreenTask.java
index 3d06990..f8df5ef 100644
--- a/hangzhoumesParent/moduleService/TemperingGlassModule/src/main/java/com/mes/job/PlcScreenTask.java
+++ b/hangzhoumesParent/moduleService/TemperingGlassModule/src/main/java/com/mes/job/PlcScreenTask.java
@@ -40,7 +40,6 @@
public void screenHome() {
JSONObject jsonObject = new JSONObject();
Reportingdamage reportingdamage = new Reportingdamage();
- //reportingdamage.setReportingWorkTime("2024-05-11");
// 鑾峰彇褰撳墠鏃ユ湡
LocalDate today = LocalDate.now();
// 璁＄畻鏈�杩戜竷澶╃殑寮�濮嬫棩鏈�
@@ -52,8 +51,9 @@
String startOfPeriodStr = startOfPeriod.format(formatter);
String endOfPeriodStr = endOfPeriod.format(formatter);
// 璁剧疆涓烘渶杩戜竷澶╃殑鏃堕棿鑼冨洿
- reportingdamage.setReportingWorkTime("2024-05-11" + " to " + endOfPeriodStr);
- //reportingdamage.setReportingWorkTime(startOfPeriodStr + " to " + endOfPeriodStr);
+ reportingdamage.setReportingWorkTime("2024-05-11");
+ //reportingdamage.setReportingWorkTime("2024-05-11");
+ reportingdamage.setReportingWorkTime2(endOfPeriodStr);
//鎵囧舰鍥惧悇璁惧鐨勫姞宸ョ牬鎹熸暟閲�
List<Reportingdamage> device = reportingWorkService.selectDamage(reportingdamage);
jsonObject.append("device", device);
diff --git a/hangzhoumesParent/moduleService/TemperingGlassModule/src/main/java/com/mes/job/PlcTemperingGlassTask.java b/hangzhoumesParent/moduleService/TemperingGlassModule/src/main/java/com/mes/job/PlcTemperingGlassTask.java
index acd2fcf..220c807 100644
--- a/hangzhoumesParent/moduleService/TemperingGlassModule/src/main/java/com/mes/job/PlcTemperingGlassTask.java
+++ b/hangzhoumesParent/moduleService/TemperingGlassModule/src/main/java/com/mes/job/PlcTemperingGlassTask.java
@@ -66,27 +66,7 @@
if (outGlass != null) {
jsonObject.append("overGlass", overGlass);
}
- //褰撳墠閽㈠寲宸ョ▼鐨勬嬁璧版暟鎹�
- LambdaQueryWrapper<TemperingGlassInfo> queryWrapper = new LambdaQueryWrapper<>();
- queryWrapper.select(TemperingGlassInfo::getEngineerId)
- .lt(TemperingGlassInfo::getState, Const.TEMPERING_END)
- .groupBy(TemperingGlassInfo::getEngineerId);
- List<String> engineerIds = temperingAgoService.list(queryWrapper)
- .stream()
- .map(TemperingGlassInfo::getEngineerId)
- .distinct()
- .collect(Collectors.toList());
-
- List<Damage> temperingTakeGlassInfos = damageService.list(
- new LambdaQueryWrapper<Damage>()
- .in(Damage::getEngineerId, engineerIds)
- .eq(Damage::getType, Const.GLASS_STATE_TAKE)
- .orderByAsc(Damage::getId)
- );
-
-
- jsonObject.append("temperingTakeGlassInfos", temperingTakeGlassInfos);
ArrayList<WebSocketServer> sendwServer = WebSocketServer.sessionMap.get("temperingGlass");
if (sendwServer != null) {
diff --git a/hangzhoumesParent/moduleService/TemperingGlassModule/src/main/java/com/mes/temperingglass/controller/TemperingGlassInfoController.java b/hangzhoumesParent/moduleService/TemperingGlassModule/src/main/java/com/mes/temperingglass/controller/TemperingGlassInfoController.java
index 4d0abc8..ed15b88 100644
--- a/hangzhoumesParent/moduleService/TemperingGlassModule/src/main/java/com/mes/temperingglass/controller/TemperingGlassInfoController.java
+++ b/hangzhoumesParent/moduleService/TemperingGlassModule/src/main/java/com/mes/temperingglass/controller/TemperingGlassInfoController.java
@@ -33,13 +33,7 @@
log.info("绛夊緟涓殑鐜荤拑淇℃伅{}",glass);
return Result.build(200, "", glass);
}
-// @ApiOperation("鏌ヨ杩涚倝涓殑閽㈠寲绛夌墖涓殑鐗堝浘淇℃伅,鐘舵�佸叏涓�1鐨勪负宸插埌銆�")
-// @GetMapping("/selectIntoGlass") // 鏌ヨ杩涚倝涓殑閽㈠寲绛夌墖涓殑鐗堝浘淇℃伅,鐘舵�佸叏涓�1鐨勪负宸插埌銆�
-// public Result <List<TemperingGlassInfo>> selectIntoGlass() {
-// List<TemperingGlassInfo> glass = temperingAgoService.selectIntoGlass();
-// log.info("杩涚倝涓殑鐜荤拑鐗堝浘淇℃伅{}",glass);
-// return Result.build(200, "", glass);
-// }
+
@ApiOperation("//閽㈠寲鍚庢樉绀哄嚭鐐夌殑鐗堝浘淇℃伅銆�")
@GetMapping("/selectOutGlass") //閽㈠寲鍚庢樉绀哄嚭鐐夌殑鐗堝浘淇℃伅
public Result <List<TemperingGlassInfo>> selectOutGlass() {
@@ -48,10 +42,12 @@
return Result.build(200, "", glass);
}
- @ApiOperation("//閽㈠寲鐮存崯")
+ @ApiOperation("//閽㈠寲鐮存崯鎷胯蛋鏀惧洖")
@PostMapping("/updateTemperingState") //閽㈠寲鍚庢樉绀哄嚭鐐夌殑鐗堝浘淇℃伅
public Result <Integer> updateTemperingState(@RequestBody Damage damage) {
- damageService.insertDamage(damage);
+ if(damage.getStatus()>5) {
+ damageService.insertDamage(damage);
+ }
TemperingGlassInfo temperingGlassInfo=new TemperingGlassInfo();
temperingGlassInfo.setState(damage.getStatus());
temperingGlassInfo.setGlassId(damage.getGlassId());
diff --git a/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downworkstation/controller/DownWorkstationController.java b/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downworkstation/controller/DownWorkstationController.java
index 3c547af..996f091 100644
--- a/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downworkstation/controller/DownWorkstationController.java
+++ b/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downworkstation/controller/DownWorkstationController.java
@@ -137,6 +137,26 @@
return Result.build(200, "淇敼鎴愬姛", redisUtil.getCacheObject("autoPrint"));
}
+ @ApiOperation("鏂板铏氭嫙宸ヤ綅")
+ @PostMapping("/insertDownWorkstation")
+ public Result insertDownWorkstation() {
+ DownWorkstation downWorkstation = new DownWorkstation();
+ downWorkstation.setTotalQuantity(0);
+ downWorkstation.setRacksNumber(0);
+ downWorkstation.setOtherNumber(0);
+ downWorkstation.setDeviceId(3);
+ downWorkstation.setEnableState(1);
+ downWorkstation.setWorkState(1);
+ downWorkstationService.save(downWorkstation);
+ return Result.build(200, "鏂板鎴愬姛", 1);
+ }
+
+ @ApiOperation("鍒犻櫎铏氭嫙宸ヤ綅")
+ @PostMapping("/deleteDownWorkstation")
+ public Result deleteDownWorkstation(DownWorkstation downWorkstation) {
+ downWorkstationService.removeById(downWorkstation.getWorkstationId());
+ return Result.build(200, "鍒犻櫎鎴愬姛", 1);
+ }
}
diff --git a/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/job/DownLoadCacheGlassTask.java b/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/job/DownLoadCacheGlassTask.java
index c324ce2..3905579 100644
--- a/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/job/DownLoadCacheGlassTask.java
+++ b/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/job/DownLoadCacheGlassTask.java
@@ -367,11 +367,21 @@
List<Integer> workList = new ArrayList();
if (flag08) {
if (!"2".equals(glassStatus11)) {
- workList.addAll(Const.G11_WORK_STATION);
+ List<Integer> wroklistOne = downWorkstationService.list(new LambdaQueryWrapper<DownWorkstation>()
+ .eq(DownWorkstation::getEnableState, Const.SLOT_ON).in(DownWorkstation::getWorkstationId, Const.G11_WORK_STATION))
+ .stream()
+ .map(DownWorkstation::getWorkstationId)
+ .collect(Collectors.toList());
+ workList.addAll(wroklistOne);
}
} else {
if (!"2".equals(glassStatus06)) {
- workList.addAll(Const.G06_WORK_STATION);
+ List<Integer> wroklistTwo = downWorkstationService.list(new LambdaQueryWrapper<DownWorkstation>()
+ .eq(DownWorkstation::getEnableState, Const.SLOT_ON).in(DownWorkstation::getWorkstationId, Const.G06_WORK_STATION))
+ .stream()
+ .map(DownWorkstation::getWorkstationId)
+ .collect(Collectors.toList());
+ workList.addAll(wroklistTwo);
}
}
List<Integer> workStationAll = Arrays.asList(1, 2, 3, 4, 5, 6);
diff --git a/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/job/Downpush.java b/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/job/Downpush.java
index c154291..8503db8 100644
--- a/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/job/Downpush.java
+++ b/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/job/Downpush.java
@@ -48,7 +48,7 @@
log.info("鍙戦�佸伐浣嶇幓鐠冧俊鎭�");
JSONObject jsonObject = new JSONObject();
- List<DownWorkstation> data = downWorkstationService.getoneDownWorkstations(1, 6);
+ List<DownWorkstation> data = downWorkstationService.list();
jsonObject.append("params", data);
log.info(jsonObject.toString());
ArrayList<WebSocketServer> sendwServer = WebSocketServer.sessionMap.get("unloadglass");
@@ -148,6 +148,16 @@
autoPrint = redisUtil.getCacheObject("autoPrint");
}
jsonObject4.append("autoPrint", autoPrint);
+ //浜哄伐涓嬬墖浣嶇疆鏈�鍚庝竴鐗�
+ DownGlassTask takeGlass = downGlassTaskService.getOne(
+ new QueryWrapper<DownGlassTask>()
+ .select("Top 1 *")
+ .eq("end_cell", Const.G13_WORK_STATION)
+ .orderByDesc("id")
+
+ );
+ jsonObject4.append("takeGlass", takeGlass);
+
ArrayList<WebSocketServer> sendwServer4 = WebSocketServer.sessionMap.get("unloadglass");
if (sendwServer4 != null) {
--
Gitblit v1.8.0