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

skyouc

2025-03-25 eb8ded2565e746a360985f702c556b26f750d35a

 rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/LocController.java

@@ -100,11 +100,12 @@
        loc.setUpdateBy(getLoginUserId());
        String join = StringUtils.join(loc.getTypeIds(), ",");
        loc.setType(join);

        if (Objects.isNull(loc.getTypeIds())) {
            throw new CoolException("库位类型不能为空！！");
        }
        if (!locService.updateById(loc)) {
            return R.error("Update Fail");
        }

        if (!locService.updateLoc(loc)) {
            throw new CoolException("库位类型关联关系修改失败!@！");
        }