From 2567eba7aff97393618e71337045345bdffdb856 Mon Sep 17 00:00:00 2001
From: skyouc <958836976@qq.com>
Date: 星期五, 27 三月 2026 20:40:10 +0800
Subject: [PATCH] no message
---
src/main/java/com/zy/asrs/controller/OpenController.java | 43 ++++++++++++++++++++++++++++---------------
1 files changed, 28 insertions(+), 15 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/OpenController.java b/src/main/java/com/zy/asrs/controller/OpenController.java
index 7e82c13..b4e7dbb 100644
--- a/src/main/java/com/zy/asrs/controller/OpenController.java
+++ b/src/main/java/com/zy/asrs/controller/OpenController.java
@@ -51,8 +51,10 @@
private MatService matService;
@Autowired
private WaitPakinService waitPakinService;
-
-
+ @Autowired
+ private BasStationService basStationService;
+ @Autowired
+ private BasStationDetlService basStationDetlService;
/**
* 缁勬墭鏌ヨ鎺ュ彛
*/
@@ -81,20 +83,31 @@
if (Cools.isEmpty(param)) {
return R.parse(BaseRes.PARAM);
}
- if (Cools.isEmpty(param.getTaskNo())) {
- return R.error("浠诲姟鍙穂taskNo]涓嶈兘涓虹┖");
- }
- WrkMast wrkMast = wrkMastService.selectOne(new EntityWrapper<WrkMast>().eq("wrk_no",param.getTaskNo()));
- if (wrkMast == null) {
- return R.error("浠诲姟涓嶅瓨鍦�");
- }
-
- List<WrkDetl> wrkDetls = wrkDetlService.selectByWrkNo(Integer.valueOf(param.getTaskNo()));
-
HashMap<String, Object> map = new HashMap<>();
- map.put("taskNo", param.getTaskNo());
- map.put("ioType", wrkMast.getIoType());
- map.put("wrkDetls", wrkDetls);
+
+ if (param.getTaskType().equals("crn")) {
+ if (Cools.isEmpty(param.getTaskNo())) {
+ return R.error("浠诲姟鍙穂taskNo]涓嶈兘涓虹┖");
+ }
+ WrkMast wrkMast = wrkMastService.selectOne(new EntityWrapper<WrkMast>().eq("wrk_no",param.getTaskNo()));
+ if (wrkMast == null) {
+ return R.error("浠诲姟涓嶅瓨鍦�");
+ }
+
+ List<WrkDetl> wrkDetls = wrkDetlService.selectByWrkNo(Integer.valueOf(param.getTaskNo()));
+ map.put("taskNo", param.getTaskNo());
+ map.put("ioType", wrkMast.getIoType());
+ map.put("wrkDetls", wrkDetls);
+ } else {
+ BasStation basStation = basStationService.selectOne(new EntityWrapper<BasStation>().eq("dev_no", param.getAgvSite()));
+ if (Objects.isNull(basStation)) {
+ return R.error("绔欑偣涓嶅瓨鍦紝璇疯仈绯荤鐞嗗憳妫�鏌ョ珯鐐逛俊鎭紒锛�");
+ }
+ List<BasStationDetl> basStationDetls = basStationDetlService.selectList(new EntityWrapper<BasStationDetl>().eq("dev_no", param.getAgvSite()));
+ map.put("taskNo", param.getAgvSite());
+ map.put("ioType", 1);
+ map.put("wrkDetls", basStationDetls);
+ }
return R.ok().add(map);
}
--
Gitblit v1.9.1