完善

cp

2025-01-04 8bfe3cdd48ca3f47d054deb5aebc48154ffb4c88

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

@@ -48,13 +48,10 @@

    @RequestMapping(value = "/locDetl/forlocNo/auth/v1")
    @ManagerAuth
    public R forlocNoV1(@RequestParam String locNo,@RequestParam String matnr) {
    public R forlocNoV1(@RequestParam String locNo) {
        LambdaQueryWrapper<LocDetl> locDetlLambdaQueryWrapper = new LambdaQueryWrapper<LocDetl>()
                .eq(LocDetl::getLocNo, locNo)
                .eq(LocDetl::getHostId, getHostId());
        if (!Cools.isEmpty(matnr)) {
            locDetlLambdaQueryWrapper.eq(LocDetl::getMatnr, matnr);
        }
        List<LocDetl> detls = locDetlService.list(locDetlLambdaQueryWrapper);
        if (Cools.isEmpty(detls)){
            return R.error("未查询到库存数据");
@@ -69,9 +66,9 @@
                .eq(LocDetl::getLocNo, locNo)
                .eq(LocDetl::getHostId, getHostId())
                .eq(LocDetl::getMatnr, matnr);
        if (!Cools.isEmpty(batch)){
            locDetlLambdaQueryWrapper.eq(LocDetl::getBatch,batch);
        }
//        if (!Cools.isEmpty(batch)){
//            locDetlLambdaQueryWrapper.eq(LocDetl::getBatch,batch);
//        }
        List<LocDetl> detls = locDetlService.list(locDetlLambdaQueryWrapper);
        if (Cools.isEmpty(detls)){
            return R.error("未查询到库存数据");
@@ -109,7 +106,14 @@
//                    .where("loc_no like '" +row +"%'");
//        }
        List<LocDetl> list = locDetlService.list(wrapper);
        return R.ok(exportSupport(list, fields));
        List<LocDetl> locDetls=new ArrayList<>();
        for (LocDetl l:list
             ) {
            String new_String = l.getMatnr().replace("\"","");
            l.setMatnr(new_String);
            locDetls.add(l);
        }
        return R.ok(exportSupport(locDetls, fields));
    }

    private <T> void convert(Map<String, Object> map, QueryWrapper<T> wrapper){