|
@@ -112,8 +112,10 @@ public class MachineCuttingToolServiceImpl extends SuperCacheServiceImpl<Machine
|
|
|
MachineCuttingTool machineCuttingTool = new MachineCuttingTool();
|
|
|
machineCuttingTool.setMachineId(resourceId);
|
|
|
machineCuttingTool.setCuttingToolName(name);
|
|
|
- machineCuttingTool.setCuttingToolPicture(cuttingTool.getCuttingToolPicture());
|
|
|
- machineCuttingTool.setCuttingToolInstallPicture(cuttingTool.getCuttingToolInstallPicture());
|
|
|
+ if(null != cuttingTool){
|
|
|
+ machineCuttingTool.setCuttingToolPicture(cuttingTool.getCuttingToolPicture());
|
|
|
+ machineCuttingTool.setCuttingToolInstallPicture(cuttingTool.getCuttingToolInstallPicture());
|
|
|
+ }
|
|
|
machineCuttingTool.setCuttingToolPosition(tool.getString("toolPosition"));
|
|
|
machineCuttingTool.setCuttingToolId(tool.getString("toolNo"));
|
|
|
String cuttingToolType = tool.getString("monitorType");
|