sucheng před 4 měsíci
rodič
revize
1827027efe

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

@@ -469,10 +469,8 @@ public class ApsProcessOperationProcessEquServiceImpl extends ServiceImpl<ApsPro
                                     }
                                 }
                             }
-                            // 计划开工时间=计划开工时间-开工时间间隔
-                            needEqu.setPlanstartdate(new Date(planstartdate.getTime() - timeInterval));
-                            // 计划完工时间=计划完工时间-开工时间间隔
-                            needEqu.setPlanenddate(new Date(processEqus.getPlanenddate().getTime() - timeInterval));
+                            needEqu.setPlanstartdate(DateUtil.offsetSecond(equDo.getPlanstartdate(), (int) DateUtil.between(equDo.getPlanstartdate(), changingWiresVo.getProcessingTime(), DateUnit.SECOND, false)));
+                            needEqu.setPlanenddate(DateUtil.offsetSecond(equDo.getPlanenddate(), (int) DateUtil.between(equDo.getPlanstartdate(), changingWiresVo.getProcessingTime(), DateUnit.SECOND, false)));
                             needEqu.setModifydate(DateUtil.date());
                             needEqu.setModifyusername(nowWorkUser.getName());
                             needEqu.setModifyuserid(nowWorkUser.getId());