From 23e5035547b997430a8a3e71cee44782011664dc Mon Sep 17 00:00:00 2001
From: verou <857149855@qq.com>
Date: 星期三, 26 三月 2025 09:50:26 +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/manager/service/impl/MatnrServiceImpl.java |   16 +++++++++++++---
 1 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/MatnrServiceImpl.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/MatnrServiceImpl.java
index f8d44ba..373d76a 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/MatnrServiceImpl.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/MatnrServiceImpl.java
@@ -87,7 +87,11 @@
                 String uuid = CommonUtil.randomUUID16();
                 matnr.setFieldsIndex(uuid);
                 //淇濆瓨鐗╂枡鎵╁睍灞炴�у��
-                FieldsUtils.saveFields(template, uuid);
+                try {
+                    FieldsUtils.saveFields(template, uuid);
+                } catch (Exception e) {
+                    throw new RuntimeException(e);
+                }
             }
             matnrs.add(matnr);
         });
@@ -212,8 +216,14 @@
          */
         String uuid16 = CommonUtil.randomUUID16();
         if (!FieldsUtils.getFieldsSta().isEmpty()) {
-            FieldsUtils.saveFields(matnr, uuid16);
-            matnr1.setFieldsIndex(uuid16);
+            Map<String, ?> extendFields = (Map<String, ?>) matnr.get("extendFields");
+            try {
+                FieldsUtils.saveFields(extendFields, uuid16);
+                matnr1.setFieldsIndex(uuid16);
+            } catch (Exception ex) {
+                log.error(ex.toString());
+                throw new CoolException("鍔ㄦ�佸瓧娈典繚瀛樺け璐�");
+            }
         }
         if (!this.saveOrUpdate(matnr1)) {
             return R.error("Save Fail");

--
Gitblit v1.9.1