feature 代码提交

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

@@ -315,10 +315,6 @@ public class ReportCheckServiceImpl implements ReportCheckService {
      * 撤回
      */
     public void goBackWf(String processOperationEquId, String blankId, ApsProductionOrderDo productionOrderDo) {
-        // modify at [ 2024-08-08 11:09:33 ] by xh: 项目经理因需求原因不在执行如下逻辑直接结束
-        if (true){
-            return;
-        }
         CommonUpdateProductionStatusReq req = new CommonUpdateProductionStatusReq();
         req.setProcessOperationEquId(processOperationEquId);
 //        req.setProcessOperationId(currentProcessOperationMainDo.getId());
@@ -328,6 +324,10 @@ public class ReportCheckServiceImpl implements ReportCheckService {
         apsProcessOperationProcessEquService.updateProductionStatus(req);
         // 备份
         apsProductionOrderService.saveHistoryInfo(productionOrderDo.getId());
+        // modify at [ 2024-08-08 11:09:33 ] by xh: 项目经理因需求原因不在执行如下逻辑直接结束
+        if (true){
+            return;
+        }
         // 坯料计划撤回发布
         apsBlankOrderService.publishCancel(Arrays.asList(blankId));
         productionOrderDo.setAuditstatus("待排程");