aps-借调逻辑优化

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

@@ -1965,7 +1965,7 @@ public class ApsBlankOrderServiceImpl extends ServiceImpl<ApsBlankOrderDao, ApsB
                 }
                 if (ObjectUtil.isNotEmpty(needBorrowOperationEqu)) {
                     //更新明细的已借调卷数
-                    //更新工序作业的一借调卷数
+                    //更新工序作业的已借调卷数
                     Integer secondroll = needBorrowOperationEqu.getSecondroll() + 1;
                     ApsProcessOperationProcessEquDo needUpdateProcessEqu = new ApsProcessOperationProcessEquDo();
                     needUpdateProcessEqu.setId(needBorrowOperationEqu.getId());
@@ -2019,16 +2019,15 @@ public class ApsBlankOrderServiceImpl extends ServiceImpl<ApsBlankOrderDao, ApsB
                         if (!r.getCode().equals("200")) {
                             throw new CustomException(r.getMsg());
                         }
-
-                        //撤回订单
-                        //被撤回的作业明细
-                        ApsProcessOperationProcessEquDo apsProcessOperationProcessEquDo = apsProcessOperationProcessEquService.getById(processoperationequid);
-                        //被撤回的坯料计划
-                        ApsBlankOrderDo changeBlankOrder = apsBlankOrderService.getById(apsProcessOperationProcessEquDo.getBlankid());
-                        //被撤回的订单信息
-                        ApsProductionOrderDo apsProductionOrderDo = apsProductionOrderService.getById(changeBlankOrder.getProductionorderid());
-                        reportCheckService.goBackWf(processoperationequid, apsProcessOperationProcessEquDo.getBlankid(), apsProductionOrderDo);
                     }
+                    //撤回订单
+                    //被撤回的作业明细
+                    ApsProcessOperationProcessEquDo apsProcessOperationProcessEquDo = apsProcessOperationProcessEquService.getById(processoperationequid);
+                    //被撤回的坯料计划
+                    ApsBlankOrderDo changeBlankOrder = apsBlankOrderService.getById(apsProcessOperationProcessEquDo.getBlankid());
+                    //被撤回的订单信息
+                    ApsProductionOrderDo apsProductionOrderDo = apsProductionOrderService.getById(changeBlankOrder.getProductionorderid());
+                    reportCheckService.goBackWf(processoperationequid, apsProcessOperationProcessEquDo.getBlankid(), apsProductionOrderDo);
 
 
 //                //处理后续工序状态