fangpy преди 2 месеца
родител
ревизия
26636b6f49
променени са 1 файла, в които са добавени 2 реда и са изтрити 2 реда
  1. 2 2
      cx-aps/cx-aps-common/src/main/java/com/rongwei/bscommon/sys/service/impl/ApsServiceImpl.java

+ 2 - 2
cx-aps/cx-aps-common/src/main/java/com/rongwei/bscommon/sys/service/impl/ApsServiceImpl.java

@@ -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);
             }