UI-Project/src/views/StockBasicData/stockBasicData.vue
@@ -20,6 +20,8 @@ const requestData = { line: 2001 }; const timeRange = ref(["2022-01-01", "2025-01-01"]) const selectValuesa = reactive({}); // request.post("/cacheGlass/taskCache/selectEdgTask",{ // ...requestData, @@ -34,6 +36,24 @@ // } // }); // 磨边任务查询 const setEdgGlassInfoRequest = async () => { const response = await request.post("/cacheGlass/edgGlassTaskInfo/setEdgGlassInfoRequest", { cellList: [selectValuesa[0]], stateList: [selectValuesa[1]], beginDate: timeRange.value[0], endDate: timeRange.value[1], }) if (response.code === 200) { ElMessage.success(response.message); } else { ElMessage.error(response.message); } } // 破损 const open = async(row) => { try { @@ -105,7 +125,7 @@ // 定义消息处理函数，更新 receivedData 变量 const handleMessage = (data) => { // 更新 tableData 的数据 tableData.value = data.EdgTasks1[0] tableData.value = data.edgTasks[0] }; onMounted(() => { socket = initializeWebSocket(socketUrl, handleMessage); @@ -123,15 +143,33 @@ <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-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-option label="未磨边" value="0"></el-option> <el-option label="磨边中" value="1"></el-option> <el-option label="已磨边" value="2"></el-option> </el-select> <el-date-picker style="margin-left: 10px;" v-model="timeRange" type="daterange" format="YYYY/MM/DD" value-format="YYYY-MM-DD" :start-placeholder="$t('reportmanage.starttime')" :end-placeholder="$t('reportmanage.endtime')" :default-time="defaultTime" /> <el-button type="primary" style="margin-left: 10px;" @click="setEdgGlassInfoRequest()">{{ $t('reportmanage.inquire') }}</el-button> <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-column prop="glass_id" align="center" :label="$t('workOrder.glassID')" min-width="180" /> <el-table-column prop="glassId" align="center" :label="$t('workOrder.glassID')" min-width="180" /> <el-table-column prop="width" align="center" :label="$t('workOrder.width')" min-width="120" /> <el-table-column prop="height" align="center" :label="$t('workOrder.height')" min-width="80" /> <el-table-column prop="thickness" align="center" :label="$t('workOrder.thickness')" min-width="120" /> <el-table-column prop="glass_type" align="center" :label="$t('workOrder.glasstype')" min-width="120" /> <el-table-column prop="glassType" align="center" :label="$t('workOrder.glasstype')" min-width="120" /> <el-table-column prop="line" align="center" :label="$t('workOrder.line')" min-width="120" /> <el-table-column fixed="right" :label="$t('workOrder.operate')" align="center" width="200"> <template #default="scope"> <el-button size="mini" type="text" plain @click="open(scope.row)">{{ $t('workOrder.breakage') }}</el-button> hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/edgglasstask/controller/EdgGlassTaskInfoController.java
@@ -13,7 +13,7 @@ /** * <p> * 前端控制器 * 前端控制器 * </p> * * @author wu @@ -35,7 +35,8 @@ @PostMapping("/setEdgGlassInfoRequest") @ApiOperation(value = "设置磨边队列查询参数", notes = "设置磨边队列查询参数") public Result<String> setEdgGlassInfoRequest(@RequestBody EdgGlassInfoRequest request) { return Result.success(edgGlassTaskInfoService.setEdgGlassInfoRequest(request)); edgGlassTaskInfoService.setEdgGlassInfoRequest(request); return Result.build(200, "查询成功", "1"); } } hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/edgglasstask/entity/request/EdgGlassInfoRequest.java
@@ -27,14 +27,14 @@ /** * 开始时间 */ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") @DateTimeFormat(pattern = "yyyy-MM-dd") @JsonFormat(pattern = "yyyy-MM-dd") private Date beginDate; /** * 结束时间 */ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") @DateTimeFormat(pattern = "yyyy-MM-dd") @JsonFormat(pattern = "yyyy-MM-dd") private Date endDate; } hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downglassinfo/controller/DownGlassInfoController.java
@@ -26,7 +26,9 @@ @PostMapping("/setDownGlassInfoRequest") @ApiOperation(value = "设置落架玻璃查询参数", notes = "设置落架玻璃查询参数") public Result<String> setDownGlassInfoRequest(@RequestBody DownGlassInfoRequest request) { return Result.success(downGlassInfoService.setDownGlassInfoRequest(request)); Result.success(downGlassInfoService.setDownGlassInfoRequest(request)); return Result.build(200, "查询成功", "1"); } } hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downworkstation/service/impl/DownWorkstationServiceImpl.java
@@ -88,9 +88,9 @@ item.put("width", downWorkstionAndDownGlassinfo.getTotalwidth()); item.put("fillColor", "yellow"); item.put("content", downWorkstionAndDownGlassinfo.getFlowCardId()); if(downWorkstionAndDownGlassinfo.getTotalQuantity()==downWorkstionAndDownGlassinfo.getRacksNumber()+downWorkstionAndDownGlassinfo.getRacksNumber()){ if (downWorkstionAndDownGlassinfo.getTotalQuantity() == downWorkstionAndDownGlassinfo.getRacksNumber() + downWorkstionAndDownGlassinfo.getRacksNumber()) { item.put("fullCardColor", "red"); }else{ } else { item.put("fullCardColor", "blue"); }
@@ -48,7 +48,7 @@ ArrayList<WebSocketServer> sendwServer = WebSocketServer.sessionMap.get("unloadglass"); if (sendwServer != null) { for (WebSocketServer webserver : sendwServer) { if (webserver != null&&webserver.session.isOpen()) { if (webserver != null && webserver.session.isOpen()) { log.info("已发送"); webserver.sendMessage(jsonObject.toString()); } @@ -60,13 +60,13 @@ public void sendGlassInfoData() { log.info("发送工位显示图信息1"); JSONObject jsonObject2 = new JSONObject(); List<Map<String, Object>> glassinfodata = downWorkstationService.getTotalGlassDimensionsByWorkstation(1,3); jsonObject2.append("glassinfo",glassinfodata); List<Map<String, Object>> glassinfodata = downWorkstationService.getTotalGlassDimensionsByWorkstation(1, 3); jsonObject2.append("glassinfo", glassinfodata); log.info(jsonObject2.toString()); ArrayList<WebSocketServer> sendwServer2 = WebSocketServer.sessionMap.get("unloadglass2"); if (sendwServer2 != null) { for (WebSocketServer webserver : sendwServer2) { if (webserver != null&&webserver.session.isOpen()) { if (webserver != null && webserver.session.isOpen()) { webserver.sendMessage(jsonObject2.toString()); } } @@ -77,35 +77,35 @@ public void sendGlassInfoData2() { log.info("发送工位显示图信息2"); JSONObject jsonObject3 = new JSONObject(); List<Map<String, Object>> glassinfodata2 = downWorkstationService.getTotalGlassDimensionsByWorkstation(4,6); jsonObject3.append("glassinfo2",glassinfodata2); List<Map<String, Object>> glassinfodata2 = downWorkstationService.getTotalGlassDimensionsByWorkstation(4, 6); jsonObject3.append("glassinfo2", glassinfodata2); log.info(jsonObject3.toString()); ArrayList<WebSocketServer> sendwServer3 = WebSocketServer.sessionMap.get("unloadglass3"); if (sendwServer3 != null) { for (WebSocketServer webserver : sendwServer3) { if (webserver != null&&webserver.session.isOpen()) { if (webserver != null && webserver.session.isOpen()) { webserver.sendMessage(jsonObject3.toString()); } } } } @Scheduled(fixedDelay = 2000) @Scheduled(fixedDelay = 2000) public void sendDownStorageCages() { log.info("发送缓存玻璃信息"); JSONObject jsonObject4 = new JSONObject(); List<Map<String, Object>> list=downStorageCageService.selectDownStorageCages(); jsonObject4.append("params2",list); log.info(jsonObject4.toString()); ArrayList<WebSocketServer> sendwServer4 = WebSocketServer.sessionMap.get("downcache"); if (sendwServer4 != null) { for (WebSocketServer webserver : sendwServer4) { if (webserver != null && webserver.session.isOpen()) { webserver.sendMessage(jsonObject4.toString()); } } } } List<Map<String, Object>> list = downStorageCageService.selectDownStorageCages(); jsonObject4.append("params2", list); log.info(jsonObject4.toString()); ArrayList<WebSocketServer> sendwServer4 = WebSocketServer.sessionMap.get("downcache"); if (sendwServer4 != null) { for (WebSocketServer webserver : sendwServer4) { if (webserver != null && webserver.session.isOpen()) { webserver.sendMessage(jsonObject4.toString()); } } } } @Scheduled(fixedDelay = 2000) public void sendDownGlassInfo() { @@ -140,10 +140,10 @@ } @Scheduled(fixedDelay = 1000) public void isRun(){ public void isRun() { JSONObject jsonObject = new JSONObject(); //正在进行的任务 List<DownWorkstation> downWorkstation = downWorkstationService.getoneDownWorkstations(1,6); List<DownWorkstation> downWorkstation = downWorkstationService.getoneDownWorkstations(1, 6); jsonObject.append("downWorkstation", downWorkstation); ArrayList<WebSocketServer> sendwServer = WebSocketServer.sessionMap.get("unLoadGlassIsRun"); if (sendwServer != null) {
