From 6b91dfe7a4ade6b22422ccda01fa8f83772b68a5 Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期四, 08 五月 2025 15:28:50 +0800
Subject: [PATCH] 动态字段优化
---
rsf-server/src/main/java/com/vincent/rsf/server/common/utils/FieldsUtils.java | 2 +-
rsf-admin/src/page/orders/asnOrder/AsnOrderItemList.jsx | 10 ++++++++++
rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/MobileServiceImpl.java | 12 ++++++++++--
rsf-server/src/main/java/com/vincent/rsf/server/api/entity/dto/ReceiptDetlsDto.java | 4 ++--
4 files changed, 23 insertions(+), 5 deletions(-)
diff --git a/rsf-admin/src/page/orders/asnOrder/AsnOrderItemList.jsx b/rsf-admin/src/page/orders/asnOrder/AsnOrderItemList.jsx
index 8668d96..c9bbd3b 100644
--- a/rsf-admin/src/page/orders/asnOrder/AsnOrderItemList.jsx
+++ b/rsf-admin/src/page/orders/asnOrder/AsnOrderItemList.jsx
@@ -199,4 +199,14 @@
}
AsnOrderItemList.Context = React.createContext()
+
+const DynamicFields = async () => {
+ const {
+ data: { code, data, msg },
+ } = await request.get("/fields/enable/list");
+}
+
+
+
+
export default AsnOrderItemList;
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/api/entity/dto/ReceiptDetlsDto.java b/rsf-server/src/main/java/com/vincent/rsf/server/api/entity/dto/ReceiptDetlsDto.java
index c540374..b1c5ce6 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/api/entity/dto/ReceiptDetlsDto.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/api/entity/dto/ReceiptDetlsDto.java
@@ -14,6 +14,7 @@
import java.io.Serializable;
import java.util.Date;
+import java.util.List;
import java.util.Map;
/**
@@ -97,9 +98,8 @@
@ApiModelProperty("琛屽彿")
private String platItemId;
-
@ApiModelProperty("鎵╁睍瀛楁")
- private Map<String, Object> extendFields;
+ private List<Map<String, Object>> extendFields;
}
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/MobileServiceImpl.java b/rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/MobileServiceImpl.java
index a95800c..b6844d9 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/MobileServiceImpl.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/MobileServiceImpl.java
@@ -271,9 +271,17 @@
if (!Objects.isNull(rcpt)) {
try {
if (Objects.isNull(rcpt.get("fieldsindex")) || StringUtils.isBlank(rcpt.get("fieldsindex").toString())) {
+ StringBuffer sb = new StringBuffer();
+ if (!dto.getExtendFields().isEmpty()) {
+ dto.getExtendFields().forEach(field -> {
+ field.keySet().forEach(key -> {
+ sb.append(field.get(key));
+ });
+ });
+ }
+ sb.append(dto.getAsnCode() + dto.getMatnr());
//鑾峰彇16浣島uid
-// String uuid16 = Cools.md5(dto.getBarcode());
- String uuid16 = Cools.md5(dto.getMatnr() + dto.getSplrBatch());
+ String uuid16 = Cools.md5Chinese(sb.toString());
rcpt.put("index", uuid16);
orderItem.setFieldsIndex(uuid16);
}
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/common/utils/FieldsUtils.java b/rsf-server/src/main/java/com/vincent/rsf/server/common/utils/FieldsUtils.java
index 672771e..46490ab 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/common/utils/FieldsUtils.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/common/utils/FieldsUtils.java
@@ -140,7 +140,7 @@
* @time 2025/4/7 15:28
*/
@Transactional(rollbackFor = Exception.class)
- public synchronized static void updateFieldsValue(Map<String, Object> params) throws Exception {
+ public static synchronized void updateFieldsValue(Map<String, Object> params) throws Exception {
List<Fields> fields = getFieldsSta();
if (fields.isEmpty()) { return; }
Object fieldsIndex = params.get("fieldsIndex");
--
Gitblit v1.9.1