aps-借调取消卷数修改

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

@@ -3995,7 +3995,7 @@ public class ApsBlankOrderServiceImpl extends ServiceImpl<ApsBlankOrderDao, ApsB
              */
             if (ObjectUtil.isNotEmpty(needBorrowOperation)) {
                 //更新工序作业的一借调卷数
-                Integer secondroll = needBorrowOperation.getSecondroll() + 1;
+//                Integer secondroll = needBorrowOperation.getSecondroll() + 1;
 //                ApsProcessOperationDo needUpdateProcess = new ApsProcessOperationDo();
 //                needUpdateProcess.setId(needBorrowOperation.getId());
 //                needUpdateProcess.setSecondroll(secondroll);
@@ -4006,16 +4006,14 @@ public class ApsBlankOrderServiceImpl extends ServiceImpl<ApsBlankOrderDao, ApsB
                  * 本次取消卷数=1
                  * 根据本次取消卷数更新对应工序作业的取消卷数
                  */
-                if (secondroll > needBorrowOperation.getCancelroll()) {
-                    CancelProcessOperationVo cancelProcessOperationVo = new CancelProcessOperationVo();
-                    needBorrowOperation.setSecondroll(secondroll);
-                    cancelProcessOperationVo.setApsprocessoperationdo(needBorrowOperation);
-                    cancelProcessOperationVo.setCurcancelroll(1);
-                    cancelProcessOperationVo.setUpdatecuropration(false);
-                    R r = apsProcessOperationService.cancelProcessOperation(cancelProcessOperationVo);
-                    if (!r.getCode().equals("200")) {
-                        throw new CustomException(r.getMsg());
-                    }
+                CancelProcessOperationVo cancelProcessOperationVo = new CancelProcessOperationVo();
+//                needBorrowOperation.setSecondroll(secondroll);
+                cancelProcessOperationVo.setApsprocessoperationdo(needBorrowOperation);
+                cancelProcessOperationVo.setCurcancelroll(1);
+                cancelProcessOperationVo.setUpdatecuropration(false);
+                R r = apsProcessOperationService.cancelProcessOperation(cancelProcessOperationVo);
+                if (!r.getCode().equals("200")) {
+                    throw new CustomException(r.getMsg());
                 }
                 //更新被借调作业及其坯料计划、订单等的生产状态
                 CommonUpdateProductionStatusReq req = new CommonUpdateProductionStatusReq();