#

Junjie

2024-09-20 053e6028bd20e599aea103401137816c6296a9ef

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

@@ -3,11 +3,14 @@
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.parser.Feature;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
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.*;
import com.zy.asrs.wms.asrs.entity.enums.LocStsType;
import com.zy.asrs.wms.asrs.service.LocDetlFieldService;
import com.zy.asrs.wms.asrs.service.LocService;
import com.zy.asrs.wms.asrs.service.MatFieldService;
import com.zy.asrs.wms.common.annotation.OperationLog;
import com.zy.asrs.wms.common.domain.BaseParam;
@@ -28,6 +31,8 @@
public class LocDetlController extends BaseController {

    @Autowired
    private LocService locService;
    @Autowired
    private LocDetlService locDetlService;
    @Autowired
    private MatFieldService matFieldService;
@@ -37,22 +42,25 @@
    @PreAuthorize("hasAuthority('asrs:locDetl:list')")
    @PostMapping("/locDetl/page")
    public R page(@RequestBody Map<String, Object> map) {
//        BaseParam baseParam = buildParam(map, BaseParam.class);
//        PageParam<LocDetl, BaseParam> pageParam = new PageParam<>(baseParam, LocDetl.class);
//
//        PageParam<LocDetl, BaseParam> page = locDetlService.page(pageParam, pageParam.buildWrapper(true));
//        JSONObject data = JSON.parseObject(JSON.toJSONString(page));
//
//        List<LocDetl> records = page.getRecords();
//        data.put("records", records);
//        for (LocDetl locDetl : records) {
//            List<LocDetlField> list = locDetlFieldService.list(new LambdaQueryWrapper<LocDetlField>().eq(LocDetlField::getDetlId, locDetl.getId()));
//            locDetl.syncField(list);
//        }

        BaseParam baseParam = buildParam(map, BaseParam.class);
        PageParam<ViewLocDetl, BaseParam> pageParam = new PageParam<>(baseParam, ViewLocDetl.class);
        PageParam<ViewLocDetl, BaseParam> data = locDetlService.getPage(pageParam, pageParam.buildWrapper(true));
        return R.ok().add(data);
    }

    @PreAuthorize("hasAuthority('asrs:locDetl:list')")
    @PostMapping("/locDetl/outPage")
    public R outPage(@RequestBody Map<String, Object> map) {
        BaseParam baseParam = buildParam(map, BaseParam.class);
        PageParam<ViewLocDetl, BaseParam> pageParam = new PageParam<>(baseParam, ViewLocDetl.class);

        QueryWrapper<ViewLocDetl> queryWrapper = pageParam.buildWrapper(true);
        List<Long> locIds = locService.listBySts(LocStsType.F.val());
        if (locIds.isEmpty()) {
            locIds.add(-1L);
        }
        queryWrapper.in("loc_id", locIds);
        PageParam<ViewLocDetl, BaseParam> data = locDetlService.getPage(pageParam, queryWrapper);
        return R.ok().add(data);
    }

@@ -64,9 +72,29 @@
    }

    @PreAuthorize("hasAuthority('asrs:locDetl:list')")
    @PostMapping("/locDetl/listByIds")
    public R listByIds(@RequestBody List<Long> ids) {
        List<LocDetl> list = locDetlService.listByIds(ids);
        List<LocDetl> locDetls = locDetlService.parseLocDetl(list);
        return R.ok().add(locDetls);
    }

    @PreAuthorize("hasAuthority('asrs:locDetl:list')")
    @GetMapping("/locDetl/locId/{locId}")
    public R list(@PathVariable("locId") Long locId) {
        List<LocDetl> list = locDetlService.list(new LambdaQueryWrapper<LocDetl>().eq(LocDetl::getLocId, locId));
        List<LocDetl> locDetls = locDetlService.parseLocDetl(list);
        return R.ok().add(locDetls);
    }

    @PreAuthorize("hasAuthority('asrs:locDetl:list')")
    @GetMapping("/locDetl/locNo/{locNo}")
    public R list(@PathVariable("locNo") String locNo) {
        Loc loc = locService.getOne(new LambdaQueryWrapper<Loc>().eq(Loc::getLocNo, locNo));
        if (loc == null) {
            return R.error("库位不存在");
        }
        List<LocDetl> list = locDetlService.list(new LambdaQueryWrapper<LocDetl>().eq(LocDetl::getLocId, loc.getId()));
        List<LocDetl> locDetls = locDetlService.parseLocDetl(list);
        return R.ok().add(locDetls);
    }
@@ -102,7 +130,6 @@
            locDetlField.setName(matField.getName());
            locDetlFieldService.save(locDetlField);
        }

        return R.ok("添加成功");
    }