更新工序作业输入已取消卷数

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

@@ -1494,9 +1494,9 @@ public class ApsProcessOperationServiceImpl extends ServiceImpl<ApsProcessOperat
         if (!equSaveList.isEmpty()) {
             apsProcessOperationProcessEquService.saveOrUpdateBatch(equSaveList, 100);
         }
-        apsProcessOperationBackupDos.stream().map(ApsProcessOperationBackupDo::getBlankid).forEach(data->{
+        apsProcessOperationBackupDos.stream().map(ApsProcessOperationBackupDo::getBlankid).forEach(data -> {
             // 更新坯料交货期
-            apsBlankOrderService.updateBlankDeliveryDate(null,data);
+            apsBlankOrderService.updateBlankDeliveryDate(null, data);
         });
 
         return R.ok();
@@ -1892,7 +1892,6 @@ public class ApsProcessOperationServiceImpl extends ServiceImpl<ApsProcessOperat
                         if (curMoveCancelRoll > 0) {
                             CancelProcessOperationVo cancelProcessOperationVo1 = new CancelProcessOperationVo();
                             cancelProcessOperationVo1.setCraftrouteid(craftrouteid);
-                            cancelProcessOperationVo1.setApsprocessoperationdo(processOperationDo);
                             if (processOperationDo.getLeavewaitworkroll() >= curMoveCancelRoll) {
                                 cancelroll = curMoveCancelRoll;
                                 cancelProcessOperationVo1.setCurcancelroll(cancelroll);
@@ -1900,6 +1899,8 @@ public class ApsProcessOperationServiceImpl extends ServiceImpl<ApsProcessOperat
                                 cancelroll = processOperationDo.getLeavewaitworkroll();
                                 cancelProcessOperationVo1.setCurcancelroll(cancelroll);
                             }
+                            processOperationDo.setInputunqualifiedroll(processOperationDo.getInputunqualifiedroll() + cancelroll);
+                            cancelProcessOperationVo1.setApsprocessoperationdo(processOperationDo);
                             cancelProcessOperation(cancelProcessOperationVo1);
                         } else {
                             break;