From b676b41c726941872df7788a05f8ce291427cd94 Mon Sep 17 00:00:00 2001
From: ZengTao <2773468879@qq.com>
Date: 星期四, 22 八月 2024 11:42:54 +0800
Subject: [PATCH] Merge branch 'master' of http://bore.pub:10439/r/HangZhouMes
---
UI-Project/config.js | 8 +-
UI-Project/src/views/User/rolelist.vue | 2
UI-Project/src/utils/constants.js | 4
hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/resources/application.yml | 8 +-
hangzhoumesParent/common/servicebase/src/main/java/com/mes/damage/entity/DamagePrint.java | 69 +++++++++++++++++++++++
hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/job/Downpush.java | 11 +--
UI-Project/src/views/PurchaseReturn/purchaseReturn.vue | 19 ++++--
UI-Project/src/views/User/userlist.vue | 2
hangzhoumesParent/moduleService/TemperingGlassModule/src/main/java/com/mes/job/PlcScreenTask.java | 2
UI-Project/src/views/largescreen/largescreen.vue | 5 +
hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/resources/application.yml | 2
11 files changed, 102 insertions(+), 30 deletions(-)
diff --git a/UI-Project/config.js b/UI-Project/config.js
index 4fc6899..9a4f798 100644
--- a/UI-Project/config.js
+++ b/UI-Project/config.js
@@ -1,9 +1,9 @@
export default {
-// serverUrl: "10.153.19.150:88/api",
- serverUrl: "192.168.1.199:88/api",
+ serverUrl: "10.153.19.150:88/api",
+// serverUrl: "192.168.1.199:88/api",
// serverUrl: "127.0.0.1:88/api",
- // serverUrl2: "10.153.19.150:88"
- serverUrl2: "192.168.1.199:88"
+ serverUrl2: "10.153.19.150:88"
+ // serverUrl2: "192.168.1.199:88"
// serverUrl2: "127.0.0.1:88"
//serverUrl:"res.abeim.cn"
diff --git a/UI-Project/src/utils/constants.js b/UI-Project/src/utils/constants.js
index c104075..b551cfb 100644
--- a/UI-Project/src/utils/constants.js
+++ b/UI-Project/src/utils/constants.js
@@ -1,4 +1,4 @@
- export const WebSocketHost = "192.168.1.199";
-// export const WebSocketHost = "10.153.19.150";
+// export const WebSocketHost = "192.168.1.199";
+export const WebSocketHost = "10.153.19.150";
// export const WebSocketHost = "127.0.0.1";
export const host = "88";
\ No newline at end of file
diff --git a/UI-Project/src/views/PurchaseReturn/purchaseReturn.vue b/UI-Project/src/views/PurchaseReturn/purchaseReturn.vue
index cee0727..fdfcfd0 100644
--- a/UI-Project/src/views/PurchaseReturn/purchaseReturn.vue
+++ b/UI-Project/src/views/PurchaseReturn/purchaseReturn.vue
@@ -625,21 +625,24 @@
<el-dialog
v-model="dialogVisible"
width="100%"
- :title="$t('processCard.glasstakeout')"
top="0vh"
+ :show-close="false"
>
+ <div class="custom-title" style="text-align: center; margin-bottom: 20px;">
+ {{ $t('processCard.glasstakeout') }}
+ </div>
<el-table
:data="tableData"
- style="width: 100%;height: 860px"
+ style="width: 100%;height: 760px"
>
<el-table-column prop="flowCardId" :label="$t('processCard.flowcard')" width="140" align="center"/>
- <el-table-column prop="layer" :label="$t('processCard.layer')" align="center" width="80"/>
+ <el-table-column prop="layer" :label="$t('processCard.layer')" align="center" width="52"/>
<el-table-column prop="engineerId" :label="$t('processCard.project')" align="center" width="110"/>
- <el-table-column prop="temperingLayoutId" :label="$t('processCard.temperinglayout')" align="center" width="80"/>
- <el-table-column prop="temperingFeedSequence" :label="$t('processCard.temperingfeed')" align="center" width="80"/>
+ <el-table-column prop="temperingLayoutId" :label="$t('processCard.temperinglayout')" align="center" width="52"/>
+ <el-table-column prop="temperingFeedSequence" :label="$t('processCard.temperingfeed')" align="center" width="52"/>
<el-table-column prop="width" :label="$t('processCard.width')" align="center" width="80"/>
<el-table-column prop="height" :label="$t('processCard.height')" align="center" width="80"/>
- <el-table-column prop="thickness" :label="$t('processCard.thickness')" align="center" width="80"/>
+ <el-table-column prop="thickness" :label="$t('processCard.thickness')" align="center" width="52"/>
</el-table>
</el-dialog>
</div>
@@ -724,4 +727,8 @@
height: 100%; /* 纭繚div鍗犳嵁鏁翠釜鐭╁舰鐨勯珮搴� */
/* font-size: small; */
}
+.custom-title {
+ font-size: 20px;
+ font-weight: bold;
+}
</style>
\ No newline at end of file
diff --git a/UI-Project/src/views/User/rolelist.vue b/UI-Project/src/views/User/rolelist.vue
index 78dfa0f..5d180ed 100644
--- a/UI-Project/src/views/User/rolelist.vue
+++ b/UI-Project/src/views/User/rolelist.vue
@@ -262,7 +262,7 @@
<el-button type="primary" style="margin-top: 10px;margin-left: 10px;" size="mini" id="searchButton" @click="add = true">{{ $t('delivery.addrole') }}</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="240" ref="table"
+ <el-table height="500" ref="table"
@selection-change="handleSelectionChange"
:data="tableData" :header-cell-style="{background:'#F2F3F5 ',color:'#1D2129'}">
<el-table-column prop="name" align="center" :label="$t('delivery.role')" min-width="180" />
diff --git a/UI-Project/src/views/User/userlist.vue b/UI-Project/src/views/User/userlist.vue
index 5d79a7b..5ebb196 100644
--- a/UI-Project/src/views/User/userlist.vue
+++ b/UI-Project/src/views/User/userlist.vue
@@ -216,7 +216,7 @@
<el-button type="primary" style="margin-top: 10px;margin-left: 10px;" size="mini" id="searchButton" @click="add = true">{{ $t('productStock.addusers') }}</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="240" ref="table"
+ <el-table height="500" ref="table"
@selection-change="handleSelectionChange"
:data="tableData" :header-cell-style="{background:'#F2F3F5 ',color:'#1D2129'}">
<el-table-column prop="userName" align="center" :label="$t('productStock.username')" min-width="180" />
diff --git a/UI-Project/src/views/largescreen/largescreen.vue b/UI-Project/src/views/largescreen/largescreen.vue
index 5270e48..b376d15 100644
--- a/UI-Project/src/views/largescreen/largescreen.vue
+++ b/UI-Project/src/views/largescreen/largescreen.vue
@@ -265,8 +265,9 @@
const socketUrl6 = `ws://${WebSocketHost}:${host}/api/unLoadGlass/api/talk/unLoadGlassIsRun`;
const handleMessage6 = (data) => {
const tasks = data.downWorkstation[0];
- if (tasks && tasks.length >= 6) {
- xiapian.value = tasks.some(task => task.racksNumber!== 0);
+ const tasks1 = data.downGlassTask[0];
+ xiapian.value = tasks1.some(task => task.thickness!== '');
+ if (tasks && tasks.length >= 6) {
xiapian1.value = tasks[0].racksNumber !== 0;
xiapian2.value = tasks[1].racksNumber !== 0;
xiapian3.value = tasks[2].racksNumber !== 0;
diff --git a/hangzhoumesParent/common/servicebase/src/main/java/com/mes/damage/entity/DamagePrint.java b/hangzhoumesParent/common/servicebase/src/main/java/com/mes/damage/entity/DamagePrint.java
new file mode 100644
index 0000000..001bb85
--- /dev/null
+++ b/hangzhoumesParent/common/servicebase/src/main/java/com/mes/damage/entity/DamagePrint.java
@@ -0,0 +1,69 @@
+package com.mes.damage.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.io.Serializable;
+import java.sql.Timestamp;
+
+/**
+ * <p>
+ *
+ * </p>
+ *
+ * @author wu
+ * @since 2024-06-25
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+public class DamagePrint implements Serializable {
+
+ /**
+ * 娴佺▼鍗�
+ */
+ private String flowCardId;
+
+ /**
+ * 宸ョ▼鍙�
+ */
+ private String engineerId;
+ /**
+ * 灞傚彿
+ */
+ private String layer;
+
+ /**
+ * 鐗堝浘id
+ */
+ private String temperingLayoutId;
+
+ /**
+ * 鐗囧簭
+ */
+ private String temperingFeedSequence;
+
+ /**
+ * 鐜荤拑id
+ */
+ private String glassId;
+
+ /**
+ * 瀹藉害
+ */
+ private double width;
+
+ /**
+ * 楂樺害
+ */
+ private double height;
+
+ /**
+ * 鍘氬害
+ */
+ private Integer thickness;
+
+
+
+}
diff --git a/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/resources/application.yml b/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/resources/application.yml
index 0d72c28..99bc35f 100644
--- a/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/resources/application.yml
+++ b/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/resources/application.yml
@@ -8,15 +8,15 @@
name: cacheVerticalGlass
mybatis-plus:
mapper-locations: classpath*:mapper/*.xml
-# configuration:
-# log-impl: org.apache.ibatis.logging.stdout.StdOutImpl
+ configuration:
+ log-impl: org.apache.ibatis.logging.stdout.StdOutImpl
mes:
sequence:
order: false
minCount: 20
carWidth: 5000 #澶ц溅瀹藉害
slotWidth: 5000 #澶ц溅瀹藉害
- inCarMaxSize: 3 #杩涚墖澶ц溅鏈�澶у瓨鏀剧幓鐠冩暟閲�
+ inCarMaxSize: 1 #杩涚墖澶ц溅鏈�澶у瓨鏀剧幓鐠冩暟閲�
outCarMaxSize: 2 #鍑虹墖澶ц溅鏈�澶у瓨鏀剧幓鐠冩暟閲�
glassGap: 350 #鐜荤拑闂磋窛
- xMaxSize: 2850
\ No newline at end of file
+ xMaxSize: 2800
\ No newline at end of file
diff --git a/hangzhoumesParent/moduleService/TemperingGlassModule/src/main/java/com/mes/job/PlcScreenTask.java b/hangzhoumesParent/moduleService/TemperingGlassModule/src/main/java/com/mes/job/PlcScreenTask.java
index b4a5334..3d06990 100644
--- a/hangzhoumesParent/moduleService/TemperingGlassModule/src/main/java/com/mes/job/PlcScreenTask.java
+++ b/hangzhoumesParent/moduleService/TemperingGlassModule/src/main/java/com/mes/job/PlcScreenTask.java
@@ -52,7 +52,7 @@
String startOfPeriodStr = startOfPeriod.format(formatter);
String endOfPeriodStr = endOfPeriod.format(formatter);
// 璁剧疆涓烘渶杩戜竷澶╃殑鏃堕棿鑼冨洿
- reportingdamage.setReportingWorkTime(startOfPeriodStr + " to " + endOfPeriodStr);
+ reportingdamage.setReportingWorkTime("2024-05-11" + " to " + endOfPeriodStr);
//reportingdamage.setReportingWorkTime(startOfPeriodStr + " to " + endOfPeriodStr);
//鎵囧舰鍥惧悇璁惧鐨勫姞宸ョ牬鎹熸暟閲�
List<Reportingdamage> device = reportingWorkService.selectDamage(reportingdamage);
diff --git a/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/job/Downpush.java b/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/job/Downpush.java
index 0cc97af..c154291 100644
--- a/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/job/Downpush.java
+++ b/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/job/Downpush.java
@@ -39,6 +39,7 @@
@Autowired
private DownGlassTaskService downGlassTaskService;
+
@Autowired
private RedisUtil redisUtil;
@@ -147,14 +148,6 @@
autoPrint = redisUtil.getCacheObject("autoPrint");
}
jsonObject4.append("autoPrint", autoPrint);
- //浜哄伐涓嬬墖浣嶇疆鏈�鍚庝竴鐗�
-// DownGlassTask downGlassTask=downGlassTaskService.getOne(
-// new LambdaQueryWrapper<DownGlassTask>()
-// .eq(DownGlassTask::getEndCell,Const.G13_WORK_STATION)
-// .orderByDesc(DownGlassTask::getGlassId)
-// .first("top 1")
-// );
-// jsonObject4.append("downGlassTask", downGlassTask);
ArrayList<WebSocketServer> sendwServer4 = WebSocketServer.sessionMap.get("unloadglass");
if (sendwServer4 != null) {
@@ -172,6 +165,8 @@
//姝ｅ湪杩涜鐨勪换鍔�
List<DownWorkstation> downWorkstation = downWorkstationService.getoneDownWorkstations(1, 6);
jsonObject.append("downWorkstation", downWorkstation);
+ List<DownGlassTask> downGlassTask = downGlassTaskService.selectOutTaskCache();
+ jsonObject.append("downGlassTask", downGlassTask);
ArrayList<WebSocketServer> sendwServer = WebSocketServer.sessionMap.get("unLoadGlassIsRun");
if (sendwServer != null) {
for (WebSocketServer webserver : sendwServer) {
diff --git a/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/resources/application.yml b/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/resources/application.yml
index 5a02460..9468ed9 100644
--- a/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/resources/application.yml
+++ b/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/resources/application.yml
@@ -3,7 +3,7 @@
spring:
profiles:
- active: prod
+ active: dev
application:
name: unLoadGlass
--
Gitblit v1.8.0