Merge branch 'devlop' of http://47.97.1.152:5880/r/wms-master into devlop

skyouc

2025-04-17 b30e2878e41607fb7fb8168e3b5b61948d7c359a

 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);
                }