更新工序作业优化

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

@@ -1837,7 +1837,9 @@ public class ApsProcessOperationServiceImpl extends ServiceImpl<ApsProcessOperat
 
             //本道工序作业
             ApsProcessOperationDo apsProcessOperationDo = cancelProcessOperationVo.getApsprocessoperationdo();
-            apsProcessOperationDo.setCancelroll(apsProcessOperationDo.getCancelroll() + curcancelroll);
+            if (cancelProcessOperationVo.getSetcancelroll()) {
+                apsProcessOperationDo.setCancelroll(apsProcessOperationDo.getCancelroll() + curcancelroll);
+            }
             apsProcessOperationDo.setLeavewaitworkroll(apsProcessOperationDo.getPlanprocessrall() - apsProcessOperationDo.getStartingroll() - apsProcessOperationDo.getInputunqualifiedroll() - apsProcessOperationDo.getCancelroll());
             Integer leaveWaitJobRoll = apsProcessOperationDo.getPlanprocessrall() - apsProcessOperationDo.getReportroll() - apsProcessOperationDo.getInputunqualifiedroll() - apsProcessOperationDo.getCancelroll();
             apsProcessOperationDo.setLeavewaitjobroll(leaveWaitJobRoll);
@@ -1915,6 +1917,7 @@ public class ApsProcessOperationServiceImpl extends ServiceImpl<ApsProcessOperat
                             }
                             processOperationDo.setInputunqualifiedroll(processOperationDo.getInputunqualifiedroll() + cancelroll);
                             cancelProcessOperationVo1.setApsprocessoperationdo(processOperationDo);
+                            cancelProcessOperationVo1.setSetcancelroll(cancelProcessOperationVo.getSetcancelroll());
                             cancelProcessOperation(cancelProcessOperationVo1);
                         } else {
                             break;

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

@@ -180,7 +180,7 @@ public class ReportCheckServiceImpl implements ReportCheckService {
         apsReportOutputService.update(new LambdaUpdateWrapper<ApsReportOutputDo>()
                 .in(ApsReportOutputDo::getId, reportOutputDos.stream().map(ApsReportOutputDo::getId).collect(Collectors.toList()))
                 .set(ApsReportOutputDo::getCheckstatus, VERIFIED));
-        if (reportOutputDos.stream().anyMatch(info -> NO.equals(info.getQualified())) && "已发布计划".equals(productionOrderDo.getAuditstatus()) ) {
+        if (reportOutputDos.stream().anyMatch(info -> NO.equals(info.getQualified())) && "已发布计划".equals(productionOrderDo.getAuditstatus())) {
             goBackWf(processOperationEquId, blankId, productionOrderDo);
         }
         apsReportRecordsService.update(new LambdaUpdateWrapper<ApsReportRecordsDo>().eq(ApsReportRecordsDo::getId, id)
@@ -459,7 +459,7 @@ public class ReportCheckServiceImpl implements ReportCheckService {
                 throw new CustomException("未找到下一个工序作业信息!");
             }
             String nextProcessesIds = currentProcessOperationEqu.getNextprocessesids();
-            if(StringUtils.isBlank(nextProcessesIds)){
+            if (StringUtils.isBlank(nextProcessesIds)) {
                 log.error("当前工序作业明细需要流转的下一个工序作业明细为空");
                 throw new CustomException("无法找到下一个工序作业明细");
             }
@@ -519,6 +519,7 @@ public class ReportCheckServiceImpl implements ReportCheckService {
             cancelProcessOperationVo.setCraftrouteid(null);
             cancelProcessOperationVo.setCurcancelroll(unqualifiedCount);
             cancelProcessOperationVo.setApsprocessoperationdo(currentProcessOperationMainDo);
+            cancelProcessOperationVo.setSetcancelroll(false);
             apsProcessOperationService.cancelProcessOperation(cancelProcessOperationVo);
         }
         log.info("更新工序作业的输出物料和在制品相关信息结束");

cx-aps/cx-aps-entity/src/main/java/com/rongwei/bsentity/vo/CancelProcessOperationVo.java

@@ -9,6 +9,8 @@ public class CancelProcessOperationVo {
     private String craftrouteid;
     //本次取消卷数
     private Integer curcancelroll;
+    //是否更新已取消卷数
+    private Boolean setcancelroll = true;
     //修改的作业
     private ApsProcessOperationDo apsprocessoperationdo;
 }