From bcd9cb83cbbb36217cb99ced7bf1fa3cb26bd53c Mon Sep 17 00:00:00 2001
From: zjj <3272660260@qq.com>
Date: 星期一, 28 四月 2025 16:59:51 +0800
Subject: [PATCH] #wms端生成任务优化

---
 rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/MatnrServiceImpl.java |   23 +++++++----------------
 1 files changed, 7 insertions(+), 16 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 fd66a2d..6c5fa1b 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
@@ -86,11 +86,13 @@
             }
             //鑾峰彇鍔ㄦ�佸瓧娈碉紝骞朵繚瀛樻槑缁嗗唴瀹�
             if (!FieldsUtils.getFieldsSta().isEmpty()) {
-                String uuid = CommonUtil.randomUUID16();
-                matnr.setFieldsIndex(uuid);
                 //淇濆瓨鐗╂枡鎵╁睍灞炴�у��
                 try {
-                    FieldsUtils.saveFields(template, uuid);
+                    String uuid = CommonUtil.randomUUID16();
+                    boolean b = FieldsUtils.saveFields(template, uuid);
+                    if (b) {
+                        matnr.setFieldsIndex(uuid);
+                    }
                 } catch (Exception e) {
                     throw new RuntimeException(e);
                 }
@@ -117,17 +119,6 @@
                 }
             }
         }
-//        IPage<Map<String, Object>> reulst = this.baseMapper.selectMatnrs(pageParam, queryWrapper);
-//        /**鑾峰彇鐗╂枡鍒嗛〉淇℃伅 */
-//        List<Map<String, Object>> mapList = reulst.getRecords();
-//        if (!mapList.isEmpty()) {
-//            mapList.forEach(map -> {
-//                if (!Objects.isNull(map.get("fieldsIndex"))) {
-//                   FieldsUtils.mergeFields(map, map.get("fieldsIndex").toString());
-//                }
-//            });
-//        }
-
         /**鎷兼帴鎵╁睍瀛楁*/
         PageParam<Matnr, BaseParam> page = this.page(pageParam, queryWrapper);
         List<Matnr> records = page.getRecords();
@@ -237,9 +228,9 @@
          */
         String uuid16 = CommonUtil.randomUUID16();
         if (!FieldsUtils.getFieldsSta().isEmpty()) {
-            Map<String, ?> extendFields = (Map<String, ?>) matnr.get("extendFields");
+//            Map<String, ?> extendFields = (Map<String, ?>) matnr.get("extendFields");
             try {
-                FieldsUtils.saveFields(extendFields, uuid16);
+                FieldsUtils.saveFields(matnr, uuid16);
                 matnr1.setFieldsIndex(uuid16);
             } catch (Exception ex) {
                 log.error(ex.toString());

--
Gitblit v1.9.1