From 8e622d6a1d07937cd654364748b52e15a50c67d8 Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期三, 14 五月 2025 09:14:43 +0800
Subject: [PATCH] Merge branch 'devlop' of http://47.97.1.152:5880/r/wms-master into devlop
---
rsf-server/src/main/java/com/vincent/rsf/server/common/utils/FieldsUtils.java | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
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 6469f3d..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
@@ -107,7 +107,7 @@
FieldsItem item = new FieldsItem();
item.setUuid(uuid)
.setValue(template.get(obj.getFields()).toString())
- .setMatnrId(Long.parseLong(template.get("matnrId").toString()))
+ .setMatnrId(!Objects.isNull(template.get("matnrId")) ? Long.parseLong(template.get("matnrId").toString()) : null)
.setFieldsId(obj.getId());
fieldsItems.add(item);
}
@@ -140,7 +140,7 @@
* @time 2025/4/7 15:28
*/
@Transactional(rollbackFor = Exception.class)
- public 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");
@@ -157,7 +157,7 @@
FieldsItem item = new FieldsItem();
item.setUuid(index)
.setFieldsId(field.getId())
- .setMatnrId(Long.parseLong(params.get("matnrId").toString()))
+ .setMatnrId(!Objects.isNull(params.get("matnrId")) ? Long.parseLong(params.get("matnrId").toString()) : null)
.setValue(params.get(field.getFields()).toString());
if (!fieldsItemService.save(item)) {
throw new CoolException("鎵╁睍瀛楁淇敼澶辫触锛侊紒");
--
Gitblit v1.9.1