取消作业更新优化

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

@@ -2157,26 +2157,26 @@ public class ApsProcessOperationServiceImpl extends ServiceImpl<ApsProcessOperat
             Integer curEquCancelRoll = 0;//作业明细本次取消卷数
             for (ApsProcessOperationProcessEquDo processOperationProcessEquDo : apsProcessOperationProcessEquDos) {
                 Integer tempRoll = processOperationProcessEquDo.getPlanprocessrall() - processOperationProcessEquDo.getStartingroll() - processOperationProcessEquDo.getCancelroll();
-//                if (tempRoll <= 0 || processOperationProcessEquDo.getClosestatus().equals("已完工")) {
-                //计算所有作业明细已取消卷数的合计
-                if (operationequrollsall == null) {
-                    operationequrollsall = new ArrayList<>();
-                }
-                boolean inlist = false;
-                for (ApsProcessOperationProcessEquDo operationProcessEquDo : operationequrollsall) {
-                    if (operationProcessEquDo.getProcessid().equals(newOperDo.getId()) && StringUtils.isNotBlank(operationProcessEquDo.getRoption()) && !operationProcessEquDo.getRoption().contains(processOperationProcessEquDo.getId())) {
-                        inlist = true;
-                        operationProcessEquDo.setCancelrollno(operationProcessEquDo.getCancelrollno() + processOperationProcessEquDo.getCancelrollno());//已取消卷数合计
-                        operationProcessEquDo.setInputunqualifiednum(operationProcessEquDo.getInputunqualifiednum() + processOperationProcessEquDo.getInputunqualifiednum());//输入不合格卷数合计
-                        operationProcessEquDo.setInputunqualifiedroll(operationProcessEquDo.getInputunqualifiedroll() + processOperationProcessEquDo.getInputunqualifiedroll());//输入已取消卷数合计
-                        operationProcessEquDo.setSecondroll(operationProcessEquDo.getSecondroll() + processOperationProcessEquDo.getSecondroll());//已借调卷数合计
+                if (tempRoll <= 0 || processOperationProcessEquDo.getClosestatus().equals("已完工") || processOperationProcessEquDo.getCancelroll() > 0) {
+                    //计算所有作业明细已取消卷数的合计
+                    if (operationequrollsall == null) {
+                        operationequrollsall = new ArrayList<>();
                     }
+                    boolean inlist = false;
+                    for (ApsProcessOperationProcessEquDo operationProcessEquDo : operationequrollsall) {
+                        if (operationProcessEquDo.getProcessid().equals(newOperDo.getId()) && StringUtils.isNotBlank(operationProcessEquDo.getRoption()) && !operationProcessEquDo.getRoption().contains(processOperationProcessEquDo.getId())) {
+                            inlist = true;
+                            operationProcessEquDo.setCancelrollno(operationProcessEquDo.getCancelrollno() + processOperationProcessEquDo.getCancelrollno());//已取消卷数合计
+                            operationProcessEquDo.setInputunqualifiednum(operationProcessEquDo.getInputunqualifiednum() + processOperationProcessEquDo.getInputunqualifiednum());//输入不合格卷数合计
+                            operationProcessEquDo.setInputunqualifiedroll(operationProcessEquDo.getInputunqualifiedroll() + processOperationProcessEquDo.getInputunqualifiedroll());//输入已取消卷数合计
+                            operationProcessEquDo.setSecondroll(operationProcessEquDo.getSecondroll() + processOperationProcessEquDo.getSecondroll());//已借调卷数合计
+                        }
+                    }
+                    if (!inlist) {
+                        operationequrollsall.add(processOperationProcessEquDo);
+                    }
+                    continue;
                 }
-                if (!inlist) {
-                    operationequrollsall.add(processOperationProcessEquDo);
-                }
-//                    continue;
-//                }
                 if (equWaitCancelRoll > 0 && cancelProcessOperationVo.getUpdatecuropration()) {
                     if (tempRoll >= equWaitCancelRoll) {
                         curEquCancelRoll = equWaitCancelRoll;