取消作业更新优化

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

@@ -2196,23 +2196,33 @@ public class ApsProcessOperationServiceImpl extends ServiceImpl<ApsProcessOperat
 
             newOperDo.setCancelroll(apsProcessOperationDo.getCancelroll());
             newOperDo.setInputunqualifiedroll(apsProcessOperationDo.getInputunqualifiedroll());
-            if (cancelProcessOperationVo.getCancelreason().equals("1")) {//借调
-                newOperDo.setSecondroll(apsProcessOperationDo.getSecondroll() + curcancelroll);
-                newOperDo.setCancelroll(newOperDo.getCancelroll() + curcancelroll);
-            } else if (cancelProcessOperationVo.getCancelreason().equals("2")) {//取消
-                newOperDo.setCancelroll(newOperDo.getCancelroll() + curcancelroll);
-            } else if (cancelProcessOperationVo.getCancelreason().equals("3") || cancelProcessOperationVo.getCancelreason().equals("4")) {//输入取消或输入不合格
-                ApsProcessOperationProcessEquDo processEquDo = operationequrollsall.stream().filter(es -> es.getProcessid().equals(newOperDo.getId())).findFirst().get();
-                if (processEquDo != null) {
-                    if (cancelProcessOperationVo.getCancelreason().equals("4")) {
-                        newOperDo.setInputunqualifiednum(processEquDo.getInputunqualifiednum());
-                    }
-                    newOperDo.setInputunqualifiedroll(processEquDo.getInputunqualifiedroll());
-                    newOperDo.setCancelroll(processEquDo.getCancelrollno());
-                    newOperDo.setSecondroll(processEquDo.getSecondroll());
-                }
-                curcancelroll = newOperDo.getCancelroll() + newOperDo.getInputunqualifiedroll() - (newOperDo.getCancelrollsum() == null ? 0 : newOperDo.getCancelrollsum());
+//            if (cancelProcessOperationVo.getCancelreason().equals("1")) {//借调
+//                newOperDo.setSecondroll(apsProcessOperationDo.getSecondroll() + curcancelroll);
+//                newOperDo.setCancelroll(newOperDo.getCancelroll() + curcancelroll);
+//            } else if (cancelProcessOperationVo.getCancelreason().equals("2")) {//取消
+//                newOperDo.setCancelroll(newOperDo.getCancelroll() + curcancelroll);
+//            } else if (cancelProcessOperationVo.getCancelreason().equals("3") || cancelProcessOperationVo.getCancelreason().equals("4")) {//输入取消或输入不合格
+//                ApsProcessOperationProcessEquDo processEquDo = operationequrollsall.stream().filter(es -> es.getProcessid().equals(newOperDo.getId())).findFirst().get();
+//                if (processEquDo != null) {
+//                    if (cancelProcessOperationVo.getCancelreason().equals("4")) {
+//                        newOperDo.setInputunqualifiednum(processEquDo.getInputunqualifiednum());
+//                    }
+//                    newOperDo.setInputunqualifiedroll(processEquDo.getInputunqualifiedroll());
+//                    newOperDo.setCancelroll(processEquDo.getCancelrollno());
+//                    newOperDo.setSecondroll(processEquDo.getSecondroll());
+//                }
+//                curcancelroll = newOperDo.getCancelroll() + newOperDo.getInputunqualifiedroll() - (newOperDo.getCancelrollsum() == null ? 0 : newOperDo.getCancelrollsum());
+//            }
+
+            ApsProcessOperationProcessEquDo processEquDo = operationequrollsall.stream().filter(es -> es.getProcessid().equals(newOperDo.getId())).findFirst().get();
+            if (processEquDo != null) {
+                newOperDo.setInputunqualifiednum(processEquDo.getInputunqualifiednum());
+                newOperDo.setInputunqualifiedroll(processEquDo.getInputunqualifiedroll());
+                newOperDo.setCancelroll(processEquDo.getCancelrollno());
+                newOperDo.setSecondroll(processEquDo.getSecondroll());
             }
+            curcancelroll = newOperDo.getCancelroll() + newOperDo.getInputunqualifiedroll() - (newOperDo.getCancelrollsum() == null ? 0 : newOperDo.getCancelrollsum());
+
             newOperDo.setCancelrollsum(newOperDo.getCancelroll() + newOperDo.getInputunqualifiedroll());
             newOperDo.setLeavewaitworkroll(apsProcessOperationDo.getPlanprocessrall() - apsProcessOperationDo.getStartingroll() - newOperDo.getCancelrollsum());
             Integer leaveWaitJobRoll = apsProcessOperationDo.getPlanprocessrall() - apsProcessOperationDo.getReportroll() - newOperDo.getCancelrollsum();
@@ -2240,13 +2250,21 @@ public class ApsProcessOperationServiceImpl extends ServiceImpl<ApsProcessOperat
                 map.put("MAINID", newOperDo.getId());
                 List<ApsProcessOperationOutMaterDo> apsProcessOperationOutMaterDos = apsProcessOperationOutMaterService.listByMap(map).stream().collect(Collectors.toList());
                 for (ApsProcessOperationOutMaterDo apsProcessOperationOutMaterDo : apsProcessOperationOutMaterDos) {
-                    apsProcessOperationOutMaterDo.setOutcancelroll(apsProcessOperationOutMaterDo.getOutcancelroll() + ((int) Math.floor((double) (curcancelroll * apsProcessOperationOutMaterDo.getPlanrollnum()) / apsProcessOperationDo.getPlanprocessrall())));
-                    apsProcessOperationOutMaterDo.setProdcancelroll(apsProcessOperationOutMaterDo.getProdcancelroll() + ((int) Math.floor((double) (curcancelroll * apsProcessOperationOutMaterDo.getPlanprodrollnum()) / apsProcessOperationDo.getPlanprocessrall())));
-                    apsProcessOperationOutMaterDo.setProdleaveoutroll(apsProcessOperationOutMaterDo.getProdleaveoutroll() - ((int) Math.floor((double) (curcancelroll * apsProcessOperationOutMaterDo.getPlanprodrollnum()) / apsProcessOperationDo.getPlanprocessrall())));
-                    apsProcessOperationOutMaterDo.setStockcancelroll(apsProcessOperationOutMaterDo.getStockcancelroll() + ((int) Math.floor((double) (curcancelroll * apsProcessOperationOutMaterDo.getPlanstockrollnum()) / apsProcessOperationDo.getPlanprocessrall())));
-                    apsProcessOperationOutMaterDo.setStockleaveoutroll(apsProcessOperationOutMaterDo.getStockleaveoutroll() - ((int) Math.floor((double) (curcancelroll * apsProcessOperationOutMaterDo.getPlanstockrollnum()) / apsProcessOperationDo.getPlanprocessrall())));
-                    apsProcessOperationOutMaterDo.setMovecancelroll(apsProcessOperationOutMaterDo.getMovecancelroll() + ((int) Math.floor((double) (curcancelroll * apsProcessOperationOutMaterDo.getPlanmoverollnum()) / apsProcessOperationDo.getPlanprocessrall())));
-                    apsProcessOperationOutMaterDo.setMoveleaveoutroll(apsProcessOperationOutMaterDo.getMoveleaveoutroll() - ((int) Math.floor((double) (curcancelroll * apsProcessOperationOutMaterDo.getPlanmoverollnum()) / apsProcessOperationDo.getPlanprocessrall())));
+//                    apsProcessOperationOutMaterDo.setOutcancelroll(apsProcessOperationOutMaterDo.getOutcancelroll() + ((int) Math.floor((double) (curcancelroll * apsProcessOperationOutMaterDo.getPlanrollnum()) / apsProcessOperationDo.getPlanprocessrall())));
+//                    apsProcessOperationOutMaterDo.setProdcancelroll(apsProcessOperationOutMaterDo.getProdcancelroll() + ((int) Math.floor((double) (curcancelroll * apsProcessOperationOutMaterDo.getPlanprodrollnum()) / apsProcessOperationDo.getPlanprocessrall())));
+//                    apsProcessOperationOutMaterDo.setProdleaveoutroll(apsProcessOperationOutMaterDo.getProdleaveoutroll() - ((int) Math.floor((double) (curcancelroll * apsProcessOperationOutMaterDo.getPlanprodrollnum()) / apsProcessOperationDo.getPlanprocessrall())));
+//                    apsProcessOperationOutMaterDo.setStockcancelroll(apsProcessOperationOutMaterDo.getStockcancelroll() + ((int) Math.floor((double) (curcancelroll * apsProcessOperationOutMaterDo.getPlanstockrollnum()) / apsProcessOperationDo.getPlanprocessrall())));
+//                    apsProcessOperationOutMaterDo.setStockleaveoutroll(apsProcessOperationOutMaterDo.getStockleaveoutroll() - ((int) Math.floor((double) (curcancelroll * apsProcessOperationOutMaterDo.getPlanstockrollnum()) / apsProcessOperationDo.getPlanprocessrall())));
+//                    apsProcessOperationOutMaterDo.setMovecancelroll(apsProcessOperationOutMaterDo.getMovecancelroll() + ((int) Math.floor((double) (curcancelroll * apsProcessOperationOutMaterDo.getPlanmoverollnum()) / apsProcessOperationDo.getPlanprocessrall())));
+//                    apsProcessOperationOutMaterDo.setMoveleaveoutroll(apsProcessOperationOutMaterDo.getMoveleaveoutroll() - ((int) Math.floor((double) (curcancelroll * apsProcessOperationOutMaterDo.getPlanmoverollnum()) / apsProcessOperationDo.getPlanprocessrall())));
+
+                    apsProcessOperationOutMaterDo.setOutcancelroll((int) Math.floor((double) (newOperDo.getCancelrollsum() * apsProcessOperationOutMaterDo.getPlanrollnum()) / apsProcessOperationDo.getPlanprocessrall()));
+                    apsProcessOperationOutMaterDo.setProdcancelroll((int) Math.floor((double) (newOperDo.getCancelrollsum() * apsProcessOperationOutMaterDo.getPlanprodrollnum()) / apsProcessOperationDo.getPlanprocessrall()));
+                    apsProcessOperationOutMaterDo.setProdleaveoutroll(apsProcessOperationOutMaterDo.getPlanprodrollnum()-apsProcessOperationOutMaterDo.getProdcancelroll());
+                    apsProcessOperationOutMaterDo.setStockcancelroll((int) Math.floor((double) (newOperDo.getCancelrollsum() * apsProcessOperationOutMaterDo.getPlanstockrollnum()) / apsProcessOperationDo.getPlanprocessrall()));
+                    apsProcessOperationOutMaterDo.setStockleaveoutroll(apsProcessOperationOutMaterDo.getPlanstockrollnum()-apsProcessOperationOutMaterDo.getStockcancelroll());
+                    apsProcessOperationOutMaterDo.setMovecancelroll((int) Math.floor((double) (newOperDo.getCancelrollsum() * apsProcessOperationOutMaterDo.getPlanmoverollnum()) / apsProcessOperationDo.getPlanprocessrall()));
+                    apsProcessOperationOutMaterDo.setMoveleaveoutroll(apsProcessOperationOutMaterDo.getPlanmoverollnum()-apsProcessOperationOutMaterDo.getMovecancelroll());
 
                     apsProcessOperationOutMaterDoList.add(apsProcessOperationOutMaterDo);
                 }