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

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

@@ -1113,7 +1113,8 @@ public class ApsReportRecordsServiceImpl extends ServiceImpl<ApsReportRecordsDao
                         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)));
+                    processEquWrapper.set(ApsProcessOperationProcessEquDo::getActualstartdate, apsReportRecordsDo.getStartworktime());
+                    processEquWrapper.set(ApsProcessOperationProcessEquDo::getPlanstartdate, apsReportRecordsDo.getStartworktime());
                     processEquWrapper.set(ApsProcessOperationProcessEquDo::getPlanenddate, finishWorkTime);
 
                 }