#

Junjie

2024-12-03 ab7b52a8884bb033e187331a437f3c9e31585a04

 zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/controller/LocController.java

@@ -4,6 +4,9 @@
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.zy.asrs.framework.common.Cools;
import com.zy.asrs.framework.common.R;
import com.zy.asrs.wms.asrs.entity.LocDetl;
import com.zy.asrs.wms.asrs.entity.enums.LocStsType;
import com.zy.asrs.wms.asrs.service.LocDetlService;
import com.zy.asrs.wms.common.annotation.OperationLog;
import com.zy.asrs.wms.common.domain.BaseParam;
import com.zy.asrs.wms.common.domain.KeyValVo;
@@ -17,10 +20,7 @@
import org.springframework.web.bind.annotation.*;

import javax.servlet.http.HttpServletResponse;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
import java.util.Map;
import java.util.*;

@RestController
@RequestMapping("/api")
@@ -28,6 +28,8 @@

    @Autowired
    private LocService locService;
    @Autowired
    private LocDetlService locDetlService;

    @PreAuthorize("hasAuthority('asrs:loc:list')")
    @PostMapping("/loc/page")
@@ -49,6 +51,43 @@
        return R.ok().add(locService.getById(id));
    }

    @PreAuthorize("hasAuthority('asrs:loc:list')")
    @PostMapping("/loc/search/locNo")
    public R get(@RequestParam("locNo") String locNo) {
        Loc loc = locService.getOne(new LambdaQueryWrapper<Loc>().eq(Loc::getLocNo, locNo));
        if(loc == null) {
            return R.error("库位不存在");
        }
        List<LocDetl> locDetls = locDetlService.list(new LambdaQueryWrapper<LocDetl>().eq(LocDetl::getLocId, loc.getId()));
        locDetls = locDetlService.parseLocDetl(locDetls);

        HashMap<String, Object> map = new HashMap<>();
        map.put("loc", loc);
        map.put("locDetls", locDetls);
        return R.ok().add(map);
    }

    @PreAuthorize("hasAuthority('asrs:loc:list')")
    @PostMapping("/loc/search/like/locNo")
    public R search(@RequestParam("locNo") String locNo) {
        if (Cools.isEmpty(locNo)) {
            return R.ok().add(new ArrayList<>());
        }
        List<LocDetl> locDetls = locDetlService.list(new LambdaQueryWrapper<LocDetl>().like(LocDetl::getLocNo, locNo));
        locDetls = locDetlService.parseLocDetl(locDetls);
        return R.ok().add(locDetls);
    }

    @PreAuthorize("hasAuthority('asrs:loc:list')")
    @PostMapping("/loc/search/empty/locNo")
    public R searchEmpty(@RequestParam("locNo") String locNo) {
        if (Cools.isEmpty(locNo)) {
            return R.ok().add(locService.list(new LambdaQueryWrapper<Loc>().eq(Loc::getLocStsId, LocStsType.O.val())));
        }
        List<Loc> list = locService.list(new LambdaQueryWrapper<Loc>().eq(Loc::getLocStsId, LocStsType.O.val()).like(Loc::getLocNo, locNo));
        return R.ok().add(list);
    }

    @PreAuthorize("hasAuthority('asrs:loc:save')")
    @OperationLog("添加库位")
    @PostMapping("/loc/save")