aps-生产计划跟踪报表

cx-aps/cx-aps-common/src/main/java/com/rongwei/bscommon/sys/service/impl/ApsBlankOrderServiceImpl.java

@@ -2819,10 +2819,11 @@ public class ApsBlankOrderServiceImpl extends ServiceImpl<ApsBlankOrderDao, ApsB
                 if (ObjectUtil.isNotEmpty(processOperationDo3)) {
                     record.setActualStartDate(processOperationDo3.getActualstartdate());
                 }
-
-                ApsProcessOperationDo processOperationDo4 = operationDoList.stream().filter(item -> ObjectUtil.isNotEmpty(item.getActualfinishdate())).max(Comparator.comparing(ApsProcessOperationDo::getActualfinishdate)).orElse(null);
-                if (ObjectUtil.isNotEmpty(processOperationDo4)) {
-                    record.setActualEndDate(processOperationDo4.getActualfinishdate());
+                if (record.getProductionOrderStatus().equals("已完工")) {
+                    ApsProcessOperationDo processOperationDo4 = operationDoList.stream().filter(item -> ObjectUtil.isNotEmpty(item.getActualfinishdate())).max(Comparator.comparing(ApsProcessOperationDo::getActualfinishdate)).orElse(null);
+                    if (ObjectUtil.isNotEmpty(processOperationDo4)) {
+                        record.setActualEndDate(processOperationDo4.getActualfinishdate());
+                    }
                 }
 
             }