From 75d0daa4f8dc2010ec92f35cac08a19d240ca45d Mon Sep 17 00:00:00 2001
From: ynhfasrs <ynhfasrs@qq.com>
Date: 星期五, 27 六月 2025 14:23:37 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/controller/OpenController.java | 56 ++++++++++----------------------------------------------
1 files changed, 10 insertions(+), 46 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/OpenController.java b/src/main/java/com/zy/asrs/controller/OpenController.java
index 1708c2e..c5fa8d3 100644
--- a/src/main/java/com/zy/asrs/controller/OpenController.java
+++ b/src/main/java/com/zy/asrs/controller/OpenController.java
@@ -15,13 +15,9 @@
import com.zy.asrs.entity.param.*;
import com.zy.asrs.service.*;
import com.zy.asrs.utils.NotifyUtils;
-import com.zy.asrs.utils.Utils;
import com.zy.common.service.CommonService;
import com.zy.common.utils.HttpHandler;
import com.zy.common.web.BaseController;
-import com.zy.core.cache.MessageQueue;
-import com.zy.core.enums.SlaveType;
-import com.zy.core.model.Task;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
@@ -137,10 +133,9 @@
}
LocMast locMast = locMastService.selectOne(new EntityWrapper<LocMast>()
.eq("loc_sts", "F")
- .eq("loc_no", locNo)
- .eq("barcode", param.getBarcode()));
+ .eq("loc_no", locNo));
if(Cools.isEmpty(locMast)){
- result = R.error("璇ュ簱浣嶄笉婊¤冻鍑哄簱鏉′欢" + locMast.getLocNo());
+ result = R.error("璇ュ簱浣嶄笉婊¤冻鍑哄簱鏉′欢" + locNo);
return result;
}
@@ -353,51 +348,20 @@
@GetMapping("/deviceStatus")
@Transactional
public R deviceStatus() {
- List<CrnStatusParam> crnStatusParams=new ArrayList<>();
- List<BasCrnp> basCrnps = basCrnpService.selectList(new EntityWrapper<>());
- for (BasCrnp basCrnp:basCrnps){
- CrnStatusParam crnStatusParam=new CrnStatusParam();
- crnStatusParam.setCrnNo(basCrnp.getCrnNo());
- crnStatusParam.setCrnSts(basCrnp.getCrnSts());
- crnStatusParam.setErrorCode(basCrnp.getCrnErr());
- BasCrnError error=basCrnErrorService.selectOne(new EntityWrapper<BasCrnError>().eq("error_code",basCrnp.getCrnErr()));
- if(Cools.isEmpty(error)){
- crnStatusParam.setErrorMsg("");
- }else {
- crnStatusParam.setErrorMsg(error.getErrName());
- }
- crnStatusParams.add(crnStatusParam);
- }
- return R.ok(crnStatusParams);
+ List<CrnStatusParam> crnStatusParams = openService.getCrnStatus();
+ List<StationStatusParam> stationStatus = openService.getStationStatus();
+ HashMap<String, Object> map = new HashMap<>();
+ map.put("crn", crnStatusParams);
+ map.put("station", stationStatus);
+ return R.ok().add(map);
}
//杈撻�佺珯鐐圭姸鎬佹煡璇㈡帴鍙�
@GetMapping("/stationStatus")
@Transactional
public R stationStatus() {
- List<StationStatusParam> data = new ArrayList<>();
- List<BasDevp> list = basDevpService.selectList(new EntityWrapper<BasDevp>()
- .in("dev_no", 102, 104, 106, 108, 203, 206, 209, 212));
- for (BasDevp basDevp : list) {
- String taskNo = "";
- String barcode = "";
- if (basDevp.getWrkNo() > 0) {
- TaskWrk taskWrk = taskWrkService.selectByWrkNo(basDevp.getWrkNo());
- if (taskWrk != null) {
- taskNo = taskWrk.getTaskNo();
- barcode = taskWrk.getBarcode();
- }
- }
-
- StationStatusParam param = new StationStatusParam();
- param.setStaNo(basDevp.getDevNo());
- param.setTaskNo(taskNo);
- param.setLoading(basDevp.getLoading());
- param.setBarcode(barcode);
-
- data.add(param);
- }
- return R.ok(data);
+ List<StationStatusParam> data = openService.getStationStatus();
+ return R.ok().add(data);
}
//妯℃嫙杈撻�佺嚎鍏ュ簱
--
Gitblit v1.9.1