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

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

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

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

@@ -1,5 +1,6 @@
 package com.rongwei.bscommon.sys.service.impl;
 
+import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.util.ObjectUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
@@ -230,6 +231,9 @@ public class ReportCheckServiceImpl implements ReportCheckService {
 //                currentProcessOperationEqu);
             // 更新当前工序作业和作业明细的数据
             apsProcessOperationService.updateById(currentProcessOperationMainDo);
+            currentProcessOperationEqu.setModifydate(DateUtil.date());
+            currentProcessOperationEqu.setModifyuserid(currentUser.getId());
+            currentProcessOperationEqu.setModifyusername(currentUser.getName());
             apsProcessOperationProcessEquService.updateById(currentProcessOperationEqu);
             // 更新报工输出物料 检验状态
             apsReportOutputService.update(new LambdaUpdateWrapper<ApsReportOutputDo>()