取消作业优化

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

@@ -1911,7 +1911,10 @@ public class ApsProcessOperationServiceImpl extends ServiceImpl<ApsProcessOperat
             map.put("MAINID", apsProcessOperationDo.getId());
             List<ApsProcessOperationOutMaterDo> apsProcessOperationOutMaterDos = apsProcessOperationOutMaterService.listByMap(map).stream().collect(Collectors.toList());
             for (ApsProcessOperationOutMaterDo apsProcessOperationOutMaterDo : apsProcessOperationOutMaterDos) {
-                Integer curOutMaterCancelRoll = curcancelroll * apsProcessOperationOutMaterDo.getOutval();//输出物料本次取消卷数
+                Integer curOutMaterCancelRoll = curcancelroll;//输出物料本次取消卷数
+                if (cancelProcessOperationVo.getSetincancelroll()) {
+                    curOutMaterCancelRoll = curcancelroll * apsProcessOperationOutMaterDo.getOutval();//输出物料本次取消卷数
+                }
                 apsProcessOperationOutMaterDo.setOutcancelroll((apsProcessOperationDo.getInputunqualifiedroll() + apsProcessOperationDo.getCancelroll()) * apsProcessOperationOutMaterDo.getOutval());
                 Integer curStockCancelRoll = 0;//本次备料取消卷数
                 Integer curMoveCancelRoll = 0;//本次流转取消卷数