From 04aeda48634ff70d08d9fb7fac4d60d4c96b6992 Mon Sep 17 00:00:00 2001
From: zhoushihao <zsh19950802@163.com>
Date: 星期一, 23 九月 2024 08:15:24 +0800
Subject: [PATCH] 原片仓储代码功能编写：基础逻辑、代码规范、添加/修改字段，移除无用的方法，新增表连接查询mapper
---
hangzhoumesParent/moduleService/GlassStorageModule/src/main/java/com/mes/job/push.java | 13 ++++---------
1 files changed, 4 insertions(+), 9 deletions(-)
diff --git a/hangzhoumesParent/moduleService/GlassStorageModule/src/main/java/com/mes/job/push.java b/hangzhoumesParent/moduleService/GlassStorageModule/src/main/java/com/mes/job/push.java
index 9135a79..d3970d5 100644
--- a/hangzhoumesParent/moduleService/GlassStorageModule/src/main/java/com/mes/job/push.java
+++ b/hangzhoumesParent/moduleService/GlassStorageModule/src/main/java/com/mes/job/push.java
@@ -7,11 +7,9 @@
import com.mes.rawglassstation.service.RawGlassStorageStationService;
import com.mes.rawglasstask.entity.RawGlassStorageTask;
import com.mes.rawglasstask.service.RawGlassStorageTaskService;
-import com.mes.shelfrack.service.ShelfRackService;
-import com.mes.storagetask.service.StorageTaskService;
import com.mes.tools.WebSocketServer;
-import org.springframework.beans.factory.annotation.Autowired;
import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.scheduling.annotation.Scheduled;
import org.springframework.stereotype.Component;
@@ -23,13 +21,10 @@
public class push {
@Autowired
- private StorageTaskService storageTaskService;
- @Autowired
- private ShelfRackService shelfRackService;
- @Autowired
private RawGlassStorageDetailsService rawGlassStorageDetailsService;
@Autowired
private RawGlassStorageStationService rawGlassStorageStationService;
+
@Autowired
private RawGlassStorageTaskService rawGlassStorageTaskService;
@@ -40,8 +35,8 @@
JSONObject jsonObject = new JSONObject();
List<RawGlassStorageDetails> rack = rawGlassStorageDetailsService.list();
List<RawGlassStorageStation> state = rawGlassStorageStationService.list();
- List<RawGlassStorageTask> tasks = rawGlassStorageTaskService.list();
-
+ //List<RawGlassStorageTask> tasks = rawGlassStorageTaskService.list();
+ List<RawGlassStorageTask> tasks = rawGlassStorageTaskService.findAll();
jsonObject.append("rack",rack);
jsonObject.append("state",state);
jsonObject.append("tasks",tasks);
--
Gitblit v1.8.0