|
@@ -1184,7 +1184,7 @@ public class ApsProcessOperationServiceImpl extends ServiceImpl<ApsProcessOperat
|
|
BigDecimal aluminumdensity = apsConfigs.get(0).getAluminumdensity();
|
|
BigDecimal aluminumdensity = apsConfigs.get(0).getAluminumdensity();
|
|
|
|
|
|
String craftrouteid = params.getCraftrouteid();
|
|
String craftrouteid = params.getCraftrouteid();
|
|
- if (craftrouteid.isEmpty()) {
|
|
|
|
|
|
+ if (craftrouteid == null) {
|
|
ApsBlankOrderDo apsBlankOrderDo = apsBlankOrderService.getById(params.getBlankid());
|
|
ApsBlankOrderDo apsBlankOrderDo = apsBlankOrderService.getById(params.getBlankid());
|
|
craftrouteid = apsBlankOrderDo.getCraftrouteid();
|
|
craftrouteid = apsBlankOrderDo.getCraftrouteid();
|
|
}
|
|
}
|
|
@@ -1352,7 +1352,7 @@ public class ApsProcessOperationServiceImpl extends ServiceImpl<ApsProcessOperat
|
|
}
|
|
}
|
|
}
|
|
}
|
|
//更新坯料计划的所选工艺路线相关信息
|
|
//更新坯料计划的所选工艺路线相关信息
|
|
- ApsCraftRouteDo apsCraftRouteDo = apsCraftRouteService.getById(params.getCraftrouteid());
|
|
|
|
|
|
+ ApsCraftRouteDo apsCraftRouteDo = apsCraftRouteService.getById(craftrouteid);
|
|
R r = new R();
|
|
R r = new R();
|
|
r.setCode("200");
|
|
r.setCode("200");
|
|
r.setData(apsCraftRouteDo);
|
|
r.setData(apsCraftRouteDo);
|