|
|
|
@ -1085,7 +1085,7 @@ public class ProductionPlanServiceImpl implements ProductionPlanService { |
|
|
|
if (node == null) { |
|
|
|
throw new I18nException("lc.production.report.node.not.exists"); |
|
|
|
} |
|
|
|
String mediaStep = resolveMediaStep(data, node); |
|
|
|
String mediaStep = resolveMediaStep(data, node, orderType); |
|
|
|
String rootPath = StringUtils.hasText(workReportMediaRootPath) ? workReportMediaRootPath : "D:\\longchuang"; |
|
|
|
File rootDir = new File(rootPath); |
|
|
|
if (!rootDir.exists() && !rootDir.mkdirs()) { |
|
|
|
@ -1191,7 +1191,7 @@ public class ProductionPlanServiceImpl implements ProductionPlanService { |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
private String resolveMediaStep(ProductionPlanNodeReportData data, ProductionPlanOrderNodeData node) { |
|
|
|
private String resolveMediaStep(ProductionPlanNodeReportData data, ProductionPlanOrderNodeData node, String orderType) { |
|
|
|
if (node == null) { |
|
|
|
return ""; |
|
|
|
} |
|
|
|
@ -1201,6 +1201,9 @@ public class ProductionPlanServiceImpl implements ProductionPlanService { |
|
|
|
if (!packNode) { |
|
|
|
return ""; |
|
|
|
} |
|
|
|
if (ORDER_TYPE_RENOVATION.equals(orderType)) { |
|
|
|
return ""; |
|
|
|
} |
|
|
|
String mediaStep = data == null ? "" : data.getMediaStep(); |
|
|
|
if (!StringUtils.hasText(mediaStep)) { |
|
|
|
throw new XJException("请先选择打包步骤"); |
|
|
|
|