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/api/service/impl/MobileServiceImpl.java | 18 ++++++++++++++----
1 files changed, 14 insertions(+), 4 deletions(-)
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 c12c7c4..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);
}
@@ -434,7 +442,9 @@
*/
@Override
public List<Fields> getDynamicFields() {
- return fieldsMapper.selectList(new LambdaQueryWrapper<Fields>().eq(Fields::getFlagEnable, 1).eq(Fields::getStatus, 1));
+ return fieldsMapper.selectList(new LambdaQueryWrapper<Fields>()
+ .eq(Fields::getFlagEnable, 1)
+ .eq(Fields::getStatus, 1).orderByAsc(Fields::getId));
}
/**
@@ -878,7 +888,7 @@
.eq(WaitPakin::getBarcode, params.get("barcode").toString())
.eq(WaitPakin::getIoStatus, PakinIOStatus.PAKIN_IO_STATUS_DONE.val));
if (Objects.isNull(waitPakin)) {
- return R.ok(new ArrayList<>());
+ return R.error("鏈壘鍒拌瀹瑰櫒鐮佺殑缁勬墭鏄庣粏锛岃妫�鏌ョ粍鎵樼姸鎬�");
}
List<WaitPakinItem> pakinItems = waitPakinItemService.list(new LambdaQueryWrapper<WaitPakinItem>()
.eq(WaitPakinItem::getPakinId, waitPakin.getId()));
--
Gitblit v1.9.1