From 1c2bbdff65ba00e81afe3bd2c5bda0d74ae59a78 Mon Sep 17 00:00:00 2001
From: wuyouming666 <2265557248@qq.com>
Date: 星期一, 15 四月 2024 11:23:25 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10101/r/HangZhouMes
---
hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downworkstation/service/DownGlassLogic.java | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downworkstation/service/DownGlassLogic.java b/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downworkstation/service/DownGlassLogic.java
index 2fceea5..045f2d8 100644
--- a/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downworkstation/service/DownGlassLogic.java
+++ b/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downworkstation/service/DownGlassLogic.java
@@ -23,7 +23,7 @@
@Autowired
private DownGlassInfo downGlassInfo;
private DownWorkstation downWorkstation;
- // private DownGlassInfoMapper downGlassInfoMapper;
+ private DownGlassInfoMapper downGlassInfoMapper;
private DownGlassInfoService downGlassInfoService;
private DownGlassTaskService downGlassTaskService;
private DownWorkstationMapper downWorkstationMapper;
@@ -68,9 +68,9 @@
downWorkstationService = WebSocketServer.applicationContext.getBean(DownWorkstationService.class);
downWorkstationTaskService = WebSocketServer.applicationContext.getBean(DownWorkstationTaskService.class);
downGlassInfoService = WebSocketServer.applicationContext.getBean(DownGlassInfoService.class);
- // downGlassInfoMapper = WebSocketServer.applicationContext.getBean(DownGlassInfoMapper.class);
+ downGlassInfoMapper = WebSocketServer.applicationContext.getBean(DownGlassInfoMapper.class);
downGlassTaskService = WebSocketServer.applicationContext.getBean(DownGlassTaskService.class);
- List<DownGlassTask> taskdownGlassInf = downGlassTaskService.getUnloadingTaskState();
+ List<DownGlassTask> taskdownGlassInf = downWorkstationMapper.selectunloadingtaskstate();
//
@@ -159,4 +159,4 @@
// }
-}
+}
\ No newline at end of file
--
Gitblit v1.8.0