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

verou

2025-03-26 669072c5f71421f937cd46a1cc8f4b838953e895

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

 rsf-server/src/main/java/com/vincent/rsf/server/common/config/MybatisPlusConfig.java

@@ -47,7 +47,8 @@
                        "sys_host",
                        "sys_user_role",
                        "sys_role_menu",
                        "sys_menu"
                        "sys_menu",
                        "man_loc_type_rela"
                ).contains(tableName);
            }
        };

 rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/LocServiceImpl.java

@@ -108,9 +108,21 @@
                }
            }
        }

        if (!this.saveBatch(list)) {
            throw new CoolException("库位初始化失败！！");
        }
        List<LocTypeRela> locTypeRelas = new ArrayList<>();
        for (Long typeId : param.getTypeIds()) {
            for (Loc loc : list) {
                LocTypeRela typeRela = new LocTypeRela();
                typeRela.setLocId(loc.getId()).setTypeId(typeId);
                locTypeRelas.add(typeRela);
            }
        }
        if (!locTypeRelaService.saveBatch(locTypeRelas)) {
            throw new CoolException("库位类型关联失败！！");
        }
        return R.ok("初始化成功！！");
    }