diff --git a/modules/i3plus-ext-mes-apiservice/src/groovy/Pisces2Mes/PiscesToMesWorkOrder.groovy b/modules/i3plus-ext-mes-apiservice/src/groovy/Pisces2Mes/PiscesToMesWorkOrder.groovy index 67289b8..66f711c 100644 --- a/modules/i3plus-ext-mes-apiservice/src/groovy/Pisces2Mes/PiscesToMesWorkOrder.groovy +++ b/modules/i3plus-ext-mes-apiservice/src/groovy/Pisces2Mes/PiscesToMesWorkOrder.groovy @@ -43,7 +43,7 @@ class PiscesToMesWorkOrder { mesWorkCenter = getMesWorkCenter(mapper, workCenterCode, mesWorkCenter) if (!Objects.isNull(mesWorkCenter)) { rowMap.put("WORK_CENTER_CODE", mesWorkCenter.getWorkCenterCode()) - rowMap.put("REP_WORK_CENTER", mesWorkCenter.getErpWorkCenter()) + rowMap.put("ERP_WORK_CENTER", mesWorkCenter.getErpWorkCenter()) } else { LOGGER.info("工作中心{},信息不存在", workCenterCode) } diff --git a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesEquipmentSpotCheckService.java b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesEquipmentSpotCheckService.java index bdcb5d9..6530b63 100644 --- a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesEquipmentSpotCheckService.java +++ b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesEquipmentSpotCheckService.java @@ -23,6 +23,7 @@ public class MesEquipmentSpotCheckService extends BaseMesService implements IMesPartS @Autowired private MesPartRepository mesPartRepository; + @Autowired + private MesPartTypeRepository mesPartTypeRepository; + protected void setPackQueryBean(MesPart bean, DdlPackBean packBean) { DdlPreparedPack.getStringLikerPack(bean.getPartNo(), "partNo", packBean); DdlPreparedPack.getStringLikerPack(bean.getPartName(), "partName", packBean); @@ -35,6 +45,22 @@ public class MesPartService extends BaseMesService implements IMesPartS } @Override + public void setBeanModel(List list) { + if(CollectionUtils.isEmpty(list)){ + return; + } + List typeCodeList = list.stream().map(MesPart::getPartTypeCode).filter(t -> !StringUtils.isEmpty(t)).distinct().collect(Collectors.toList()); + if(!CollectionUtils.isEmpty(typeCodeList)){ + Map beanMap = BeanMapUtilsExt.getBeanMap(mesPartTypeRepository, "partTypeCode", list.iterator().next().getOrganizeCode(),typeCodeList, "零件类型"); + list.forEach(t->{ + if (beanMap.containsKey(t.getPartTypeCode())) { + t.setPartTypeName(beanMap.get(t.getPartTypeCode()).getPartTypeName()); + } + }); + } + } + + @Override public MesPart getPartByPartNo(String partNo, String organizeCode) { DdlPackBean ddlPackBean = DdlPackBean.getDdlPackBean(organizeCode); DdlPreparedPack.getStringEqualPack(partNo, "partNo", ddlPackBean);