From eba785e5620416d47f72982b97fdefae98a4d875 Mon Sep 17 00:00:00 2001
From: wangfei <3597712270@qq.com>
Date: 星期三, 18 九月 2024 16:15:47 +0800
Subject: [PATCH] 1.后端：原片仓储新增是否禁用接口，页面查询接口 2：前端原片仓储界面完善功能，调用部分接口
---
hangzhoumesParent/moduleService/GlassStorageModule/src/main/java/com/mes/job/push.java | 10 ++--------
1 files changed, 2 insertions(+), 8 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 0096d59..9135a79 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
@@ -1,28 +1,22 @@
package com.mes.job;
import cn.hutool.json.JSONObject;
-
import com.mes.rawglassdetails.entity.RawGlassStorageDetails;
import com.mes.rawglassdetails.service.RawGlassStorageDetailsService;
import com.mes.rawglassstation.entity.RawGlassStorageStation;
import com.mes.rawglassstation.service.RawGlassStorageStationService;
import com.mes.rawglasstask.entity.RawGlassStorageTask;
import com.mes.rawglasstask.service.RawGlassStorageTaskService;
-import com.mes.shelfrack.entity.request.RawUsageAndShelfRack;
import com.mes.shelfrack.service.ShelfRackService;
-import com.mes.storagetask.entity.request.StorageTaskRequest;
import com.mes.storagetask.service.StorageTaskService;
import com.mes.tools.WebSocketServer;
import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.scheduling.annotation.Scheduled;
import lombok.extern.slf4j.Slf4j;
+import org.springframework.scheduling.annotation.Scheduled;
import org.springframework.stereotype.Component;
-import java.text.SimpleDateFormat;
import java.util.ArrayList;
-import java.util.Date;
import java.util.List;
-import java.util.Map;
@Slf4j
@Component
@@ -46,7 +40,7 @@
JSONObject jsonObject = new JSONObject();
List<RawGlassStorageDetails> rack = rawGlassStorageDetailsService.list();
List<RawGlassStorageStation> state = rawGlassStorageStationService.list();
- List<RawGlassStorageTask> tasks = rawGlassStorageTaskService.selectTasks();
+ List<RawGlassStorageTask> tasks = rawGlassStorageTaskService.list();
jsonObject.append("rack",rack);
jsonObject.append("state",state);
--
Gitblit v1.8.0