From f72666e8460de6747f517c5aa29c41df99250700 Mon Sep 17 00:00:00 2001
From: wuyouming666 <2265557248@qq.com>
Date: 星期一, 22 四月 2024 13:24:21 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10101/r/HangZhouMes
---
UI-Project/src/views/UnLoadGlass/loadmachinerack.vue | 12 ++--
UI-Project/config.js | 2
hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/bigstorage/service/impl/BigStorageCageServiceImpl.java | 3 +
UI-Project/src/router/index.js | 48 ++++++++--------
hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downworkstation/controller/DownWorkstationController.java | 4 +
hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/glassinfo/service/impl/GlassInfoServiceImpl.java | 2
hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downstorage/service/impl/DownStorageCageServiceImpl.java | 63 ++++++++++++++++-----
7 files changed, 87 insertions(+), 47 deletions(-)
diff --git a/UI-Project/config.js b/UI-Project/config.js
index 6d62cdd..788923e 100644
--- a/UI-Project/config.js
+++ b/UI-Project/config.js
@@ -1,6 +1,6 @@
export default {
serverUrl: "10.153.19.150:88/api",
//serverUrl: "localhost:88/api/",
- serverUrl2: "10.153.19.150:8085"
+ serverUrl2: "10.153.19.150:88"
//serverUrl:"res.abeim.cn"
}
\ No newline at end of file
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/UnLoadGlass/loadmachinerack.vue b/UI-Project/src/views/UnLoadGlass/loadmachinerack.vue
index a504e69..91793a6 100644
--- a/UI-Project/src/views/UnLoadGlass/loadmachinerack.vue
+++ b/UI-Project/src/views/UnLoadGlass/loadmachinerack.vue
@@ -8,7 +8,7 @@
import { ElMessage, ElMessageBox } from 'element-plus'
import Landingindication from "./Landingindication.vue";
import Landingindicationtwo from "./Landingindicationtwo.vue";
-import unloadrequest from "@/utils/unloadrequest";
+import request from "@/utils/request";
const dialogFormVisiblea = ref(false)
@@ -99,10 +99,10 @@
//鑾峰彇娴佺▼鍗″彿
const fetchFlowCardId = async () => {
try {
- const response = await unloadrequest.get('/api/unLoadGlass/getflowCardId');
+ const response = await request.get('unLoadGlass/downWorkStation/getflowCardId');
console.log(response)
if (response.code === 200) {
- flowCardOptions.value = response.data.map(item => ({ flowcard_id: item.flowcard_id }));
+ flowCardOptions.value = response.data.map(item => ({ flowcard_id: item.flow_card_id }));
} else {
ElMessage.error(response.msg);
}
@@ -113,7 +113,7 @@
//纭
const handleConfirm = async () => {
try {
- const response = await unloadrequest.post('/api/unLoadGlass/updateFlowCardId', {
+ const response = await request.post('unLoadGlass/downWorkStation/updateFlowCardId', {
workstationId: workstationId.value,
flowCardId: flowCardId.value
});
@@ -147,7 +147,7 @@
//娓呴櫎鍐呭
const handleclear = async () => {
try {
- const response = await unloadrequest.post('/api/unLoadGlass/clear', {
+ const response = await request.post('unLoadGlass/downWorkStation/clear', {
workstationId: workstationId.value,
});
@@ -180,7 +180,7 @@
const fetchTableData = async () => {
try {
// 鍙戦�佽幏鍙栬〃鏍兼暟鎹殑璇锋眰锛屽苟绛夊緟鍝嶅簲
- const response = await unloadrequest.get('/api/unLoadGlass/getone');
+ const response = await request.get('unLoadGlass/downWorkStation/getone');
// 妫�鏌ュ搷搴旂姸鎬�
if (response.code === 200) {
diff --git a/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/bigstorage/service/impl/BigStorageCageServiceImpl.java b/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/bigstorage/service/impl/BigStorageCageServiceImpl.java
index 6956b36..6e71ea3 100644
--- a/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/bigstorage/service/impl/BigStorageCageServiceImpl.java
+++ b/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/bigstorage/service/impl/BigStorageCageServiceImpl.java
@@ -162,6 +162,9 @@
bigStorageCageMapper.update(bigStorageCage, bigStorageCageWrapper);
}
+
+
+
@Override
public List<BigStorageCage> querybigStorageCageDetail() {
//1銆佽幏鍙栧ぇ鐞嗙墖绗间俊鎭�
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 ecceaf3..c2e631f 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
@@ -121,21 +121,6 @@
- @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")
- );
-
- }
@@ -178,4 +163,52 @@
+ @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.sequence")
+ );
+
+ }
+
+
+// @Override
+// public List<DownStorageCageDetails> Out() {
+// log.info("鍗曠墖鎯呭喌 鏍规嵁浼犲叆鐨勫伐浣嶆煡璇㈢鍚堟寜鐓уぇ灏忓嚭鐗囩殑灏忕墖");
+//
+//
+// return downStorageCageMapper.selectJoinList(
+// DownStorageCageDetails.class, new MPJQueryWrapper<DownStorageCageDetails>()
+// .select("escd.*")
+// .leftJoin("down_storage_cage_details escd on t.slot = escd.slot")
+// .leftJoin("down_workstation dw on escd.flow_card_id = dw.flow_card_id")
+// .isNotNull("escd.slot")
+//
+// .orderByDesc("escd.width")
+// .orderByDesc("escd.height")
+// );
+// }
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
}
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 6480461..e7677f6 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
@@ -133,5 +133,9 @@
+
+
+
+
}
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 b3d9cc9..82dae46 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
@@ -39,7 +39,7 @@
@Override
public List<Map<String, Object>> getFlowCardId() {
- return baseMapper.selectMaps(new QueryWrapper<GlassInfo>().select("DISTINCT flowcard_id"));
+ return baseMapper.selectMaps(new QueryWrapper<GlassInfo>().select("DISTINCT flow_card_id"));
}
--
Gitblit v1.8.0