diff --git a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesPackingRuleDetailService.java b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesPackingRuleDetailService.java index 0b9e0a8..2a0f5f5 100644 --- a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesPackingRuleDetailService.java +++ b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesPackingRuleDetailService.java @@ -1,28 +1,17 @@ package cn.estsh.i3plus.ext.mes.apiservice.serviceimpl.base; -import cn.estsh.i3plus.ext.mes.api.base.IMesPackingPartTypeService; import cn.estsh.i3plus.ext.mes.api.base.IMesPackingRuleDetailService; import cn.estsh.i3plus.ext.mes.pojo.util.MesExtConstWords; import cn.estsh.i3plus.pojo.base.bean.DdlPackBean; import cn.estsh.i3plus.pojo.base.tool.DdlPreparedPack; -import cn.estsh.i3plus.pojo.mes.bean.MesPackingPartType; import cn.estsh.i3plus.pojo.mes.bean.MesPackingRuleDetail; import lombok.extern.slf4j.Slf4j; -import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; -import org.springframework.util.CollectionUtils; - -import java.util.List; -import java.util.Map; -import java.util.stream.Collectors; @Service @Slf4j public class MesPackingRuleDetailService extends BaseMesService implements IMesPackingRuleDetailService { - @Autowired - private IMesPackingPartTypeService packingPartTypeService; - @Override protected void setPackQueryBean(MesPackingRuleDetail bean, DdlPackBean packBean) { DdlPreparedPack.getStringLikerPack(bean.getPackageCode(), MesExtConstWords.PACKAGE_CODE, packBean); @@ -30,20 +19,4 @@ public class MesPackingRuleDetailService extends BaseMesService list) { - if (CollectionUtils.isEmpty(list)) return; - - DdlPackBean packBean = DdlPackBean.getDdlPackBean(list.get(0).getOrganizeCode()); - List packingPartTypeList = packingPartTypeService.findAll(packBean); - Map packingPartTypeMap = CollectionUtils.isEmpty(packingPartTypeList) ? null : - packingPartTypeList.stream().filter(o -> null != o).collect(Collectors.toMap(MesPackingPartType::getPartType, MesPackingPartType::getPartTypeName)); - - if (!CollectionUtils.isEmpty(packingPartTypeMap)) { - list.forEach(o -> { - o.setPartTypeName(packingPartTypeMap.get(o.getPartType())); - }); - } - } - }