From 07e08c668653df7b383ef9e32a078cb681ba2e44 Mon Sep 17 00:00:00 2001
From: zwl <1051256694@qq.com>
Date: 星期五, 10 四月 2026 14:15:38 +0800
Subject: [PATCH] 1.数字孪生--库位和库存详情 新增按排去查库位
---
src/main/java/com/zy/asrs/service/impl/DigitalTwinServiceImpl.java | 42 ++++++++++++++++++++----------------------
1 files changed, 20 insertions(+), 22 deletions(-)
diff --git a/src/main/java/com/zy/asrs/service/impl/DigitalTwinServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/DigitalTwinServiceImpl.java
index a099b9d..785a98a 100644
--- a/src/main/java/com/zy/asrs/service/impl/DigitalTwinServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/DigitalTwinServiceImpl.java
@@ -220,24 +220,14 @@
/**
* 鏌ヨ搴撳瓨鍜屽簱浣嶈缁嗕俊鎭�
*
- * @param areaId
+ * @param arr
* @return
*/
- public List<DtLocDetailVo> warehouseDetail(String areaId) {
-
- List<LocMast> locMastList = locMastService.selectList(new EntityWrapper<>());
- return locMastList.stream()
- .map(loc -> {
- DtLocDetailVo vo = new DtLocDetailVo();
- BeanUtils.copyProperties(loc, vo);
- vo.setLocMast(loc);
- LocDetl query = new LocDetl();
- query.setLocNo(loc.getLocNo());
- LocDetl locDetl = locDetlMapper.selectOne(query);
- vo.setLocDetl(locDetl);
- return vo;
- })
- .collect(Collectors.toList());
+ public List<LocMast> warehouseDetail(Integer[] arr) {
+ if (arr == null || arr.length == 0) {
+ return locMastService.selectList(new EntityWrapper<>());
+ }
+ return locMastService.selectList(new EntityWrapper<LocMast>().in("row1", Arrays.asList(arr)));
}
/**
@@ -341,12 +331,20 @@
vo.setCrnNo(crnp.getCrnNo());
Integer wrkNo = crnp.getWrkNo();
vo.setTaskNo(wrkNo == null ? null : String.valueOf(wrkNo));
- String locNo = !Cools.isEmpty(crnp.getToLocno()) ? crnp.getToLocno() : crnp.getFrmLocno();
- if (!Cools.isEmpty(locNo)) {
- LocMast locMast = locMastService.selectById(locNo);
- if (locMast != null) {
- vo.setBay1(locMast.getBay1());
- vo.setLev1(locMast.getLev1());
+ vo.setBay1(crnp.getBay());
+ vo.setLev1(crnp.getLevel());
+ if (vo.getBay1() == null || vo.getLev1() == null) {
+ String locNo = !Cools.isEmpty(crnp.getToLocno()) ? crnp.getToLocno() : crnp.getFrmLocno();
+ if (!Cools.isEmpty(locNo)) {
+ LocMast locMast = locMastService.selectById(locNo);
+ if (locMast != null) {
+ if (vo.getBay1() == null) {
+ vo.setBay1(locMast.getBay1());
+ }
+ if (vo.getLev1() == null) {
+ vo.setLev1(locMast.getLev1());
+ }
+ }
}
}
vo.setVerticalSpeed(parseInteger(crnp.getCtlHp()));
--
Gitblit v1.9.1