diff --git a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesWorkCenterPartRelationService.java b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesWorkCenterPartRelationService.java index 5046f7c..0459746 100644 --- a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesWorkCenterPartRelationService.java +++ b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesWorkCenterPartRelationService.java @@ -50,7 +50,7 @@ public class MesWorkCenterPartRelationService extends BaseMesService relationList = beanList.stream().collect(Collectors.collectingAndThen( Collectors.toCollection(() -> new TreeSet<>( - Comparator.comparing(p -> p.getPartNo() + ";" + p.getWorkCenterName()))), ArrayList::new)); + Comparator.comparing(p -> p.getPartNo() + ";" + p.getWorkCenterCode()))), ArrayList::new)); for (MesWorkCenterPartRelation item : relationList) { //根据零件号查询数据 @@ -68,17 +68,17 @@ public class MesWorkCenterPartRelationService extends BaseMesService centerList = mesWorkCenterRao.findByHqlWhere(workCenterPackBean); if (centerList.isEmpty()) { throw ImppExceptionBuilder.newInstance() .setSystemID(CommonEnumUtil.SOFT_TYPE.MES.getCode()) .setErrorCode(ImppExceptionEnum.VARIFY_EXCEPTION.getCode()) - .setErrorDetail("产线【%s】不存在!",item.getWorkCenterName()) + .setErrorDetail("产线【%s】不存在!",item.getWorkCenterCode()) .build(); } MesWorkCenter mesWorkCenter = centerList.get(0); - item.setWorkCenterCode(mesWorkCenter.getWorkCenterCode()); + item.setWorkCenterName(mesWorkCenter.getWorkCenterName()); } return relationList; @@ -90,14 +90,14 @@ public class MesWorkCenterPartRelationService extends BaseMesService