|
@@ -287,7 +287,7 @@ public class ToolManagementServiceImpl extends SuperCacheServiceImpl<ToolManagem
|
|
|
toolCheckDTO.setHasCuttingToolsFlag(CollectionUtil.isEmpty(toolCodes) ? "是" : "否");
|
|
|
toolCheckDTO.setMsg(CollectionUtil.isNotEmpty(toolCodes) ?
|
|
|
"缺少:" + lackTools.stream().map(obj -> obj.getToolName()).collect(Collectors.joining(";")) : "校验成功");
|
|
|
- toolCheckDTO.setPlanId(planProduct.getId());
|
|
|
+ toolCheckDTO.setPlanId(planProduct.getPlanId());
|
|
|
returnList.add(toolCheckDTO);
|
|
|
|
|
|
}
|
|
@@ -490,7 +490,7 @@ public class ToolManagementServiceImpl extends SuperCacheServiceImpl<ToolManagem
|
|
|
toolCheckDTO.setHasCuttingToolsFlag(CollectionUtil.isEmpty(differenceCategory) ? "是" : "否");
|
|
|
toolCheckDTO.setMsg(CollectionUtil.isNotEmpty(differenceCategory) ?
|
|
|
"缺少:" + lackTools.stream().map(obj -> obj.getCutterName()).collect(Collectors.joining(";")) + (isFree ? ",机床刀库空闲个数大于缺刀个数" : "") + (" 缺刀总数:" + differenceCategory.size() + "个") : "校验成功");
|
|
|
- toolCheckDTO.setPlanId(planProduct.getId());
|
|
|
+ toolCheckDTO.setPlanId(planProduct.getPlanId());
|
|
|
|
|
|
returnList.add(toolCheckDTO);
|
|
|
}
|