liyong
9 天以前 1ab2b329a40decba8ff7eefbeb158ff259aceb6d
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/packages/MesWmPackageLineController.java
@@ -8,12 +8,14 @@
import cn.iocoder.yudao.module.mes.controller.admin.wm.packages.vo.line.MesWmPackageLinePageReqVO;
import cn.iocoder.yudao.module.mes.controller.admin.wm.packages.vo.line.MesWmPackageLineRespVO;
import cn.iocoder.yudao.module.mes.controller.admin.wm.packages.vo.line.MesWmPackageLineSaveReqVO;
import cn.iocoder.yudao.module.mes.dal.dataobject.md.item.MesMdItemDO;
import cn.iocoder.yudao.module.mes.dal.dataobject.md.unitmeasure.MesMdUnitMeasureDO;
import cn.iocoder.yudao.module.mdm.api.item.MdmItemApi;
import cn.iocoder.yudao.module.mdm.api.item.dto.MdmItemRespDTO;
import cn.iocoder.yudao.module.mes.dal.dataobject.pro.workorder.MesProWorkOrderDO;
import cn.iocoder.yudao.module.mes.dal.dataobject.wm.packages.MesWmPackageLineDO;
import cn.iocoder.yudao.module.mes.service.md.item.MesMdItemService;
import cn.iocoder.yudao.module.mes.service.md.unitmeasure.MesMdUnitMeasureService;
import cn.iocoder.yudao.module.mdm.api.unit.MdmUnitMeasureApi;
import cn.iocoder.yudao.module.mdm.api.unit.dto.MdmUnitMeasureRespDTO;
import cn.iocoder.yudao.module.mes.service.pro.workorder.MesProWorkOrderService;
import cn.iocoder.yudao.module.mes.service.wm.packages.MesWmPackageLineService;
import io.swagger.v3.oas.annotations.Operation;
@@ -28,6 +30,7 @@
import java.util.Collections;
import java.util.List;
import java.util.Map;
import java.util.stream.Collectors;
import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success;
import static cn.iocoder.yudao.framework.common.util.collection.CollectionUtils.convertSet;
@@ -41,9 +44,9 @@
        @Resource
        private MesWmPackageLineService packageLineService;
        @Resource
        private MesMdItemService itemService;
        private MdmItemApi mdmItemApi;
        @Resource
        private MesMdUnitMeasureService unitMeasureService;
        private MdmUnitMeasureApi mdmUnitMeasureApi;
        @Resource
        private MesProWorkOrderService workOrderService;
@@ -99,11 +102,12 @@
                        return Collections.emptyList();
                }
                // 批量查询物料
                Map<Long, MesMdItemDO> itemMap = itemService
                Map<Long, MdmItemRespDTO> itemMap = mdmItemApi
                                .getItemMap(convertSet(list, MesWmPackageLineDO::getItemId));
                // 批量查询计量单位
                Map<Long, MesMdUnitMeasureDO> unitMeasureMap = unitMeasureService.getUnitMeasureMap(
                                convertSet(itemMap.values(), MesMdItemDO::getUnitMeasureId));
                Map<Long, MdmUnitMeasureRespDTO> unitMeasureMap = mdmUnitMeasureApi.getUnitMeasureList(
                                convertSet(itemMap.values(), MdmItemRespDTO::getUnitMeasureId)).getCheckedData()
                                .stream().collect(Collectors.toMap(MdmUnitMeasureRespDTO::getId, e -> e));
                // 批量查询工单
                Map<Long, MesProWorkOrderDO> workOrderMap = workOrderService.getWorkOrderMap(
                                convertSet(list, MesWmPackageLineDO::getWorkOrderId));