skyouc
2025-03-24 815f8cf710a592c7b92942f4b80193c0a91c41b0
物料关系字段显示修复
2个文件已修改
16 ■■■■ 已修改文件
rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/LocAreaMatRela.java 8 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
rsf-server/src/main/resources/application-dev.yml 8 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
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;
    }
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: