|
|
|
@ -50,7 +50,7 @@ public class MesWorkCenterPartRelationService extends BaseMesService<MesWorkCent
|
|
|
|
|
//去重
|
|
|
|
|
ArrayList<MesWorkCenterPartRelation> 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<MesWorkCent
|
|
|
|
|
item.setPartName(mesPartSap.getPartName());
|
|
|
|
|
//根据产线名称去查询数据
|
|
|
|
|
DdlPackBean workCenterPackBean = DdlPackBean.getDdlPackBean(organizeCode);
|
|
|
|
|
DdlPreparedPack.getStringEqualPack(item.getWorkCenterName(),"workCenterName",workCenterPackBean);
|
|
|
|
|
DdlPreparedPack.getStringEqualPack(item.getWorkCenterCode(),"workCenterCode",workCenterPackBean);
|
|
|
|
|
List<MesWorkCenter> 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<MesWorkCent
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
DdlPackBean partRelationPackBean = DdlPackBean.getDdlPackBean(organizeCode);
|
|
|
|
|
DdlPreparedPack.getStringEqualPack(item.getWorkCenterName(), "workCenterName", partRelationPackBean);
|
|
|
|
|
DdlPreparedPack.getStringEqualPack(item.getWorkCenterCode(), "workCenterCode", partRelationPackBean);
|
|
|
|
|
DdlPreparedPack.getStringEqualPack(item.getPartNo(), "partNo", partRelationPackBean);
|
|
|
|
|
boolean flg = baseRDao.isExitByHql(partRelationPackBean);
|
|
|
|
|
if (flg) {
|
|
|
|
|
throw ImppExceptionBuilder.newInstance()
|
|
|
|
|
.setSystemID(CommonEnumUtil.SOFT_TYPE.MES.getCode())
|
|
|
|
|
.setErrorCode(ImppExceptionEnum.VARIFY_EXCEPTION.getCode())
|
|
|
|
|
.setErrorDetail("产线【%s】与零件【%s】关系已存在,请勿重复添加!",item.getWorkCenterName(),item.getPartNo())
|
|
|
|
|
.setErrorDetail("产线【%s】与零件【%s】关系已存在,请勿重复添加!",item.getWorkCenterCode(),item.getPartNo())
|
|
|
|
|
.build();
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|