feature 先更新取消卷数 在调用方法

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

@@ -629,9 +629,13 @@ public class ReportCheckServiceImpl implements ReportCheckService {
                     int toBeStartedQty = apsProcessOperationProcessEquDo.getPlanprocessrall() - apsProcessOperationProcessEquDo.getStartingroll() - apsProcessOperationProcessEquDo.getCancelroll();
                     // 本次取消卷数
                     int cancelQty = toBeStartedQty >= value ? value : toBeStartedQty;
-                    log.debug("工序作业:{}的本次取消卷数:{}",apsProcessOperationProcessEquDo.getId(),cancelQty);
+                    log.debug("工序作业:{}的本次取消卷数:{}", apsProcessOperationProcessEquDo.getId(), cancelQty);
                     //取消和更新作业明细
-                    apsProcessOperationService.cancelProcessOperationEqu(cancelQty,apsProcessOperationDo, apsProcessOperationProcessEquDo);
+                    apsProcessOperationService.cancelProcessOperationEqu(cancelQty, apsProcessOperationDo, apsProcessOperationProcessEquDo);
+                    apsProcessOperationService.update(new LambdaUpdateWrapper<ApsProcessOperationDo>()
+                            .eq(ApsProcessOperationDo::getId, apsProcessOperationDo.getId())
+                            .set(ApsProcessOperationDo::getInputunqualifiedroll, cancelQty + apsProcessOperationDo.getInputunqualifiedroll())
+                    );
                     //取消和更新工序作业
                     cancelProcessOperationVo = new CancelProcessOperationVo();
                     cancelProcessOperationVo.setCraftrouteid(null);
@@ -641,10 +645,6 @@ public class ReportCheckServiceImpl implements ReportCheckService {
                     cancelProcessOperationVo.setSetincancelroll(false);
                     cancelProcessOperationVo.setUpdatecuropration(false);
                     apsProcessOperationService.cancelProcessOperation(cancelProcessOperationVo);
-                    apsProcessOperationService.update(new LambdaUpdateWrapper<ApsProcessOperationDo>()
-                            .eq(ApsProcessOperationDo::getId, apsProcessOperationDo.getId())
-                            .set(ApsProcessOperationDo::getInputunqualifiedroll,cancelQty+apsProcessOperationDo.getInputunqualifiedroll())
-                    );
                     value = value - cancelQty;
                 }
             }