aps-开工、报工、取消开工合并加工工序处理

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

@@ -1109,8 +1109,8 @@ public class ApsReportRecordsServiceImpl extends ServiceImpl<ApsReportRecordsDao
                 if (newLeaveWaitJobRoll == 0) {
                     processEquWrapper.set(ApsProcessOperationProcessEquDo::getClosestatus, "已完工");
                     Date finishWorkTime = DateUtil.date();
-                    if (ObjectUtil.isEmpty(apsReportRecordsDo.getStartworktime())) {
-                        finishWorkTime = apsReportRecordsDo.getStartworktime();
+                    if (ObjectUtil.isNotEmpty(apsReportRecordsDo.getReportworktime())) {
+                        finishWorkTime = apsReportRecordsDo.getReportworktime();
                     }
                     processEquWrapper.set(ApsProcessOperationProcessEquDo::getActualfinishdate, finishWorkTime);
 //                    processEquWrapper.set(ApsProcessOperationProcessEquDo::getPlanstartdate, DateUtil.offsetMinute(finishWorkTime, -1 * (int) DateUtil.between(apsProcessOperationProcessEquDo.getPlanenddate(), apsProcessOperationProcessEquDo.getPlanstartdate(), DateUnit.MINUTE)));