skyouc
2025-03-24 7232279f6e73cc0e9a851da14b0a30131503f601
修改
获取物料分组, 库位类型列表报错问题修复
3个文件已修改
12 ■■■■ 已修改文件
rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/LocAreaMatRelaController.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/LocAreaMatRelaServiceImpl.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
rsf-server/src/main/resources/application-dev.yml 8 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/LocAreaMatRelaController.java
@@ -109,7 +109,7 @@
        if (Objects.isNull(param)) {
            throw new CoolException("参数不能为空!!!");
        }
        if (!StringUtils.isBlank(param.get("locTypeId").toString())) {
        if (!StringUtils.isBlank(param.get("typeId").toString())) {
            throw new CoolException("库位类型不能为空!!");
        }
        if (!StringUtils.isBlank(param.get("areaMatId").toString())) {
rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/LocAreaMatRelaServiceImpl.java
@@ -154,7 +154,7 @@
        }
        if (!this.remove(new LambdaQueryWrapper<LocAreaMatRela>()
                        .eq(LocAreaMatRela::getAreaMatId, Long.parseLong(param.get("areaMatId").toString()))
                .eq(LocAreaMatRela::getLocTypeId, Long.parseLong(param.get("locTypeId").toString())))) {
                .eq(LocAreaMatRela::getLocTypeId, Long.parseLong(param.get("typeId").toString())))) {
            throw new CoolException("删除失败!!");
        }
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: