pjb
2025-03-08 83b51a5a0774ea8ecb9a06304af3b956a21307c8
zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/service/impl/LocDetlServiceImpl.java
@@ -7,6 +7,7 @@
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.zy.asrs.framework.exception.CoolException;
import com.zy.asrs.wms.asrs.entity.*;
import com.zy.asrs.wms.asrs.entity.enums.LocAreaTypeSts;
import com.zy.asrs.wms.asrs.entity.enums.LocStsType;
import com.zy.asrs.wms.asrs.entity.param.FieldParam;
import com.zy.asrs.wms.asrs.entity.param.FieldSortParam;
@@ -102,7 +103,7 @@
    @Override
    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);
        List<Map<String, Object>> list = viewLocDetlMapper.queryStock(matnr, batch, param, sortParam, LocAreaTypeSts.LOC_AREA_TYPE_UTC.id);
        List<LocDetl> locDetlsSort = resortDetls(list);
        return locDetlsSort;
    }
@@ -183,7 +184,7 @@
    }
    @Override
    @Transactional
    @Transactional(rollbackFor = Exception.class)
    public void locDetlFreeze(LocDetlFreezeParam param) {
        if (param == null) {
            throw new CoolException("参数不能为空");
@@ -230,12 +231,11 @@
    @Override
    public List<LocDetl> queryFlatStock(String matnr, String batch, List<FieldParam> params) {
        //获取平库中符合条件的库位
        List<Map<String, Object>> list = viewLocDetlMapper.queryFlatStock(matnr, batch, params);
        List<Map<String, Object>> list = viewLocDetlMapper.queryFlatStock(matnr, batch, params, LocAreaTypeSts.LOC_AREA_TYPE_FLAT.id);
        List<LocDetl> detls = new ArrayList<>();
        list.forEach(action -> {
            LocDetl locDetl = new LocDetl();
            BeanUtils.copyProperties(action, locDetl);
            detls.add(locDetl);
            LocDetl parseObject = JSONObject.parseObject(JSON.toJSONString(action), LocDetl.class);
            detls.add(parseObject);
        });
        return detls;
    }