|
|
|
@ -33,7 +33,6 @@ import org.springframework.web.bind.annotation.RestController;
|
|
|
|
|
import javax.annotation.Resource;
|
|
|
|
|
import javax.validation.Valid;
|
|
|
|
|
import java.util.*;
|
|
|
|
|
import java.util.stream.Collectors;
|
|
|
|
|
|
|
|
|
|
@RestController
|
|
|
|
|
public class InvWarehouseController extends BaseController {
|
|
|
|
@ -273,6 +272,13 @@ public class InvWarehouseController extends BaseController {
|
|
|
|
|
if (userCount > 0) {
|
|
|
|
|
return ResultVOUtils.error(500, "修改失败,请先移除该仓库关联用户!");
|
|
|
|
|
}
|
|
|
|
|
// 先判断是否有相同名字的仓库
|
|
|
|
|
boolean checkResult = invWarehouseService.checkDuplicateName(invWarehouseEntity.getParentId(), invWarehouseEntity.getName());
|
|
|
|
|
if (checkResult) {
|
|
|
|
|
return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, "仓库名称重复!");
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
//更新仓库信息
|
|
|
|
|
invWarehouseEntity.setUpdateTime(new Date());
|
|
|
|
|