From 1c02f5b648cd3c58a7db7dcec761071d5daabb26 Mon Sep 17 00:00:00 2001
From: ZY <zc857179121@qq.com>
Date: 星期二, 20 八月 2024 13:24:20 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/wms-dev' into wms-dev
---
zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/entity/LocDetl.java | 21 +++++++++++++++++++++
1 files changed, 21 insertions(+), 0 deletions(-)
diff --git a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/entity/LocDetl.java b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/entity/LocDetl.java
index 7472fb6..f7cb142 100644
--- a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/entity/LocDetl.java
+++ b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/entity/LocDetl.java
@@ -6,9 +6,11 @@
import java.text.SimpleDateFormat;
import java.util.*;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.fasterxml.jackson.annotation.JsonAnyGetter;
import com.zy.asrs.common.utils.Synchro;
import com.zy.asrs.wms.asrs.service.LocService;
+import com.zy.asrs.wms.asrs.service.MatFieldService;
import com.zy.asrs.wms.asrs.service.MatService;
import com.zy.asrs.wms.system.entity.Host;
import com.zy.asrs.wms.system.entity.User;
@@ -316,4 +318,23 @@
dynamicFields.put(key, value);
}
+ public List<Map<String, Object>> getDynamicFieldsList() {
+ MatFieldService service = SpringUtils.getBean(MatFieldService.class);
+ List<MatField> matFields = service.list(new LambdaQueryWrapper<MatField>().eq(MatField::getFieldType, 1));
+ HashMap<String, Object> fieldMap = new HashMap<>();
+ for (MatField matField : matFields) {
+ fieldMap.put(matField.getName(), matField.getDescribe());
+ }
+
+ List<Map<String, Object>> list = new ArrayList<>();
+ for (Map.Entry<String, Object> entry : dynamicFields.entrySet()) {
+ HashMap<String, Object> map = new HashMap<>();
+ map.put("key", entry.getKey());
+ map.put("value", entry.getValue());
+ map.put("desc", fieldMap.get(entry.getKey()));
+ list.add(map);
+ }
+ return list;
+ }
+
}
--
Gitblit v1.9.1