From adae16c35c9da4181647b9d815f7a6c9c6431ee8 Mon Sep 17 00:00:00 2001
From: ZY <zc857179121@qq.com>
Date: 星期三, 25 九月 2024 15:02:17 +0800
Subject: [PATCH] linux证书兼容
---
zy-asrs-wms/src/main/java/com/zy/asrs/wms/utils/Utils.java | 18 +++++++++++++++---
1 files changed, 15 insertions(+), 3 deletions(-)
diff --git a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/utils/Utils.java b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/utils/Utils.java
index 998116d..5d947dd 100644
--- a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/utils/Utils.java
+++ b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/utils/Utils.java
@@ -19,14 +19,26 @@
public static final String _LINK = "-";
- public static final String _KEY_LINK = "_";
-
public static String getMatUniqueKey(String matnr, String batch, List<FieldParam> params) {
MatUniqueObjDto dto = new MatUniqueObjDto();
dto.setMatnr(matnr);
dto.setBatch(batch);
- dto.setParams(params);
+ ArrayList<FieldParam> list = new ArrayList<>();
+ for (FieldParam param : params) {
+ FieldParam fieldParam = new FieldParam();
+ list.add(fieldParam);
+
+ String value = "";
+ if (!Cools.isEmpty(param.getValue())) {
+ value = param.getValue().toString();
+ }
+
+ fieldParam.setName(param.getName());
+ fieldParam.setType(param.getType());
+ fieldParam.setValue(value);
+ }
+ dto.setParams(list);
String encode = Base64.getEncoder().encodeToString(JSON.toJSONString(dto).getBytes());
return encode;
}
--
Gitblit v1.9.1