From 70930071a49190f414c8d8bc9c9e9795a4096739 Mon Sep 17 00:00:00 2001
From: zhang <zc857179121@qq.com>
Date: 星期一, 23 三月 2026 16:08:27 +0800
Subject: [PATCH] Merge branch 'refs/heads/rcs_master' into jdxaj
---
zy-acs-manager/src/main/java/com/zy/acs/manager/manager/controller/DigitalController.java | 43 ++++++++++++++++++++-----------------------
1 files changed, 20 insertions(+), 23 deletions(-)
diff --git a/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/controller/DigitalController.java b/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/controller/DigitalController.java
index a5a6429..4b77fcc 100644
--- a/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/controller/DigitalController.java
+++ b/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/controller/DigitalController.java
@@ -7,16 +7,13 @@
import com.zy.acs.common.domain.protocol.IMessageBody;
import com.zy.acs.common.enums.AgvInOutFlagType;
import com.zy.acs.common.utils.RedisSupport;
+import com.zy.acs.framework.common.Cools;
+import com.zy.acs.framework.common.R;
import com.zy.acs.manager.manager.controller.result.DigitalAgvVo;
import com.zy.acs.manager.manager.controller.result.DigitalStockVo;
import com.zy.acs.manager.manager.entity.*;
-import com.zy.acs.manager.manager.enums.ActionStsType;
-import com.zy.acs.manager.manager.enums.ActionTypeType;
-import com.zy.acs.manager.manager.enums.LocStsType;
-import com.zy.acs.manager.manager.enums.TaskStsType;
+import com.zy.acs.manager.manager.enums.*;
import com.zy.acs.manager.manager.service.*;
-import com.zy.acs.framework.common.Cools;
-import com.zy.acs.framework.common.R;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestMapping;
@@ -51,14 +48,14 @@
public R getAgvInfo() {
List<DigitalAgvVo> voList = new ArrayList<>();
- List<Agv> agvList = agvService.list(new LambdaQueryWrapper<Agv>().eq(Agv::getStatus, 1));
+ List<Agv> agvList = agvService.list(new LambdaQueryWrapper<Agv>().eq(Agv::getStatus, StatusType.ENABLE.val));
for (Agv agv : agvList) {
DigitalAgvVo vo = new DigitalAgvVo();
vo.setAgvNo(agv.getUuid());
AgvDetail agvDetail = agvDetailService.selectByAgvId(agv.getId());
if (null == agvDetail) { continue; }
- Code currCode = codeService.getById(agvDetail.getCode());
+ Code currCode = codeService.getCacheById(agvDetail.getCode());
if (null == currCode) { continue; }
vo.synPosition(currCode.getX(), 0, currCode.getY());
@@ -139,9 +136,9 @@
/**
* SELECT
* ml.loc_no,
- * ml.row,
- * ml.bay,
- * ml.lev,
+ * ml.row_no,
+ * ml.bay_no,
+ * ml.lev_no,
* ml.loc_sts AS locStsEl
* FROM man_loc ml
* LEFT JOIN man_task mt ON mt.dest_loc = ml.id OR mt.ori_loc = ml.id
@@ -177,9 +174,9 @@
*
* SELECT
* ml.loc_no,
- * ml.row,
- * ml.bay,
- * ml.lev,
+ * ml.row_no,
+ * ml.bay_no,
+ * ml.lev_no,
* ml.loc_sts AS locStsEl
* FROM man_loc ml
* LEFT JOIN man_task mt ON mt.dest_loc = ml.id OR mt.ori_loc = ml.id
@@ -221,9 +218,9 @@
for (Loc loc : locService.list(new LambdaQueryWrapper<Loc>().eq(Loc::getLocSts, LocStsType.STOCK.val()))) {
DigitalStockVo vo = new DigitalStockVo();
vo.setLocNo(loc.getLocNo());
- vo.setRow(loc.getRow());
- vo.setBay(loc.getBay());
- vo.setLev(loc.getLev());
+ vo.setRowNo(loc.getRowNo());
+ vo.setBayNo(loc.getBayNo());
+ vo.setLevNo(loc.getLevNo());
vo.setLocSts(loc.getLocStsEl());
voList.add(vo);
}
@@ -249,9 +246,9 @@
if (action.getActionSts().equals(ActionStsType.FINISH.val())) {
DigitalStockVo vo = new DigitalStockVo();
vo.setLocNo(loc.getLocNo());
- vo.setRow(loc.getRow());
- vo.setBay(loc.getBay());
- vo.setLev(loc.getLev());
+ vo.setRowNo(loc.getRowNo());
+ vo.setBayNo(loc.getBayNo());
+ vo.setLevNo(loc.getLevNo());
vo.setLocSts(loc.getLocStsEl());
voList.add(vo);
}
@@ -278,9 +275,9 @@
if (!action.getActionSts().equals(ActionStsType.FINISH.val())) {
DigitalStockVo vo = new DigitalStockVo();
vo.setLocNo(loc.getLocNo());
- vo.setRow(loc.getRow());
- vo.setBay(loc.getBay());
- vo.setLev(loc.getLev());
+ vo.setRowNo(loc.getRowNo());
+ vo.setBayNo(loc.getBayNo());
+ vo.setLevNo(loc.getLevNo());
vo.setLocSts(loc.getLocStsEl());
voList.add(vo);
}
--
Gitblit v1.9.1