From 815f8cf710a592c7b92942f4b80193c0a91c41b0 Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期一, 24 三月 2025 08:14:57 +0800
Subject: [PATCH] 物料关系字段显示修复
---
rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/LocAreaMatRela.java | 8 ++++----
rsf-server/src/main/resources/application-dev.yml | 8 ++++----
2 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/LocAreaMatRela.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/LocAreaMatRela.java
index e7363d0..e086af8 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/LocAreaMatRela.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/LocAreaMatRela.java
@@ -165,7 +165,7 @@
WarehouseAreasService service = SpringUtils.getBean(WarehouseAreasService.class);
WarehouseAreas warehouseAreas = service.getById(this.areaId);
if (!Cools.isEmpty(warehouseAreas)){
- return String.valueOf(warehouseAreas.getCode());
+ return String.valueOf(warehouseAreas.getName());
}
return null;
}
@@ -174,7 +174,7 @@
MatnrService service = SpringUtils.getBean(MatnrService.class);
Matnr matnr = service.getById(this.matnrId);
if (!Cools.isEmpty(matnr)){
- return String.valueOf(matnr.getUnit());
+ return String.valueOf(matnr.getName());
}
return null;
}
@@ -183,7 +183,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;
}
@@ -201,7 +201,7 @@
LocService service = SpringUtils.getBean(LocService.class);
Loc loc = service.getById(this.locId);
if (!Cools.isEmpty(loc)){
- return String.valueOf(loc.getWarehouseId());
+ return String.valueOf(loc.getCode());
}
return null;
}
diff --git a/rsf-server/src/main/resources/application-dev.yml b/rsf-server/src/main/resources/application-dev.yml
index 3f84f94..ce13aca 100644
--- a/rsf-server/src/main/resources/application-dev.yml
+++ b/rsf-server/src/main/resources/application-dev.yml
@@ -12,10 +12,10 @@
matching-strategy: ANT_PATH_MATCHER
datasource:
driver-class-name: com.mysql.jdbc.Driver
- url: jdbc:mysql://192.168.4.24:3306/rsf?useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai
- username: root
-# url: jdbc:mysql://47.76.147.249:3306/rsf?useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai
-# username: rsf
+# url: jdbc:mysql://192.168.4.24:3306/rsf?useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai
+# username: root
+ url: jdbc:mysql://47.76.147.249:3306/rsf?useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai
+ username: rsf
password: 34821015
type: com.alibaba.druid.pool.DruidDataSource
druid:
--
Gitblit v1.9.1