|
@@ -2143,7 +2143,7 @@ public class ApsProcessOperationServiceImpl extends ServiceImpl<ApsProcessOperat
|
|
|
if (processOperationProcessEquDo.getPlanprocessrall() == processOperationProcessEquDo.getCancelroll()) {
|
|
|
processOperationProcessEquDo.setProcessdevice("");
|
|
|
processOperationProcessEquDo.setProcessdeviceid("");
|
|
|
- } else if (processOperationProcessEquDo.getPlanprocessrall() > processOperationProcessEquDo.getCancelroll()) {
|
|
|
+ } else if (!apsProcessOperationDo.getProcess().equals("小卷成退") && processOperationProcessEquDo.getPlanprocessrall() > processOperationProcessEquDo.getCancelroll()) {
|
|
|
BigDecimal addMinute = apsProcessOperationDo.getOnceprocessmin().multiply(new BigDecimal(60)).multiply(new BigDecimal(processOperationProcessEquDo.getPlanprocessrall() - processOperationProcessEquDo.getCancelroll()));//秒向上取整
|
|
|
Calendar calendar = Calendar.getInstance();
|
|
|
calendar.setTime(processOperationProcessEquDo.getPlanstartdate());
|