|
@@ -794,8 +794,8 @@ public class ApsServiceImpl implements ApsService {
|
|
|
if (apsType.getConstraintMode() != null && apsType.getConstraintMode().equals("lz") && "dd".equals(apsType.getScheduleType())) {
|
|
|
productionScheduleRetVo = rwApsServer.productionLzDdSchedule(apsProductionSchedule);
|
|
|
}else if("dd".equals(apsType.getScheduleType()) && "thMergeBf".equals(apsType.getThMergeMode())){
|
|
|
- productionScheduleRetVo = rwApsServer.productionThDdSchedule(apsProductionSchedule);
|
|
|
-// productionScheduleRetVo = rwApsServer.productionSchedule(apsProductionSchedule);
|
|
|
+// productionScheduleRetVo = rwApsServer.productionThDdSchedule(apsProductionSchedule);
|
|
|
+ productionScheduleRetVo = rwApsServer.productionSchedule(apsProductionSchedule);
|
|
|
}else {
|
|
|
productionScheduleRetVo = rwApsServer.productionSchedule(apsProductionSchedule);
|
|
|
}
|