From 2027077e00eff0b9fa6b0f68f803a9780f065e21 Mon Sep 17 00:00:00 2001
From: 严智鑫 <test>
Date: 星期一, 22 四月 2024 11:18:14 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10101/r/HangZhouMes
---
hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downstorage/service/impl/DownStorageCageDetailsServiceImpl.java | 7
UI-Project/config.js | 4
hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/glassinfo/service/GlassInfoService.java | 1
UI-Project/src/views/Returns/returns.vue | 204 ++++++----
hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downstorage/service/DownGlassCacheLogic.java | 25
hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/common/PLCAutoMes.java | 17
hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/common/Plchome.java | 3
hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downstorage/service/DownStorageCageService.java | 3
UI-Project/src/assets/shangpianji.png | 0
UI-Project/src/views/Caching/caching.vue | 657 +-----------------------------------
UI-Project/vue.config.js | 5
hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downstorage/service/impl/DownStorageCageServiceImpl.java | 53 ++
/dev/null | 0
hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downstorage/entity/DownStorageCage.java | 9
UI-Project/src/router/index.js | 48 +-
hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downworkstation/controller/DownWorkstationController.java | 2
hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downstorage/controller/DownStorageCageDetailsController.java | 28 +
hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downstorage/service/DownStorageCageDetailsService.java | 3
hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/glassinfo/service/impl/GlassInfoServiceImpl.java | 2
UI-Project/vite.config.js | 2
20 files changed, 288 insertions(+), 785 deletions(-)
diff --git a/UI-Project/config.js b/UI-Project/config.js
index 1871721..6d62cdd 100644
--- a/UI-Project/config.js
+++ b/UI-Project/config.js
@@ -1,6 +1,6 @@
export default {
- serverUrl: "localhost:88/api/loadGlass",
+ serverUrl: "10.153.19.150:88/api",
//serverUrl: "localhost:88/api/",
- serverUrl2: "localhost:8085"
+ serverUrl2: "10.153.19.150:8085"
//serverUrl:"res.abeim.cn"
}
\ No newline at end of file
diff --git a/UI-Project/src/assets/shangpianji .png b/UI-Project/src/assets/shangpianji .png
deleted file mode 100644
index fb645ca..0000000
--- a/UI-Project/src/assets/shangpianji .png
+++ /dev/null
Binary files differ
diff --git a/UI-Project/src/assets/shangpianji.png b/UI-Project/src/assets/shangpianji.png
index e69de29..fb645ca 100644
--- a/UI-Project/src/assets/shangpianji.png
+++ b/UI-Project/src/assets/shangpianji.png
Binary files differ
diff --git a/UI-Project/src/router/index.js b/UI-Project/src/router/index.js
index 6ff9458..8ca7249 100644
--- a/UI-Project/src/router/index.js
+++ b/UI-Project/src/router/index.js
@@ -36,32 +36,32 @@
},
/*----------- 鐢ㄦ埛鍒楄〃 ----------------*/
-{
- path: 'User',
- name: 'User',
- component: () => import('../views/User/userlist.vue'),
- children:[
- {
- path: '/User/userlist',
- name: 'userlist',
- component: () => import('../views/User/userlist.vue')
- },
- ]
- },
+// {
+// path: 'User',
+// name: 'User',
+// component: () => import('../views/User/userlist.vue'),
+// children:[
+// {
+// path: '/User/userlist',
+// name: 'userlist',
+// component: () => import('../views/User/userlist.vue')
+// },
+// ]
+// },
/*----------- 鏉冮檺鍒楄〃 ----------------*/
-{
- path: 'Permissions',
- name: 'Permissions',
- component: () => import('../views/Permissions/permissionslist.vue'),
- children:[
- {
- path: '/Permissions/permissionslist',
- name: 'permissionslist',
- component: () => import('../views/Permissions/permissionslist.vue')
- },
- ]
- },
+// {
+// path: 'Permissions',
+// name: 'Permissions',
+// component: () => import('../views/Permissions/permissionslist.vue'),
+// children:[
+// {
+// path: '/Permissions/permissionslist',
+// name: 'permissionslist',
+// component: () => import('../views/Permissions/permissionslist.vue')
+// },
+// ]
+// },
/*----------- 涓婄墖鏈� ----------------*/
{
path: 'Returns',
diff --git a/UI-Project/src/views/Caching/caching.vue b/UI-Project/src/views/Caching/caching.vue
index 76b577a..7b7903b 100644
--- a/UI-Project/src/views/Caching/caching.vue
+++ b/UI-Project/src/views/Caching/caching.vue
@@ -4,643 +4,36 @@
import {useRouter} from "vue-router"
const router = useRouter()
-import { ref } from 'vue'
+import request from "@/utils/request"
+import { ref, onMounted } from "vue";
+// import { ref } from 'vue'
import { ElMessage, ElMessageBox } from 'element-plus'
// import LanguageMixin from './lang/LanguageMixin'
+const tableData = ref([])
-const tableData = [
- {
- id: '1',
- long: '1005',
- wide: '183.6',
- thick: '1991',
- type: '1200',
- typea: '1',
- },
- {
- id: '2',
- long: '105',
- wide: '183',
- thick: '191',
- typea: '1',
- type: '1200'
- },
- {
- id: '2',
- long: '105',
- wide: '183',
- thick: '191',
- typea: '1',
- type: '1200'
- },
- {
- id: '2',
- long: '105',
- wide: '183',
- thick: '191',
- typea: '1',
- type: '1200'
- },
- {
- id: '2',
- long: '105',
- wide: '183',
- thick: '191',
- typea: '1',
- type: '寰呰瘑鍒�'
- },
- {
- id: '2',
- long: '105',
- wide: '183',
- thick: '191',
- typea: '1',
- type: '寰呰瘑鍒�'
- },
- {
- id: '2',
- long: '105',
- wide: '183',
- thick: '191',
- typea: '1',
- type: '寰呰瘑鍒�'
- },
- {
- id: '2',
- long: '105',
- wide: '183',
- thick: '191',
- typea: '1',
- type: '寰呰瘑鍒�'
- },
- {
- id: '2',
- long: '105',
- wide: '183',
- thick: '191',
- typea: '1',
- type: '寰呰瘑鍒�'
- },
- {
- id: '2',
- long: '105',
- wide: '183',
- thick: '191',
- typea: '1',
- type: '寰呰瘑鍒�'
- },
- {
- id: '2',
- long: '105',
- wide: '183',
- thick: '191',
- typea: '1',
- type: '寰呰瘑鍒�'
- },
- {
- id: '2',
- long: '105',
- wide: '183',
- thick: '191',
- typea: '1',
- type: '寰呰瘑鍒�'
- },
- {
- id: '2',
- long: '105',
- wide: '183',
- thick: '191',
- typea: '1',
- type: '寰呰瘑鍒�'
- },
- {
- id: '2',
- long: '105',
- wide: '183',
- thick: '191',
- typea: '1',
- type: '寰呰瘑鍒�'
- },
- {
- id: '2',
- long: '105',
- wide: '183',
- thick: '191',
- typea: '1',
- type: '寰呰瘑鍒�'
- },
- {
- id: '2',
- long: '105',
- wide: '183',
- thick: '191',
- typea: '1',
- type: '寰呰瘑鍒�'
- },
- {
- id: '2',
- long: '105',
- wide: '183',
- thick: '191',
- typea: '1',
- type: '寰呰瘑鍒�'
- },
- {
- id: '2',
- long: '105',
- wide: '183',
- thick: '191',
- typea: '1',
- type: '寰呰瘑鍒�'
- },
- {
- id: '2',
- long: '105',
- wide: '183',
- thick: '191',
- typea: '1',
- type: '寰呰瘑鍒�'
- },
- {
- id: '2',
- long: '105',
- wide: '183',
- thick: '191',
- typea: '1',
- type: '寰呰瘑鍒�'
- },
- {
- id: '2',
- long: '105',
- wide: '183',
- thick: '191',
- typea: '1',
- type: '寰呰瘑鍒�'
- },
- {
- id: '2',
- long: '105',
- wide: '183',
- thick: '191',
- typea: '1',
- type: '寰呰瘑鍒�'
- },
- {
- id: '2',
- long: '105',
- wide: '183',
- thick: '191',
- typea: '1',
- type: '寰呰瘑鍒�'
- },
- {
- id: '2',
- long: '105',
- wide: '183',
- thick: '191',
- typea: '1',
- type: '寰呰瘑鍒�'
- },
- {
- id: '2',
- long: '105',
- wide: '183',
- thick: '191',
- typea: '1',
- type: '寰呰瘑鍒�'
- },
- {
- id: '2',
- long: '105',
- wide: '183',
- thick: '191',
- typea: '1',
- type: '寰呰瘑鍒�'
- },
- {
- id: '2',
- long: '105',
- wide: '183',
- thick: '191',
- typea: '1',
- type: '寰呰瘑鍒�'
- },
- {
- id: '2',
- long: '105',
- wide: '183',
- thick: '191',
- typea: '1',
- type: '寰呰瘑鍒�'
- },
- {
- id: '2',
- long: '105',
- wide: '183',
- thick: '191',
- typea: '1',
- type: '寰呰瘑鍒�'
- },
- {
- id: '2',
- long: '105',
- wide: '183',
- thick: '191',
- typea: '1',
- type: '寰呰瘑鍒�'
- },
- {
- id: '2',
- long: '105',
- wide: '183',
- thick: '191',
- typea: '1',
- type: '寰呰瘑鍒�'
- },
- {
- id: '2',
- long: '105',
- wide: '183',
- thick: '191',
- typea: '1',
- type: '寰呰瘑鍒�'
- },
- {
- id: '2',
- long: '105',
- wide: '183',
- thick: '191',
- typea: '1',
- type: '寰呰瘑鍒�'
- },
- {
- id: '2',
- long: '105',
- wide: '183',
- thick: '191',
- typea: '1',
- type: '寰呰瘑鍒�'
- },
- {
- id: '2',
- long: '105',
- wide: '183',
- thick: '191',
- typea: '1',
- type: '寰呰瘑鍒�'
- },
- {
- id: '2',
- long: '105',
- wide: '183',
- thick: '191',
- typea: '1',
- type: '寰呰瘑鍒�'
- },
- {
- id: '2',
- long: '105',
- wide: '183',
- thick: '191',
- typea: '1',
- type: '寰呰瘑鍒�'
- },
- {
- id: '2',
- long: '105',
- wide: '183',
- thick: '191',
- typea: '1',
- type: '寰呰瘑鍒�'
- },
- {
- id: '2',
- long: '105',
- wide: '183',
- thick: '191',
- typea: '1',
- type: '寰呰瘑鍒�'
- },
- {
- id: '2',
- long: '105',
- wide: '183',
- thick: '191',
- typea: '1',
- type: '寰呰瘑鍒�'
- },
- {
- id: '2',
- long: '105',
- wide: '183',
- thick: '191',
- typea: '1',
- type: '寰呰瘑鍒�'
- },
- {
- id: '2',
- long: '105',
- wide: '183',
- thick: '191',
- typea: '1',
- type: '寰呰瘑鍒�'
- },
- {
- id: '2',
- long: '105',
- wide: '183',
- thick: '191',
- typea: '1',
- type: '寰呰瘑鍒�'
- },
- {
- id: '2',
- long: '105',
- wide: '183',
- thick: '191',
- typea: '1',
- type: '寰呰瘑鍒�'
- },
- {
- id: '2',
- long: '105',
- wide: '183',
- thick: '191',
- typea: '1',
- type: '寰呰瘑鍒�'
- },
- {
- id: '2',
- long: '105',
- wide: '183',
- thick: '191',
- typea: '1',
- type: '寰呰瘑鍒�'
- },
- {
- id: '2',
- long: '105',
- wide: '183',
- thick: '191',
- typea: '1',
- type: '寰呰瘑鍒�'
- },
- {
- id: '2',
- long: '105',
- wide: '183',
- thick: '191',
- typea: '1',
- type: '寰呰瘑鍒�'
- },
- {
- id: '2',
- long: '105',
- wide: '183',
- thick: '191',
- typea: '1',
- type: '寰呰瘑鍒�'
- },
- {
- id: '2',
- long: '105',
- wide: '183',
- thick: '191',
- typea: '1',
- type: '寰呰瘑鍒�'
- },
- {
- id: '2',
- long: '105',
- wide: '183',
- thick: '191',
- typea: '1',
- type: '寰呰瘑鍒�'
- },
- {
- id: '2',
- long: '105',
- wide: '183',
- thick: '191',
- typea: '1',
- type: '寰呰瘑鍒�'
- },
- {
- id: '2',
- long: '105',
- wide: '183',
- thick: '191',
- typea: '1',
- type: '寰呰瘑鍒�'
- },
- {
- id: '2',
- long: '105',
- wide: '183',
- thick: '191',
- typea: '1',
- type: '寰呰瘑鍒�'
- },
- {
- id: '2',
- long: '105',
- wide: '183',
- thick: '191',
- typea: '1',
- type: '寰呰瘑鍒�'
- },
- {
- id: '2',
- long: '105',
- wide: '183',
- thick: '191',
- typea: '1',
- type: '寰呰瘑鍒�'
- },
- {
- id: '2',
- long: '105',
- wide: '183',
- thick: '191',
- typea: '1',
- type: '寰呰瘑鍒�'
- },
- {
- id: '2',
- long: '105',
- wide: '183',
- thick: '191',
- typea: '1',
- type: '寰呰瘑鍒�'
- },
- {
- id: '2',
- long: '105',
- wide: '183',
- thick: '191',
- typea: '1',
- type: '寰呰瘑鍒�'
- },
- {
- id: '2',
- long: '105',
- wide: '183',
- thick: '191',
- typea: '1',
- type: '寰呰瘑鍒�'
- },
- {
- id: '2',
- long: '105',
- wide: '183',
- thick: '191',
- typea: '1',
- type: '寰呰瘑鍒�'
- },
- {
- id: '2',
- long: '105',
- wide: '183',
- thick: '191',
- typea: '1',
- type: '寰呰瘑鍒�'
- },
- {
- id: '2',
- long: '105',
- wide: '183',
- thick: '191',
- typea: '1',
- type: '寰呰瘑鍒�'
- },
- {
- id: '2',
- long: '105',
- wide: '183',
- thick: '191',
- typea: '1',
- type: '寰呰瘑鍒�'
- },
- {
- id: '2',
- long: '105',
- wide: '183',
- thick: '191',
- typea: '1',
- type: '寰呰瘑鍒�'
- },
- {
- id: '2',
- long: '105',
- wide: '183',
- thick: '191',
- typea: '1',
- type: '寰呰瘑鍒�'
- },
- {
- id: '2',
- long: '105',
- wide: '183',
- thick: '191',
- typea: '1',
- type: '寰呰瘑鍒�'
- },
- {
- id: '2',
- long: '105',
- wide: '183',
- thick: '191',
- typea: '1',
- type: '寰呰瘑鍒�'
- },
- {
- id: '2',
- long: '105',
- wide: '183',
- thick: '191',
- typea: '1',
- type: '寰呰瘑鍒�'
- },
- {
- id: '2',
- long: '105',
- wide: '183',
- thick: '191',
- typea: '1',
- type: '寰呰瘑鍒�'
- },
- {
- id: '2',
- long: '105',
- wide: '183',
- thick: '191',
- typea: '1',
- type: '寰呰瘑鍒�'
- },
- {
- id: '2',
- long: '105',
- wide: '183',
- thick: '191',
- typea: '1',
- type: '寰呰瘑鍒�'
- },
- {
- id: '2',
- long: '105',
- wide: '183',
- thick: '191',
- typea: '1',
- type: '寰呰瘑鍒�'
- },
- {
- id: '2',
- long: '105',
- wide: '183',
- thick: '191',
- typea: '1',
- type: '寰呰瘑鍒�'
- },
- {
- id: '2',
- long: '105',
- wide: '183',
- thick: '191',
- typea: '1',
- type: '寰呰瘑鍒�'
- },
- {
- id: '2',
- long: '105',
- wide: '183',
- thick: '191',
- typea: '1',
- type: '寰呰瘑鍒�'
- },
- {
- id: '2',
- long: '105',
- wide: '183',
- thick: '191',
- typea: '1',
- type: '寰呰瘑鍒�'
+// 鍙戦�佽幏鍙栬〃鏍兼暟鎹殑璇锋眰
+const fetchTableData = async () => {
+ try {
+ // 鍙戦�佽幏鍙栬〃鏍兼暟鎹殑璇锋眰锛屽苟绛夊緟鍝嶅簲
+ // const response = await request.post("/loadGlass/optimizeProject/listByState", requestData);
+ const response = await request.get("/unLoadGlass/unLoadGlass/downstorage");
+
+ // 妫�鏌ュ搷搴旂姸鎬�
+ if (response.code === 200) {
+ // 鏇存柊琛ㄦ牸鏁版嵁
+ console.log('鎴愬姛鑾峰彇琛ㄦ牸鏁版嵁:', response.data);
+ tableData.splice(0, tableData.length, ...response.data);
+ } else {
+ // 璇锋眰澶辫触锛屾樉绀洪敊璇秷鎭�
+ ElMessage.error(response.msg);
+ }
+ } catch (error) {
+ // 澶勭悊璇锋眰澶辫触鐨勬儏鍐�
+ ElMessage.error('鑾峰彇琛ㄦ牸鏁版嵁澶辫触锛岃閲嶈瘯');
}
-]
-const tableDataa = [
- {
- ida: '3',
- longa: '1005',
- widea: '183.6',
- thicka: '1991',
- },
- {
- ida: '4',
- longa: '105',
- widea: '183',
- thicka: '191',
- }
-]
+};
+onMounted(fetchTableData);
const dialogForm = () => {
ElMessageBox.confirm(
diff --git a/UI-Project/src/views/Returns/returns.vue b/UI-Project/src/views/Returns/returns.vue
index 97d7b27..759d3ca 100644
--- a/UI-Project/src/views/Returns/returns.vue
+++ b/UI-Project/src/views/Returns/returns.vue
@@ -15,47 +15,7 @@
import { ref, onMounted } from "vue";
// import http from "@/http/index";
-// const tableData = ref([])
-// let app = ref({
-// data(){
-// return {
-// enableState:'',
-// }
-// },
-// })
-// const tableData = ref({
-// workstationId:'',
-// patternWidth :'',
-// patternHeigth :'',
-// filmsId :'',
-// number :'',
-// patternThickness :'',
-// enableState:'',
-// })
-// request.post(`/LoadGlass/list`).then((res) => {
-// if (res.code == 200) {
-// console.log(res.data);
-// } else {
-// ElMessage.warning(res.msg)
-// router.push("/login")
-// }
-// });
-// request.get("/LoadGlass/list").then((res) => {
-// if (res.code == 200) {
-// console.log(res.data);
-// tableData.value = res
-// } else {
-// ElMessage.warning(res.msg)
-// router.push("/login")
-// }
-// });
-
- // request
- // const requestData = {
- // projectNo:"P24030805",
- // state:0
- // };
-
+const tableDataa = ref([])
const requestData = {
// projectNo:"P24030805",
@@ -63,13 +23,18 @@
};
const tableData = reactive([]);
+// let filterData = ref({
+// damageDetails: {
+// state: '',
+// },
+// })
// 鍙戦�佽幏鍙栬〃鏍兼暟鎹殑璇锋眰
const fetchTableData = async () => {
try {
// 鍙戦�佽幏鍙栬〃鏍兼暟鎹殑璇锋眰锛屽苟绛夊緟鍝嶅簲
// const response = await request.post("/loadGlass/optimizeProject/listByState", requestData);
- const response = await request.get("/loadGlass/LoadGlass/list");
+ const response = await request.get("/loadGlass/up-patten-usage/prioritylist");
// 妫�鏌ュ搷搴旂姸鎬�
if (response.code === 200) {
@@ -85,30 +50,66 @@
ElMessage.error('鑾峰彇琛ㄦ牸鏁版嵁澶辫触锛岃閲嶈瘯');
}
};
+request.get("/loadGlass/LoadGlass/list").then((res) => {
+ if (res.code == 200) {
+ console.log(res.data);
+ tableDataa.value = res.data
+ } else {
+ ElMessage.warning(res.msg)
+ router.push("/login")
+ }
+ });
+//瀹氫箟鎺ユ敹鍔犺浇琛ㄥご涓嬫媺鏁版嵁
+const titleSelectJson = ref({
+ processType: [],
+
+})
+const getBasicData = ref({
+ id: '',
+ projectNo: '',
+})
+request.post("/loadGlass/optimizeProject/listByState", requestData)
+.then((res) => {
+ if (res.code == 200) {
+ titleSelectJson.value.processType = res.data;
+ console.log(res.data);
+ } else {
+ ElMessage.warning(res.msg)
+ router.push("/login")
+ }
+ });
+
+// const billall = () => {
+// request.post("/loadGlass/optimizeProject/listByState", requestData)
+// .then((res: any) => {
+// // if (res.code == 200) {
+// tableData.value = res.data;
+// // let self = this
+// // }
+// })
+// .catch((err: any) => {});
+// }
const user = ref('');
-const remoteMethod = () => {
- request.post("/loadGlass/optimizeProject/listByState", requestData)
- .then((res: any) => {
- // if (res.code == 200) {
- tableData.value = res.data;
- // let self = this
- // }
- })
- .catch((err: any) => {});
-}
+// 瀹氫箟琛ㄥご涓婁紶鏁版嵁
+let titleUploadData = ref({
+ projectNo:'',
+})
+// const billall = {
+// data () {
+// return {
+// form: {
+// projectNo: '',
+// },
+// billall:[],
+// }
+// },
+// methods:{
+
+// }
+// }
onMounted(fetchTableData);
-
-
-// onMounted(() => {
-// request
-// .post("/loadGlass/LoadGlass/selectPriority")
-// .then((res: any) => {
-// tableData.value = res.data;
-// })
-// .catch((err: any) => {});
-// });
interface User {
id: string
name: string
@@ -144,6 +145,7 @@
}
}
}
+
const open = () => {
ElMessageBox.confirm(
'鏄惁鍒犻櫎璇ユ潯淇℃伅?',
@@ -236,60 +238,88 @@
<el-button style="margin-top: 5px;margin-left: 20px;" id="searchButton" type="primary">寮�濮嬩笂鐗�</el-button>
<el-button style="margin-top: 5px;margin-left: 20px;" id="searchButton" type="warning" >鏆傚仠</el-button>
<el-button style="margin-top: 5px;margin-left: 20px;" id="searchButton" type="danger" >鍋滄浠诲姟</el-button>
- <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="100%"
- ref="table"
+ <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"
+ ref="table"
:header-cell-style="{background:'#F2F3F5 ',color:'#1D2129'}"
:data="tableData"
:span-method="objectSpanMethod"
+ > -->
+ <el-table
+ height="150"
+ ref="table"
+ :header-cell-style="{background:'#F2F3F5 ',color:'#1D2129'}"
+ :data="tableData"
>
- <el-table-column prop="workstationId" label="宸ョ▼鍙�" width="200" align="center"/>
- <el-table-column prop="patternWidth" label="鍘熺墖瀹�" align="center"/>
- <el-table-column prop="patternHeigth" label="鍘熺墖闀�" align="center"/>
+ <el-table-column prop="engineeringId" label="宸ョ▼鍙�" width="200" align="center"/>
+ <el-table-column prop="width" label="鍘熺墖瀹�" align="center"/>
+ <el-table-column prop="height" label="鍘熺墖闀�" align="center"/>
<el-table-column prop="filmsId" label="鑶滅郴" align="center"/>
- <el-table-column prop="number" label="鏁伴噺" align="center"/>
- <el-table-column prop="patternThickness" label="鍘氬害" align="center"/>
+ <el-table-column prop="layoutSequence" label="鏁伴噺" align="center"/>
+ <el-table-column prop="thickness" label="鍘氬害" align="center"/>
<el-table-column
align="center"
label="鐘舵��"
min-width="80"
- prop="enableState"
+ prop="state"
>
- <el-tag type="success">灏辩华</el-tag>
+ <!-- <el-tag type="success" v-if="damageDetails.state === 1">灏辩华</el-tag> -->
<!-- <el-tag type="danger" v-if="row.enableState==2">鏈氨缁�</el-tag> -->
</el-table-column>
</el-table>
</div>
</el-card>
<div id="parent">
- <img src="../../assets/shangpianji .png" alt="" style="max-width: 20%;max-height: 20%;margin-top: 20px;margin-left: 500px;">
- <el-button style="margin-top: -830px;margin-left: -40px;" size="mini" id="searchButton" @click="add = true">娣诲姞鍘熺墖</el-button>
- <el-button style="margin-top: -10px;margin-left: -80px;" size="mini" id="searchButton" @click="adda = true">娣诲姞鍘熺墖</el-button>
- <!-- <div id="overlay" v-show="state"></div> -->
- <!-- <div id="overlaya" v-show="statea"></div> -->
+ <img src="../../assets/shangpianji.png" alt="" style="max-width: 20%;max-height: 20%;margin-top: 20px;margin-left: 500px;">
+ <!-- <el-button style="margin-top: -830px;margin-left: -40px;" size="mini" id="searchButton" @click="add = true">娣诲姞鍘熺墖</el-button> -->
+ <!-- <el-button style="margin-top: -10px;margin-left: -80px;" size="mini" id="searchButton" @click="adda = true">娣诲姞鍘熺墖</el-button> -->
</div>
+ <div style="margin-top: -350px;margin-left: 650px;">
+ <el-table :data="tableDataa" border style="width: 60%"
+ :header-cell-style="{background:'#F2F3F5 ',color:'#1D2129'}"
+ >
+ <el-table-column prop="patternWidth" align="center" label="瀹�" min-width="80" />
+ <el-table-column prop="patternHeigth" align="center" label="闀�" min-width="80" />
+ <el-table-column prop="filmsId" align="center" label="鑶滅郴" min-width="80" />
+ <el-table-column prop="number" align="center" label="鏁伴噺" min-width="80" />
+ <el-table-column fixed="right" label="鎿嶄綔" align="center" width="150">
+ <template #default>
+ <el-button size="mini" type="text" plain @click="add = true">娣诲姞</el-button>
+ <el-button size="mini" type="text" plain @click="open">鍒犻櫎</el-button>
+ </template>
+ </el-table-column>
+ </el-table>
+ </div>
</div>
<el-dialog v-model="dialogFormVisible" top="24vh" width="30%" title="宸ョ▼" >
<div style="margin-left: 50px;margin-bottom: 10px;">
<el-form-item label="宸ョ▼鍙凤細" :required="true">
- <el-select
+ <el-select v-model="getBasicData.projectNo" clearable placeholder="璇烽�夋嫨宸ョ▼" style="width: 220px"
+ >
+ <el-option
+ v-for="item in titleSelectJson['processType']"
+ :key="item.id"
+ :label="item.projectNo"
+ :value="item.projectNo"
+ />
+ </el-select>
+ <!-- <el-select
clearable
placeholder="璇烽�夋嫨宸ョ▼"
style="width: 300px"
- filterable
- :remote-method="remoteMethod"
+ v-model="form.id"
>
<el-option
- v-for="item in remoteMethod"
- :key="item.projectNo"
+ v-for="item in billall"
+ :key="item.id"
:label="item.projectNo"
:value="item.projectNo"
/>
- </el-select>
+ </el-select> -->
</el-form-item>
</div>
<template #footer>
@@ -432,11 +462,12 @@
margin-left: 20px;
size: 50px;
margin-top: 20px;
- margin-bottom: 20px;
+ margin-bottom: 10px;
}
#parent{
position: relative;
width: 1500px;
+ margin-left: -300px
}
#overlay{
position: absolute;
@@ -456,4 +487,5 @@
margin-top: -40px;
margin-left: 167px;
}
+
</style>
\ No newline at end of file
diff --git a/UI-Project/vite.config.js b/UI-Project/vite.config.js
index d89091a..e0a49a0 100644
--- a/UI-Project/vite.config.js
+++ b/UI-Project/vite.config.js
@@ -22,7 +22,7 @@
https: false,
proxy: {
'/api': {
- target: 'http://localhost:88/',
+ target: 'http://10.153.19.150:88/',
changeOrigin: true,
rewrite: (path) => path.replace(/^\/api/, '/'),
},
diff --git a/UI-Project/vue.config.js b/UI-Project/vue.config.js
new file mode 100644
index 0000000..1b2c99f
--- /dev/null
+++ b/UI-Project/vue.config.js
@@ -0,0 +1,5 @@
+module.exports = {
+ assetsDir: 'static',
+ parallel: false,
+ publicPath: './',
+};
\ No newline at end of file
diff --git a/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/common/PLCAutoMes.java b/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/common/PLCAutoMes.java
index e6eaef7..6fd4740 100644
--- a/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/common/PLCAutoMes.java
+++ b/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/common/PLCAutoMes.java
@@ -22,12 +22,7 @@
private static String PlcMes = PLCAutoMes.class.getResource("/JsonFile/PlcMes.json").getPath();
private static String PlcRead = PLCAutoMes.class.getResource("/JsonFile/PlcRead.json").getPath();
private static String Plcframe = PLCAutoMes.class.getResource("/JsonFile/Plcframe.json").getPath();
- // private static String PlcParameter = PLCAutomaticParameterSettingReview2.class
-// .getResource("/JsonFile/PlcParameter.json").getPath();
-// private static String PlcSign = PLCAutomaticParameterSettingReview2.class.getResource("/JsonFile/PlcSign.json")
-// .getPath();
-// private static String PlcState = PLCAutomaticParameterSettingReview2.class.getResource("/JsonFile/PlcState.json")
-// .getPath();
+
private static String PlcAlarm = PLCAutoMes.class.getResource("/JsonFile/PlcAlarm.json").getPath();
// private static String PlcTest = PLCAutoMes.class.getResource("/JsonFile/PlcTest.json").getPath();
@@ -67,19 +62,11 @@
// readAndUpdateWordValues(PlcReadObject);
readAndUpdateWordValues(PlcMesObject);
-// readAndUpdateWordValues(PlcframeObject);
- // readAndUpdateWordValues(PlcframeObject);
- // readAndUpdateWordValues(plcStateObject);
- // int index = PlcMesObject.getPlcParameter("AddStart").getAddressIndex();
- // System.out.println(index);
- // PlcMesObject.getPlcParameter("AddStart").getAddress(index);
- // System.out.println(PlcMesObject.getPlcParameter("AddStart").getAddress(index));
List<String> addresses = new ArrayList<>();
addresses.add("FeedID");
addresses.add("AddStart");
- // System.out.println(addresses);
- // System.out.println(PlcMesObject.getPlcParameterValues(addresses));
+
List<String> addresses2 = new ArrayList<>();
addresses2.add("FeedID");
addresses2.add("FeedCarStatus");
diff --git a/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/common/Plchome.java b/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/common/Plchome.java
index 9a4a882..e9885db 100644
--- a/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/common/Plchome.java
+++ b/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/common/Plchome.java
@@ -29,8 +29,7 @@
i++;
Thread.sleep(100);
DownGlassLogic plcService = plcServiceSupplier.get();
- // plcService.performPlcActions();
- //plcService.unloadpush();
+
//褰撲笅鐗囦换鍔¤〃鐘舵�佷负1鏃跺�欏皢鏁版嵁鎻掑叆鍒颁笅鐗囩幓鐠冧俊鎭〃
plcService.insertdownglassinfo();
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 4a6a297..17a62f7 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
@@ -13,7 +13,7 @@
import java.util.Map;
@Api(tags = "缂撳瓨")
@RestController
-@RequestMapping("/api/unLoadGlass/downstorage")
+@RequestMapping("/downStorage")
public class DownStorageCageDetailsController {
@Autowired
@@ -30,7 +30,7 @@
//鏌ヨ纾ㄨ竟缂撳瓨鐞嗙墖绗煎唴璇︽儏
- @ApiOperation("鏌ヨ纾ㄨ竟缂撳瓨鐞嗙墖绗煎唴璇︽儏")
+ @ApiOperation("鏌ヨ缂撳瓨鐞嗙墖绗煎唴璇︽儏")
@GetMapping("/selectStorageCage")
@ResponseBody
public Result selectEdgStorageCage () {
@@ -40,6 +40,30 @@
+ @ApiOperation("娣诲姞缂撳瓨鐞嗙墖绗间俊鎭� 鍔熻兘锛氱鍐呯粦瀹氱幓鐠� 鍙傛暟(DownStorageCageDetails downStorageCageDetails)")
+ @PostMapping("/insertEdgStorageCage")
+ @ResponseBody
+ public Result insertEdgStorageCage(@RequestBody DownStorageCageDetails downStorageCageDetails) {
+ boolean isSucess=downStorageCageDetailsService.updatedownStorageCageDetails(downStorageCageDetails);
+ return Result.build(200,"娣诲姞鎴愬姛",1);
+ }
+ @ApiOperation("淇敼缂撳瓨鐞嗙墖绗间俊鎭� 鍔熻兘锛氬绗煎唴鏍呮牸杩涜銆愬惎鐢�/绂佺敤銆�/ 銆愭洿鎹€�戠鍐呮爡鏍肩幓鐠冧俊鎭�")
+ @PostMapping("/updateEdgStorageCage")
+ @ResponseBody
+ public Result updateEdgStorageCage(@RequestBody DownStorageCageDetails downStorageCageDetails) {
+ boolean isSucess=downStorageCageDetailsService.updatedownStorageCageDetails(downStorageCageDetails);
+ return Result.build(200,"鏇存崲鎴愬姛",1);
+ }
+ @ApiOperation("鍒犻櫎缂撳瓨鐞嗙墖绗间俊鎭� 鍔熻兘锛氬绗煎唴鏍呮牸鐜荤拑杩涜銆愭竻闄ゃ��")
+ @PostMapping("/deleteEdgStorageCage")
+ @ResponseBody
+ public Result deleteEdgStorageCage(@RequestBody DownStorageCageDetails downStorageCageDetails) {
+ boolean isSucess=downStorageCageDetailsService.updatedownStorageCageDetails(downStorageCageDetails);
+ return Result.build(200,"鍒犻櫎鎴愬姛",1);
+ }
+
+
+
//
diff --git a/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downstorage/entity/DownStorageCage.java b/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downstorage/entity/DownStorageCage.java
index e747ab1..1617790 100644
--- a/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downstorage/entity/DownStorageCage.java
+++ b/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downstorage/entity/DownStorageCage.java
@@ -2,6 +2,8 @@
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.EqualsAndHashCode;
@@ -15,36 +17,43 @@
* @author zhoush
* @since 2024-03-27
*/
+@ApiModel(description = "<p> 缂撳瓨</p>")
@Data
@EqualsAndHashCode(callSuper = false)
public class DownStorageCage implements Serializable {
+ @ApiModelProperty(hidden = true)
private static final long serialVersionUID = 1L;
/**
* 涓嬬墖鍓嶇悊鐗囩琛╥d
*/
+ @ApiModelProperty(value = "涓嬬墖鍓嶇悊鐗囩琛╥d", position = 2)
@TableId(value = "id", type = IdType.AUTO)
private Integer id;
/**
* 璁惧id
*/
+ @ApiModelProperty(value = "璁惧id", position = 3)
private Integer deviceId;
/**
* 鏍呮牸鍙�
*/
+ @ApiModelProperty(value = "鏍呮牸鍙�", position = 4)
private Integer slot;
/**
* 鍚敤鐘舵��
*/
+ @ApiModelProperty(value = "鍚敤鐘舵��", position = 5)
private String enableState;
/**
* 鍓╀綑
*/
+ @ApiModelProperty(value = "鍓╀綑", position = 6)
private Integer remainWidth;
diff --git a/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downstorage/service/DownGlassCacheLogic.java b/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downstorage/service/DownGlassCacheLogic.java
index 382665d..1aa2bdf 100644
--- a/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downstorage/service/DownGlassCacheLogic.java
+++ b/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downstorage/service/DownGlassCacheLogic.java
@@ -29,8 +29,11 @@
public static final String RESULT_IN_OUT = "3";
@Autowired
private DownStorageCageDetailsMapper selectInfo;
- private GlassInfoService GlassInfoService;
+ @Autowired
+ private GlassInfoService glassInfoService;
+ @Autowired
private DownStorageCageService downStorageCageService;
+ @Autowired
private DownGlassTaskService downGlassTaskService;
@@ -65,11 +68,11 @@
*/
public boolean processInto(String Number) {
- GlassInfoService = WebSocketServer.applicationContext.getBean(GlassInfoService.class);
+ glassInfoService = WebSocketServer.applicationContext.getBean(GlassInfoService.class);
downStorageCageService = WebSocketServer.applicationContext.getBean(DownStorageCageService.class);
//鎸塱d鏌ヨ鐜荤拑淇℃伅琛ㄩ噷鐨勭幓鐠�
- GlassInfo GlassInfo = GlassInfoService.selectGlassId(Number);
+ GlassInfo GlassInfo = glassInfoService.selectGlassId(Number);
PlcParameterObject plcmes = PLCAutoMes.PlcMesObject;
//瀛樺湪姝ょ幓鐠冪紪鍙�
if (GlassInfo != null) {
@@ -92,6 +95,7 @@
selectInfo.insertCacheTask(GlassInfo.getId() + "", "0", item.getSlot() + "", "1", GlassInfo.getWidth(), GlassInfo.getHeight(), GlassInfo.getFilmsid(), GlassInfo.getThickness(), GlassInfo.getFlowcardId());
S7control.getinstance().WriteWord(plcmes.getPlcParameter("MESToGaStatus").getAddress(), (short) 1);
+
//瀹屾垚鍚庢彃鍏ュ皬鐗囨暟鎹埌缂撳瓨琛�
return true;
}
@@ -111,9 +115,12 @@
String G13 = S7control.getinstance().ReadWord("DB14.58", 1).get(0) + "";
PlcParameterObject plcmes = PLCAutoMes.PlcMesObject;
+
List<DownStorageCageDetails> list = downStorageCageService.getCacheOut(1, 5);
List<DownStorageCageDetails> list2 = downStorageCageService.getCacheOut(6, 10);
List<DownStorageCageDetails> list3 = downStorageCageService.getCacheOut(1, 10);
+ GlassInfo Maxglass=glassInfoService.selectGlassId("2");;
+
// 浼樺厛 瓒呭嚭灏哄浼樺厛浜哄伐鍑虹墖 浜哄伐澶勭悊
if (!list3.isEmpty()) {
DownStorageCageDetails item3 = list3.get(0);
@@ -130,20 +137,18 @@
}
//鍚屾椂璇锋眰 浼樺厛鍚庣鍑虹墖
- else if (!list3.isEmpty()) {
+ else if (!list3.isEmpty()&&Maxglass.equals(list3.get(0))) {
DownStorageCageDetails item3 = list3.get(0);
if (G06.equals("0") && G11.equals("0")) {
-
String endcell = "11";
String SendEndcell = "1";
-
selectInfo.insertCacheTask(item3.getGlassId() + "", "0", endcell, "2", item3.getWidth(), item3.getHeight(), item3.getFilmsid(), item3.getThickness(), item3.getFlowCardId());
S7control.getinstance().writeString(plcmes.getPlcParameter("DB14.28").getAddress(), SendEndcell);
S7control.getinstance().writeString(plcmes.getPlcParameter("DB14.20").getAddress(), "1");
return true;
}
}
- // 鎸夌収椤哄簭绗﹀悎鍓嶇鍑虹墖
+ // 鎸夌収澶у皬绗﹀悎鍓嶇鍑虹墖
else if (!list.isEmpty()) {
DownStorageCageDetails item = list.get(0);
if (G06.equals("0") && G11.equals("1")) {
@@ -185,7 +190,7 @@
public boolean selectMessageId(String Number) {
//鏌ヨ鏄惁瀛樺湪
- GlassInfo GlassInfo = GlassInfoService.selectGlassId(Number);
+ GlassInfo GlassInfo = glassInfoService.selectGlassId(Number);
if (GlassInfo == null) {
//杩斿洖 涓嶅瓨鍦�
return false;
@@ -202,7 +207,7 @@
public boolean deleteMessageId(String Number) {
//鏌ヨ鏄惁瀛樺湪
- GlassInfo GlassInfo = GlassInfoService.selectGlassId(Number);
+ GlassInfo GlassInfo = glassInfoService.selectGlassId(Number);
if (GlassInfo == null) {
//杩斿洖 涓嶅瓨鍦�
return false;
@@ -218,7 +223,7 @@
*/
public boolean isExist(String Number) {
//鏌ヨ鏄惁瀛樺湪
- GlassInfo GlassInfo = GlassInfoService.selectGlassId(Number);
+ GlassInfo GlassInfo = glassInfoService.selectGlassId(Number);
if (GlassInfo == null) {
//杩斿洖 涓嶅瓨鍦�
return false;
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 9bc7a7b..b71fc94 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
@@ -9,5 +9,6 @@
void addDownStorageCageDetails(DownStorageCageDetails details);
-
+ //淇敼鐞嗙墖绗煎唴淇℃伅
+ boolean updatedownStorageCageDetails(DownStorageCageDetails details);
}
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 f54c837..343af18 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
@@ -24,5 +24,6 @@
List<Map> getCacheInfo();
List<DownStorageCageDetails> getIsExistIntoCacheByLayoutAndSequence(Integer tempering_layout_id, Integer tempering_feed_sequence, double width);
List<DownStorageCageDetails> getIsExistIntoCacheByLayout(Integer tempering_layout_id, double width);
-
+ List<DownStorageCageDetails> getIsExistIntoCacheByflowcardid(String flowcardid, double width);
+ List<DownStorageCageDetails> IsExistIntoCacheByflowcardid(String flowcardid, double width);
}
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 dd58aa6..fb0e5b0 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
@@ -33,7 +33,12 @@
-
+ @Override
+ //淇敼鐞嗙墖绗煎唴淇℃伅 鍔熻兘锛氬绗煎唴鏍呮牸鐜荤拑 銆愭坊鍔�/鍒犻櫎/鏇存崲銆�
+ public boolean updatedownStorageCageDetails(DownStorageCageDetails details){
+ baseMapper.updateById(details);
+ return true;
+ }
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 40c62bb..ecceaf3 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
@@ -71,7 +71,7 @@
@Override
public List<DownStorageCageDetails> getCacheOut(int start, int end) {
log.info("鏍规嵁浼犲叆鐨勫伐浣嶆煡璇㈢鍚堟寜鐓ч『搴忓拰澶у皬鍑虹墖鐨勫皬鐗�");
- List<DownStorageCageDetails> list = downStorageCageMapper.selectJoinList(
+ return downStorageCageMapper.selectJoinList(
DownStorageCageDetails.class, new MPJQueryWrapper<DownStorageCageDetails>()
.select("escd.*")
.leftJoin("down_storage_cage_details escd on t.slot = escd.slot")
@@ -82,7 +82,6 @@
.orderByDesc("escd.width")
.orderByDesc("escd.height")
);
- return list;
}
@@ -92,19 +91,20 @@
@Override
public List<Map> getCacheInfo() {
log.info(" 鏌ヨ绗煎瓙鍐呬俊鎭�");
- List<Map> map = downStorageCageMapper.selectJoinList(
+ return downStorageCageMapper.selectJoinList(
Map.class, new MPJQueryWrapper<DownStorageCageDetails>()
.select("escd.*")
.leftJoin("down_storage_cage_details escd on t.slot = escd.slot")
.orderByAsc("t.slot")
);
- return map;
+
}
+
+
@Override
public List<DownStorageCageDetails> getIsExistIntoCacheByLayoutAndSequence(Integer tempering_layout_id, Integer tempering_feed_sequence, double width) {
log.info(" 鏌ヨ鍙繘姝ょ墖鐜荤拑鐨勬爡鏍煎彿 鎵惧埌鐩稿悓鐗堝浘id骞朵笖澶т簬鍓嶉潰鐨勯『搴忕殑绌烘牸");
-
List<DownStorageCageDetails> list = downStorageCageMapper.selectJoinList(
DownStorageCageDetails.class, new MPJQueryWrapper<DownStorageCageDetails>()
.select("escd.*")
@@ -118,10 +118,48 @@
return list;
}
+
+
+
+ @Override
+ public List<DownStorageCageDetails> getIsExistIntoCacheByflowcardid(String flowcardid, double width) {
+ log.info(" 鏌ヨ鍙繘姝ょ墖鐜荤拑鐨勬爡鏍煎彿 鎵惧埌鐩稿悓娴佺▼鍗″彿鐨勭┖鏍�");
+
+ return downStorageCageMapper.selectJoinList(
+ DownStorageCageDetails.class, new MPJQueryWrapper<DownStorageCageDetails>()
+ .select("escd.*")
+ .leftJoin("down_storage_cage_details escd on t.slot = escd.slot")
+ .isNotNull("escd.slot")
+ .eq("escd.flow_card_id", flowcardid)
+ .gt("t.remain_width", width)
+ .orderByAsc("escd.tempering_feed_sequence")
+ );
+
+ }
+
+
+
+ @Override
+ public List<DownStorageCageDetails> IsExistIntoCacheByflowcardid(String flowcardid, double width) {
+ log.info(" 鏌ヨ鍙繘姝ょ墖鐜荤拑鐨勬爡鏍煎彿");
+ return downStorageCageMapper.selectJoinList(
+ DownStorageCageDetails.class, new MPJQueryWrapper<DownStorageCageDetails>()
+ .select("escd.*")
+ .leftJoin("down_storage_cage_details escd on t.slot = escd.slot")
+ .isNotNull("escd.slot")
+ .lt("escd.flow_card_id", flowcardid)
+ // 鏉′欢 t.remain_width - width > 0
+ .apply("t.remain_width - " + width + " > 0")
+ .orderByDesc("escd.tempering_layout_id, escd.tempering_feed_sequence")
+ );
+
+ }
+
+
@Override
public List<DownStorageCageDetails> getIsExistIntoCacheByLayout(Integer tempering_layout_id, double width) {
log.info(" 鏌ヨ鍙繘姝ょ墖鐜荤拑鐨勬爡鏍煎彿");
- List<DownStorageCageDetails> list = downStorageCageMapper.selectJoinList(
+ return downStorageCageMapper.selectJoinList(
DownStorageCageDetails.class, new MPJQueryWrapper<DownStorageCageDetails>()
.select("escd.*")
.leftJoin("down_storage_cage_details escd on t.slot = escd.slot")
@@ -131,7 +169,7 @@
.apply("t.remain_width - " + width + " > 0")
.orderByDesc("escd.tempering_layout_id, escd.tempering_feed_sequence")
);
- return list;
+
}
@@ -139,4 +177,5 @@
+
}
diff --git a/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downworkstation/controller/DownWorkstationController.java b/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downworkstation/controller/DownWorkstationController.java
index c2305f2..6480461 100644
--- a/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downworkstation/controller/DownWorkstationController.java
+++ b/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downworkstation/controller/DownWorkstationController.java
@@ -26,7 +26,7 @@
@RestController
@Api(tags = "宸ヤ綅")
-@RequestMapping("/api/unLoadGlass")
+@RequestMapping("/downWorkStation")
public class DownWorkstationController {
@Autowired
diff --git a/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/glassinfo/service/GlassInfoService.java b/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/glassinfo/service/GlassInfoService.java
index 4019774..7d16a94 100644
--- a/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/glassinfo/service/GlassInfoService.java
+++ b/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/glassinfo/service/GlassInfoService.java
@@ -21,4 +21,5 @@
List<Map<String, Object>> getFlowCardId();
GlassInfo selectGlassId(String id);
+// List<GlassInfo> getmaxglass(GlassInfo glassInfo);
}
diff --git a/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/glassinfo/service/impl/GlassInfoServiceImpl.java b/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/glassinfo/service/impl/GlassInfoServiceImpl.java
index d064db4..b3d9cc9 100644
--- a/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/glassinfo/service/impl/GlassInfoServiceImpl.java
+++ b/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/glassinfo/service/impl/GlassInfoServiceImpl.java
@@ -42,6 +42,8 @@
return baseMapper.selectMaps(new QueryWrapper<GlassInfo>().select("DISTINCT flowcard_id"));
}
+
+
@Override
public GlassInfo selectGlassId(String id) {
QueryWrapper<GlassInfo> queryWrapper = new QueryWrapper<>();
--
Gitblit v1.8.0