From 9c5c1dea8f5ef329804b29d728a52a45dc527a4f Mon Sep 17 00:00:00 2001
From: skyouc <958836976@qq.com>
Date: 星期三, 11 三月 2026 18:34:50 +0800
Subject: [PATCH] no message
---
src/main/java/com/zy/asrs/controller/OpenController.java | 43 ++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 42 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/OpenController.java b/src/main/java/com/zy/asrs/controller/OpenController.java
index 7b3e816..0b8728d 100644
--- a/src/main/java/com/zy/asrs/controller/OpenController.java
+++ b/src/main/java/com/zy/asrs/controller/OpenController.java
@@ -11,6 +11,8 @@
import com.zy.asrs.entity.param.*;
import com.zy.asrs.mapper.ReportQueryMapper;
import com.zy.asrs.service.*;
+import com.zy.asrs.service.impl.BasStationDetlServiceImpl;
+import com.zy.asrs.service.impl.BasStationServiceImpl;
import com.zy.common.model.DetlDto;
import com.zy.common.web.BaseController;
import lombok.extern.slf4j.Slf4j;
@@ -51,7 +53,10 @@
private MatService matService;
@Autowired
private WaitPakinService waitPakinService;
-
+ @Autowired
+ private BasStationServiceImpl basStationService;
+ @Autowired
+ private BasStationDetlService basStationDetlService;
/**
@@ -75,6 +80,42 @@
}
/**
+ * 浠诲姟鏌ヨ鎺ュ彛
+ */
+ @PostMapping("/queryTask")
+ public synchronized R queryTask(@RequestBody QueryTaskParam param) {
+ if (Cools.isEmpty(param)) {
+ return R.parse(BaseRes.PARAM);
+ }
+ HashMap<String, Object> map = new HashMap<>();
+
+ 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);
+ }
+
+ /**
* 搴撳瓨淇℃伅鏌ヨ鎺ュ彛
*/
@GetMapping("/queryLoc")
--
Gitblit v1.9.1