|
@@ -231,8 +231,8 @@ public class ToolManagementServiceImpl extends SuperCacheServiceImpl<ToolManagem
|
|
|
|
|
|
//机床现有刀具集合
|
|
|
List<Long> realToolId = toolManagementMapper.getToolManagementToolId(vo.getResourceId());
|
|
|
- //Integer freeCount = toolManagementMapper.getFreeStorge(vo.getResourceId());
|
|
|
- Integer freeCount=0;
|
|
|
+ Integer freeCount = toolManagementMapper.getFreeStorge(vo.getResourceId());
|
|
|
+ //Integer freeCount=0;
|
|
|
//if(!realToolId.containsAll(toolId)){
|
|
|
//需要的类别
|
|
|
List<String> toolCategory = cuttingToolMapper.getToolCategory(toolId);
|