取消卷数优化

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

@@ -1836,9 +1836,9 @@ public class ApsProcessOperationServiceImpl extends ServiceImpl<ApsProcessOperat
 
             //本道工序作业
             ApsProcessOperationDo apsProcessOperationDo = cancelProcessOperationVo.getApsprocessoperationdo();
-            if (cancelProcessOperationVo.getSetcancelroll()) {
-                apsProcessOperationDo.setCancelroll(apsProcessOperationDo.getCancelroll() + curcancelroll);
-            }
+//            if (cancelProcessOperationVo.getSetcancelroll()) {
+            apsProcessOperationDo.setCancelroll(apsProcessOperationDo.getCancelroll() + curcancelroll);
+//            }
             apsProcessOperationDo.setLeavewaitworkroll(apsProcessOperationDo.getPlanprocessrall() - apsProcessOperationDo.getStartingroll() - apsProcessOperationDo.getInputunqualifiedroll() - apsProcessOperationDo.getCancelroll());
             Integer leaveWaitJobRoll = apsProcessOperationDo.getPlanprocessrall() - apsProcessOperationDo.getReportroll() - apsProcessOperationDo.getInputunqualifiedroll() - apsProcessOperationDo.getCancelroll();
             apsProcessOperationDo.setLeavewaitjobroll(leaveWaitJobRoll);
@@ -1871,7 +1871,7 @@ public class ApsProcessOperationServiceImpl extends ServiceImpl<ApsProcessOperat
             List<ApsProcessOperationOutMaterDo> apsProcessOperationOutMaterDos = apsProcessOperationOutMaterService.listByMap(map).stream().collect(Collectors.toList());
             for (ApsProcessOperationOutMaterDo apsProcessOperationOutMaterDo : apsProcessOperationOutMaterDos) {
                 Integer curOutMaterCancelRoll = curcancelroll * apsProcessOperationOutMaterDo.getOutval();//输出物料本次取消卷数
-                if(cancelProcessOperationVo.getSetcancelroll()){
+                if (cancelProcessOperationVo.getSetcancelroll()) {
                     apsProcessOperationOutMaterDo.setOutcancelroll(apsProcessOperationOutMaterDo.getOutcancelroll() + curOutMaterCancelRoll);
                 }
                 Integer curStockCancelRoll = 0;//本次备料取消卷数
@@ -1910,10 +1910,10 @@ public class ApsProcessOperationServiceImpl extends ServiceImpl<ApsProcessOperat
                             cancelProcessOperationVo1.setCraftrouteid(craftrouteid);
                             if (processOperationDo.getLeavewaitworkroll() >= curMoveCancelRoll) {
                                 cancelroll = curMoveCancelRoll;
-                                cancelProcessOperationVo1.setCurcancelroll(cancelroll);
+                                cancelProcessOperationVo1.setCurcancelroll(0);
                             } else {
                                 cancelroll = processOperationDo.getLeavewaitworkroll();
-                                cancelProcessOperationVo1.setCurcancelroll(cancelroll);
+                                cancelProcessOperationVo1.setCurcancelroll(0);
                             }
                             processOperationDo.setInputunqualifiedroll(getInputCancelRoll(apsProcessOperationDo.getPlanprocessrall(), apsProcessOperationDo.getCancelroll(), apsProcessOperationOutMaterDo));
                             cancelProcessOperationVo1.setApsprocessoperationdo(processOperationDo);