From c8e616de8ce8a247fe692250790fe8c89e71e862 Mon Sep 17 00:00:00 2001
From: wuyouming666 <2265557248@qq.com>
Date: 星期二, 16 七月 2024 08:34:48 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10101/r/HangZhouMes
---
hangzhoumesParent/common/servicebase/src/main/java/com/mes/glassinfo/service/impl/GlassInfoServiceImpl.java | 4
UI-Project/config.js | 3
UI-Project/src/views/UnLoadGlass/Landingindication.vue | 5
hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/edgstoragecage/entity/EdgStorageCage.java | 1
hangzhoumesParent/moduleService/UnLoadGlassModule/src/test/java/mes/UnloadGlassModuleApplicationTest.java | 4
hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/test/java/com/mes/CacheVerticalGlassModuleApplicationTest.java | 1
UI-Project/src/views/Caching/cachingbefore.vue | 24 -
UI-Project/src/lang/zh.js | 14
hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/edgstoragecage/service/impl/EdgStorageCageServiceImpl.java | 11
hangzhoumesParent/common/servicebase/src/main/java/com/mes/pp/service/impl/OptimizeLayoutServiceImpl.java | 22 +
hangzhoumesParent/common/servicebase/src/main/java/com/mes/pp/service/OptimizeLayoutService.java | 16 +
hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/job/PlcSlicecage.java | 10
hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downstorage/service/impl/DownStorageCageServiceImpl.java | 2
UI-Project/src/views/UnLoadGlass/loadmachinerack.vue | 2
UI-Project/src/views/Caching/cachingun.vue | 13
UI-Project/src/views/Slicecage/slicecage.vue | 114 +++++++-
UI-Project/src/views/PurchaseReturn/purchaseStorage.vue | 2
UI-Project/src/main.js | 4
UI-Project/src/views/UnLoadGlass/Landingindicationtwo.vue | 6
hangzhoumesParent/common/servicebase/src/main/java/com/mes/pp/mapper/OptimizeLayoutMapper.java | 20 +
hangzhoumesParent/common/servicebase/src/main/java/com/mes/work_assignment/controller/WorkAssignmentController.java | 4
UI-Project/src/views/largescreen/largescreen.vue | 473 ++++++++++++++++-------------------
hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/edgstoragecage/controller/EdgStorageCageController.java | 12
23 files changed, 438 insertions(+), 329 deletions(-)
diff --git a/UI-Project/config.js b/UI-Project/config.js
index 2dfd4e0..b15a1a5 100644
--- a/UI-Project/config.js
+++ b/UI-Project/config.js
@@ -1,6 +1,7 @@
export default {
serverUrl: "10.153.19.150:88/api",
-
+// serverUrl: "192.168.1.199:88/api",
serverUrl2: "10.153.19.150:88"
+ // serverUrl2: "192.168.1.199:88"
//serverUrl:"res.abeim.cn"
}
\ No newline at end of file
diff --git a/UI-Project/src/lang/zh.js b/UI-Project/src/lang/zh.js
index 0dbaa83..3a9af7a 100644
--- a/UI-Project/src/lang/zh.js
+++ b/UI-Project/src/lang/zh.js
@@ -90,8 +90,8 @@
width:'瀹�',
height:'楂�',
startstatus:'鍚敤鐘舵��',
- disable:'绂佺敤',
- start:'鍚敤',
+ disable:'宸茬鐢�',
+ start:'宸插惎鐢�',
deficiencieste:'鎶ョ己',
updown:'浜哄伐涓嬬墖',
operate:'鎿嶄綔',
@@ -168,8 +168,8 @@
gridnumber:'鏍呮牸鍙�',
gridnumbera:'鏍呮牸鍙凤細',
grid:'璇疯緭鍏ユ爡鏍煎彿',
- enable:'鍚敤',
- disable:'绂佺敤',
+ enable:'宸插惎鐢�',
+ disable:'宸茬鐢�',
remainingwidth:'鍓╀綑瀹藉害',
add:'娣诲姞',
sheetID:'閽㈠寲灏忕墖淇℃伅琛↖D',
@@ -237,7 +237,7 @@
state:'鐘舵��',
devicenumber:'璁惧鍙�',
startstatus:'鍚敤鐘舵��',
- enable:'鍚敤',
+ enable:'宸插惎鐢�',
unenable:'鏈惎鐢�',
operate:'鎿嶄綔',
bindingshelves:'缁戝畾鏋跺瓙',
@@ -410,7 +410,7 @@
notstocked: '鏈叆搴�',
inboundstatus: '閮ㄥ垎鍏ュ簱鐘舵��',
allstatus: '鍏ㄩ儴鍏ュ簱鐘舵��',
-
-
+ completedquantity: '瀹屾垚鏁伴噺',
+ scrapquantity: '鎶ュ簾鏁伴噺',
}
}
\ No newline at end of file
diff --git a/UI-Project/src/main.js b/UI-Project/src/main.js
index 8ac785a..7f48d13 100644
--- a/UI-Project/src/main.js
+++ b/UI-Project/src/main.js
@@ -12,7 +12,9 @@
import 'vxe-table/lib/style.css'
import i18n from '@/lang'
// import Echarts from "vue-echarts"
-// import * as echarts from "echarts"
+import * as echarts from "echarts"
+// echarts.registerMap('china', china)
+// Vue.prototype.$echarts = echarts
// app.component("v-chart", Echarts)
// app.config.globalProperties.$echarts = echarts
diff --git a/UI-Project/src/views/Caching/cachingbefore.vue b/UI-Project/src/views/Caching/cachingbefore.vue
index 04a819f..6c9510b 100644
--- a/UI-Project/src/views/Caching/cachingbefore.vue
+++ b/UI-Project/src/views/Caching/cachingbefore.vue
@@ -42,7 +42,7 @@
const toggleEnableState = async (row) => {
const newState = row.enable_state === 1 ? 0 : 1;
// 鍙戦�佽姹傚埌鍚庣鏇存柊鐘舵�侊紙杩欓噷鐪佺暐浜嗗疄闄呯殑璇锋眰閫昏緫锛�
- const response = await request.post('/cacheGlass/edgStorageCage/updateEdgStorageCage', { id: row.id, enablestate: newState });
+ const response = await request.post('/cacheGlass/edgStorageCage/updateEdgStorageCage', { id: row.id, enableState: newState });
if (response.code === 200) {
ElMessage.success(response.message);
} else {
@@ -104,7 +104,7 @@
</script>
<template>
- <div>
+ <div style="height: 500px;">
<el-card style="flex: 1;margin-left: 10px;margin-top: 20px;" v-loading="loading">
<div style="width: 98%; height: calc(100% - 35px); overflow-y: auto;">
<el-table height="240" ref="table"
@@ -141,10 +141,9 @@
</el-table>
</div>
</el-card>
- </div>
- <div id="awatch">
- <img src="../../assets/woshihuancun.png" alt="" style="width: 60%;height: 90%;margin-left: 260px;margin-top: 20px;position: relative;">
- <div style="position: absolute; width: 500px;height: 95px;margin-top: -165px;margin-left: 450px;">
+ <div class="awatch">
+ <img src="../../assets/woshihuancun.png" alt="" style="width: 70%;height: 90%;margin-left: 200px;margin-top: 20px;position: relative;">
+ <div style="position: relative; width: 500px;height: 95px;margin-top: -165px;margin-left: 450px;">
<div
v-for="(rect, index) in adjustedRects"
:key="rect"
@@ -153,11 +152,9 @@
backgroundColor: '#409EFF'
}"
>
- </div>
</div>
-<!-- <div style="width: 100px;height: 10px;background-color: #409EFF;margin-top: -124px;margin-left: 480px;"></div>
-<div style="width: 100px;height: 10px;background-color: #409EFF;margin-top: -30px;margin-left: 850px;"></div>
-<div style="width: 100px;height: 10px;background-color: #409EFF;margin-top: 30px;margin-left: 695px;"></div> -->
+ </div>
+</div>
</div>
</template>
@@ -178,9 +175,10 @@
background-color: #337ecc;
margin-left: 28%;
}
-#awatch{
+.awatch{
height: 460px;
width: 1500px;
- /* margin-top: -60px; */
+ max-width: 100%;
}
-</style>
\ No newline at end of file
+
+</style>
diff --git a/UI-Project/src/views/Caching/cachingun.vue b/UI-Project/src/views/Caching/cachingun.vue
index cf17b1f..d1ec117 100644
--- a/UI-Project/src/views/Caching/cachingun.vue
+++ b/UI-Project/src/views/Caching/cachingun.vue
@@ -1,5 +1,5 @@
<template>
- <div>
+ <div style="height: 500px;">
<el-card style="flex: 1;margin-left: 10px;margin-top: 20px;" v-loading="loading">
<div style="width: 98%; height: calc(100% - 35px); overflow-y: auto;">
<el-table height="240" ref="table"
@@ -36,10 +36,9 @@
</el-table>
</div>
</el-card>
- </div>
- <div id="awatch">
- <img src="../../assets/woshihuancun.png" alt="" style="width: 60%;height: 90%;margin-left: 260px;margin-top: 20px;position: relative;">
- <div style="position: absolute; width: 500px;height: 95px;margin-top: -165px;margin-left: 450px;">
+ <div class="awatch">
+ <img src="../../assets/woshihuancun.png" alt="" style="width: 70%;height: 90%;margin-left: 200px;margin-top: 20px;position: relative;">
+ <div style="position: relative; width: 500px;height: 95px;margin-top: -165px;margin-left: 450px;">
<div
v-for="(rect, index) in adjustedRects"
:key="rect"
@@ -50,6 +49,7 @@
>
</div>
</div>
+</div>
</div>
</template>
<script setup>
@@ -245,9 +245,10 @@
background-color: #337ecc;
margin-left: 28%;
}
-#awatch{
+.awatch{
height: 460px;
width: 1500px;
+ max-width: 100%;
/* margin-top: -60px; */
}
</style>
\ No newline at end of file
diff --git a/UI-Project/src/views/PurchaseReturn/purchaseStorage.vue b/UI-Project/src/views/PurchaseReturn/purchaseStorage.vue
index 10bf427..d987eb8 100644
--- a/UI-Project/src/views/PurchaseReturn/purchaseStorage.vue
+++ b/UI-Project/src/views/PurchaseReturn/purchaseStorage.vue
@@ -38,7 +38,7 @@
widtha: rect.width,
heighta: rect.height,
}));
- console.log(data.intoGlass[0]);
+ console.log(adjustedRects.value);
};
onMounted(() => {
// fetchFlowCardId();
diff --git a/UI-Project/src/views/Slicecage/slicecage.vue b/UI-Project/src/views/Slicecage/slicecage.vue
index dc2e16a..5fd9087 100644
--- a/UI-Project/src/views/Slicecage/slicecage.vue
+++ b/UI-Project/src/views/Slicecage/slicecage.vue
@@ -23,6 +23,8 @@
const carPosition = ref([])
const adjustedRects = ref([]);
const project = ref([]);
+const adjust = ref([]);
+const adjusta = ref([]);
const adjustedRectsa = ref([]);
const adjustedRectsb = ref([]);
const adjustedRectsc = ref([]);
@@ -30,6 +32,7 @@
const adjustedRectse = ref([]);
const adjustedRectsf = ref([]);
const adjustedRectsg = ref([]);
+const adjustedRectsh = ref([]);
const currentRow = reactive({}); // 褰撳墠琛岀殑鏁版嵁
const add = ref(false)
const flowCardId = ref('');
@@ -64,6 +67,7 @@
const cell6=ref(true);
const cell7=ref(true);
const cell8=ref(true);
+const cell9=ref(true);
const selectedRow = ref(null); // 瀛樺偍閫変腑鐨勮鏁版嵁
@@ -124,7 +128,11 @@
}
return index;
}
-
+ function jumpToPage(page: number) {
+ if (page >= 1 && page <= totalPages.value) {
+ currentPage.value = page;
+ }
+}
// 涓婁竴椤靛拰涓嬩竴椤垫柟娉�
const prevPage = () => {
if (currentPage.value > 1) {
@@ -463,14 +471,21 @@
// 鏇存柊 tableData 鐨勬暟鎹�
tableDatac.value = data.bigStorageCageDetailsOutTask[0]
tableDatad.value = data.bigStorageCageDetailsFeedTask[0]
+ // adjust.value = data.bigStorageCageDetailsFeedTask[0].map(rect => ({
+ // ...rect,
+ // }));
+ adjusta.value = data.bigStorageCageDetailsOutTask[0].filter(rect => rect.slot !== null && rect.slot !== undefined);
+ adjust.value = data.bigStorageCageDetailsFeedTask[0].filter(rect => rect.slot !== null && rect.slot !== undefined);
+// const adjust = computed(() => {
+// return data.value.bigStorageCageDetailsFeedTask[0].filter(rect => rect.slot !== null && rect.slot !== undefined);
+// });
tableData.value = data.bigStorageCageInfo[0]
tableDatab.value = data.temperingGlassInfoList[0]
tableDatae.value = data.bigStorageCageUsage[0]
carPosition.value = data.carPostion[0]
- console.log(carPosition.value);
- window.localStorage.setItem('length', data.data.bigStorageCageInfos[0][1].length)
+ window.localStorage.setItem('length', data.bigStorageCageInfos[0][1].length)
let length = window.localStorage.getItem('length')
- adjustedRects.value = data.data.bigStorageCageInfos[0][1].map(rect => ({
+ adjustedRects.value = data.bigStorageCageInfos[0][1].map(rect => ({
...rect,
height: 20/length,
top: 29/length
@@ -506,6 +521,11 @@
top: 29/length
}));
adjustedRectsg.value = data.bigStorageCageInfos[0][8].map(rect => ({
+ ...rect,
+ height: 20/length,
+ top: 29/length
+ }));
+adjustedRectsh.value = data.bigStorageCageInfos[0][9].map(rect => ({
...rect,
height: 20/length,
top: 29/length
@@ -581,7 +601,7 @@
<div style="width: 98%; height: calc(100% - 35px); overflow-y: auto;max-height: 100px;">
<el-table height="100%" ref="table"
:data="tableDatac" :header-cell-style="{background:'#F2F3F5 ',color:'#1D2129'}">
- <el-table-column prop="bigStorageCageOutTask.glassId" align="center" :label="$t('searchOrder.outputglassID')" min-width="100" />
+ <el-table-column prop="bigStorageCageOutTask.glassId" align="center" :label="$t('searchOrder.outputglassID')" min-width="120" />
<el-table-column prop="bigStorageCageOutTask.startSlot" align="center" :label="$t('searchOrder.startposition')" min-width="120" />
<el-table-column prop="bigStorageCageOutTask.endSlot" align="center" :label="$t('searchOrder.targetlocation')" min-width="120" />
<el-table-column prop="bigStorageCageOutTask.trainNumber" align="center" :label="$t('searchOrder.trips')" min-width="120" />
@@ -594,9 +614,9 @@
<el-table-column prop="id" align="center" :label="$t('searchOrder.tabid')" min-width="150"/>
<el-table-column prop="deviceId" align="center" :label="$t('searchOrder.tid')" min-width="100"/>
<el-table-column prop="slot" align="center" :label="$t('searchOrder.gridnumber')" min-width="100"/>
- <el-table-column prop="glassId" align="center" :label="$t('searchOrder.glassID')" min-width="100"/>
+ <el-table-column prop="glassId" align="center" :label="$t('searchOrder.glassID')" min-width="120"/>
<el-table-column prop="sequence" align="center" :label="$t('searchOrder.pieceingrid')" min-width="150"/>
- <el-table-column prop="flowCardId" align="center" :label="$t('searchOrder.cardnumber')" min-width="100"/>
+ <el-table-column prop="flowCardId" align="center" :label="$t('searchOrder.cardnumber')" min-width="140"/>
<el-table-column prop="glassType" align="center" :label="$t('searchOrder.typeglass')" min-width="100"/>
<el-table-column prop="width" align="center" :label="$t('searchOrder.width')" min-width="100"/>
<el-table-column prop="height" align="center" :label="$t('searchOrder.height')" min-width="100"/>
@@ -662,16 +682,38 @@
<!-- // 鐖剁骇妗� -->
<div class="img-dlpl" >
<div class="img-car1" :style="'z-index:999;left:247px;top:' + 350*carPosition[0] + 'px;position:absolute;'">
- <div v-show="cellshow1" style="margin-top:10px;width:200px;height:5px;background-color:#409EFF;"></div>
+ <div
+ v-for="(rect, index) in adjusta"
+ :key="rect.id"
+ :style="{
+ width: '30px',
+ height: '5px',
+ backgroundColor: '#409EFF',
+ marginLeft: index * 5+ `px`,
+ top: '10px',
+ }"
+ >
+ </div>
</div>
<div class="img-car4" :style="'z-index:999;left:704px;top:' + 350*carPosition[1] + 'px;position:absolute;'">
- <div v-show="cellshow4" style="margin-top:10px;width:200px;height:5px;background-color:#409EFF;"></div>
+ <div
+ v-for="(rect, index) in adjust"
+ :key="rect.id"
+ :style="{
+ width: '30px',
+ height: '5px',
+ backgroundColor: '#409EFF',
+ marginLeft: index * 5+ `px`,
+ top: '10px',
+ }"
+ >
+ </div>
</div>
<div style="position: relative;">
<div v-show="cell1" style="width: 227px;height: 29px;position: relative;top:55px;left: 465px;">
<div
v-for="(rect, index) in adjustedRects"
- :key="rect.id"
+ :key="rect"
:style="{
// display:'flex',
@@ -915,6 +957,37 @@
</div>
</div>
</div>
+ <div v-show="cell9" style="width: 227px;height: 29px;position: absolute;top:300px;left: 465px;">
+ <div
+ v-for="(rect, index) in adjustedRectsh"
+ :key="rect.id"
+ :style="{
+
+ // display:'flex',
+ position: 'absolute',
+ width: '227px',
+ // backgroundColor: 'red',
+ left: '0px',
+ top: index*rect.top+`px`,
+ height: `${rect.height}px`,
+ }"
+ >
+ <div
+ v-for="(rects, index) in rect.bigStorageCageDetails"
+ :key="rects"
+ :style="{
+ float:'left',
+ width: '18px',
+ height: `${rect.height}px`,
+ backgroundColor: '#911005',
+ // border:'1px solid black',
+ top: '0px',
+ marginRight: rects.gap/5000*227+'px'
+ }"
+ >
+ </div>
+ </div>
+ </div>
</div>
</div>
</div>
@@ -983,7 +1056,7 @@
</el-table>
</div>
</el-dialog>
-<el-dialog v-model="dialogFormVisiblea" top="5vh" width="97%" :title="$t('searchOrder.cageinformation')">
+<el-dialog v-model="dialogFormVisiblea" top="2vh" width="97%" :title="$t('searchOrder.cageinformation')">
<el-table
:data="paginatedUsers"
@row-click="handleRowClick"
@@ -1004,9 +1077,9 @@
:header-cell-style="{background:'#F2F3F5 ',color:'#1D2129'}"
>
<!-- <el-table-column prop="menuName" label="浜岀骇鑿滃崟鏍�" align="center" min-width="140" :header-cell-style="{background:'#F2F3F5 ',color:'#1D2129'}"/> -->
- <el-table-column prop="glassId" :label="$t('searchOrder.glassID')" align="center" min-width="90"/>
- <el-table-column prop="sequence" align="center" :label="$t('searchOrder.pieceingrid')" min-width="110" />
- <el-table-column prop="flowCardId" align="center" :label="$t('searchOrder.cardnumber')" min-width="120" />
+ <el-table-column prop="glassId" :label="$t('searchOrder.glassID')" align="center" min-width="130"/>
+ <el-table-column prop="sequence" align="center" :label="$t('searchOrder.pieceingrid')" min-width="130" />
+ <el-table-column prop="flowCardId" align="center" :label="$t('searchOrder.cardnumber')" min-width="130" />
<el-table-column prop="glassType" align="center" :label="$t('searchOrder.typeglass')" min-width="80" />
<el-table-column prop="width" align="center" :label="$t('searchOrder.width')" min-width="80" />
<el-table-column prop="height" align="center" :label="$t('searchOrder.height')" min-width="80" />
@@ -1073,7 +1146,16 @@
<div style="margin-top: 20px; text-align: center;">
<!-- 涓婁竴椤垫寜閽� -->
<el-button @click="prevPage" :disabled="currentPage === 1">{{ $t('searchOrder.up') }}</el-button>
-
+ <div style="display: inline-block; margin: 0 20px;">
+ <el-button
+ v-for="page in totalPages"
+ :key="page"
+ :class="{ 'is-active': currentPage === page }"
+ @click="jumpToPage(page)"
+ >
+ {{ page }}
+ </el-button>
+ </div>
<!-- 涓嬩竴椤垫寜閽� -->
<el-button @click="nextPage" :disabled="currentPage >= totalPages">{{ $t('searchOrder.down') }}</el-button>
@@ -1250,6 +1332,7 @@
position:relative
}
.img-car1{
+ display: flex;
background-image:url('../../assets/lp.png');
position: absolute;
background-repeat: no-repeat;
@@ -1262,6 +1345,7 @@
position:relative
}
.img-car4{
+ display: flex;
background-image:url('../../assets/lpa.png');
position: absolute;
background-repeat: no-repeat;
diff --git a/UI-Project/src/views/UnLoadGlass/Landingindication.vue b/UI-Project/src/views/UnLoadGlass/Landingindication.vue
index f8d1715..89d7621 100644
--- a/UI-Project/src/views/UnLoadGlass/Landingindication.vue
+++ b/UI-Project/src/views/UnLoadGlass/Landingindication.vue
@@ -171,8 +171,7 @@
Swal.fire({
// title: '鐜荤拑淇℃伅',
- title: this.$t('reportWork.glassinformation'),
- // title: "$t('reportWork.glassinformation')",
+ title: t('reportWork.glassinformation'),
html: tableContent,
customClass: {
popup: 'format-pre'
@@ -199,7 +198,7 @@
<style scoped>
.glass-rack {
- margin-left: 20px;
+ /* margin-left: 10px; */
width: 500px;
margin-top: 5px;
}
diff --git a/UI-Project/src/views/UnLoadGlass/Landingindicationtwo.vue b/UI-Project/src/views/UnLoadGlass/Landingindicationtwo.vue
index 7f31ea5..6566fde 100644
--- a/UI-Project/src/views/UnLoadGlass/Landingindicationtwo.vue
+++ b/UI-Project/src/views/UnLoadGlass/Landingindicationtwo.vue
@@ -167,7 +167,7 @@
tableContent += '</table>';
Swal.fire({
- title: "$t('reportWork.glassinformation')",
+ title: t('reportWork.glassinformation'),
// title: '鐜荤拑淇℃伅',
html: tableContent,
customClass: {
@@ -193,9 +193,9 @@
<style scoped>
.glass-rack {
- margin-left: 20px;
+ /* margin-left: 20px; */
width: 500px;
- margin-top: 10px;
+ margin-top: 5px;
}
.rack-rect:hover {
cursor: pointer;
diff --git a/UI-Project/src/views/UnLoadGlass/loadmachinerack.vue b/UI-Project/src/views/UnLoadGlass/loadmachinerack.vue
index ef90cf6..9769112 100644
--- a/UI-Project/src/views/UnLoadGlass/loadmachinerack.vue
+++ b/UI-Project/src/views/UnLoadGlass/loadmachinerack.vue
@@ -222,7 +222,7 @@
<el-table-column prop="totalquantity" align="center" :label="$t('reportWork.totalquantity')" min-width="120" />
<el-table-column prop="racksnumber" align="center" :label="$t('reportWork.beendropped')" min-width="120" />
<el-table-column prop="layer" align="center" label="灞傛暟" min-width="120" />
- <el-table-column prop="artificialnumber" align="center" label="浜哄伐涓嬬墖鏁�" min-width="120" />
+ <el-table-column prop="otherNumber" align="center" label="浜哄伐涓嬬墖鏁�" min-width="120" />
<el-table-column prop="work_state" align="center" :label="$t('reportWork.state')" min-width="120" />
<el-table-column prop="deviceId" align="center" :label="$t('reportWork.devicenumber')" min-width="120" />
<el-table-column
diff --git a/UI-Project/src/views/largescreen/largescreen.vue b/UI-Project/src/views/largescreen/largescreen.vue
index 4f2d4ae..bd8d350 100644
--- a/UI-Project/src/views/largescreen/largescreen.vue
+++ b/UI-Project/src/views/largescreen/largescreen.vue
@@ -1,107 +1,105 @@
<template>
- <el-card style="flex: 1;margin-left: 10px;margin-top: 10px;margin-right: 10px;" v-loading="loading">
- <el-scrollbar height="600px">
- <div id="top" style="height: 150px;display: flex;">
- <div v-for="(rect, index) in adjustedRects"
- :key="index"
- :style="{ width: '1000px', height: '100px',margin: '5px',}">
- <div ref="setChartDom(index, $el)" style="width: 100%; height: 100%;"></div>
- <div style="text-align: center;">
- {{ rect.thisProcess }}</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 id="center" style="margin-top: 10px;margin-left: 10px; height: 240px;width: 750px;">
- <img src="../../assets/d1.png" alt="" style="margin-left: -30px; width: 110%;height: 100%;position: relative;">
+ <el-card style="flex: 1;margin-left: 10px;margin-top: 10px;margin-right: 10px;" v-loading="loading">
+ <el-scrollbar height="600px">
+<div id="top" style="height: 150px;display: flex;">
+ <div class="echarts-container">
+ <div v-for="(processData, index) in processesData" :key="index" class="echarts-item">
+ <div :id="'pieChart_' + index" class="pie-chart"></div>
</div>
- <div id="centerright" style="margin-top: 10px;margin-left: 10px; height: 240px;width: 240px;background-color: #911005;">
- <el-table height="240" ref="table" width="340px"
- @selection-change="handleSelectionChange"
- :data="tableDatab" :header-cell-style="{background:'#F2F3F5 ',color:'#1D2129'}">
- <el-table-column prop="projectNo" align="center" :label="$t('large.projectnumber')" min-width="50" />
- <el-table-column prop="projectName" align="center" :label="$t('large.projectname')" min-width="50" />
- </el-table>
- </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 id="center" style="margin-top: 10px;margin-left: 10px; height: 240px;width: 750px;">
+ <img src="../../assets/d1.png" alt="" style="margin-left: -30px; width: 110%;height: 100%;position: relative;">
+</div>
+<div id="centerright" style="margin-top: 10px;margin-left: 10px; height: 240px;width: 240px;background-color: #911005;">
+ <el-table height="240" ref="table" width="340px"
+ @selection-change="handleSelectionChange"
+ :data="tableDatab" :header-cell-style="{background:'#F2F3F5 ',color:'#1D2129'}">
+ <el-table-column prop="projectNo" align="center" :label="$t('large.projectnumber')" min-width="50" />
+ <el-table-column prop="projectName" align="center" :label="$t('large.projectname')" min-width="50" />
+ </el-table>
+</div>
</div>
<div id="bottom" style="margin-top: 10px;height: 190px;background-color: #911005;">
- <el-table height="190" 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" />
- <el-table-column prop="customerName" align="center" :show-overflow-tooltip="true" :label="$t('large.customerName')" min-width="90" />
- <el-table-column prop="project" align="center" :label="$t('large.project')" min-width="50" />
- <el-table-column prop="area" align="center" :label="$t('large.are')" min-width="50" />
- <el-table-column prop="quantity" align="center" :label="$t('large.quantity')" min-width="50" />
- <el-table-column
- align="center"
- :label="$t('large.warehousing')"
- min-width="50"
- prop="warehousing"
- >
- <template #default="scope">
- <el-tag :type="getStatusType(scope.row.warehousing)">
- {{ getStatusText(scope.row.warehousing) }}
- </el-tag>
- </template>
- </el-table-column>
- <el-table-column prop="deliveryDate" align="center" :label="$t('large.deliveryDate')" min-width="50" />
- </el-table>
+<el-table height="190" 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" />
+ <el-table-column prop="customerName" align="center" :show-overflow-tooltip="true" :label="$t('large.customerName')" min-width="90" />
+ <el-table-column prop="project" align="center" :label="$t('large.project')" min-width="50" />
+ <el-table-column prop="area" align="center" :label="$t('large.are')" min-width="50" />
+ <el-table-column prop="quantity" align="center" :label="$t('large.quantity')" min-width="50" />
+ <el-table-column
+ align="center"
+ :label="$t('large.warehousing')"
+ min-width="50"
+ prop="warehousing"
+ >
+ <template #default="scope">
+ <el-tag :type="getStatusType(scope.row.warehousing)">
+ {{ getStatusText(scope.row.warehousing) }}
+ </el-tag>
+ </template>
+ </el-table-column>
+ <el-table-column prop="deliveryDate" align="center" :label="$t('large.deliveryDate')" min-width="50" />
+ </el-table>
</div>
- </el-scrollbar>
- </el-card>
- <el-dialog v-model="blinda" top="10vh" width="80%" :title="$t('large.brokeno')">
- <el-table height="500" ref="table"
- @selection-change="handleSelectionChange"
- :data="tableData" :header-cell-style="{background:'#F2F3F5 ',color:'#1D2129'}">
- <el-table-column prop="reportingWorkTime" fixed align="center" :label="$t('large.time')" min-width="110" />
- <el-table-column prop="orderId" fixed align="center" :label="$t('large.number')" min-width="110" />
- <el-table-column prop="reportingWorkId" align="center" :label="$t('large.jobnumber')" min-width="120" />
- <el-table-column prop="productionId" align="center" :label="$t('large.productionnumber')" min-width="130" />
- <el-table-column prop="processId" align="center" :label="$t('large.cardnumber')" min-width="140" />
- <el-table-column prop="project" align="center" :label="$t('large.projectname')" min-width="110" />
- <el-table-column prop="batch" align="center" :label="$t('large.batch')" min-width="110" />
- <el-table-column prop="reviewer" align="center" :label="$t('large.detailID')" min-width="110" />
- <el-table-column prop="orderSort" align="center" :label="$t('large.serialnumber')" min-width="110" />
- <el-table-column prop="productName" align="center" :label="$t('large.productname')" :show-overflow-tooltip="true" min-width="220" />
- <el-table-column prop="technologyNumber" align="center" :label="$t('large.serial')" min-width="110" />
- <el-table-column prop="glassAddress" align="center" :label="$t('large.slicemarker')" min-width="130" />
- <el-table-column prop="patchNum" align="center" :label="$t('large.numberpatches')" min-width="110" />
- <el-table-column prop="width" align="center" :label="$t('large.width')" min-width="110" />
- <el-table-column prop="height" align="center" :label="$t('large.height')" min-width="110" />
- <el-table-column prop="shape" align="center" :label="$t('large.shape')" min-width="110" />
- <el-table-column prop="responsibleProcess" align="center" :label="$t('large.responsibleprocess')" min-width="110" />
- <el-table-column prop="patchProcesses" align="center" :label="$t('large.process')" min-width="110" />
- <el-table-column prop="breakageQuantity" align="center" :label="$t('large.numberfractions')" min-width="110" />
- <el-table-column prop="patchReason" align="center" :label="$t('large.breakreason')" min-width="110" />
- <el-table-column prop="patchType" align="center" :label="$t('large.breaktype')" min-width="110" />
- <el-table-column prop="responsiblePersonnel" align="center" :label="$t('large.responsiblepersonnel')" min-width="110" />
- <el-table-column prop="responsibleEquipment" align="center" :label="$t('large.responsiblequipment')" min-width="110" />
- <el-table-column prop="responsibleTeam" align="center" :label="$t('large.responsibleteam')" min-width="110" />
- <el-table-column prop="patchArea" align="center" :label="$t('large.area')" min-width="110" />
- <el-table-column prop="qualityInspector" align="center" :label="$t('large.inspector')" min-width="110" />
- </el-table>
- <template #footer>
- <div id="dialog-footer">
- <el-button @click="blinda = false">{{ $t('large.close') }}</el-button>
- </div>
- </template>
- </el-dialog>
+</el-scrollbar>
+</el-card>
+<el-dialog v-model="blinda" top="5vh" width="80%" :title="$t('large.brokeno')">
+ <el-table height="400" ref="table"
+ @selection-change="handleSelectionChange"
+ :data="tableData" :header-cell-style="{background:'#F2F3F5 ',color:'#1D2129'}">
+ <el-table-column prop="reportingWorkTime" fixed align="center" :label="$t('large.time')" min-width="110" />
+ <el-table-column prop="orderId" fixed align="center" :label="$t('large.number')" min-width="110" />
+ <el-table-column prop="reportingWorkId" align="center" :label="$t('large.jobnumber')" min-width="120" />
+ <el-table-column prop="productionId" align="center" :label="$t('large.productionnumber')" min-width="130" />
+ <el-table-column prop="processId" align="center" :label="$t('large.cardnumber')" min-width="140" />
+ <el-table-column prop="project" align="center" :label="$t('large.projectname')" min-width="110" />
+ <el-table-column prop="batch" align="center" :label="$t('large.batch')" min-width="110" />
+ <el-table-column prop="reviewer" align="center" :label="$t('large.detailID')" min-width="110" />
+ <el-table-column prop="orderSort" align="center" :label="$t('large.serialnumber')" min-width="110" />
+ <el-table-column prop="productName" align="center" :label="$t('large.productname')" :show-overflow-tooltip="true" min-width="220" />
+ <el-table-column prop="technologyNumber" align="center" :label="$t('large.serial')" min-width="110" />
+ <el-table-column prop="glassAddress" align="center" :label="$t('large.slicemarker')" min-width="130" />
+ <el-table-column prop="patchNum" align="center" :label="$t('large.numberpatches')" min-width="110" />
+ <el-table-column prop="width" align="center" :label="$t('large.width')" min-width="110" />
+ <el-table-column prop="height" align="center" :label="$t('large.height')" min-width="110" />
+ <el-table-column prop="shape" align="center" :label="$t('large.shape')" min-width="110" />
+ <el-table-column prop="responsibleProcess" align="center" :label="$t('large.responsibleprocess')" min-width="110" />
+ <el-table-column prop="patchProcesses" align="center" :label="$t('large.process')" min-width="110" />
+ <el-table-column prop="breakageQuantity" align="center" :label="$t('large.numberfractions')" min-width="110" />
+ <el-table-column prop="patchReason" align="center" :label="$t('large.breakreason')" min-width="110" />
+ <el-table-column prop="patchType" align="center" :label="$t('large.breaktype')" min-width="110" />
+ <el-table-column prop="responsiblePersonnel" align="center" :label="$t('large.responsiblepersonnel')" min-width="110" />
+ <el-table-column prop="responsibleEquipment" align="center" :label="$t('large.responsiblequipment')" min-width="110" />
+ <el-table-column prop="responsibleTeam" align="center" :label="$t('large.responsibleteam')" min-width="110" />
+ <el-table-column prop="patchArea" align="center" :label="$t('large.area')" min-width="110" />
+ <el-table-column prop="qualityInspector" align="center" :label="$t('large.inspector')" min-width="110" />
+ </el-table>
+ <template #footer>
+ <div id="dialog-footer" style="text-align: center;">
+ <el-button @click="blinda = false">{{ $t('large.close') }}</el-button>
+ </div>
+ </template>
+</el-dialog>
</template>
<script setup>
import { Delete, Upload } from '@element-plus/icons-vue'
@@ -124,188 +122,147 @@
let chartInstance = null;
const blinda = ref(false)
const handleBinda = (row) => {
- blinda.value = true;
+blinda.value = true;
};
+const processesData = ref([
+
+]);
function getStatusType(warehousing) {
- switch (warehousing) {
- case 0:
- return 'info';
- case 1:
- return 'warning';
- case 2:
- return 'success';
- }
+switch (warehousing) {
+ case 0:
+ return 'info';
+ case 1:
+ return 'warning';
+ case 2:
+ return 'success';
+}
}
function getStatusText(warehousing) {
- switch (warehousing) {
- case 0:
- return t('large.notstocked');
- case 1:
- return t('large.inboundstatus');
- case 2:
- return t('large.allstatus');
- }
+switch (warehousing) {
+ case 0:
+ return t('large.notstocked');
+ case 1:
+ return t('large.inboundstatus');
+ case 2:
+ return t('large.allstatus');
+}
}
const socketUrl = `ws://${WebSocketHost}:${host}/api/temperingGlass/api/talk/screen`;
const handleMessage = (data) => {
- tableData.value = data.awaitingRepairs[0]
- tableDatab.value = data.DoingTask[0]
- tableDatac.value = data.orders[0]
- // adjustedRects.value = data.device[0].map(rect => ({
- // ...rect,
- // completed: rect.completedQuantity,
- // breakage: rect.breakageQuantity,
- // thisProcess: rect.thisProcess,
- // }));
+tableData.value = data.awaitingRepairs[0]
+tableDatab.value = data.DoingTask[0]
+tableDatac.value = data.orders[0]
+// adjustedRects.value = data.device[0].map(rect => ({
+// ...rect,
+// completed: rect.completedQuantity,
+// breakage: rect.breakageQuantity,
+// thisProcess: rect.thisProcess,
+// }));
};
let socket;
// 璁剧疆鍥捐〃 DOM 寮曠敤
function setChartDom(index, el) {
- if (!chartRefs.value[index]) {
- chartRefs.value[index] = { dom: el, chart: null };
- } else {
- chartRefs.value[index].dom = el;
- }
+if (!chartRefs.value[index]) {
+ chartRefs.value[index] = { dom: el, chart: null };
+} else {
+ chartRefs.value[index].dom = el;
+}
}
onMounted(() => {
- socket = new WebSocket(socketUrl);
- socket.onmessage = (event) => {
- const data = JSON.parse(event.data);
- adjustedRects.value = data.device[0].map(rect => ({
- ...rect,
- completedQuantity: rect.completedQuantity,
- breakageQuantity: rect.breakageQuantity,
- thisProcess: rect.thisProcess,
- }));
- console.log(adjustedRects.value);
- // updateCharts();
- };
- adjustedRects.value.forEach((rect, index) => {
- initChart(index, rect);
- });
- // };
+socket = new WebSocket(socketUrl);
+socket.onmessage = (event) => {
+ const data = JSON.parse(event.data);
+ processesData.value = data.device[0].map(rect => ({
+ ...rect,
+ completedQuantity: rect.completedQuantity,
+ breakageQuantity: rect.breakageQuantity,
+ thisProcess: rect.thisProcess,
+ }));
+ renderPieCharts();
+ console.log(processesData.value);
+ // updateCharts();
+};
+
+// };
});
-
-
-function initChart(index, rect) {
- const { dom } = chartRefs.value[index] || { dom: null };
- if (dom) {
- const chart = echarts.init(dom);
- const option = {
- tooltip: {
- trigger: 'item'
- },
- legend: {
- orient: 'vertical',
- left: 'left',
- },
- series: [
- {
- name: '楗肩姸鍥�',
- type: 'pie',
- radius: ['50%','70%'],
- data: [
- {value: rect.completedQuantity, name: '鍔犲伐鏁伴噺'},
- {value: rect.breakageQuantity, name: '娆＄牬鏁伴噺'},
- console.log(rect.breakageQuantity)
- ],
- emphasis: {
- itemStyle: {
- shadowBlur: 10,
- shadowOffsetX: 0,
- shadowColor: 'rgba(0, 0, 0, 0.5)'
- }
- }
- }
- ]
- };
- chart.setOption(option);
- chartRefs.value[index] = { ...chartRefs.value[index], chart };
+const renderPieCharts = () => {
+processesData.value.forEach((data, index) => {
+ const chart = echarts.init(document.getElementById('pieChart_' + 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
+ },
+ }
+ ]
+ };
-}
-console.log(chartRefs.value[index]);
-}
-
-// 鏇存柊鍥捐〃
-// function updateCharts() {
-// adjustedRects.value.forEach((rect, index) => {
-// const { chart } = chartRefs.value[index] || { chart: null };
-// if (chart) {
-// chart.setOption({
-// series: [{
-// data: [
-// { value: rect.completedQuantity, name: '鍔犲伐鏁伴噺' },
-// { value: rect.breakageQuantity, name: '娆＄牬鏁伴噺' },
-// ],
-// }],
-// });
-// }
-// });
-// }
-// 鍒濆鍖栧浘琛�
-// function initChart(index, rect) {
-// const chartDom = ref(`chartDom${index}`).value;
-// console.log(ref(`chartDom${index}`).value);
-// const chart = echarts.init(chartDom);
-// const option = {
-// tooltip: {
-// trigger: 'item'
-// },
-// legend: {
-// orient: 'vertical',
-// left: 'left',
-// },
-// series: [
-// {
-// name: '楗肩姸鍥�',
-// type: 'pie',
-// radius: ['50%','70%'],
-// data: [
-// {value: rect.completed, name: '鍔犲伐鏁伴噺'},
-// {value: rect.breakage, name: '娆＄牬鏁伴噺'},
-// ],
-// emphasis: {
-// itemStyle: {
-// shadowBlur: 10,
-// shadowOffsetX: 0,
-// shadowColor: 'rgba(0, 0, 0, 0.5)'
-// }
-// }
-// }
-// ]
-// };
-// chart.setOption(option);
-// }
-// 娓呯悊 WebSocket 杩炴帴
+ chart.setOption(options);
+});
+};
+
+
onUnmounted(() => {
- socket.close();
+socket.close();
});
onMounted(() => {
- // fetchFlowCardId();
- // fetchTableData(); // 鑾峰彇鏁版嵁
- initializeWebSocket(socketUrl, handleMessage);
+// fetchFlowCardId();
+// fetchTableData(); // 鑾峰彇鏁版嵁
+initializeWebSocket(socketUrl, handleMessage);
+
});
onBeforeUnmount(() => {
- console.log("鍏抽棴浜�")
- closeWebSocket();
+console.log("鍏抽棴浜�")
+closeWebSocket();
});
</script>
-
+
<style scoped>
-.rect {
- border: 1px solid black; /* 璁剧疆鐭╁舰鐨勮竟妗� */
- /* background-color: lightblue; 璁剧疆鐭╁舰鐨勮儗鏅壊 */
-}
-.centered-text {
- /* 璁剧疆鏂囧瓧灞呬腑鏍峰紡 */
- display: flex;
- justify-content: center;
- align-items: center;
- height: 100%; /* 纭繚div鍗犳嵁鏁翠釜鐭╁舰鐨勯珮搴� */
-}
-#dialog-footer{
- text-align: center;
- margin-top: -15px;
+
+
+
+.echarts-container {
+display: flex;
+flex-wrap: wrap;
+gap: 20px;
+}
+
+.echarts-item {
+width: 150px;
+height: 150px;
+margin: 20px;
+}
+
+.pie-chart {
+width: 100%;
+height: 100%;
}
</style>
\ No newline at end of file
diff --git a/hangzhoumesParent/common/servicebase/src/main/java/com/mes/glassinfo/service/impl/GlassInfoServiceImpl.java b/hangzhoumesParent/common/servicebase/src/main/java/com/mes/glassinfo/service/impl/GlassInfoServiceImpl.java
index c143b88..bd43bad 100644
--- a/hangzhoumesParent/common/servicebase/src/main/java/com/mes/glassinfo/service/impl/GlassInfoServiceImpl.java
+++ b/hangzhoumesParent/common/servicebase/src/main/java/com/mes/glassinfo/service/impl/GlassInfoServiceImpl.java
@@ -86,7 +86,7 @@
public void saveGlassInfo(List<GlassInfo> glassinfo) {
this.saveBatch(glassinfo);
}
-
+/*
@Override
public int getGlassInfoCountByFlowCardId(String flowCardId,int layer) {
@@ -128,7 +128,7 @@
.collect(Collectors.toList());
log.info("result666: {}", result);
return result;
- }
+ }*/
diff --git a/hangzhoumesParent/common/servicebase/src/main/java/com/mes/pp/mapper/OptimizeLayoutMapper.java b/hangzhoumesParent/common/servicebase/src/main/java/com/mes/pp/mapper/OptimizeLayoutMapper.java
new file mode 100644
index 0000000..857d2a9
--- /dev/null
+++ b/hangzhoumesParent/common/servicebase/src/main/java/com/mes/pp/mapper/OptimizeLayoutMapper.java
@@ -0,0 +1,20 @@
+package com.mes.pp.mapper;
+
+import com.baomidou.dynamic.datasource.annotation.DS;
+import com.github.yulichang.base.MPJBaseMapper;
+import com.mes.pp.entity.OptimizeLayout;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * <p>
+ * Mapper 鎺ュ彛
+ * </p>
+ *
+ * @author zhoush
+ * @since 2024-04-16
+ */
+@DS("pp")
+@Mapper
+public interface OptimizeLayoutMapper extends MPJBaseMapper<OptimizeLayout> {
+
+}
diff --git a/hangzhoumesParent/common/servicebase/src/main/java/com/mes/pp/service/OptimizeLayoutService.java b/hangzhoumesParent/common/servicebase/src/main/java/com/mes/pp/service/OptimizeLayoutService.java
new file mode 100644
index 0000000..a4f81b7
--- /dev/null
+++ b/hangzhoumesParent/common/servicebase/src/main/java/com/mes/pp/service/OptimizeLayoutService.java
@@ -0,0 +1,16 @@
+package com.mes.pp.service;
+
+import com.github.yulichang.base.MPJBaseService;
+import com.mes.pp.entity.OptimizeLayout;
+
+/**
+ * <p>
+ * 鏈嶅姟绫�
+ * </p>
+ *
+ * @author zhoush
+ * @since 2024-04-16
+ */
+public interface OptimizeLayoutService extends MPJBaseService<OptimizeLayout> {
+
+}
diff --git a/hangzhoumesParent/common/servicebase/src/main/java/com/mes/pp/service/impl/OptimizeLayoutServiceImpl.java b/hangzhoumesParent/common/servicebase/src/main/java/com/mes/pp/service/impl/OptimizeLayoutServiceImpl.java
new file mode 100644
index 0000000..b4c2ce7
--- /dev/null
+++ b/hangzhoumesParent/common/servicebase/src/main/java/com/mes/pp/service/impl/OptimizeLayoutServiceImpl.java
@@ -0,0 +1,22 @@
+package com.mes.pp.service.impl;
+
+import com.baomidou.dynamic.datasource.annotation.DS;
+import com.github.yulichang.base.MPJBaseServiceImpl;
+import com.mes.pp.entity.OptimizeLayout;
+import com.mes.pp.mapper.OptimizeLayoutMapper;
+import com.mes.pp.service.OptimizeLayoutService;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 鏈嶅姟瀹炵幇绫�
+ * </p>
+ *
+ * @author zhoush
+ * @since 2024-04-16
+ */
+@Service
+@DS("pp")
+public class OptimizeLayoutServiceImpl extends MPJBaseServiceImpl<OptimizeLayoutMapper, OptimizeLayout> implements OptimizeLayoutService {
+
+}
diff --git a/hangzhoumesParent/common/servicebase/src/main/java/com/mes/work_assignment/controller/WorkAssignmentController.java b/hangzhoumesParent/common/servicebase/src/main/java/com/mes/work_assignment/controller/WorkAssignmentController.java
index 9836cf1..2384256 100644
--- a/hangzhoumesParent/common/servicebase/src/main/java/com/mes/work_assignment/controller/WorkAssignmentController.java
+++ b/hangzhoumesParent/common/servicebase/src/main/java/com/mes/work_assignment/controller/WorkAssignmentController.java
@@ -26,9 +26,9 @@
@Autowired
private WorkAssignmentService workAssignmentService;
- @ApiOperation("鎶ュ伐鏁版嵁鏌ヨ")
+ @ApiOperation("鍊肩彮鏁版嵁鏌ヨ")
@GetMapping("/selectWorkAssignment")
- public Result selectDamage(int line,String workingProcedure) {
+ public Result selectWorkAssignment(int line,String workingProcedure) {
return Result.build(200,"鏌ヨ鎴愬姛",workAssignmentService.selectWorkAssignment(line,workingProcedure));
}
diff --git a/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/edgstoragecage/controller/EdgStorageCageController.java b/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/edgstoragecage/controller/EdgStorageCageController.java
index c4c802d..289db38 100644
--- a/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/edgstoragecage/controller/EdgStorageCageController.java
+++ b/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/edgstoragecage/controller/EdgStorageCageController.java
@@ -55,16 +55,16 @@
@PostMapping("/updateEdgStorageCage")
@ResponseBody
public Result updateEdgStorageCage(@RequestBody EdgStorageCage edgStorageCage) {
- boolean isSucess=edgStorageCageService.updateEdgStorageCage(edgStorageCage);
- return Result.build(200,"銆愬惎鐢�/绂佺敤銆戞垚鍔�",1);
+ String isSucess=edgStorageCageService.updateEdgStorageCage(edgStorageCage)?"鎴愬姛":"澶辫触";
+ return Result.build(200,"銆愬惎鐢�/绂佺敤銆�"+isSucess,1);
}
@ApiOperation("纾ㄨ竟缂撳瓨鐞嗙墖绗间俊鎭� 鍔熻兘锛氬绗煎唴鏍呮牸鐜荤拑杩涜銆愭竻闄�/鏇存崲/缁戝畾銆� EdgStorageCage鏍煎瓙淇℃伅,EdgStorageCageDetails 鐜荤拑淇℃伅 ")
@PostMapping("/edgStorageCageGlass")
@ResponseBody
public Result edgStorageCageGlass(@RequestBody EdgStorageCageDetails edgStorageCageDetails,int edgStorageCageId) {
- boolean isSucess=edgStorageCageService.updateEdgStorageCageDetails(edgStorageCageId,edgStorageCageDetails);
- return Result.build(200,"銆愭竻闄�/鏇存崲/缁戝畾銆戞垚鍔�",1);
+ String isSucess=edgStorageCageService.updateEdgStorageCageDetails(edgStorageCageId,edgStorageCageDetails)?"鎴愬姛":"澶辫触";
+ return Result.build(200,"銆愭竻闄�/鏇存崲/缁戝畾銆�"+isSucess,1);
}
@ApiOperation("纾ㄨ竟妯″潡姹囨姤鐜荤拑鐘舵�� 鍔熻兘锛氬绗煎唴鏍呮牸鐜荤拑杩涜銆愮牬鎹�/鎷胯蛋銆� ")
@@ -73,8 +73,8 @@
public Result edgReportStatus(@RequestBody Map<String, String> arguments) {
String edgStorageCageDetailsId=arguments.get("glassId");
int controlsId=Integer.valueOf(arguments.get("controlsId"));
- boolean isSucess=edgStorageCageDetailsService.identWorn(edgStorageCageDetailsId,controlsId);
- return Result.build(200,"銆愮牬鎹�/鎷胯蛋銆戞垚鍔�",1);
+ String isSucess=edgStorageCageDetailsService.identWorn(edgStorageCageDetailsId,controlsId)?"鎴愬姛":"澶辫触";
+ return Result.build(200,"銆愮牬鎹�/鎷胯蛋銆�"+isSucess,1);
}
}
diff --git a/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/edgstoragecage/entity/EdgStorageCage.java b/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/edgstoragecage/entity/EdgStorageCage.java
index 2ab45f6..57b807d 100644
--- a/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/edgstoragecage/entity/EdgStorageCage.java
+++ b/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/edgstoragecage/entity/EdgStorageCage.java
@@ -1,6 +1,7 @@
package com.mes.edgstoragecage.entity;
import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import lombok.Data;
import lombok.EqualsAndHashCode;
diff --git a/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/edgstoragecage/service/impl/EdgStorageCageServiceImpl.java b/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/edgstoragecage/service/impl/EdgStorageCageServiceImpl.java
index 01d94b9..c4b5266 100644
--- a/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/edgstoragecage/service/impl/EdgStorageCageServiceImpl.java
+++ b/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/edgstoragecage/service/impl/EdgStorageCageServiceImpl.java
@@ -122,9 +122,14 @@
@Override
public boolean updateEdgStorageCage(EdgStorageCage edgStorageCage) {
EdgStorageCage edgItem = baseMapper.selectById(edgStorageCage.getId());
- edgItem.setEnableState(edgStorageCage.getEnableState());
- baseMapper.updateById(edgItem);
- return true;
+ if(edgItem!=null){
+ edgItem.setEnableState(edgStorageCage.getEnableState());
+ baseMapper.updateById(edgItem);
+ log.info("鍗у缂撳瓨锛氥�愬惎鐢�/绂佺敤銆� 鍙傛暟:{} 缁撴灉:鎴愬姛",edgStorageCage);
+ return true;
+ }
+ log.info("鍗у缂撳瓨锛氥�愬惎鐢�/绂佺敤銆� 鍙傛暟:{} 缁撴灉:澶辫触",edgStorageCage);
+ return false;
}
/**
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 c3aae6d..e200106 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
@@ -33,7 +33,7 @@
private TemperingGlassInfoService temperingGlassInfoService;
private JSONObject jsonObject = new JSONObject();
- public void dataBase1() throws InterruptedException {
+ public void queryDataSource1() throws InterruptedException {
List<Double> carPostion=new ArrayList<>();
carPostion.add(0.25);
carPostion.add(0.5);
@@ -58,7 +58,7 @@
}
- public void dataBase2() throws InterruptedException {
+ public void queryDataSource2() throws InterruptedException {
//鍑虹墖闃熷垪
List<TemperingGlassInfo> temperingGlassInfoList= temperingGlassInfoService.list();
jsonObject.append("temperingGlassInfoList", temperingGlassInfoList);
@@ -72,8 +72,10 @@
public void plcStorageCageTask() throws InterruptedException {
jsonObject = new JSONObject();
try {
- dataBase1();
- dataBase2();
+ //鏌ヨ浣跨敤鏁版嵁婧�1鏌ヨ鏁版嵁
+ queryDataSource1();
+ //鏌ヨ浣跨敤鏁版嵁婧�2鏌ヨ鏁版嵁
+ queryDataSource2();
ArrayList<WebSocketServer> sendwServer = WebSocketServer.sessionMap.get("slicecage");
if (sendwServer != null) {
for (WebSocketServer webserver : sendwServer) {
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 3aba6ca..65bf9c0 100644
--- a/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/test/java/com/mes/CacheVerticalGlassModuleApplicationTest.java
+++ b/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/test/java/com/mes/CacheVerticalGlassModuleApplicationTest.java
@@ -95,6 +95,5 @@
damage.setRemark("");
damage.setStatus(2);
damageService.insertDamage(damage);
-
}
}
diff --git a/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downstorage/service/impl/DownStorageCageServiceImpl.java b/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downstorage/service/impl/DownStorageCageServiceImpl.java
index bd9433b..39639cb 100644
--- a/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downstorage/service/impl/DownStorageCageServiceImpl.java
+++ b/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downstorage/service/impl/DownStorageCageServiceImpl.java
@@ -105,6 +105,7 @@
}
return emptyList.get(0);
}
+/*
@Override
public List<DownStorageCageDetails> selectCacheMax() {
@@ -124,6 +125,7 @@
);
}
+*/
@Override
diff --git a/hangzhoumesParent/moduleService/UnLoadGlassModule/src/test/java/mes/UnloadGlassModuleApplicationTest.java b/hangzhoumesParent/moduleService/UnLoadGlassModule/src/test/java/mes/UnloadGlassModuleApplicationTest.java
index 76d153c..395722b 100644
--- a/hangzhoumesParent/moduleService/UnLoadGlassModule/src/test/java/mes/UnloadGlassModuleApplicationTest.java
+++ b/hangzhoumesParent/moduleService/UnLoadGlassModule/src/test/java/mes/UnloadGlassModuleApplicationTest.java
@@ -190,7 +190,7 @@
//downGlassTaskService.getUnloadingTaskState();
}
- @Test
+ /* @Test
public void updateDownStorageCage() {
@@ -199,7 +199,7 @@
downStorageCage.setId(1);
downStorageCageService.updateDownStorageCage(downStorageCage);
- }
+ }*/
--
Gitblit v1.8.0