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" 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"; 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> 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" /> 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" /> 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; hangzhoumesParent/common/servicebase/src/main/java/com/mes/damage/entity/DamagePrint.java
New file @@ -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; } 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 xMaxSize: 2800 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); 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) { hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/resources/application.yml
@@ -3,7 +3,7 @@ spring: profiles: active: prod active: dev application: name: unLoadGlass
