no message

yangyang

2025-07-14 06c4e59fa35c1b9e74da9cf3d081e78c13d17e20

 zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/service/impl/LocDetlServiceImpl.java

@@ -26,6 +26,7 @@
import org.springframework.transaction.annotation.Transactional;



import java.util.*;

import java.util.stream.Collectors;



@Service("locDetlService")

public class LocDetlServiceImpl extends ServiceImpl<LocDetlMapper, LocDetl> implements LocDetlService {

@@ -42,15 +43,14 @@
    @Override

    public PageParam<ViewLocDetl, BaseParam> getPage(PageParam<ViewLocDetl, BaseParam> pageParam, QueryWrapper<ViewLocDetl> buildWrapper) {

        PageParam<ViewLocDetl, BaseParam> result = viewLocDetlMapper.selectPage(pageParam, buildWrapper);



        //解析动态字段

        JSONObject data = JSON.parseObject(JSON.toJSONString(result));

        List<ViewLocDetl> records = result.getRecords();

        data.put("records", records);

        for (ViewLocDetl locDetl : records) {

            Map<String, Object> resultMap = viewLocDetlMapper.getById(locDetl.getId());

            locDetl.syncFieldMap(resultMap);

        }

//        JSONObject data = JSON.parseObject(JSON.toJSONString(result));

//        List<ViewLocDetl> records = result.getRecords();

//        data.put("records", records);

//        for (ViewLocDetl locDetl : records) {

//            Map<String, Object> resultMap = viewLocDetlMapper.getById(locDetl.getId());

//            locDetl.syncFieldMap(resultMap);

//        }

        return result;

    }



@@ -105,7 +105,7 @@
    public List<LocDetl> queryStock(String matnr, String batch, List<FieldParam> param, List<FieldSortParam> sortParam) {

        List<Map<String, Object>> list = viewLocDetlMapper.queryStock(matnr, batch, param, sortParam, LocAreaTypeSts.LOC_AREA_TYPE_UTC.id);

        List<LocDetl> locDetlsSort = resortDetls(list);

        return locDetlsSort;

        return locDetlsSort.stream().sorted(Comparator.comparing(LocDetl::getCreateTime)).collect(Collectors.toList());

    }



    private List<LocDetl> resortDetls(List<Map<String, Object>> list) {