Merge remote-tracking branch 'origin/wms-dev' into wms-dev

ZY

2024-08-16 57e23c353a177b9c003a2f524a2adeaf641e2e4c

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

@@ -4,21 +4,24 @@
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.zy.asrs.wms.asrs.entity.LocDetl;
import com.zy.asrs.wms.asrs.entity.LocDetlField;
import com.zy.asrs.wms.asrs.entity.ViewLocDetl;
import com.zy.asrs.wms.asrs.entity.param.FieldParam;
import com.zy.asrs.wms.asrs.entity.param.FieldSortParam;
import com.zy.asrs.wms.asrs.mapper.LocDetlMapper;
import com.zy.asrs.wms.asrs.entity.LocDetl;
import com.zy.asrs.wms.asrs.mapper.ViewLocDetlMapper;
import com.zy.asrs.wms.asrs.service.LocDetlFieldService;
import com.zy.asrs.wms.asrs.service.LocDetlService;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.zy.asrs.wms.common.domain.BaseParam;
import com.zy.asrs.wms.common.domain.PageParam;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;

import java.util.*;
import java.util.ArrayList;
import java.util.List;
import java.util.Map;

@Service("locDetlService")
public class LocDetlServiceImpl extends ServiceImpl<LocDetlMapper, LocDetl> implements LocDetlService {
@@ -66,7 +69,7 @@
            param.add(fieldParam);
        }

        List<Map<String, Object>> list2 = viewLocDetlMapper.getList(matnr, batch, param);
        List<Map<String, Object>> list2 = viewLocDetlMapper.getListLike(matnr, batch, param);
        List<LocDetl> locDetls = new ArrayList<>();
        for (Map<String, Object> objectMap : list2) {
            LocDetl locDetl = JSON.parseObject(JSON.toJSONString(objectMap), LocDetl.class);
@@ -84,4 +87,23 @@
        }
        return list;
    }

    /**
     * 根据出库条件查询符合的库存
     * @param param 查询条件
     * @param sortParam 排序字段
     * @return
     */
    @Override
    public List<LocDetl> getSuitableMat( List<FieldParam> param, List<FieldSortParam> sortParam) {
        List<Map<String, Object>> stock = viewLocDetlMapper.getSuitableMat(param, sortParam);
        List<LocDetl> locDetls = new ArrayList<>();
        for (Map<String, Object> objectMap : stock) {
            LocDetl detl = JSON.parseObject(JSON.toJSONString(objectMap), LocDetl.class);
            detl.syncFieldMap(objectMap);
            locDetls.add(detl);
        }
        return locDetls;
    }

}