From ac45194a5ff830a0f355a76a202e1d4f1d15a35b Mon Sep 17 00:00:00 2001
From: Junjie <540245094@qq.com>
Date: 星期四, 26 九月 2024 13:07:15 +0800
Subject: [PATCH] #
---
zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/entity/LocDetl.java | 38 ++++++++++++++++++++++++++------------
1 files changed, 26 insertions(+), 12 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 76ca46e..6596b8a 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
@@ -1,26 +1,23 @@
package com.zy.asrs.wms.asrs.entity;
-import com.baomidou.mybatisplus.annotation.TableLogic;
-
import java.lang.reflect.Field;
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;
import org.springframework.format.annotation.DateTimeFormat;
-import java.text.SimpleDateFormat;
import java.util.Date;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableLogic;
import com.baomidou.mybatisplus.annotation.TableName;
-import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import com.zy.asrs.framework.common.Cools;
@@ -29,7 +26,6 @@
import com.zy.asrs.wms.system.service.HostService;
import java.io.Serializable;
-import java.util.Date;
@Data
@TableName("man_loc_detl")
@@ -57,15 +53,15 @@
private String locNo;
/**
- * 鐗╂枡
+ * 鍟嗗搧
*/
- @ApiModelProperty(value= "鐗╂枡")
+ @ApiModelProperty(value= "鍟嗗搧")
private Long matId;
/**
- * 鐗╂枡鍙�
+ * 鍟嗗搧缂栧彿
*/
- @ApiModelProperty(value= "鐗╂枡鍙�")
+ @ApiModelProperty(value= "鍟嗗搧缂栧彿")
private String matnr;
/**
@@ -102,7 +98,6 @@
* 鏄惁鍒犻櫎 1: 鏄� 0: 鍚�
*/
@ApiModelProperty(value= "鏄惁鍒犻櫎 1: 鏄� 0: 鍚� ")
- @TableLogic
private Integer deleted;
/**
@@ -161,7 +156,7 @@
// null, // 搴撲綅
// null, // 搴撲綅鍙穂闈炵┖]
// null, // 鐗╂枡
-// null, // 鐗╂枡鍙�
+// null, // 鍟嗗搧缂栧彿
// null, // 璁㈠崟鍙�
// null, // 鎵瑰彿
// null, // 鏁伴噺
@@ -316,4 +311,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