Merge branch 'springboot3.5_cs' into spring3.5

zhou zhou

1 天以前 1724f77c35022b643c28dd3e5547679a5edc2d49

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

@@ -21,7 +21,7 @@
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.web.bind.annotation.*;

import javax.servlet.http.HttpServletResponse;
import jakarta.servlet.http.HttpServletResponse;
import java.util.*;

@Api(tags = "库区物料关系绑定")
@@ -183,12 +183,12 @@
        if (Objects.isNull(param)) {
            throw new CoolException("参数不能为空！！");
        }
        if (Objects.isNull(param.getAreaId())) {
            throw new CoolException("库区不能为空！！");
        }
        if (Objects.isNull(param.getWarehouseId())) {
            throw new CoolException("仓库不能为空！！");
        }
//        if (Objects.isNull(param.getAreaId())) {
//            throw new CoolException("库区不能为空！！");
//        }
//        if (Objects.isNull(param.getWarehouseId())) {
//            throw new CoolException("仓库不能为空！！");
//        }
        if (Objects.isNull(param.getAreaMatId())) {
            throw new CoolException("主单ID不能为空！！");
        }