From a66b4925a2528ff23a34c3607e9c45bbbdd28e5e Mon Sep 17 00:00:00 2001
From: zhoushihao <zsh19950802@163.com>
Date: 星期四, 15 八月 2024 09:00:05 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
UI-Project/src/layout/MainErpView.vue | 35 +-
UI-Project/src/views/StockBasicData/stockBasicData.vue | 8
UI-Project/src/views/Returns/returns.vue | 2
UI-Project/src/views/Identify/identify.vue | 12
UI-Project/src/views/Caching/cachingbefore.vue | 2
UI-Project/src/lang/zh.js | 2
hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downstorage/service/DownStorageCageService.java | 3
hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downstorage/service/impl/DownStorageCageServiceImpl.java | 27 +
UI-Project/src/views/UnLoadGlass/loadmachinerack.vue | 17
hangzhoumesParent/moduleService/CacheGlassModule/src/test/java/com/mes/CacheGlassModuleApplicationTest.java | 2
UI-Project/src/views/Caching/cachingun.vue | 270 ++++++++++----------
UI-Project/src/views/Slicecage/slicecage.vue | 12
hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downstorage/controller/DownStorageCageDetailsController.java | 6
UI-Project/package-lock.json | 14
UI-Project/package.json | 2
UI-Project/src/views/PurchaseReturn/purchaseReturn.vue | 26 +-
UI-Project/src/views/UnLoadGlass/PrintFlow.vue | 76 +++--
UI-Project/src/views/largescreen/largescreen.vue | 206 +++++++--------
18 files changed, 375 insertions(+), 347 deletions(-)
diff --git a/UI-Project/package-lock.json b/UI-Project/package-lock.json
index e9f2959..d59de38 100644
--- a/UI-Project/package-lock.json
+++ b/UI-Project/package-lock.json
@@ -8,7 +8,7 @@
"name": "northglass-mes",
"version": "0.0.0",
"dependencies": {
- "@element-plus/icons-vue": "^2.1.0",
+ "@element-plus/icons-vue": "^2.3.1",
"@vue-macros/reactivity-transform": "^0.3.23",
"axios": "^1.6.8",
"chart.js": "^4.4.3",
@@ -100,9 +100,9 @@
}
},
"node_modules/@element-plus/icons-vue": {
- "version": "2.1.0",
- "resolved": "https://registry.npmjs.org/@element-plus/icons-vue/-/icons-vue-2.1.0.tgz",
- "integrity": "sha512-PSBn3elNoanENc1vnCfh+3WA9fimRC7n+fWkf3rE5jvv+aBohNHABC/KAR5KWPecxWxDTVT1ERpRbOMRcOV/vA==",
+ "version": "2.3.1",
+ "resolved": "https://registry.npmmirror.com/@element-plus/icons-vue/-/icons-vue-2.3.1.tgz",
+ "integrity": "sha512-XxVUZv48RZAd87ucGS48jPf6pKu0yV5UCg9f4FFwtrYxXOwWuVJo6wOvSLKEoMQKjv8GsX/mhP6UsC1lRwbUWg==",
"peerDependencies": {
"vue": "^3.2.0"
}
@@ -2225,9 +2225,9 @@
"integrity": "sha512-SITSV6aIXsuVNV3f3O0f2n/cgyEDWoSqtZMYiAmcsYHydcKrOz3gUxB/iXd/Qf08+IZX4KpgNbvUdMBmWz+kcA=="
},
"@element-plus/icons-vue": {
- "version": "2.1.0",
- "resolved": "https://registry.npmjs.org/@element-plus/icons-vue/-/icons-vue-2.1.0.tgz",
- "integrity": "sha512-PSBn3elNoanENc1vnCfh+3WA9fimRC7n+fWkf3rE5jvv+aBohNHABC/KAR5KWPecxWxDTVT1ERpRbOMRcOV/vA==",
+ "version": "2.3.1",
+ "resolved": "https://registry.npmmirror.com/@element-plus/icons-vue/-/icons-vue-2.3.1.tgz",
+ "integrity": "sha512-XxVUZv48RZAd87ucGS48jPf6pKu0yV5UCg9f4FFwtrYxXOwWuVJo6wOvSLKEoMQKjv8GsX/mhP6UsC1lRwbUWg==",
"requires": {}
},
"@esbuild/win32-ia32": {
diff --git a/UI-Project/package.json b/UI-Project/package.json
index ba92794..feeda10 100644
--- a/UI-Project/package.json
+++ b/UI-Project/package.json
@@ -8,7 +8,7 @@
"preview": "vite preview"
},
"dependencies": {
- "@element-plus/icons-vue": "^2.1.0",
+ "@element-plus/icons-vue": "^2.3.1",
"@vue-macros/reactivity-transform": "^0.3.23",
"axios": "^1.6.8",
"chart.js": "^4.4.3",
diff --git a/UI-Project/src/lang/zh.js b/UI-Project/src/lang/zh.js
index f4e78d2..01b7556 100644
--- a/UI-Project/src/lang/zh.js
+++ b/UI-Project/src/lang/zh.js
@@ -432,6 +432,8 @@
allstatus: '鍏ㄩ儴鍏ュ簱鐘舵��',
completedquantity: '瀹屾垚鏁伴噺',
scrapquantity: '鎶ュ簾鏁伴噺',
+ number: '鏁伴噺',
+ method: '鍔犲伐鏂瑰紡',
},
reportmanage:{
productiontime :'鐢熶骇鏃堕棿',
diff --git a/UI-Project/src/layout/MainErpView.vue b/UI-Project/src/layout/MainErpView.vue
index 5f91bf3..ba2c234 100644
--- a/UI-Project/src/layout/MainErpView.vue
+++ b/UI-Project/src/layout/MainErpView.vue
@@ -10,7 +10,7 @@
const { t } = useI18n()
let language = ref(localStorage.getItem('lang') || 'zh')
const store = userInfo()
-
+const isCollapse = ref(false);
// const { $i18n } = useI18n(); // 鑾峰彇 i18n 瀹炰緥
const router = useRouter()
const userStore = useUserInfoStore()
@@ -158,6 +158,9 @@
openFlag = menuID
}
}
+function toggleCollapse() {
+ isCollapse.value = !isCollapse.value;
+}
</script>
<template>
@@ -188,33 +191,21 @@
<SwitchButton size=""/>{{ $t('main.quit') }}
</el-icon>
</el-button>
+ <!-- <div class="header-left">
+ <el-button :icon="isCollapse ? 'el-icon-s-unfold' : 'el-icon-s-fold'" @click="toggleCollapse"
+ style="height:30px;"></el-button>
+ </div> -->
</span>
</div>
</el-header>
<div id="line"></div>
<el-container>
- <!-- <el-aside width="160px"
- style="height: 99%; background-color: #fff;">
- <div class="menu">
- <div v-for="items in menuList">
- <div class='menu_title'
- @click="openMenu(items.id)">
- <span>鈽�</span>
- {{ items.menuName }}
- </div>
- <ul class='enter-x-left'
- v-show="openFlag==items.id">
- <li v-for="menuItem in items.children"
- style="margin-bottom:2px">
- <router-link :to="{path:menuItem.url}">
- {{ menuItem.menuName }}
- </router-link>
- </el-aside> -->
+ <el-aside :width="isCollapse ? '30px' : '200px'" style="background-color: #fff;">
<el-row :span="20">
- <el-menu :default-active="activePath" class="el-menu-vertical-demo" background-color="#fff">
+ <el-menu :default-active="activePath" class="el-menu-vertical-demo" >
<div class="menu">
<div v-for="items in menuList">
- <div class='menu_title'
+ <div class='menu_title' v-show="!isCollapse"
@click="openMenu(items.id)">
<span>鈽�</span>
{{ items.menuName }}
@@ -232,12 +223,12 @@
</div>
</el-menu>
</el-row>
- <el-main>
+</el-aside>
+<el-main>
<div id="main">
<router-view></router-view>
</div>
</el-main>
-
</el-container>
</el-container>
</div>
diff --git a/UI-Project/src/views/Caching/cachingbefore.vue b/UI-Project/src/views/Caching/cachingbefore.vue
index e4c67f3..36a24cc 100644
--- a/UI-Project/src/views/Caching/cachingbefore.vue
+++ b/UI-Project/src/views/Caching/cachingbefore.vue
@@ -110,7 +110,7 @@
<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"
+ <el-table height="340" ref="table"
@selection-change="handleSelectionChange"
:data="tableData" :header-cell-style="{background:'#F2F3F5 ',color:'#1D2129'}">
<el-table-column prop="slot" align="center" :label="$t('sorter.gridnumber')" min-width="80" />
diff --git a/UI-Project/src/views/Caching/cachingun.vue b/UI-Project/src/views/Caching/cachingun.vue
index d7676bf..8e0a488 100644
--- a/UI-Project/src/views/Caching/cachingun.vue
+++ b/UI-Project/src/views/Caching/cachingun.vue
@@ -2,159 +2,152 @@
<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"
- @selection-change="handleSelectionChange"
- :data="tableData" :header-cell-style="{background:'#F2F3F5 ',color:'#1D2129'}">
+ <el-table height="340" ref="table" @selection-change="handleSelectionChange" :data="tableData"
+ :header-cell-style="{ background: '#F2F3F5 ', color: '#1D2129' }">
<el-table-column prop="slot" align="center" :label="$t('sorter.gridnumber')" min-width="80" />
<el-table-column prop="glass_id" align="center" :label="$t('sorter.glassnumber')" min-width="80" />
<el-table-column prop="width" align="center" :label="$t('sorter.width')" min-width="120" />
<el-table-column prop="height" align="center" :label="$t('sorter.height')" min-width="120" />
- <el-table-column
- align="center"
- :label="$t('sorter.startstatus')"
- min-width="80"
- prop="enable_state"
- >
- <template #default="scope">
- <el-tag
- :type="scope.row.enable_state === 1 ? 'success' : 'danger'"
- @click="toggleEnableState(scope.row)"
- >
- {{ scope.row.enable_state === 1 ? $t('sorter.start') : $t('sorter.disable') }}
- </el-tag>
- </template>
- <!-- <template #default="scope">
+ <el-table-column align="center" :label="$t('sorter.startstatus')" min-width="80" prop="enable_state">
+ <template #default="scope">
+ <el-tag :type="scope.row.enable_state === 1 ? 'success' : 'danger'" @click="toggleEnableState(scope.row)">
+ {{ scope.row.enable_state === 1 ? $t('sorter.start') : $t('sorter.disable') }}
+ </el-tag>
+ </template>
+ <!-- <template #default="scope">
<el-tag type="success" >{{ scope.row.enable_state==1?"鍚敤":"鏈惎鐢�" }}</el-tag>
</template> -->
</el-table-column>
<el-table-column fixed="right" :label="$t('sorter.operate')" align="center" width="200">
<template #default="scope">
- <el-button size="mini" type="text" plain @click="open(scope.row)">{{ $t('sorter.deficiencieste') }}</el-button>
- <el-button size="mini" type="text" plain @click="opena(scope.row)">{{ $t('sorter.updown') }}</el-button>
+ <el-button size="mini" type="text" plain @click="open(scope.row)">{{ $t('sorter.deficiencieste')
+ }}</el-button>
+ <el-button size="mini" type="text" plain @click="opena(scope.row)">{{ $t('sorter.updown') }}</el-button>
</template>
- </el-table-column>
+ </el-table-column>
</el-table>
</div>
</el-card>
- <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"
- :style="{ position: 'absolute',
- top: `${rect.id}px`, left: `10px`, width: `${rect.width}px`, height: `5px`,
+ <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" :style="{
+ position: 'absolute',
+ top: `${rect.id}px`, left: `10px`, width: `${rect.width}px`, height: `5px`,
backgroundColor: '#409EFF'
- }"
- >
+ }">
+ </div>
+ </div>
</div>
</div>
-</div>
-</div>
</template>
<script setup>
-import {Search,Lock,Avatar} from "@element-plus/icons-vue";
-import {reactive} from "vue";
-import {useRouter} from "vue-router"
+import { Search, Lock, Avatar } from "@element-plus/icons-vue";
+import { reactive } from "vue";
+import { useRouter } from "vue-router"
const router = useRouter()
const adda = ref(false)
-import { WebSocketHost ,host} from '@/utils/constants'
+import { WebSocketHost, host } from '@/utils/constants'
import request from "@/utils/request"
-import { ref, onMounted , onBeforeUnmount,onUnmounted} from "vue";
+import { ref, onMounted, onBeforeUnmount, onUnmounted } from "vue";
import { initializeWebSocket, closeWebSocket } from '@/utils/WebSocketService';
// import { ref } from 'vue'
import { ElMessage, ElMessageBox } from 'element-plus'
// import LanguageMixin from './lang/LanguageMixin'
-
+
import { useI18n } from 'vue-i18n'
- const { t } = useI18n()
+const { t } = useI18n()
// import i18n from '@/i18n';
const tableData = reactive([]);
const slot = ref('')
const adjustedRects = ref([]);
-
-onMounted(async () => {
- try {
- const response = await request.get('/unLoadGlass/downStorage/selectStorageCage'); // 鏇挎崲涓轰綘鐨凙PI绔偣
- if (response.code === 200) {
- const rawRects = response.data; // 璁剧疆鐭╁舰鏁版嵁
- tableData.value = response.data
- console.log(response.data);
- adjustedRects.value = rawRects.map(rect => ({
- ...rect, // 澶嶅埗鍘熷瀵硅薄鐨勫叾浠栧睘鎬�
- width: rect.width * 0.5 ,
- id: rect.id * 10,
- }));
- console.log(adjustedRects.value);
- } else {
- ElMessage.warning(res.msg)
- }
- } catch (error) {
- // console.error('Error fetching rects :', error);
- }
-});
-const open = async(row) => {
+
+onMounted(async () => {
try {
- const confirmResult = await ElMessageBox.confirm(
- t('sorter.information'),
- t('sorter.prompt'),
- {
- confirmButtonText: t('sorter.yes'),
+ const response = await request.get('/unLoadGlass/downStorage/selectStorageCage'); // 鏇挎崲涓轰綘鐨凙PI绔偣
+ if (response.code === 200) {
+ const rawRects = response.data; // 璁剧疆鐭╁舰鏁版嵁
+ tableData.value = response.data
+ console.log(response.data);
+ adjustedRects.value = rawRects.map(rect => ({
+ ...rect, // 澶嶅埗鍘熷瀵硅薄鐨勫叾浠栧睘鎬�
+ width: rect.width * 0.5,
+ id: rect.id * 10,
+ }));
+ console.log(adjustedRects.value);
+ } else {
+ ElMessage.warning(res.msg)
+ }
+ } catch (error) {
+ // console.error('Error fetching rects :', error);
+ }
+});
+const open = async (row) => {
+ try {
+ const confirmResult = await ElMessageBox.confirm(
+ t('sorter.information'),
+ t('sorter.prompt'),
+ {
+ confirmButtonText: t('sorter.yes'),
cancelButtonText: t('sorter.cancel'),
- type: 'warning',
- }
- );
- if (confirmResult === 'confirm') {
+ type: 'warning',
+ }
+ );
+ if (confirmResult === 'confirm') {
// 鐢ㄦ埛鐐瑰嚮浜嗏�滄槸鈥濓紝鐜板湪璋冪敤鍒犻櫎鎺ュ彛
- var url="/unLoadGlass/downStorage/deleteDownStorageCage?downStorageCageId="+row.id;
+ var url = "/unLoadGlass/downStorage/deleteDownStorageCage";
console.log(url);
const response = await request.post(url, {
- esdId: row.esdId
+ glassId: row.glass_id,
+ state: 9,
+ line: 1001,
+ workingProcedure: '纾ㄨ竟鍓嶇悊鐗囩',
})
if (response.code === 200) {
ElMessage.success(response.message);
- } else {
- // 鍒犻櫎澶辫触锛屾偍鍙互澶勭悊閿欒鎴栨樉绀洪敊璇俊鎭粰鐢ㄦ埛
+ } else {
+ // 鍒犻櫎澶辫触锛屾偍鍙互澶勭悊閿欒鎴栨樉绀洪敊璇俊鎭粰鐢ㄦ埛
ElMessage.error(response.message);
- // alert('鍒犻櫎澶辫触锛�' + deleteResponse.message);
- }
- }
- }
- catch (error) {
- // 澶勭悊鍙兘鍑虹幇鐨勯敊璇紝姣斿 ElMessageBox 鎶涘嚭鐨勫紓甯哥瓑
- console.error('鍙戠敓閿欒:', error);
+ // alert('鍒犻櫎澶辫触锛�' + deleteResponse.message);
+ }
}
-};
+ }
+ catch (error) {
+ // 澶勭悊鍙兘鍑虹幇鐨勯敊璇紝姣斿 ElMessageBox 鎶涘嚭鐨勫紓甯哥瓑
+ console.error('鍙戠敓閿欒:', error);
+}
+};
// 浜哄伐涓嬬墖
-const opena = async(row) => {
+const opena = async (row) => {
try {
- const confirmResult = await ElMessageBox.confirm(
- t('sorter.infor'),
- t('sorter.prompt'),
- {
- confirmButtonText: t('sorter.yes'),
+ const confirmResult = await ElMessageBox.confirm(
+ t('sorter.infor'),
+ t('sorter.prompt'),
+ {
+ confirmButtonText: t('sorter.yes'),
cancelButtonText: t('sorter.cancel'),
- type: 'warning',
- }
- );
+ type: 'warning',
+ }
+ );
if (confirmResult === 'confirm') {
const response = await request.post("/unLoadGlass/downGlassTask/generateOutGlassTask", {
glassId: row.glass_id
})
- if (response.code === 200) {
- ElMessage.success(response.message);
- } else {
+ if (response.code === 200) {
+ ElMessage.success(response.message);
+ } else {
// 鍒犻櫎澶辫触锛屾偍鍙互澶勭悊閿欒鎴栨樉绀洪敊璇俊鎭粰鐢ㄦ埛
- ElMessage.error(response.message);
+ ElMessage.error(response.message);
// alert('鍒犻櫎澶辫触锛�' + deleteResponse.message);
- }
- }
- }
- catch (error) {
+ }
+ }
+ }
+ catch (error) {
// 澶勭悊鍙兘鍑虹幇鐨勯敊璇紝姣斿 ElMessageBox 鎶涘嚭鐨勫紓甯哥瓑
- console.error('鍙戠敓閿欒:', error);
- }
-};
+ console.error('鍙戠敓閿欒:', error);
+ }
+};
// const open = async(row) => {
// const { t } = useI18n();
// try {
@@ -184,23 +177,23 @@
// }
// }
// }
-
-
+
+
// catch (error) {
// // 澶勭悊鍙兘鍑虹幇鐨勯敊璇紝姣斿 ElMessageBox 鎶涘嚭鐨勫紓甯哥瓑
// console.error('鍙戠敓閿欒:', error);
// }
// };
-const toggleEnableState = async (row) => {
- const newState = row.enable_state === 1 ? 0 : 1;
+const toggleEnableState = async (row) => {
+ const newState = row.enable_state === 1 ? 0 : 1;
// 鍙戦�佽姹傚埌鍚庣鏇存柊鐘舵�侊紙杩欓噷鐪佺暐浜嗗疄闄呯殑璇锋眰閫昏緫锛�
- const response = await request.post('/unLoadGlass/downStorage/updateDownStorageCage', { id: row.id, enableState: newState });
+ const response = await request.post('/unLoadGlass/downStorage/updateDownStorageCage', { id: row.id, enableState: newState });
if (response.code === 200) {
- ElMessage.success(response.message);
- } else {
- ElMessage.error(response.message);
- }
- row.enable_state = newState;
+ ElMessage.success(response.message);
+ } else {
+ ElMessage.error(response.message);
+ }
+ row.enable_state = newState;
};
@@ -213,44 +206,57 @@
tableData.splice(0, tableData.length, ...data.params2[0]);
// tableData.value = data.params[0]
// adjustedRects.value = data.EdgStorageCageinfos[0]
- adjustedRects.value = data.params2[0].map(rect => ({
- ...rect, // 澶嶅埗鍘熷瀵硅薄鐨勫叾浠栧睘鎬�
- width: rect.width * 0.5 ,
- id: rect.id * 10,
- }));
+ adjustedRects.value = data.params2[0].map(rect => ({
+ ...rect, // 澶嶅埗鍘熷瀵硅薄鐨勫叾浠栧睘鎬�
+ width: rect.width * 0.5,
+ id: rect.id * 10,
+ }));
};
onMounted(() => {
socket = initializeWebSocket(socketUrl, handleMessage);
});
- onUnmounted(() => {
- if (socket) {
+onUnmounted(() => {
+ if (socket) {
closeWebSocket(socket);
- }
- });
+ }
+});
onBeforeUnmount(() => {
console.log("鍏抽棴浜�")
closeWebSocket();
});
</script>
<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{
+#dt {
+ display: block;
+ float: left;
+ line-height: 20px;
+ margin-left: 100px;
+}
+
+#dta {
+ display: block;
+ float: left;
+ line-height: 20px;
+ margin-left: 80%;
+}
+
+#dialog-footer {
text-align: center;
margin-top: -15px;
}
-#message{
+
+#message {
text-align: center;
align-items: center;
color: black;
- width: 200px;
- height: 100px;
- background-color: #337ecc;
- margin-left: 28%;
+ width: 200px;
+ height: 100px;
+ background-color: #337ecc;
+ margin-left: 28%;
}
-.awatch{
+
+.awatch {
height: 460px;
width: 1500px;
max-width: 100%;
diff --git a/UI-Project/src/views/Identify/identify.vue b/UI-Project/src/views/Identify/identify.vue
index 58b7421..83eae3b 100644
--- a/UI-Project/src/views/Identify/identify.vue
+++ b/UI-Project/src/views/Identify/identify.vue
@@ -84,10 +84,10 @@
// console.log(url);
// const response = await request.post(url)
const response = await request.post('/cacheGlass/taskCache/identControls', {
- identId: currentGlassId.value,
- controlsId: 8,
+ glassId: currentGlassId.value,
+ state: 8,
line: 1001,
- machine: '璇嗗埆',
+ workingProcedure: '璇嗗埆',
})
if (response.code == 200) {
ElMessage.success(response.message);
@@ -111,10 +111,10 @@
// console.log(url);
// const response = await request.post(url)
const response = await request.post('/cacheGlass/taskCache/identControls', {
- identId: currentGlassId.value,
- controlsId: 9,
+ glassId: currentGlassId.value,
+ state: 9,
line: 1001,
- machine: '璇嗗埆',
+ workingProcedure: '璇嗗埆',
})
if (response.code == 200) {
// 缁戝畾鎴愬姛锛屽鐞嗛�昏緫
diff --git a/UI-Project/src/views/PurchaseReturn/purchaseReturn.vue b/UI-Project/src/views/PurchaseReturn/purchaseReturn.vue
index 36297d2..60ec592 100644
--- a/UI-Project/src/views/PurchaseReturn/purchaseReturn.vue
+++ b/UI-Project/src/views/PurchaseReturn/purchaseReturn.vue
@@ -38,17 +38,17 @@
heighta = rect.height;
}
if (rect.angle === 0) {
+ adjustedWidth = widtha * 0.12;
+ adjustedHeight = heighta * 0.1;
+ // adjustedWidtha = widtha;
+ // adjustedHeighta = heighta;
+ newX = 5087 - (rect.yCoordinate + widtha);
+ } else {
adjustedWidth = heighta * 0.12;
adjustedHeight = widtha * 0.1;
// adjustedWidtha = widtha;
// adjustedHeighta = heighta;
- newX = 5087 - (rect.yCoordinate + heighta);
- } else {
- adjustedWidth = widtha * 0.12;
- adjustedHeight = heighta * 0.1;
- // adjustedWidtha = widtha;
- // adjustedHeighta = heighta;
- newX = 5087 - (rect.yCoordinate + widtha);
+ newX = 5087 - (rect.yCoordinate + heighta);
}
// if (rect.angle === 0) {
// adjustedWidth = heighta * 0.12;
@@ -89,17 +89,17 @@
heighta = rect.height;
}
if (rect.angle === 0) {
- adjustedWidth = heighta * 0.12;
- adjustedHeight = widtha * 0.1;
- // adjustedWidtha = widtha;
- // adjustedHeighta = heighta;
- newX = 5087 - (rect.yCoordinate + heighta);
- } else {
adjustedWidth = widtha * 0.12;
adjustedHeight = heighta * 0.1;
// adjustedWidtha = widtha;
// adjustedHeighta = heighta;
newX = 5087 - (rect.yCoordinate + widtha);
+ } else {
+ adjustedWidth = heighta * 0.12;
+ adjustedHeight = widtha * 0.1;
+ // adjustedWidtha = widtha;
+ // adjustedHeighta = heighta;
+ newX = 5087 - (rect.yCoordinate + heighta);
}
// if (rect.angle === 0) {
// adjustedWidth = heighta * 0.12;
diff --git a/UI-Project/src/views/Returns/returns.vue b/UI-Project/src/views/Returns/returns.vue
index bcbbd2e..76b56c6 100644
--- a/UI-Project/src/views/Returns/returns.vue
+++ b/UI-Project/src/views/Returns/returns.vue
@@ -718,7 +718,7 @@
<el-card style="flex: 1;margin-left: 10px;margin-top: 15px;" v-loading="loading">
<div style="width: 98%; height: calc(100% - 35px); overflow-y: auto;">
<el-table
- height="150"
+ height="350"
ref="table"
:header-cell-style="{background:'#F2F3F5 ',color:'#1D2129'}"
:data="tableData"
diff --git a/UI-Project/src/views/Slicecage/slicecage.vue b/UI-Project/src/views/Slicecage/slicecage.vue
index 9378fbf..ee4b3d7 100644
--- a/UI-Project/src/views/Slicecage/slicecage.vue
+++ b/UI-Project/src/views/Slicecage/slicecage.vue
@@ -600,8 +600,9 @@
// 鏇存柊 tableData 鐨勬暟鎹�
if(data.bigStorageCageDetailsOutTask!=null){
tableDatac.value = data.bigStorageCageDetailsOutTask[0]
+ console.log(data.bigStorageCageDetailsOutTask[0])
adjusta.value = data.bigStorageCageDetailsOutTask[0].filter(rect => rect.slot !== null && rect.slot !== undefined);
- console.log(data.bigStorageCageDetailsOutTask[0]);
+ // console.log(data.bigStorageCageDetailsOutTask[0]);
} else {
tableDatac.value = '',
@@ -628,6 +629,7 @@
}
if(data.temperingGlassInfoList!=null){
tableDatab.value = data.temperingGlassInfoList[0]
+ console.log(tableDatab.value)
}else{
tableDatab.value = ''
}
@@ -1352,8 +1354,8 @@
<el-table ref="table" style="margin-top: 20px;height: 500px;"
:data="tableDatab" :header-cell-style="{background:'#F2F3F5 ',color:'#1D2129'}">
<el-table-column prop="id" fixed align="center" :label="$t('searchOrder.sheetID')" min-width="150"/>
- <el-table-column prop="flowcardId" fixed align="center" :label="$t('searchOrder.processcards')" min-width="120" />
- <el-table-column prop="glassType" align="center" :label="$t('searchOrder.processcardtype')" min-width="150" />
+ <el-table-column prop="flowCardId" fixed align="center" :label="$t('searchOrder.processcards')" min-width="120" />
+ <!-- <el-table-column prop="glassType" align="center" :label="$t('searchOrder.processcardtype')" min-width="150" /> -->
<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" />
<el-table-column prop="thickness" align="center" :label="$t('searchOrder.thickness')" min-width="80" />
@@ -1387,13 +1389,13 @@
</el-tag>
</template>
</el-table-column>
- <el-table-column fixed="right" :label="$t('searchOrder.operate')" align="center" 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="brokea(scope.row)">{{ $t('searchOrder.breakage') }}</el-button>
<el-button size="mini" type="text" plain @click="brokeb(scope.row)">{{ $t('searchOrder.takeout') }}</el-button>
<el-button size="mini" type="text" plain @click="deletea(scope.row)">{{ $t('searchOrder.delete') }}</el-button>
</template>
- </el-table-column>
+ </el-table-column> -->
</el-table>
</el-dialog>
<el-dialog v-model="dialogFormVisiblec" top="5vh" width="85%" :title="$t('searchOrder.temperingqueries')">
diff --git a/UI-Project/src/views/StockBasicData/stockBasicData.vue b/UI-Project/src/views/StockBasicData/stockBasicData.vue
index 70a5bcc..2ba2936 100644
--- a/UI-Project/src/views/StockBasicData/stockBasicData.vue
+++ b/UI-Project/src/views/StockBasicData/stockBasicData.vue
@@ -157,18 +157,18 @@
<template>
<div>
<el-card style="flex: 1;margin-left: 10px;margin-top: 20px;" v-loading="loading">
- <el-select v-model="selectValuesa[0]" filterable :placeholder="$t('璇烽�夋嫨绾胯矾')" clearable>
+ <el-select v-model="selectValuesa[0]" filterable :placeholder="$t('璇烽�夋嫨绾胯矾')" clearable style="margin-left: 20px;">
<el-option label="纾ㄨ竟涓�绾�" value="2001"></el-option>
<el-option label="纾ㄨ竟浜岀嚎" value="2002"></el-option>
</el-select>
- <el-select v-model="selectValuesa[1]" filterable :placeholder="$t('璇烽�夋嫨鐘舵��')" clearable >
+ <el-select v-model="selectValuesa[1]" filterable :placeholder="$t('璇烽�夋嫨鐘舵��')" clearable style="margin-left: 20px;" >
<el-option label="鏈（杈�" value="0"></el-option>
<el-option label="纾ㄨ竟涓�" value="1"></el-option>
<el-option label="宸茬（杈�" value="2"></el-option>
</el-select>
- <span class="demonstration">鏃堕棿娈�</span>
- <el-date-picker v-model="timeRange" type="datetimerange" range-separator="鑷�" start-placeholder="寮�濮嬫棩鏈�"
+ <span class="demonstration" style="margin-left: 20px;">鏃堕棿娈�</span>
+ <el-date-picker v-model="timeRange" type="datetimerange" range-separator="鑷�" start-placeholder="寮�濮嬫棩鏈�" style="margin-left: 20px;"
end-placeholder="缁撴潫鏃ユ湡">
</el-date-picker>
<el-button type="primary" style="margin-left: 10px;" @click="setEdgGlassInfoRequest()">{{
diff --git a/UI-Project/src/views/UnLoadGlass/PrintFlow.vue b/UI-Project/src/views/UnLoadGlass/PrintFlow.vue
index 26a1a9f..19a600a 100644
--- a/UI-Project/src/views/UnLoadGlass/PrintFlow.vue
+++ b/UI-Project/src/views/UnLoadGlass/PrintFlow.vue
@@ -69,54 +69,56 @@
}
-const printFlowCard = () => {
- // 闇�瑕佹墦鍗扮殑灞�閮ㄥ尯鍩熻祴浜�"print-wrap"鐨刬d
- let el = document.getElementById("printFlowCard");
- let doc = document;
- let body = doc.body || doc.getElementsByTagName("body")[0];
- let printId = "print-" + Date.now();
+// const printFlowCard = () => {
+// // 闇�瑕佹墦鍗扮殑灞�閮ㄥ尯鍩熻祴浜�"print-wrap"鐨刬d
+// let el = document.getElementById("printFlowCard");
+// let doc = document;
+// let body = doc.body || doc.getElementsByTagName("body")[0];
+// let printId = "print-" + Date.now();
- // 鍒涘缓鏃犲壇浣滅敤鐨勬墦鍗板鍣�(鍥犱笉纭畾椤甸潰鐨勬墦鍗板厓绱犳湁鏃犲叾瀹冩牱寮�)
- let content = doc.createElement("div");
- content.id = printId;
+// // 鍒涘缓鏃犲壇浣滅敤鐨勬墦鍗板鍣�(鍥犱笉纭畾椤甸潰鐨勬墦鍗板厓绱犳湁鏃犲叾瀹冩牱寮�)
+// let content = doc.createElement("div");
+// content.id = printId;
- // 鏍峰紡鎺у埗涓庢墦鍗版棤鍏崇殑鍏冪礌闅愯棌
- let style = doc.createElement("style");
- style.innerHTML =
- "body>#" +
- printId +
- "{display:none}@media print{" +
- "@page {" +
- " size: auto; " +
- " margin: 5mm 5mm 5mm 5mm; " +
- " }body>:not(#" +
- printId +
- "){display:none !important}body>#" +
- printId +
- "{display:block;padding-top:1px}}";
- //
- content.innerHTML = el.outerHTML;
- // // console.log("el.outerHTML", el.outerHTML);
- body.appendChild(style);
+// // 鏍峰紡鎺у埗涓庢墦鍗版棤鍏崇殑鍏冪礌闅愯棌
+// let style = doc.createElement("style");
+// style.innerHTML =
+// "body>#" +
+// printId +
+// "{display:none}@media print{" +
+// "@page {" +
+// " size: auto; " +
+// " margin: 5mm 5mm 5mm 5mm; " +
+// " }body>:not(#" +
+// printId +
+// "){display:none !important}body>#" +
+// printId +
+// "{display:block;padding-top:1px}}";
+// //
+// content.innerHTML = el.outerHTML;
+// // // console.log("el.outerHTML", el.outerHTML);
+// body.appendChild(style);
- // 涓巗tyle鍏冪礌璁剧疆鐨勬牱寮忕浉閰嶅悎
- // 鎶婃墦鍗板唴瀹圭殑鍏冪礌娣诲姞鍒癰ody(浣滀负body鐨勫瓙鍏冪礌锛屽彲鐢╞ody鐨勫瓙閫夋嫨鍣� '>' 鎺у埗鎵撳嵃鏍峰紡)
- body.appendChild(content);
- setTimeout(() => {
- window.print();
- body.removeChild(content);
- body.removeChild(style);
- }, 20);
-}
+// // 涓巗tyle鍏冪礌璁剧疆鐨勬牱寮忕浉閰嶅悎
+// // 鎶婃墦鍗板唴瀹圭殑鍏冪礌娣诲姞鍒癰ody(浣滀负body鐨勫瓙鍏冪礌锛屽彲鐢╞ody鐨勫瓙閫夋嫨鍣� '>' 鎺у埗鎵撳嵃鏍峰紡)
+// body.appendChild(content);
+// setTimeout(() => {
+// window.print();
+// body.removeChild(content);
+// body.removeChild(style);
+// }, 20);
+// }
onMounted(async () => {
-
+ console.log(props.printFlowCardId,props.printLayer)
try {
+
const response = await request.post('/unLoadGlass/downGlassInfo/downGlassPrint',{
flowCardId:props.printFlowCardId,
layer:props.printLayer
});
if (response.code == 200) {
+
// 缁戝畾鎴愬姛锛屽鐞嗛�昏緫
produceList.value = response.data;
ElMessage.success(response.message);
diff --git a/UI-Project/src/views/UnLoadGlass/loadmachinerack.vue b/UI-Project/src/views/UnLoadGlass/loadmachinerack.vue
index 2aec6e9..d3e6467 100644
--- a/UI-Project/src/views/UnLoadGlass/loadmachinerack.vue
+++ b/UI-Project/src/views/UnLoadGlass/loadmachinerack.vue
@@ -6,6 +6,7 @@
import request from "@/utils/request";
import {closeWebSocket, initializeWebSocket} from '@/utils/WebSocketService';
import {host, WebSocketHost} from '@/utils/constants'
+import PrintFlow from "@/views/UnLoadGlass/PrintFlow.vue";
const router = useRouter()
const {t} = useI18n()
@@ -23,6 +24,7 @@
const dialogFormVisible = ref(false);
// 琛ㄥ崟鏁版嵁
const workstationId = ref('');
+const workFlowCard = ref('');
const selectedProjectNoa = ref(null); // 褰撳墠閫変腑鐨勮鑹�
const flowCardId = ref('');
const flowCardOptions = ref('[]');
@@ -129,6 +131,7 @@
const handleBindRack2 = (row) => {
workstationId.value = row.workstationId; // 鍋囪rackNumber鏄灦鍙峰瓧娈电殑灞炴�у悕
dialogFormVisiblea2.value = true; // 鎵撳紑缁戝畾鏋跺瓙瀵硅瘽妗�
+ workFlowCard.value=row.flowCardId;
};
//娓呴櫎鍐呭
const handleclear = async () => {
@@ -143,6 +146,9 @@
console.log('娓呴櫎鎴愬姛');
ElMessage.success(response.message);
dialogFormVisiblea2.value = false;
+ if(fullFlowCard.value==workFlowCard.value){
+ fullFlowCard.value="";
+ }
} else if (response.code === 500) {
// 娓呴櫎澶辫触鐨勯�昏緫
console.log('娓呴櫎澶辫触');
@@ -189,12 +195,11 @@
selectOptionsa.value = data.engineerIdList[0]
}
if (data.autoPrint != null) {
- autoPrint.value = data.autoPrint;
+ autoPrint.value = data.autoPrint[0];
}
- console.log(autoPrint.value)
- tableData.splice(0, tableData.length, ...data.params[0]);
- if (fullFlowCard.value == "") {
+
+ if (fullFlowCard.value == ""&&autoPrint.value==true) {
for (let i = 0; i < tableData.length; i++) {
if (tableData[i].totalQuantity != 0) {
if (tableData[i].totalQuantity == tableData[i].racksNumber + tableData[i].otherNumber && fullFlowCard.value != tableData[i].flowCardId) {
@@ -208,7 +213,9 @@
}
}
}
-
+ if(data.params!=null){
+ tableData.splice(0, tableData.length, ...data.params[0]);
+ }
// console.log("鏇存柊鍚庢暟鎹�", data.params[0]);
};
diff --git a/UI-Project/src/views/largescreen/largescreen.vue b/UI-Project/src/views/largescreen/largescreen.vue
index e46d431..abbf44e 100644
--- a/UI-Project/src/views/largescreen/largescreen.vue
+++ b/UI-Project/src/views/largescreen/largescreen.vue
@@ -25,7 +25,7 @@
</el-table-column>
</el-table>
</div> -->
-<div id="parent" style="margin-top: 10px;margin-left: 10px; height: 240px;width: 1000px;">
+<div id="parent" style="margin-top: 10px;margin-left: 150px; height: 240px;width: 1000px;">
<img src="../../assets/dpxsa.png" alt="" style="margin-left: -10px; width: 100%;height: 100%;position: relative;">
<div id="lipiana" v-show="woshia"></div>
<div id="lipianb" v-show="woshia"></div>
@@ -45,14 +45,14 @@
<div id="xiapianji5" v-show="xiapian5"></div>
<div id="xiapianji6" v-show="xiapian6"></div>
</div>
-<div id="centerright" style="margin-top: 10px;margin-left: 10px; height: 240px;width: 240px;background-color: #911005;">
+<!-- <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 id="bottom" style="margin-top: 10px;height: 190px;background-color: #911005;">
<el-table height="190" ref="table"
@@ -75,41 +75,29 @@
</el-tag>
</template>
</el-table-column>
- <el-table-column prop="deliveryDate" align="center" :label="$t('large.deliveryDate')" min-width="50" />
+ <el-table-column prop="deliveryDate" align="center" :label="$t('large.deliveryDate')" 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(scope.row)">{{ $t('large.mes') }}</el-button>
+ </template>
+ </el-table-column>
</el-table>
</div>
</el-scrollbar>
</el-card>
-<el-dialog v-model="blinda" top="5vh" width="80%" :title="$t('large.brokeno')">
+<el-dialog v-model="blinda" top="5vh" width="85%">
<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-column prop="orderId" fixed align="center" :label="$t('large.orderId')" min-width="110" />
+ <el-table-column prop="project" fixed align="center" :label="$t('large.project')" min-width="110" />
+ <el-table-column prop="productName" fixed align="center" :label="$t('large.productname')" min-width="110" />
+ <el-table-column prop="width" fixed align="center" :label="$t('large.width')" min-width="100" />
+ <el-table-column prop="height" fixed align="center" :label="$t('large.height')" min-width="100" />
+ <el-table-column prop="area" fixed align="center" :label="$t('large.are')" min-width="100" />
+ <el-table-column prop="quantity" fixed align="center" :label="$t('large.number')" min-width="110" />
+ <el-table-column prop="processingNote" fixed align="center" :label="$t('large.method')" min-width="110" />
+ <el-table-column prop="deliveryDate" fixed align="center" :label="$t('large.deliveryDate')" min-width="130" />
</el-table>
<template #footer>
<div id="dialog-footer" style="text-align: center;">
@@ -133,46 +121,50 @@
const tableDatac = ref([])
const adjustedRects = ref([]);
const chartRefs = ref([]);
-// const flake = ref(false)
-// const flakeb = ref(false)
-// const flakec = ref(false)
-// const flaked = ref(false)
-// const woshia = ref(false)
-// const woshic = ref(false)
-// const dalipiana = ref(false)
-// const dalipianb = ref(false)
-// const shangpian = ref(false)
-// const xiapian1 = ref(false)
-// const xiapian2 = ref(false)
-// const xiapian3 = ref(false)
-// const xiapian4 = ref(false)
-// const xiapian5 = ref(false)
-// const xiapian6 = ref(false)
-const flake = ref(true)
-const flakeb = ref(true)
-const flakec = ref(true)
-const flaked = ref(true)
-const woshia = ref(true)
-const woshic = ref(true)
-const dalipiana = ref(true)
-const dalipianb = ref(true)
-const shangpian = ref(true)
-const xiapian1 = ref(true)
-const xiapian2 = ref(true)
-const xiapian3 = ref(true)
-const xiapian4 = ref(true)
-const xiapian5 = ref(true)
-const xiapian6 = ref(true)
+const flake = ref(false)
+const flakeb = ref(false)
+const flakec = ref(false)
+const flaked = ref(false)
+const woshia = ref(false)
+const woshic = ref(false)
+const dalipiana = ref(false)
+const dalipianb = ref(false)
+const shangpian = ref(false)
+const xiapian1 = ref(false)
+const xiapian2 = ref(false)
+const xiapian3 = ref(false)
+const xiapian4 = ref(false)
+const xiapian5 = ref(false)
+const xiapian6 = ref(false)
const thisProcess = ref(); // 鐢ㄤ簬瀛樺偍process_id鐨勫搷搴斿紡寮曠敤
// 瀹氫箟涓�涓搷搴斿紡寮曠敤鏉ュ瓨鍌ㄥ浘琛ㄥ疄渚�
const chartDom = ref(null);
let chartInstance = null;
const blinda = ref(false)
-const handleBinda = (row) => {
-blinda.value = true;
-};
+const handleBinda = async (row) => {
+ blinda.value = true;
+ await fetchFlowCardId(row.orderId);
+};
const processesData = ref([]);
+const fetchFlowCardId = async (orderId) => {
+ try {
+ const response = await request.post('/loadGlass/order/order/selectOrderdetail',{
+ orderId: orderId
+ })
+ if (response.code == 200) {
+ ElMessage.success(response.message);
+ tableData.value = response.data;
+ console.log(tableData.value);
+ } else {
+ ElMessage.error(response.message);
+ }
+}
+catch (error) {
+ // 澶勭悊閿欒
+ console.error(error);
+ }
+}
function getStatusType(warehousing) {
switch (warehousing) {
case 0:
@@ -201,7 +193,7 @@
let socket6 = null;
const socketUrl = `ws://${WebSocketHost}:${host}/api/temperingGlass/api/talk/screen`;
const handleMessage = (data) => {
-tableData.value = data.awaitingRepairs[0]
+// tableData.value = data.awaitingRepairs[0]
tableDatab.value = data.DoingTask[0]
tableDatac.value = data.orders[0]
socket.onmessage = (event) => {
@@ -224,50 +216,48 @@
}
const socketUrl2 = `ws://${WebSocketHost}:${host}/api/temperingGlass/api/talk/temperingIsRun`;
const handleMessage2 = (data) => {
- // const tasks = data.temperingTaskType[0];
- // if (tasks && tasks.length >= 4) {
- // flake.value = tasks[0].state === 1;
- // flakeb.value = tasks[1].state === 2;
- // flakec.value = tasks[2].state === 3;
- // flaked.value = tasks[3].state === 4;
- // }
+ const tasks = data.temperingTaskType[0];
+ flake.value = tasks.some(task => task.state == 1);
+ flakeb.value = tasks.some(task => task.state == 2);
+ flakec.value = tasks.some(task => task.state == 3);
+ flaked.value = tasks.some(task => task.state == 4);
};
// 鍗у紡鐞嗙墖
const socketUrl3 = `ws://${WebSocketHost}:${host}/api/cacheGlass/api/talk/cacheGlassIsRun`;
const handleMessage3 = (data) => {
- // const tasks = data.taskCaches[0];
- // woshia.value = tasks.some(task => task.line == 2001);
- // woshic.value = tasks.some(task => task.line == 2002);
- // console.log(tasks);
+ const tasks = data.taskCaches[0];
+ woshia.value = tasks.some(task => task.line == 2001);
+ woshic.value = tasks.some(task => task.line == 2002);
+ console.log(tasks);
};
// 澶х悊鐗囩
const socketUrl4 = `ws://${WebSocketHost}:${host}/api/cacheVerticalGlass/api/talk/isRun`;
const handleMessage4 = (data) => {
-// const tasks = data.bigStorageCageDetailsOutTask[0];
-// const taskss = data.bigStorageCageDetailsFeedTask[0];
-// dalipiana.value = tasks.some(task => task.slot !== null && task.slot !== undefined);
-// dalipianb.value = taskss.some(task => task.slot !== null && task.slot !== undefined);
+ const tasks = data.bigStorageCageDetailsOutTask[0];
+ const taskss = data.bigStorageCageDetailsFeedTask[0];
+ dalipiana.value = tasks.some(task => task.slot !== null && task.slot !== undefined);
+dalipianb.value = taskss.some(task => task.slot !== null && task.slot !== undefined);
};
// 涓婄墖
const socketUrl5 = `ws://${WebSocketHost}:${host}/api/loadGlass/api/talk/loadGlassIsRun`;
const handleMessage5 = (data) => {
-// if(data.engineering.length !==0 ){
-// shangpian.value = true;
-// }
+ if(data.engineering.length !==0 ){
+ shangpian.value = true;
+}
};
// 涓嬬墖
const socketUrl6 = `ws://${WebSocketHost}:${host}/api/unLoadGlass/api/talk/unLoadGlassIsRun`;
const handleMessage6 = (data) => {
const tasks = data.downWorkstation[0];
- // if (tasks && tasks.length >= 6) {
- // xiapian1.value = tasks[0].racksNumber !== 0;
- // xiapian2.value = tasks[1].racksNumber !== 0;
- // xiapian3.value = tasks[2].racksNumber !== 0;
- // xiapian4.value = tasks[3].racksNumber !== 0;
- // xiapian5.value = tasks[4].racksNumber !== 0;
- // xiapian6.value = tasks[5].racksNumber !== 0;
- // }
+ if (tasks && tasks.length >= 6) {
+ xiapian1.value = tasks[0].racksNumber !== 0;
+ xiapian2.value = tasks[1].racksNumber !== 0;
+ xiapian3.value = tasks[2].racksNumber !== 0;
+ xiapian4.value = tasks[3].racksNumber !== 0;
+ xiapian5.value = tasks[4].racksNumber !== 0;
+ xiapian6.value = tasks[5].racksNumber !== 0;
+ }
};
const renderPieCharts = () => {
processesData.value.forEach((data, index) => {
@@ -445,20 +435,20 @@
#longa{
position: absolute;
z-index: 1;
- width: 29px;
+ width: 33px;
height: 5px;
background-color: #529b2e;
margin-top: -20px;
- margin-left: 80px;
+ margin-left: 130px;
}
#longb{
position: absolute;
z-index: 1;
- width: 29px;
+ width: 33px;
height: 5px;
background-color: #529b2e;
margin-top: -20px;
- margin-left: 150px;
+ margin-left: 235px;
}
#shangpianji{
position: absolute;
@@ -467,60 +457,60 @@
height: 10px;
background-color: #529b2e;
margin-top: -90px;
- margin-left: 568px;
+ margin-left: 868px;
}
#xiapianji1{
position: absolute;
z-index: 1;
- width: 10px;
+ width: 12px;
height: 7px;
background-color: #529b2e;
margin-top: -213px;
- margin-left: 111px;
+ margin-left: 173px;
}
#xiapianji2{
position: absolute;
z-index: 1;
- width: 10px;
+ width: 12px;
height: 7px;
background-color: #529b2e;
margin-top: -213px;
- margin-left: 140px;
+ margin-left: 217px;
}
#xiapianji3{
position: absolute;
z-index: 1;
- width: 10px;
+ width: 12px;
height: 7px;
background-color: #529b2e;
margin-top: -202px;
- margin-left: 126px;
+ margin-left: 196px;
}
#xiapianji4{
position: absolute;
z-index: 1;
- width: 10px;
+ width: 12px;
height: 7px;
background-color: #529b2e;
margin-top: -213px;
- margin-left: 175px;
+ margin-left: 270px;
}
#xiapianji5{
position: absolute;
z-index: 1;
- width: 10px;
+ width: 12px;
height: 7px;
background-color: #529b2e;
margin-top: -213px;
- margin-left: 204px;
+ margin-left: 314px;
}
#xiapianji6{
position: absolute;
z-index: 1;
- width: 10px;
+ width: 12px;
height: 7px;
background-color: #529b2e;
margin-top: -202px;
- margin-left: 190px;
+ margin-left: 293px;
}
</style>
\ No newline at end of file
diff --git a/hangzhoumesParent/moduleService/CacheGlassModule/src/test/java/com/mes/CacheGlassModuleApplicationTest.java b/hangzhoumesParent/moduleService/CacheGlassModule/src/test/java/com/mes/CacheGlassModuleApplicationTest.java
index 9e6a161..8907e28 100644
--- a/hangzhoumesParent/moduleService/CacheGlassModule/src/test/java/com/mes/CacheGlassModuleApplicationTest.java
+++ b/hangzhoumesParent/moduleService/CacheGlassModule/src/test/java/com/mes/CacheGlassModuleApplicationTest.java
@@ -149,7 +149,7 @@
arguments.put("controlsId","300"); //鎷胯蛋锛�200/鐮存崯锛�201
arguments.put("line","2001"); //绾胯矾锛�
arguments.put("machine","鍐峰姞宸�"); //璁惧鍚嶇О锛�
- edgStorageCageDetailsService.identWorn(arguments);
+// edgStorageCageDetailsService.identWorn(arguments);
log.info("璇嗗埆鍙般�愮牬鎹�/鎷胯蛋銆戯細{}", 1);
}
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 e7feaef..3a9e7f3 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
@@ -2,6 +2,7 @@
import com.mes.downstorage.entity.DownStorageCage;
import com.mes.downstorage.entity.DownStorageCageDetails;
+import com.mes.downstorage.entity.request.CacheWornRequest;
import com.mes.downstorage.service.DownStorageCageDetailsService;
import com.mes.downstorage.service.DownStorageCageService;
import com.mes.utils.Result;
@@ -61,8 +62,9 @@
@ApiOperation("鍒犻櫎缂撳瓨鐞嗙墖绗间俊鎭� 鍔熻兘锛氬绗煎唴鏍呮牸鐜荤拑杩涜銆愭竻闄ゃ��")
@PostMapping("/deleteDownStorageCage")
@ResponseBody
- public Result deleteDownStorageCage(@RequestBody DownStorageCageDetails downStorageCageDetails,int downStorageCageId) {
- boolean isSucess=downStorageCageService.updateDownStorageCageDetails(downStorageCageId,downStorageCageDetails);
+ public Result deleteDownStorageCage(@RequestBody CacheWornRequest cacheWornRequest) {
+ downStorageCageService.deleteDownStorageCage(cacheWornRequest);
+// boolean isSucess=downStorageCageService.updateDownStorageCageDetails(downStorageCageId,downStorageCageDetails);
return Result.build(200,"鍒犻櫎鎴愬姛",1);
}
diff --git a/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downstorage/service/DownStorageCageService.java b/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downstorage/service/DownStorageCageService.java
index 5281217..09ff9fc 100644
--- a/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downstorage/service/DownStorageCageService.java
+++ b/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downstorage/service/DownStorageCageService.java
@@ -4,6 +4,7 @@
import com.mes.downglassinfo.entity.DownGlassTask;
import com.mes.downstorage.entity.DownStorageCage;
import com.mes.downstorage.entity.DownStorageCageDetails;
+import com.mes.downstorage.entity.request.CacheWornRequest;
import com.mes.glassinfo.entity.GlassInfo;
import java.util.List;
@@ -53,6 +54,8 @@
List<Map<String, Object>> selectDownStorageCages();
List<DownStorageCageDetails> selectCacheMax();
+
+ void deleteDownStorageCage(CacheWornRequest cacheWornRequest);
}
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 18e1259..b204f0c 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
@@ -1,14 +1,18 @@
package com.mes.downstorage.service.impl;
import cn.hutool.core.collection.CollectionUtil;
+import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
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.damage.entity.Damage;
+import com.mes.damage.service.DamageService;
import com.mes.downglassinfo.entity.DownGlassTask;
import com.mes.downglassinfo.service.DownGlassTaskService;
import com.mes.downstorage.entity.DownStorageCage;
import com.mes.downstorage.entity.DownStorageCageDetails;
+import com.mes.downstorage.entity.request.CacheWornRequest;
import com.mes.downstorage.mapper.DownStorageCageDetailsMapper;
import com.mes.downstorage.mapper.DownStorageCageMapper;
import com.mes.downstorage.service.DownStorageCageDetailsService;
@@ -46,6 +50,8 @@
private DownStorageCageDetailsService downStorageCageDetailsService;
@Autowired
private DownStorageCageDetailsMapper downStorageCageDetailsMapper;
+ @Autowired
+ DamageService damageService;
@Override
public DownGlassTask createDownGlassTask(GlassInfo glassInfo, Integer startCell, Integer endCell, Integer taskType) {
@@ -128,7 +134,6 @@
}
-
@Override
public List<Map<String, Object>> selectDownStorageCages() {
return baseMapper.selectJoinMaps(JoinWrappers.lambda(DownStorageCage.class)
@@ -190,7 +195,10 @@
if (downItem != null) {
//绉婚櫎
- DownStorageCageDetails result = downStorageCageDetailsMapper.selectOne(new MPJLambdaWrapper<DownStorageCageDetails>().eq(DownStorageCageDetails::getSlot, downStorageCageId));
+ DownStorageCageDetails result = downStorageCageDetailsMapper
+ .selectOne(new MPJLambdaWrapper<DownStorageCageDetails>()
+ .eq(DownStorageCageDetails::getSlot, downStorageCageId)
+ );
if (result != null) {
result.setSlot(0);
downStorageCageDetailsMapper.updateById(result);
@@ -200,4 +208,19 @@
return true;
}
+ @Override
+ public void deleteDownStorageCage(CacheWornRequest cacheWornRequest) {
+ Damage damage = new Damage();
+ BeanUtils.copyProperties(cacheWornRequest, damage);
+ damage.setType(cacheWornRequest.getState());
+ damage.setRemark("");
+ damage.setStatus(0);
+ damageService.insertDamage(damage);
+ downStorageCageDetailsService.update(new LambdaUpdateWrapper<DownStorageCageDetails>()
+ .set(DownStorageCageDetails::getState, Const.GLASS_STATE_OUT)
+ .eq(DownStorageCageDetails::getGlassId, cacheWornRequest.getGlassId())
+ .eq(DownStorageCageDetails::getState,Const.GLASS_STATE_IN));
+
+ }
+
}
--
Gitblit v1.8.0