From a11e93f691f128763fa3c441f0936abec7a9655e Mon Sep 17 00:00:00 2001
From: verou <857149855@qq.com>
Date: 星期五, 11 四月 2025 16:38:47 +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/entity/Matnr.java | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/Matnr.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/Matnr.java
index 02bf4be..3978f0c 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/Matnr.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/Matnr.java
@@ -360,7 +360,7 @@
MatnrGroupService service = SpringUtils.getBean(MatnrGroupService.class);
MatnrGroup matnrGroup = service.getById(this.groupId);
if (!Cools.isEmpty(matnrGroup)){
- return String.valueOf(matnrGroup.getCode());
+ return String.valueOf(matnrGroup.getName());
}
return null;
}
@@ -388,7 +388,7 @@
}
}
- public String getIsLabelMange$(){
+ public String getFlagLabelMange$(){
if (null == this.flagLabelMange){ return null; }
switch (this.flagLabelMange){
case 0:
--
Gitblit v1.9.1