From c407e091ff0320625ef2566a4bea362c697200c9 Mon Sep 17 00:00:00 2001
From: zhoushihao <zsh19950802@163.com>
Date: 星期六, 29 六月 2024 22:09:00 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downstorage/service/impl/DownStorageCageDetailsServiceImpl.java | 27 +
UI-Project/src/views/Slicecage/slicecage.vue | 751 ++++++++++++++++++++++---------------------
UI-Project/src/views/UnLoadGlass/Landingindication.vue | 2
UI-Project/src/views/Returns/returns.vue | 8
UI-Project/src/views/GlassStorage/MaterialRackManagement.vue | 179 +++++++++
UI-Project/src/views/UnLoadGlass/Landingindicationtwo.vue | 2
UI-Project/src/lang/zh.js | 3
hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downstorage/controller/DownStorageCageDetailsController.java | 11
hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downstorage/service/DownStorageCageDetailsService.java | 7
9 files changed, 593 insertions(+), 397 deletions(-)
diff --git a/UI-Project/src/lang/zh.js b/UI-Project/src/lang/zh.js
index 3aa72a1..83e2f37 100644
--- a/UI-Project/src/lang/zh.js
+++ b/UI-Project/src/lang/zh.js
@@ -194,7 +194,10 @@
search:'鎼滅储',
tabid:'澶х悊鐗囩璇︽儏琛╥d',
tid:'璁惧id',
+ tida:'璁惧id锛�',
fin:'鏄惁瀹屾垚浠诲姟锛�',
+ sureadd:'纭娣诲姞',
+ sureadda:'鏄惁纭娣诲姞锛�',
},
workOrder:{
glassID:'鐜荤拑ID',
diff --git a/UI-Project/src/views/GlassStorage/MaterialRackManagement.vue b/UI-Project/src/views/GlassStorage/MaterialRackManagement.vue
index 23b2204..830f6d8 100644
--- a/UI-Project/src/views/GlassStorage/MaterialRackManagement.vue
+++ b/UI-Project/src/views/GlassStorage/MaterialRackManagement.vue
@@ -1,5 +1,5 @@
<template>
- <div >
+ <div class="app-container">
<el-card style="flex: 1; margin-left: 10px; " :loading="loading">
<div slot="header" class="clearfix" style="display: flex; align-items: center;">
@@ -7,7 +7,7 @@
<div >
<el-button type="success" size="mini" @click="handleInbound()">鍏ュ簱</el-button>
<el-button type="success" size="mini" @click="handleInbound()">鍚婅浣嶅叆搴�</el-button>
- <el-button type="success" size="mini" @click="handleInbound()">娣诲姞鍘熺墖</el-button>
+
</div>
<!-- 鍙充晶閫夋嫨妗� -->
@@ -55,12 +55,12 @@
</el-table-column>
<!-- 鎿嶄綔鍒� -->
- <el-table-column label="鎿嶄綔" width="300">
+ <el-table-column label="鎿嶄綔" width="350">
<template #default="{ row }">
- <el-button type="primary" size="mini" @click="handleEdit(row)">淇敼</el-button>
+ <el-button type="primary" size="mini" @click="edithandleRowClick(row)">淇敼</el-button>
<el-button type="danger" size="mini" @click="handleDelete(row)">鍒犻櫎</el-button>
<el-button type="warning" size="mini" @click="handleCheckout(row)">鍑哄簱</el-button>
-
+ <el-button type="success" size="mini" @click="addglass()">娣诲姞鍘熺墖</el-button>
</template>
</el-table-column>
</el-table>
@@ -156,7 +156,65 @@
<el-button type="primary" @click="handleConfirmInbound">纭� 瀹�</el-button>
</div>
</el-dialog>
- <div ref="chart" id="chart" style="width: 100%; height: 400px;"></div>
+
+
+ <el-dialog title="娣诲姞鍘熺墖" v-model="dialogVisible3" width="50%">
+ <el-form :model="formData3" ref="form" label-width="80px">
+ <el-form-item label="棰滆壊鑶滅郴">
+ <el-input v-model="formData.selectedColor" readonly style="width: 250px; height: 35px; font-size: 20px"></el-input>
+ <el-dropdown @command="handleCommand">
+ <span class="el-dropdown-link">
+ 閫夋嫨<i class="el-icon-arrow-down el-icon--right"></i>
+ </span>
+ <el-dropdown-menu slot="dropdown">
+ <el-dropdown-item v-for="color in colors" :key="color['0_glass_id']" :command="color['0_glass_id']">
+ {{ color['0_glass_id'] }}
+ </el-dropdown-item>
+ </el-dropdown-menu>
+ </el-dropdown>
+ </el-form-item>
+
+ <el-form-item label="闀垮害">
+ <el-input v-model="formData.wid" required style="width: 250px; font-size: 20px" @focus="clearInput('wid')"></el-input>
+ </el-form-item>
+
+ <el-form-item label="楂樺害">
+ <el-input v-model="formData.heig" required style="width: 250px; font-size: 20px" @focus="clearInput('heig')"></el-input>
+ </el-form-item>
+
+ <el-form-item label="鍘氬害">
+ <el-input v-model="formData.thinkness" required style="width: 250px; font-size: 20px" @focus="clearInput('thinkness')"></el-input>
+ </el-form-item>
+
+ <el-form-item label="鏁伴噺">
+ <el-input-number v-model="formData.num" required :min="0" :max="9000" style="width: 250px; font-size: 20px" @focus="clearInput('num')"></el-input-number>
+ </el-form-item>
+ </el-form>
+
+ <span slot="footer" class="dialog-footer">
+ <el-button @click="dialogVisible3 = false">鍏抽棴</el-button>
+ <el-button type="primary" @click="submitForm">鎻愪氦</el-button>
+ </span>
+ </el-dialog>
+
+ <el-dialog title="缂栬緫" v-model="editdialogVisible" width="30%" @close="edithandleDialogClose">
+ <el-form :model="editForm" ref="editForm" label-width="80px">
+ <el-form-item label="鏁伴噺">
+ <el-input v-model="editForm.quantity"></el-input>
+ </el-form-item>
+ <el-form-item label="鎵规鍙�">
+ <el-input v-model="editForm.batchnumber"></el-input>
+ </el-form-item>
+ </el-form>
+
+ <div slot="footer" class="dialog-footer">
+ <el-button @click="editdialogVisible = false">鍙栨秷</el-button>
+ <el-button type="primary" @click="editsaveEdit">淇濆瓨</el-button>
+ </div>
+ </el-dialog>
+
+
+ <!-- <div ref="chart" id="chart" style="width: 100%; height: 400px;"></div> -->
</div>
</template>
@@ -283,16 +341,9 @@
});
- const handleEdit = (row) => {
- // 澶勭悊淇敼鏁伴噺閫昏緫
- console.log('Edit Quantity:', row);
- };
+
- const handleDelete = (row) => {
- // 澶勭悊鍒犻櫎閫昏緫
- console.log('Delete:', row);
- };
-
+
const handleCheckout = (row) => {
// 澶勭悊鍑哄簱閫昏緫
console.log('Checkout:', row);
@@ -322,7 +373,83 @@
// 鍏抽棴瀵硅瘽妗�
dialogVisible.value = false;
};
+
+
+
+
+
+ const dialogVisible3 = ref(false);
+ const colors = ref([
+ { '0_glass_id': 'Red' },
+ { '0_glass_id': 'Green' },
+ { '0_glass_id': 'Blue' }
+ // Add more colors as needed
+ ]);
+
+ const formData3 = ref({
+ selectedColor: '',
+ wid: '',
+ heig: '',
+ thinkness: '',
+ num: ''
+ });
+
+
+ const addglass = () => {
+ // 鎵撳紑鍏ュ簱瀵硅瘽妗�
+ dialogVisible3.value = true;
+ };
+ const handleCommand = (command) => {
+ formData.value.selectedColor = command;
+ };
+
+ const clearInput = (field) => {
+ formData.value[field] = '';
+ };
+
+ const submitForm = () => {
+ console.log('鎻愪氦鏁版嵁:', formData.value);
+ dialogVisible3.value = false;
+ // Add your submit logic here
+ };
+
+
+
+ const editdialogVisible = ref(false);
+ const editForm = ref({
+ quantity: '',
+ batchnumber: ''
+ });
+ let currentRow = ref(null);
+
+ // 澶勭悊琛岀偣鍑讳簨浠�
+ const edithandleRowClick = (row) => {
+ currentRow.value = row;
+ editForm.value.quantity = row.quantity;
+ editForm.value.batchnumber = row.batchnumber;
+ editdialogVisible.value = true;
+ console.log(editForm.value)
+ };
+
+ // 娣诲姞淇濆瓨缂栬緫鍐呭
+ const editsaveEdit = () => {
+ if (!currentRow.value) return;
+
+ // 鏇存柊褰撳墠琛屾暟鎹�
+ currentRow.value.quantity = parseInt(editForm.value.quantity);
+ currentRow.value.batchnumber = editForm.value.batchnumber;
+
+ // 鍏抽棴瀵硅瘽妗�
+ editdialogVisible.value = false;
+ };
+
+ // 瀵硅瘽妗嗗叧闂椂閲嶇疆缂栬緫琛ㄥ崟鍜屽綋鍓嶈鏁版嵁
+ const edithandleDialogClose = () => {
+ editForm.value.quantity = '';
+ editForm.value.batchnumber = '';
+ currentRow.value = null;
+ };
let chartInstance = null;
@@ -407,6 +534,26 @@
</script>
-<style>
+<style scoped>
+html, body {
+ height: 100%;
+ margin: 0;
+ padding: 0;
+ overflow: hidden; /* 绂佹鍑虹幇婊氬姩鏉� */
+}
+.app-container {
+
+ flex-direction: column;
+ height: 100vh; /* 浣跨敤瑙嗗彛楂樺害 */
+}
+
+
+
+
+
+.custom-dialog {
+ max-height: 90vh; /* 鏈�澶ч珮搴︿负瑙嗗彛楂樺害鐨�90% */
+ overflow-y: auto; /* 瀵硅瘽妗嗗唴閮ㄥ嚭鐜板瀭鐩存粴鍔ㄦ潯 */
+}
</style>
diff --git a/UI-Project/src/views/Returns/returns.vue b/UI-Project/src/views/Returns/returns.vue
index cff32bf..42dd369 100644
--- a/UI-Project/src/views/Returns/returns.vue
+++ b/UI-Project/src/views/Returns/returns.vue
@@ -323,8 +323,8 @@
const uniqueThicknesses = new Set(response.data.map(item => item.thickness));
selectOptions.value = Array.from(uniqueWidths).map(width => ({
- value: width, // 鍋囪杩欐槸浣犳兂瑕佷綔涓簐alue鐨勫睘鎬�
- label: width, // 鍋囪杩欐槸浣犳兂瑕佹樉绀虹殑label
+ value: width,
+ label: width,
}));
selectOptionsa.value = Array.from(uniqueHeights).map(height => ({
value: height,
@@ -504,14 +504,13 @@
ElMessage.error(t('basicData.updatanull'));
return; // 濡傛灉 id 涓虹┖锛屽垯涓嶆墽琛屽悗缁搷浣�
}
-
const newState = row.state === 100 ? 0 : 100;
-
try {
// 鍙戦�佽姹傚埌鍚庣鏇存柊鐘舵��
const response = await request.post('/loadGlass/up-patten-usage/updateGlassState', { id: row.id, state: newState });
if (response.code === 200) {
ElMessage.success(response.message);
+ row.state = newState;
} else {
ElMessage.error(response.message);
}
@@ -520,7 +519,6 @@
ElMessage.error(t('basicData.glassnull'));
}
};
-
const wsUrl = `ws://${WebSocketHost}:${host}/api/loadGlass/api/talk/loadGlass`;
const ws = new WebSocket(wsUrl);
ws.onopen = () => {
diff --git a/UI-Project/src/views/Slicecage/slicecage.vue b/UI-Project/src/views/Slicecage/slicecage.vue
index 2a42c23..a27ce75 100644
--- a/UI-Project/src/views/Slicecage/slicecage.vue
+++ b/UI-Project/src/views/Slicecage/slicecage.vue
@@ -1,18 +1,13 @@
<script lang="ts" setup>
-// import zhCn from 'element-plus/lib/locale/lang/zh-cn'
-// import en from 'element-plus/dist/locale/en.mjs'
-// const { locale } = useI18n()
-
import { useI18n } from 'vue-i18n'
const { t } = useI18n()
let language = ref(localStorage.getItem('lang') || 'zh')
import {Search} from "@element-plus/icons-vue";
-import {reactive} from "vue";
import {useRouter} from "vue-router"
const router = useRouter()
import request from "@/utils/request"
import { WebSocketHost ,host} from '@/utils/constants'
-import { ref, onMounted , onBeforeUnmount} from "vue";
+import { ref, onMounted , onBeforeUnmount, reactive} from "vue";
import { initializeWebSocket, closeWebSocket } from '@/utils/WebSocketService';
import { ElMessage, ElMessageBox } from 'element-plus'
import { tr } from "element-plus/es/locale";
@@ -23,10 +18,18 @@
const tableDatab = ref([])
const tableDatac = ref([])
const tableDatad = ref([])
+const tableDataf = ref([])
const tableDatae = ref([])
const adjustedRects = ref([]);
+const project = ref([]);
const adjustedRectsa = ref([]);
-// const height = ref([]);
+const adjustedRectsb = ref([]);
+const adjustedRectsc = ref([]);
+const adjustedRectsd = ref([]);
+const adjustedRectse = ref([]);
+const adjustedRectsf = ref([]);
+const adjustedRectsg = ref([]);
+const currentRow = reactive({}); // 褰撳墠琛岀殑鏁版嵁
const add = ref(false)
const flowCardId = ref('');
const gap = ref('');
@@ -67,111 +70,8 @@
const cell7=ref(true);
const cell8=ref(true);
const selectedRow = ref(null); // 瀛樺偍閫変腑鐨勮鏁版嵁
-
const currentPage4 = ref(4)
const pageSize4 = ref(100)
-
- // var timer=setInterval(() => {
- // // console.log(million.value,million1.value);
- // million.value+=1;
- // if(million.value-million1.value!==12){
-
- // if(million.value-million1.value>=2){
- // if(carposition1.value==220){
- // timers1.value=false;
- // }else if(carposition1.value==60){
- // timers1.value=true;
- // }
- // if(timers1.value==true){
- // carposition1.value=carposition1.value+16;
- // }else{
- // carposition1.value=carposition1.value-16;
- // }
-
-
- // if(carposition2.value==220){
- // timers2.value=false;
- // }else if(carposition2.value==60){
- // timers2.value=true;
- // }
- // if(timers2.value==true){
- // carposition2.value+=16;
- // }else{
- // carposition2.value-=16;
- // }
- // }else{
-
- // }
- // }else{
- // million1.value=million.value;
-
- // if(cellshow1.value==true){
- // cellshow1.value=false;
- // }else{
- // cellshow1.value=true;
- // }
- // if(cellshow2.value==true){
- // cellshow2.value=false;
- // }else{
- // cellshow2.value=true;
- // }
- // }
-
- // }, 1000);
-
- // var timer=setInterval(() => {
- // // console.log(million3.value,million4.value);
- // million3.value+=1;
- // if(million3.value-million4.value!==12){
-
- // if(million3.value-million4.value>=2){
- // if(carposition3.value==260){
- // timers3.value=false;
- // }else if(carposition3.value==60){
- // timers3.value=true;
- // }
- // if(timers3.value==true){
- // carposition3.value=carposition3.value+20;
- // }else{
- // carposition3.value=carposition3.value-20;
- // }
-
-
- // if(carposition4.value==260){
- // timers4.value=false;
- // }else if(carposition4.value==60){
- // timers4.value=true;
- // }
- // if(timers4.value==true){
- // carposition4.value+=20;
- // }else{
- // carposition4.value-=20;
- // }
- // }else{
-
- // }
- // }else{
- // million4.value=million3.value;
- // if(cellshow5.value==true){
- // cellshow5.value=false;
-
- // }else{
- // cellshow5.value=true;
-
- // }
- // if(cellshow3.value==true){
- // cellshow3.value=false;
- // }else{
- // cellshow3.value=true;
- // }
- // if(cellshow4.value==true){
- // cellshow4.value=false;
- // }else{
- // cellshow4.value=true;
- // }
- // }
-
- // }, 1000);
const getTableRow = (row,type) =>{
switch (type) {
@@ -188,78 +88,35 @@
}
const handleBindRack = (row) => {
selectedRow.value = row; // 鏇存柊閫変腑鐨勮鏁版嵁
+ currentRow.deviceId = row.deviceId; // 鐩存帴璁剧疆鍝嶅簲寮忓睘鎬�
+ currentRow.slot = row.slot;
+ console.log(row.deviceId);
+ console.log(row.slot);
+ window.localStorage.setItem('deviceId', row.deviceId)
+ window.localStorage.setItem('slot', row.slot)
add.value = true; // 鎵撳紑缁戝畾鏋跺瓙瀵硅瘽妗�
+
};
-async function handleConfirm() {
- if (!selectedRow.value) {
- // 澶勭悊娌℃湁閫変腑琛岀殑鎯呭喌...
- return;
- }
-
- // 鏋勯�犱綘鐨凱OST璇锋眰鏁版嵁锛屽寘鍚�変腑鐨勮鏁版嵁鍜岃〃鍗曟暟鎹�
- const postData = {
- ...selectedRow.value, // 閫変腑琛岀殑鏁版嵁
- };
-
+// 鎼滅储
+const searchout = async () => {
try {
- const response = await request.post('/cacheVerticalGlass/bigStorageCageDetails/insertBigStorageCageDetails', {
- 'flowCardId': flowCardId.value,
- 'gap': gap.value,
- 'glassId': glassId.value,
- 'glassType': glassType.value,
- 'height': height.value,
- 'sequence': sequence.value,
- 'state': state.value,
- 'temperingFeedSequence': temperingFeedSequence.value,
- 'temperingLayoutId': temperingLayoutId.value,
- 'thickness': thickness.value,
- 'width': width.value,
- body: JSON.stringify(postData),
+ const response = await request.post('/cacheVerticalGlass/bigStorageCageDetails/selectBigStorageCageDetails',{
+ glassId:glassId.value
});
if (response.code == 200) {
// 缁戝畾鎴愬姛锛屽鐞嗛�昏緫
+ tableDataf.value = response.data;
ElMessage.success(response.message);
- add.value = false;
- tableData.value = response.data;
+
} else {
// 璇锋眰澶辫触锛屾樉绀洪敊璇秷鎭�
ElMessage.error(response.message);
}
- } catch (error) {
- // 澶勭悊閿欒...
- console.error(error);
- }
-}
-// 娣诲姞
-// const handleConfirm = async () => {
-// try {
-// const response = await request.post('/cacheVerticalGlass/bigStorageCageDetails/insertBigStorageCageDetails', {
-// 'bigStorageCageOutTask.flowCardId': flowCardId.value,
-// 'bigStorageCageOutTask.gap': gap.value,
-// 'bigStorageCageOutTask.glassId': glassId.value,
-// 'bigStorageCageOutTask.glassType': glassType.value,
-// 'bigStorageCageOutTask.height': height.value,
-// 'bigStorageCageOutTask.sequence': sequence.value,
-// 'bigStorageCageOutTask.state': state.value,
-// 'bigStorageCageOutTask.temperingFeedSequence': temperingFeedSequence.value,
-// 'bigStorageCageOutTask.temperingLayoutId': temperingLayoutId.value,
-// 'bigStorageCageOutTask.thickness': thickness.value,
-// 'bigStorageCageOutTask.width': width.value,
-// });
-// if (response.code == 200) {
-// // 缁戝畾鎴愬姛锛屽鐞嗛�昏緫
-// ElMessage.success(response.message);
-// add.value = false;
-// tableData.value = response.data;
-// } else {
-// // 璇锋眰澶辫触锛屾樉绀洪敊璇秷鎭�
-// ElMessage.error(response.msg);
-// }
-// } catch (error) {
-// // 澶勭悊閿欒
-// console.error(error);
-// }
-// };
+ } catch (error) {
+ // 澶勭悊閿欒
+ console.error(error);
+ }
+};
// 鏄惁绂佺敤
const toggleEnableState = async (row) => {
const newState = row.enableState === 1 ? 0 : 1;
@@ -274,13 +131,7 @@
ElMessage.error(response.message);
}
row.enableState = newState;
-};
-// const tableData = ref([
-// // ...鎮ㄧ殑琛ㄦ牸鏁版嵁
-// id:
-// deviceId slot enableState remainWidth
-
-// ]);
+};
// 鍒犻櫎
const opena = async(row) => {
try {
@@ -322,22 +173,14 @@
}
);
if (confirmResult === 'confirm') {
- // const dataToSend = {
- // ...row,
- // status: 0
- // };
- // 鐢ㄦ埛鐐瑰嚮浜嗏�滄槸鈥濓紝鐜板湪璋冪敤鍒犻櫎鎺ュ彛
const response = await request.post("/cacheVerticalGlass/bigStorageCageDetails/damageBigStorageCageDetails?status="+0, row)
if (response.code === 200) {
ElMessage.success(response.message);
} else {
- // 鍒犻櫎澶辫触锛屾偍鍙互澶勭悊閿欒鎴栨樉绀洪敊璇俊鎭粰鐢ㄦ埛
ElMessage.error(response.message);
- // alert('鍒犻櫎澶辫触锛�' + deleteResponse.message);
}
}
} catch (error) {
- // 澶勭悊鍙兘鍑虹幇鐨勯敊璇紝姣斿 ElMessageBox 鎶涘嚭鐨勫紓甯哥瓑
console.error('鍙戠敓閿欒:', error);
}
};
@@ -354,22 +197,14 @@
}
);
if (confirmResult === 'confirm') {
- // const dataToSend = {
- // ...row,
- // status: 1
- // };
- // 鐢ㄦ埛鐐瑰嚮浜嗏�滄槸鈥濓紝鐜板湪璋冪敤鍒犻櫎鎺ュ彛
const response = await request.post("/cacheVerticalGlass/bigStorageCageDetails/damageBigStorageCageDetails?status="+1, row)
if (response.code === 200) {
ElMessage.success(response.message);
} else {
- // 鍒犻櫎澶辫触锛屾偍鍙互澶勭悊閿欒鎴栨樉绀洪敊璇俊鎭粰鐢ㄦ埛
ElMessage.error(response.message);
- // alert('鍒犻櫎澶辫触锛�' + deleteResponse.message);
}
}
} catch (error) {
- // 澶勭悊鍙兘鍑虹幇鐨勯敊璇紝姣斿 ElMessageBox 鎶涘嚭鐨勫紓甯哥瓑
console.error('鍙戠敓閿欒:', error);
}
};
@@ -391,13 +226,10 @@
if (response.code === 200) {
ElMessage.success(response.message);
} else {
- // 鍒犻櫎澶辫触锛屾偍鍙互澶勭悊閿欒鎴栨樉绀洪敊璇俊鎭粰鐢ㄦ埛
ElMessage.error(response.message);
- // alert('鍒犻櫎澶辫触锛�' + deleteResponse.message);
}
}
} catch (error) {
- // 澶勭悊鍙兘鍑虹幇鐨勯敊璇紝姣斿 ElMessageBox 鎶涘嚭鐨勫紓甯哥瓑
console.error('鍙戠敓閿欒:', error);
}
};
@@ -414,22 +246,14 @@
}
);
if (confirmResult === 'confirm') {
- // 鐢ㄦ埛鐐瑰嚮浜嗏�滄槸鈥濓紝鐜板湪璋冪敤鍒犻櫎鎺ュ彛
- // const dataToSend = {
- // ...row,
- // status: 0
- // };
const response = await request.post("/cacheVerticalGlass/temperingGlassInfo/damageTemperingGlassInfo?status="+0, row)
if (response.code === 200) {
ElMessage.success(response.message);
} else {
- // 鍒犻櫎澶辫触锛屾偍鍙互澶勭悊閿欒鎴栨樉绀洪敊璇俊鎭粰鐢ㄦ埛
ElMessage.error(response.message);
- // alert('鍒犻櫎澶辫触锛�' + deleteResponse.message);
}
}
} catch (error) {
- // 澶勭悊鍙兘鍑虹幇鐨勯敊璇紝姣斿 ElMessageBox 鎶涘嚭鐨勫紓甯哥瓑
console.error('鍙戠敓閿欒:', error);
}
};
@@ -446,22 +270,14 @@
}
);
if (confirmResult === 'confirm') {
- // 鐢ㄦ埛鐐瑰嚮浜嗏�滄槸鈥濓紝鐜板湪璋冪敤鍒犻櫎鎺ュ彛
- // const dataToSend = {
- // ...row,
- // status: 1
- // };
const response = await request.post("/cacheVerticalGlass/temperingGlassInfo/damageTemperingGlassInfo?status="+1, row)
if (response.code === 200) {
ElMessage.success(response.message);
} else {
- // 鍒犻櫎澶辫触锛屾偍鍙互澶勭悊閿欒鎴栨樉绀洪敊璇俊鎭粰鐢ㄦ埛
ElMessage.error(response.message);
- // alert('鍒犻櫎澶辫触锛�' + deleteResponse.message);
}
}
} catch (error) {
- // 澶勭悊鍙兘鍑虹幇鐨勯敊璇紝姣斿 ElMessageBox 鎶涘嚭鐨勫紓甯哥瓑
console.error('鍙戠敓閿欒:', error);
}
};
@@ -478,7 +294,6 @@
}
);
if (confirmResult === 'confirm') {
- // 鐢ㄦ埛鐐瑰嚮浜嗏�滄槸鈥濓紝鐜板湪璋冪敤鍒犻櫎鎺ュ彛
const dataToSend = {
...row,
status: 1
@@ -487,13 +302,10 @@
if (response.code === 200) {
ElMessage.success(response.message);
} else {
- // 鍒犻櫎澶辫触锛屾偍鍙互澶勭悊閿欒鎴栨樉绀洪敊璇俊鎭粰鐢ㄦ埛
ElMessage.error(response.message);
- // alert('鍒犻櫎澶辫触锛�' + deleteResponse.message);
}
}
} catch (error) {
- // 澶勭悊鍙兘鍑虹幇鐨勯敊璇紝姣斿 ElMessageBox 鎶涘嚭鐨勫紓甯哥瓑
console.error('鍙戠敓閿欒:', error);
}
};
@@ -510,21 +322,46 @@
}
);
if (confirmResult === 'confirm') {
- // 鐢ㄦ埛鐐瑰嚮浜嗏�滄槸鈥濓紝鐜板湪璋冪敤鍒犻櫎鎺ュ彛
- // const dataToSend = {
- // ...row,
- // status: 1
- // };
const response = await request.post("/cacheVerticalGlass/bigStorageCageDetails/finishBigStorageCageDetails", row)
if (response.code === 200) {
ElMessage.success(response.message);
} else {
- // 鍒犻櫎澶辫触锛屾偍鍙互澶勭悊閿欒鎴栨樉绀洪敊璇俊鎭粰鐢ㄦ埛
ElMessage.error(response.message);
- // alert('鍒犻櫎澶辫触锛�' + deleteResponse.message);
}
}
- } catch (error) {
+ } catch (error) {
+ console.error('鍙戠敓閿欒:', error);
+ }
+};
+// 纭娣诲姞
+const finisha = async(row) => {
+ try {
+ const confirmResult = await ElMessageBox.confirm(
+ t('searchOrder.sureadda'),
+ t('searchOrder.prompt'),
+ {
+ confirmButtonText: t('searchOrder.yes'),
+ cancelButtonText: t('searchOrder.cancel'),
+ type: 'warning',
+ }
+ );
+ if (confirmResult === 'confirm') {
+ let deviceId = window.localStorage.getItem('deviceId')
+ let slot = window.localStorage.getItem('slot')
+ const dataToSend = {
+ ...row,
+ deviceId: deviceId,
+ slot: slot
+ };
+ const response = await request.post("/cacheVerticalGlass/bigStorageCageDetails/insertBigStorageCageDetails", dataToSend)
+ if (response.code === 200) {
+ add.value = false;
+ ElMessage.success(response.message);
+ } else {
+ ElMessage.error(response.message);
+ }
+ }
+ } catch (error) {
// 澶勭悊鍙兘鍑虹幇鐨勯敊璇紝姣斿 ElMessageBox 鎶涘嚭鐨勫紓甯哥瓑
console.error('鍙戠敓閿欒:', error);
}
@@ -543,24 +380,51 @@
tableDatab.value = data.temperingGlassInfoList[0]
tableDatae.value = data.bigStorageCageUsage[0]
// adjustedRects.value = data.bigStorageCageInfo1[0]
+ window.localStorage.setItem('length', data.bigStorageCageInfo1[0].length)
+ let length = window.localStorage.getItem('length')
adjustedRects.value = data.bigStorageCageInfo1[0].map(rect => ({
...rect,
- // width: rect.remainWidth *0.04,
- top: rect.id *2,
+ height: 20/length,
+ top: 29/length
}));
-console.log(data.bigStorageCageInfo1[0]);
+ let small = data.bigStorageCageInfo1[0]
+ console.log(small[0].bigStorageCageDetails);
adjustedRectsa.value = data.bigStorageCageInfo2[0].map(rect => ({
...rect,
- // width: rect.remainWidth *0.04,
- top: rect.id *2,
+ height: 20/length,
+ top: 29/length
}));
- // window.localStorage.setItem('length', data.bigStorageCageInfo1[0].length)
- // let length = window.localStorage.getItem('length')
-
+adjustedRectsb.value = data.bigStorageCageInfo3[0].map(rect => ({
+ ...rect,
+ height: 20/length,
+ top: 29/length
+ }));
+adjustedRectsc.value = data.bigStorageCageInfo4[0].map(rect => ({
+ ...rect,
+ height: 20/length,
+ top: 29/length
+ }));
+adjustedRectsd.value = data.bigStorageCageInfo5[0].map(rect => ({
+ ...rect,
+ height: 20/length,
+ top: 29/length
+ }));
+adjustedRectse.value = data.bigStorageCageInfo6[0].map(rect => ({
+ ...rect,
+ height: 20/length,
+ top: 29/length
+ }));
+adjustedRectsf.value = data.bigStorageCageInfo7[0].map(rect => ({
+ ...rect,
+ height: 20/length,
+ top: 29/length
+ }));
+adjustedRectsg.value = data.bigStorageCageInfo8[0].map(rect => ({
+ ...rect,
+ height: 20/length,
+ top: 29/length
+ }));
};
-// function getRectHeight(length: number) {
-// return length > 0 ? 29 / length : 29;
-// }
// 鍒濆鍖� WebSocket锛屽苟浼犻�掓秷鎭鐞嗗嚱鏁�
onMounted(() => {
// fetchFlowCardId();
@@ -709,9 +573,6 @@
</el-col>
</div>
</div>
- <!-- <div id="awatch">
- <img src="../../assets/cp.png" alt="" style="width: 70%;height: 70%;margin-left: 160px;">
-</div> -->
<!-- // 鐖剁骇妗� -->
<div class="img-dlpl" >
<div class="img-car1" :style="'z-index:999;left:247px;top:' + carposition1 + 'px;position:absolute;'">
@@ -727,174 +588,321 @@
<div class="img-car4" :style="'z-index:999;left:704px;top:' + carposition4 + 'px;position:absolute;'">
<div v-show="cellshow4" style="margin-top:10px;width:200px;height:5px;background-color:#409EFF;"></div>
</div>
- <div v-show="cell1" style="width: 227px;position: relative;height: 29px;top:55px;left: 465px;background-color: #911005;">
+ <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"
+ :key="rect.id"
:style="{
+
+ // display:'flex',
position: 'absolute',
width: '227px',
- height: '0.8px',
- backgroundColor: '#409EFF',
+ // backgroundColor: 'red',
left: '0px',
- top: `${rect.top}px`,
+ 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 v-show="cell2" style="width: 227px;height: 29px;position: relative;top:86px;left: 465px;background-color: #911005;">
+ <div v-show="cell2" style="width: 227px;height: 29px;position: relative;top:56px;left: 465px;">
<div
v-for="(rect, index) in adjustedRectsa"
- :key="rect"
+ :key="rect.id"
:style="{
+
+ // display:'flex',
position: 'absolute',
width: '227px',
- height: '0.8px',
- backgroundColor: '#409EFF',
+ // backgroundColor: 'red',
left: '0px',
- top: `${rect.top}px`,
+ 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 v-show="cell3" style="width: 227px;height: 29px;position: absolute;top:117px;left: 465px;background-color: #409EFF;">
+ <div v-show="cell3" style="width: 227px;height: 29px;position: absolute;top:117px;left: 465px;">
+ <div
+ v-for="(rect, index) in adjustedRectsb"
+ :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 v-show="cell4" style="width: 227px;height: 29px;position: absolute;top:148px;left: 465px;background-color: #409EFF;">
</div>
- <div v-show="cell5" style="width: 227px;height: 29px;position: absolute;top:208px;left: 465px;background-color: #409EFF;">
+ <div v-show="cell4" style="width: 227px;height: 29px;position: absolute;top:148px;left: 465px;">
+ <div
+ v-for="(rect, index) in adjustedRectsc"
+ :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 v-show="cell6" style="width: 227px;height: 29px;position: absolute;top:238px;left: 465px;background-color: #409EFF;">
</div>
- <div v-show="cell7" style="width: 227px;height: 29px;position: absolute;top:269px;left: 465px;background-color: #409EFF;">
+ <div v-show="cell5" style="width: 227px;height: 29px;position: absolute;top:208px;left: 465px;">
+ <div
+ v-for="(rect, index) in adjustedRectsd"
+ :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 v-show="cell8" style="width: 227px;height: 29px;position: absolute;top:300px;left: 465px;background-color: #409EFF;">
- </div> -->
+ </div>
+ <div v-show="cell6" style="width: 227px;height: 29px;position: absolute;top:238px;left: 465px;">
+ <div
+ v-for="(rect, index) in adjustedRectse"
+ :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 v-show="cell7" style="width: 227px;height: 29px;position: absolute;top:269px;left: 465px;">
+ <div
+ v-for="(rect, index) in adjustedRectsf"
+ :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 v-show="cell8" style="width: 227px;height: 29px;position: absolute;top:300px;left: 465px;">
+ <div
+ v-for="(rect, index) in adjustedRectsg"
+ :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>
- <el-dialog v-model="add" top="10vh" width="65%" :title="$t('searchOrder.addcage')" >
- <div style="margin-top: -20px;margin-bottom: 40px;margin-left: 30px">
- <el-input :placeholder="$t('searchOrder.inputid')" clearable style="width: 200px;">
- </el-input>
- <el-button type="primary" plain style="margin-left: 10px;">{{ $t('searchOrder.search') }}</el-button>
-
- <!-- <span style="margin-right: 10px">绂佺敤璇�</span>
- <el-input clearable placeholder="璇疯緭鍏ョ鐢ㄨ瘝" size="mini"
- style="margin-right: 50px; width: 200px;" /> -->
- </div>
- <div style="margin-left: -50px;margin-top: 10px;margin-bottom: 10px;">
- <el-form size="mini" label-width="180px">
- <el-form label-width="180px" label-position="right">
+ <el-dialog v-model="add" top="10vh" width="70%" :title="$t('searchOrder.addcage')" >
+ <div style="margin-bottom: 20px">
+ <el-form>
<el-row style="margin-top: -15px;margin-bottom: -2px;">
- <el-col :span="6">
+ <el-col :span="4">
<div id="dt" style="font-size: 15px;">
- <div>
- <el-form-item :label="$t('searchOrder.glassIDa')" :required="true" style="width: 24vw;">
- <el-input :placeholder="$t('searchOrder.inglassID')" v-model="glassId" autocomplete="off" />
+ <el-form-item :label="$t('searchOrder.tida')" style="width: 14vw">
+ {{ currentRow.deviceId }}
+ <!-- <el-input v-model="currentRow.id" autocomplete="off"></el-input> -->
</el-form-item>
- </div></div>
+ </div>
</el-col>
- <el-col :span="9">
+ <el-col :span="5">
<div id="dta" style="font-size: 15px;">
- <div>
- <el-form-item :label="$t('searchOrder.pieceingrida')" :required="true" style="width: 24vw;">
- <el-input :placeholder="$t('searchOrder.inpieceingrid')" v-model="sequence" autocomplete="off" />
- </el-form-item></div>
+ <el-form-item :label="$t('searchOrder.gridnumbera')" style="width: 14vw">
+ {{ currentRow.slot }}
+ <!-- <el-input v-model="currentRow.slot" autocomplete="off"></el-input> -->
+ </el-form-item>
</div>
</el-col>
</el-row>
- <el-row style="margin-top: 10px;">
- <el-col :span="6">
- <div id="dt" style="font-size: 15px;">
- <div>
- <el-form-item :label="$t('searchOrder.cardnumbera')" :required="true" style="width: 24vw;">
- <el-input :placeholder="$t('searchOrder.incardnumber')" v-model="flowCardId" autocomplete="off" />
- </el-form-item></div></div>
- </el-col>
- <el-col :span="9">
- <div id="dta" style="font-size: 15px;">
- <div>
- <el-form-item :label="$t('searchOrder.typeglassa')" :required="true" style="width: 24vw;">
- <el-input :placeholder="$t('searchOrder.intypeglass')" v-model="glassType" autocomplete="off" />
- </el-form-item></div></div>
- </el-col>
- </el-row>
- <el-row style="margin-top: 10px;">
- <el-col :span="6">
- <div id="dt" style="font-size: 15px;">
- <div>
- <el-form-item :label="$t('searchOrder.widtha')" :required="true" style="width: 24vw;">
- <el-input :placeholder="$t('searchOrder.inwidth')" v-model="width" autocomplete="off" />
- </el-form-item></div></div>
- </el-col>
- <el-col :span="9">
- <div id="dta" style="font-size: 15px;">
- <div>
- <el-form-item :label="$t('searchOrder.heighta')" :required="true" style="width: 24vw;">
- <el-input :placeholder="$t('searchOrder.inheight')" v-model="height" autocomplete="off" />
- </el-form-item></div></div>
- </el-col>
- </el-row>
- <el-row style="margin-top: 10px;">
- <el-col :span="6">
- <div id="dt" style="font-size: 15px;">
- <div>
- <el-form-item :label="$t('searchOrder.thicknessa')" :required="true" style="width: 24vw;">
- <el-input :placeholder="$t('searchOrder.inthickness')" v-model="thickness" autocomplete="off" />
- </el-form-item></div></div>
- </el-col>
- <el-col :span="9">
- <div id="dta" style="font-size: 15px;">
- <div>
- <el-form-item :label="$t('searchOrder.layoutIDa')" :required="true" style="width: 24vw;">
- <el-input :placeholder="$t('searchOrder.inlayoutID')" v-model="temperingLayoutId" autocomplete="off" />
- </el-form-item></div></div>
- </el-col>
- </el-row>
- <el-row style="margin-top: 10px;">
- <el-col :span="6">
- <div id="dt" style="font-size: 15px;">
- <div>
- <el-form-item :label="$t('searchOrder.picturesequencea')" :required="true" style="width: 24vw;">
- <el-input :placeholder="$t('searchOrder.inpicturesequence')" v-model="temperingFeedSequence" autocomplete="off" />
- </el-form-item></div></div>
- </el-col>
- <el-col :span="9">
- <div id="dta" style="font-size: 15px;">
- <div>
- <el-form-item :label="$t('searchOrder.startstatusa')" :required="true" style="width: 24vw;">
- <el-input :placeholder="$t('searchOrder.instartstatus')" v-model="state" autocomplete="off" />
- </el-form-item></div></div>
- </el-col>
- </el-row>
- <el-row style="margin-top: 10px;">
- <el-col :span="6">
- <div id="dt" style="font-size: 15px;">
- <div>
- <el-form-item :label="$t('searchOrder.glassgapsa')" :required="true" style="width: 24vw;">
- <el-input :placeholder="$t('searchOrder.inglassgaps')" v-model="gap" autocomplete="off" />
- </el-form-item></div></div>
- </el-col>
- <el-col :span="9">
- <div id="dta" style="font-size: 15px;">
- <div>
- <el-form-item :label="$t('searchOrder.gridnumbera')" :required="true" style="width: 24vw;">
- <el-input :placeholder="$t('searchOrder.grid')" v-model="state" autocomplete="off" />
- </el-form-item></div></div>
- </el-col>
- </el-row>
- </el-form>
- </el-form>
- </div>
- <template #footer>
- <div id="dialog-footer">
- <el-button type="primary" @click="handleConfirm">
- {{ $t('searchOrder.sure') }}
- </el-button>
- <el-button @click="add = false">{{ $t('searchOrder.cancel') }}</el-button>
+ </el-form>
+ </div>
+ <div style="margin-top: -20px;margin-bottom: 40px;margin-left: 30px">
+ <el-input v-model="glassId" :placeholder="$t('searchOrder.inputid')" clearable style="width: 200px;">
+ </el-input>
+ <el-button type="primary" plain style="margin-left: 10px;" @click="searchout">{{ $t('searchOrder.search') }}</el-button>
+ </div>
+
+ <div style="width: 98%; height: calc(100% - 35px); overflow-y: auto;max-height: 500px;">
+ <el-table height="100%" ref="table"
+ :data="tableDataf" :header-cell-style="{background:'#F2F3F5 ',color:'#1D2129'}">
+ <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="180" />
+ <el-table-column prop="flowCardId" align="center" :label="$t('searchOrder.cardnumber')" min-width="150" />
+ <el-table-column prop="glassType" align="center" :label="$t('searchOrder.typeglass')" min-width="150"/>
+ <el-table-column prop="width" align="center" :label="$t('searchOrder.width')" min-width="150"/>
+ <el-table-column prop="height" align="center" :label="$t('searchOrder.height')" min-width="150"/>
+ <el-table-column prop="thickness" align="center" :label="$t('searchOrder.thickness')" min-width="150"/>
+ <el-table-column prop="temperingLayoutId" align="center" :label="$t('searchOrder.layoutID')" min-width="150"/>
+ <el-table-column prop="temperingFeedSequence" align="center" :label="$t('searchOrder.picturesequence')" min-width="150"/>
+ <el-table-column
+ align="center"
+ :label="$t('searchOrder.startstatus')"
+ min-width="80"
+ prop="state"
+ >
+ <template #default="scope">
+ <el-tag
+ :type="scope.row.state === 1 ? 'success' : 'danger'"
+ >
+ {{ scope.row.state === 1 ? $t('searchOrder.enable') : $t('searchOrder.disable') }}
+ </el-tag>
+ </template>
+ </el-table-column>
+ <el-table-column prop="gap" align="center" :label="$t('searchOrder.glassgaps')" min-width="150"/>
+ <!-- <el-table-column prop="slot" align="center" :label="$t('searchOrder.gridnumber')" min-width="150"/> -->
+ <el-table-column fixed="right" :label="$t('searchOrder.operate')" align="center" width="150">
+ <template #default="scope">
+ <el-button size="mini" type="text" plain @click="finisha(scope.row)">{{ $t('searchOrder.sureadd') }}</el-button>
+ </template>
+ </el-table-column>
+ </el-table>
</div>
- </template>
</el-dialog>
<el-dialog v-model="dialogFormVisiblea" top="5vh" width="97%" :title="$t('searchOrder.cageinformation')">
<el-table
@@ -1050,7 +1058,6 @@
</template>
<style scoped>
-
#dt { display:block; float:left;line-height: 20px;margin-left: 100px;}
#dta { display:block; float:left;line-height: 20px;margin-left: 80%;}
#dialog-footer{
diff --git a/UI-Project/src/views/UnLoadGlass/Landingindication.vue b/UI-Project/src/views/UnLoadGlass/Landingindication.vue
index a7dcb00..41a6a45 100644
--- a/UI-Project/src/views/UnLoadGlass/Landingindication.vue
+++ b/UI-Project/src/views/UnLoadGlass/Landingindication.vue
@@ -46,7 +46,7 @@
{ x: 280, y: 100, height: 100, width: 60, fillColor: '#6a6da9', item: { height: 90, width: 10, fillColor: 'yellow', content: 'NG12345678',downGlassInfoList:"" } },
- { x: 140, y: 420, height: 60, width: 110, fillColor: '#6a6da9', item: { height: 20, width: 100, fillColor: 'yellow', content: 'NG1234561454' ,downGlassInfoList:""} }
+ { x: 140, y: 320, height: 60, width: 110, fillColor: '#6a6da9', item: { height: 20, width: 100, fillColor: 'yellow', content: 'NG1234561454' ,downGlassInfoList:""} }
]);
diff --git a/UI-Project/src/views/UnLoadGlass/Landingindicationtwo.vue b/UI-Project/src/views/UnLoadGlass/Landingindicationtwo.vue
index 2405177..c7fa71e 100644
--- a/UI-Project/src/views/UnLoadGlass/Landingindicationtwo.vue
+++ b/UI-Project/src/views/UnLoadGlass/Landingindicationtwo.vue
@@ -46,7 +46,7 @@
{ x: 280, y: 100, height: 100, width: 60, fillColor: '#6a6da9', item: { height: 90, width: 10, fillColor: 'yellow', content: 'NG12345678' } },
- { x: 140, y: 420, height: 60, width: 110, fillColor: '#6a6da9', item: { height: 20, width: 100, fillColor: 'yellow', content: 'NG1234561454' } }
+ { x: 140, y: 320, height: 60, width: 110, fillColor: '#6a6da9', item: { height: 20, width: 100, fillColor: 'yellow', content: 'NG1234561454' } }
]);
diff --git a/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downstorage/controller/DownStorageCageDetailsController.java b/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downstorage/controller/DownStorageCageDetailsController.java
index 2f56341..e7feaef 100644
--- a/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downstorage/controller/DownStorageCageDetailsController.java
+++ b/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downstorage/controller/DownStorageCageDetailsController.java
@@ -69,8 +69,15 @@
-//
+ @ApiOperation("淇敼鐜荤拑鐘舵�� 鍔熻兘锛氬绗煎唴鏍呮牸鐜荤拑杩涜銆愮牬鎹�/鎷胯蛋銆� ")
+ @PostMapping("/ReportStatus")
+ @ResponseBody
+ public Result edgReportStatus(@RequestBody Map<String, String> arguments) {
+ String downStorageCageDetailsId=arguments.get("glassId");
+ int controlsId=Integer.valueOf(arguments.get("controlsId"));
+ boolean isSucess=downStorageCageDetailsService.identWorn(downStorageCageDetailsId,controlsId);
+ return Result.build(200,"銆愮牬鎹�/鎷胯蛋銆戞垚鍔�",1);
+ }
- // Other CRUD operations can be defined here
}
diff --git a/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downstorage/service/DownStorageCageDetailsService.java b/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downstorage/service/DownStorageCageDetailsService.java
index 1b1479a..29c215b 100644
--- a/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downstorage/service/DownStorageCageDetailsService.java
+++ b/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downstorage/service/DownStorageCageDetailsService.java
@@ -72,4 +72,11 @@
boolean DirectConnection(GlassInfo glassInfo);
DownStorageCageDetails getGlassInfoMaxCount();
+
+ /**
+ * @param glassId
+ * @param ControlsId
+ * @return 鐮存崯
+ */
+ boolean identWorn(String glassId, int ControlsId);
}
diff --git a/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downstorage/service/impl/DownStorageCageDetailsServiceImpl.java b/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downstorage/service/impl/DownStorageCageDetailsServiceImpl.java
index 98b237c..1b3d559 100644
--- a/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downstorage/service/impl/DownStorageCageDetailsServiceImpl.java
+++ b/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downstorage/service/impl/DownStorageCageDetailsServiceImpl.java
@@ -3,12 +3,19 @@
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.github.yulichang.query.MPJLambdaQueryWrapper;
+import com.github.yulichang.query.MPJQueryWrapper;
+
+
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+
import com.github.yulichang.toolkit.JoinWrappers;
+import com.github.yulichang.wrapper.MPJLambdaWrapper;
import com.mes.common.config.Const;
import com.mes.downstorage.entity.DownStorageCage;
import com.mes.downstorage.entity.DownStorageCageDetails;
import com.mes.downstorage.mapper.DownStorageCageDetailsMapper;
+
import com.mes.downstorage.mapper.DownStorageCageMapper;
import com.mes.downstorage.service.DownStorageCageDetailsService;
import com.mes.downworkstation.entity.DownWorkstation;
@@ -346,4 +353,24 @@
}
+
+
+ @Override
+ public boolean identWorn(String glassId, int ControlsId) {
+ List<DownStorageCageDetails> edgStorageCageDetails = baseMapper.selectList(new MPJLambdaQueryWrapper<DownStorageCageDetails>().selectAll(DownStorageCageDetails.class).eq(DownStorageCageDetails::getGlassId, glassId));
+ if (edgStorageCageDetails.size() == 1) {
+ DownStorageCageDetails item = edgStorageCageDetails.get(0);
+ item.setState(ControlsId);
+ baseMapper.update(item, new MPJLambdaWrapper<DownStorageCageDetails>().selectAll(DownStorageCageDetails.class).eq(DownStorageCageDetails::getGlassId, glassId));
+ return true;
+ }
+
+ return false;
+ }
+
+
+
+
+
+
}
--
Gitblit v1.8.0