From a1f7856f0f450883c7060444a4fc2b721720a051 Mon Sep 17 00:00:00 2001
From: zwl <1051256694@qq.com>
Date: 星期三, 15 四月 2026 11:00:05 +0800
Subject: [PATCH] 1.erp对接新增字段 2.电视机数据
---
src/main/java/com/zy/asrs/service/impl/DigitalTwinServiceImpl.java | 30 +++++++++++++++++++++++++++++-
1 files changed, 29 insertions(+), 1 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 b34a1a7..e31d1e7 100644
--- a/src/main/java/com/zy/asrs/service/impl/DigitalTwinServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/DigitalTwinServiceImpl.java
@@ -227,7 +227,7 @@
if (arr == null || arr.length == 0) {
return locMastService.selectList(new EntityWrapper<>());
}
- return locMastService.selectList(new EntityWrapper<LocMast>().in("crn_no", Arrays.asList(arr)));
+ return locMastService.selectList(new EntityWrapper<LocMast>().in("row1", Arrays.asList(arr)));
}
/**
@@ -445,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