展示库存明细

chen.lin

1 天以前 bb7dd1f513149ecd2887895c807861fdd06a43f6

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

@@ -5,7 +5,6 @@
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.vincent.rsf.framework.common.Cools;
import com.vincent.rsf.framework.common.R;
import com.vincent.rsf.server.api.utils.LocUtils;
import com.vincent.rsf.server.common.constant.Constants;
import com.vincent.rsf.server.common.utils.ExcelUtil;
import com.vincent.rsf.server.common.annotation.OperationLog;
@@ -14,7 +13,10 @@
import com.vincent.rsf.server.common.domain.PageParam;
import com.vincent.rsf.server.common.utils.FieldsUtils;
import com.vincent.rsf.server.manager.controller.params.LocToTaskParams;
import com.vincent.rsf.server.manager.entity.Loc;
import com.vincent.rsf.server.manager.entity.LocItem;
import com.vincent.rsf.server.manager.entity.ViewStockManage;
import com.vincent.rsf.server.manager.enums.TaskResouceType;
import com.vincent.rsf.server.manager.service.LocItemService;
import com.vincent.rsf.server.manager.service.LocService;
import com.vincent.rsf.server.system.controller.BaseController;
@@ -41,13 +43,24 @@
        BaseParam baseParam = buildParam(map, BaseParam.class);
        PageParam<LocItem, BaseParam> pageParam = new PageParam<>(baseParam, LocItem.class);

        QueryWrapper<LocItem> wrapper = pageParam.buildWrapper(true);
        FieldsUtils.setFieldsFilters(wrapper, pageParam, LocItem.class);

        /**拼接扩展字段*/
        PageParam<LocItem, BaseParam> page = locItemService.page(pageParam, pageParam.buildWrapper(true));
        PageParam<LocItem, BaseParam> page = locItemService.page(pageParam, wrapper);
        List<LocItem> records = page.getRecords();
        for (LocItem record : records) {
            if (!Objects.isNull(record.getFieldsIndex())) {
                Map<String, String> fields = FieldsUtils.getFields(record.getFieldsIndex());
                record.setExtendFields(fields);
            }
            // 填充库位状态，便于列表展示
            if (record.getLocId() != null) {
                Loc loc = locService.getById(record.getLocId());
                if (loc != null) {
                    record.setLocUseStatus(loc.getUseStatus());
                    record.setLocUseStatus$(loc.getUseStatus$());
                }
            }
        }
        page.setRecords(records);
@@ -77,6 +90,13 @@
                Map<String, String> fields = FieldsUtils.getFields(record.getFieldsIndex());
                record.setExtendFields(fields);
            }
            if (record.getLocId() != null) {
                Loc loc = locService.getById(record.getLocId());
                if (loc != null) {
                    record.setLocUseStatus(loc.getUseStatus());
                    record.setLocUseStatus$(loc.getUseStatus$());
                }
            }
        }
        page.setRecords(records);

@@ -98,7 +118,7 @@
        param.setType(Constants.TASK_TYPE_OUT_STOCK);

        try {
            locItemService.generateTask(param, getLoginUserId());
            locItemService.generateTask(TaskResouceType.TASK_RESOUCE_STOCK_TYPE.val, param, getLoginUserId());
        } catch (Exception e) {
            throw new RuntimeException(e);
        }
@@ -136,7 +156,7 @@
        map.setType(Constants.TASK_TYPE_OUT_CHECK);

        try {
            locItemService.generateTask(map, getLoginUserId());
            locItemService.generateTask(TaskResouceType.TASK_RESOUCE_CHECK_TYPE.val, map, getLoginUserId());
        } catch (Exception e) {
            throw new RuntimeException(e);
        }
@@ -160,7 +180,7 @@
    @PreAuthorize("hasAuthority('manager:locItem:list')")
    @GetMapping("/locItem/{id}")
    public R get(@PathVariable("id") Long id) {
        return R.ok().add(locService.getById(id));
        return R.ok().add(locItemService.getById(id));
    }

    @PreAuthorize("hasAuthority('manager:locItem:save')")