作业调整

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

@@ -371,7 +371,6 @@ public class ApsProcessOperationServiceImpl extends ServiceImpl<ApsProcessOperat
                             apsProcessOperationOutMaterDo.setMoveleaveoutroll(apsProcessOperationOutMaterDo.getPlanrollnum() - apsProcessOperationOutMaterDo.getPlanprodrollnum());
                             previousProcessVo.setApsProcessOperationOutMaterDo(apsProcessOperationOutMaterDo);
 
-
                             //本道工序的可选设备
                             List<ApsCraftRouteStepEquDo> apsCraftRouteStepEquDos = apsCraftRouteStepEquDoList.stream().filter(crse -> apsCraftRouteStepDo1.getId().equals(crse.getCraftstepid())).collect(Collectors.toList());
                             if (apsCraftRouteStepEquDos.size() == 0) {
@@ -2066,65 +2065,6 @@ public class ApsProcessOperationServiceImpl extends ServiceImpl<ApsProcessOperat
                 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())));
 
-
-//                Integer curOutMaterCancelRoll = curcancelroll;//输出物料本次取消卷数
-//                if (cancelProcessOperationVo.getUpdatecuropration()) {
-//                    curOutMaterCancelRoll = curcancelroll * apsProcessOperationOutMaterDo.getOutval();//输出物料本次取消卷数
-//                }
-//                apsProcessOperationOutMaterDo.setOutcancelroll((apsProcessOperationDo.getInputunqualifiedroll() + apsProcessOperationDo.getCancelroll()) * apsProcessOperationOutMaterDo.getOutval());
-//                Integer curStockCancelRoll = 0;//本次备料取消卷数
-//                Integer curMoveCancelRoll = 0;//本次流转取消卷数
-//                Integer curProdCancelRoll = 0;//本次成品取消卷数
-//                if (apsProcessOperationOutMaterDo.getStockleaveoutroll() >= curOutMaterCancelRoll) {
-//                    curStockCancelRoll = curOutMaterCancelRoll;
-//                } else {
-//                    curStockCancelRoll = apsProcessOperationOutMaterDo.getStockleaveoutroll();
-//                    curOutMaterCancelRoll = curOutMaterCancelRoll - curStockCancelRoll;
-//                    if (apsProcessOperationOutMaterDo.getMoveleaveoutroll() >= curOutMaterCancelRoll) {
-//                        curMoveCancelRoll = curOutMaterCancelRoll;
-//                    } else {
-//                        curMoveCancelRoll = apsProcessOperationOutMaterDo.getMoveleaveoutroll();
-//                        curOutMaterCancelRoll = curOutMaterCancelRoll - curMoveCancelRoll;
-//                        if (apsProcessOperationOutMaterDo.getProdleaveoutroll() >= curOutMaterCancelRoll) {
-//                            curProdCancelRoll = curOutMaterCancelRoll;
-//                        } else {
-//                            curProdCancelRoll = apsProcessOperationOutMaterDo.getProdleaveoutroll();
-//                        }
-//                    }
-//                }
-//                apsProcessOperationOutMaterDo.setProdcancelroll(apsProcessOperationOutMaterDo.getProdcancelroll() + curProdCancelRoll);
-//                apsProcessOperationOutMaterDo.setProdleaveoutroll(apsProcessOperationOutMaterDo.getProdleaveoutroll() - curProdCancelRoll);
-//                apsProcessOperationOutMaterDo.setStockcancelroll(apsProcessOperationOutMaterDo.getStockcancelroll() + curStockCancelRoll);
-//                apsProcessOperationOutMaterDo.setStockleaveoutroll(apsProcessOperationOutMaterDo.getStockleaveoutroll() - curStockCancelRoll);
-//                apsProcessOperationOutMaterDo.setMovecancelroll(apsProcessOperationOutMaterDo.getMovecancelroll() + curMoveCancelRoll);
-//                apsProcessOperationOutMaterDo.setMoveleaveoutroll(apsProcessOperationOutMaterDo.getMoveleaveoutroll() - curMoveCancelRoll);
-
-//                if (curMoveCancelRoll > 0 && apsProcessOperationDos.size() > 0) {
-//                    List<ApsProcessOperationDo> processOperationDos = apsProcessOperationDos.stream().filter(apo -> apsProcessOperationOutMaterDo.getId().equals(apo.getPlaninputid())).collect(Collectors.toList());
-//                    for (ApsProcessOperationDo processOperationDo : processOperationDos) {
-//                        Integer cancelroll = 0;
-//                        if (curMoveCancelRoll > 0) {
-//                            CancelProcessOperationVo cancelProcessOperationVo1 = new CancelProcessOperationVo();
-//                            cancelProcessOperationVo1.setCraftrouteid(craftrouteid);
-//                            if (processOperationDo.getLeavewaitworkroll() >= curMoveCancelRoll) {
-//                                cancelroll = curMoveCancelRoll;
-//                                cancelProcessOperationVo1.setCurcancelroll(cancelroll);
-//                            } else {
-//                                cancelroll = processOperationDo.getLeavewaitworkroll();
-//                                cancelProcessOperationVo1.setCurcancelroll(cancelroll);
-//                            }
-////                            processOperationDo.setInputunqualifiedroll(getInputCancelRoll(apsProcessOperationDo.getPlanprocessrall(), apsProcessOperationDo.getCancelroll(), apsProcessOperationOutMaterDo));
-//                            processOperationDo.setInputunqualifiedroll(processOperationDo.getInputunqualifiedroll() + cancelroll);
-//                            cancelProcessOperationVo1.setApsprocessoperationdo(processOperationDo);
-//                            cancelProcessOperationVo1.setSetincancelroll(false);
-//                            cancelProcessOperation(cancelProcessOperationVo1);
-//                        } else {
-//                            break;
-//                        }
-//                        curMoveCancelRoll = curMoveCancelRoll - cancelroll;
-//                    }
-//                }
-
                 apsProcessOperationOutMaterDoList.add(apsProcessOperationOutMaterDo);
             }