动态字段显示问题修复

skyouc

7 天以前 db475501a4073d48f2fd804ca6428b0f86fe6332

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

@@ -10,6 +10,8 @@
import com.vincent.rsf.server.common.domain.BaseParam;
import com.vincent.rsf.server.common.domain.KeyValVo;
import com.vincent.rsf.server.common.domain.PageParam;
import com.vincent.rsf.server.common.utils.FieldsUtils;
import com.vincent.rsf.server.manager.entity.AsnOrderItem;
import com.vincent.rsf.server.manager.entity.WarehouseAreasItem;
import com.vincent.rsf.server.manager.service.WarehouseAreasItemService;
import com.vincent.rsf.server.system.controller.BaseController;
@@ -34,13 +36,17 @@
        BaseParam baseParam = buildParam(map, BaseParam.class);
        PageParam<WarehouseAreasItem, BaseParam> pageParam = new PageParam<>(baseParam, WarehouseAreasItem.class);
        QueryWrapper<WarehouseAreasItem> queryWrapper = pageParam.buildWrapper(true);
        queryWrapper.select( "id","area_id","area_name","asn_id","plat_item_id","po_code",
                "asn_code",   "asn_item_id","matnr_id","maktx","matnr_code","fields_index","track_code",
                "SUM(anfme) anfme","SUM(work_qty) work_qty","ispt_result","SUM(qty) qty",   "splr_batch","batch","unit","stock_unit",
                "brand","shipper_id","splr_id","weight","prod_time","`status`",   "create_by",
                "create_time","update_by","update_time","memo");
        queryWrapper.groupBy("matnr_code", "splr_batch", "track_code");
        return R.ok().add(warehouseAreasItemService.page(pageParam, queryWrapper));
        /**拼接扩展字段*/
        PageParam<WarehouseAreasItem, BaseParam> page = warehouseAreasItemService.page(pageParam, queryWrapper);
        List<WarehouseAreasItem> records = page.getRecords();
        for (WarehouseAreasItem record : records) {
            if (!Objects.isNull(record.getFieldsIndex())) {
                Map<String, String> fields = FieldsUtils.getFields(record.getFieldsIndex());
                record.setExtendFields(fields);
            }
        }
        page.setRecords(records);
        return R.ok().add(page);
    }

    @PreAuthorize("hasAuthority('manager:warehouseAreasItem:list')")