From 34150a16ef56b933c59838da129d5b35b9dc09d8 Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期三, 26 三月 2025 13:29:21 +0800
Subject: [PATCH] 添加仓库,库区树状接口

---
 rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/MatnrServiceImpl.java |   18 +++++++++++++++---
 1 files changed, 15 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..e2ffec0 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
@@ -4,6 +4,7 @@
 import cn.afterturn.easypoi.excel.entity.result.ExcelImportResult;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.vincent.rsf.framework.common.R;
@@ -87,7 +88,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);
         });
@@ -100,6 +105,7 @@
 
     @Override
     public PageParam<Matnr, BaseParam> getMatnrPage(PageParam<Matnr, BaseParam> pageParam) {
+        QueryWrapper<Matnr> queryWrapper = pageParam.buildWrapper(true);
         IPage<Map<String, Object>> reulst = this.baseMapper.selectMatnrs(pageParam, pageParam.buildWrapper(true));
         /**鑾峰彇鐗╂枡鍒嗛〉淇℃伅 */
         List<Map<String, Object>> mapList = reulst.getRecords();
@@ -212,8 +218,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