|
|
@@ -165,7 +165,7 @@ public class SceneService implements ISceneService {
|
|
|
sceneVo.setDeptName(tmDepartment.getName());
|
|
|
}
|
|
|
sceneVo.setType(CameraUtil.getTypeByCameraType(sceneVo.getCameraType(),param.getIsObj()));
|
|
|
- if(sceneVo.getStatus() == 0 && modelingMap.get(sceneVo.getNum()) != null && !modelingMap.get(sceneVo.getNum())){
|
|
|
+ if((sceneVo.getStatus() == 0 || sceneVo.getStatus() == 4) && modelingMap.get(sceneVo.getNum()) != null && !modelingMap.get(sceneVo.getNum())){
|
|
|
sceneVo.setStatus(5);
|
|
|
}
|
|
|
|
|
|
@@ -183,7 +183,7 @@ public class SceneService implements ISceneService {
|
|
|
|
|
|
|
|
|
private Integer setLaserStatus(Integer status,Integer payStatus){
|
|
|
- //深时状态,-1:场景被删 0:计算中 1计算失败 2计算成功 3封存 4生成OBJ中 ,5排队
|
|
|
+ //深时状态,-1:场景被删 0:计算中 1计算失败 2计算成功 3封存 4重算中 ,5排队
|
|
|
if(status == 0){
|
|
|
return 0;
|
|
|
}
|