|
@@ -373,16 +373,16 @@ public class ProductionScheduleServiceImpl implements ProductionScheduleService
|
|
|
productionScheduleRetVo.setScoreResult(scoreManager.explain(solvedBalance1).toString());
|
|
|
// 得分分析
|
|
|
softExplain(explain,solvedBalance1.getProcessesList());
|
|
|
-
|
|
|
- apsUtils.maxTimeXz(solvedBalance1);
|
|
|
- log.info("**************最终排程评分分析***************");
|
|
|
- ScoreExplanation<ApsSolution, HardSoftScore> explain1 = scoreManager.explain(solvedBalance1);
|
|
|
- log.info(explain1.toString());
|
|
|
- log.info("**************最终排程评分分析***************");
|
|
|
- productionScheduleRetVo.setScoreResult(scoreManager.explain(solvedBalance1).toString());
|
|
|
- // 得分分析
|
|
|
- softExplain(explain1,solvedBalance1.getProcessesList());
|
|
|
-
|
|
|
+ if("default".equals(productionScheduleVo.getScheduleType().getScheduleType())){
|
|
|
+ apsUtils.maxTimeXz(solvedBalance1);
|
|
|
+ log.info("**************最终排程评分分析***************");
|
|
|
+ ScoreExplanation<ApsSolution, HardSoftScore> explain1 = scoreManager.explain(solvedBalance1);
|
|
|
+ log.info(explain1.toString());
|
|
|
+ log.info("**************最终排程评分分析***************");
|
|
|
+ productionScheduleRetVo.setScoreResult(scoreManager.explain(solvedBalance1).toString());
|
|
|
+ // 得分分析
|
|
|
+ softExplain(explain1,solvedBalance1.getProcessesList());
|
|
|
+ }
|
|
|
|
|
|
solvedBalance.getProcessesList().addAll(solvedBalance1.getProcessesList());
|
|
|
thOrderids.addAll(v);
|