From 1f9f8a9ada78fe159f1ae014242e64604ceccb32 Mon Sep 17 00:00:00 2001
From: cl <1442464845@qq.com>
Date: 星期三, 15 四月 2026 20:09:55 +0800
Subject: [PATCH] 托盘数
---
src/main/java/com/zy/asrs/service/impl/DigitalTwinServiceImpl.java | 50 ++++++++++++++++++++++++++++++++++----------------
1 files changed, 34 insertions(+), 16 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 a0a1f08..e31d1e7 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)));
}
/**
@@ -455,6 +445,34 @@
return result;
}
+
+ @Override
+ public List<Map<String, Object>> getLocalDetalByLocNo(String locNo) {
+ if (locNo == null || locNo.trim().isEmpty()) {
+ return Collections.emptyList();
+ }
+
+ List<LocDetl> locDetls = locDetlService.selectList(new EntityWrapper<LocDetl>()
+ .eq("loc_no", locNo.trim())
+ .orderBy("appe_time", true));
+ List<Map<String, Object>> result = new ArrayList<>();
+
+ for (LocDetl locDetl : locDetls) {
+ Map<String, Object> item = new LinkedHashMap<>();
+ item.put("locNo", locDetl.getLocNo());
+ item.put("zpallet", locDetl.getZpallet());
+ item.put("matnr", locDetl.getMatnr());
+ item.put("maktx", locDetl.getMaktx());
+ item.put("specs", locDetl.getSpecs());
+ item.put("batch", locDetl.getBatch());
+ item.put("anfme", locDetl.getAnfme());
+ item.put("orderNo", locDetl.getOrderNo());
+ item.put("frozen", locDetl.getFrozen());
+ result.add(item);
+ }
+
+ return result;
+ }
public Map<String, Object> getLocInfo() {
List<LocMast> LocMasts = locMastMapper.selectList(new EntityWrapper<>());
Map<String, Object> result = new HashMap<>();
--
Gitblit v1.9.1