计算计划作业时长去掉合并加工限制

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

@@ -252,22 +252,22 @@ public class ApsProcessOperationServiceImpl extends ServiceImpl<ApsProcessOperat
                             //输入物料ID对应前道工序作业输出物料只有一个后道工序作业），则不可编辑，自动计算=计划输入卷数
                             if (apsCraftRouteStepDoList1.size() == 1) {
                                 apsProcessOperationDo.setPlanprocessrall(processVo.get(0).getPlanprocessrall());
-                                if (!apsProcessOperationDo.getProcessway().equals("合并加工")) {
-                                    BigDecimal loadingmin = apsProcessOperationDo.getLoadingmin() == null ? BigDecimal.valueOf(0) : apsProcessOperationDo.getLoadingmin();
-                                    BigDecimal cuttingmin = apsProcessOperationDo.getCuttingmin() == null ? BigDecimal.valueOf(0) : apsProcessOperationDo.getCuttingmin();
-                                    if (apsProcessOperationDo.getTimeway().equals("10")) {
-                                        //如果计时方式=按设备运转速度计时，计划作业时长=计划加工卷数*(上料时长+下料时长+(输入单卷重/（输入物料宽度/1000*输入物料厚度/1000*设备运转速度/1000*铝的密度）))
-                                        BigDecimal prowidth = apsProcessOperationDo.getProwidth() == null ? BigDecimal.valueOf(1) : apsProcessOperationDo.getProwidth();
-                                        BigDecimal thickness = apsProcessOperationDo.getThickness() == null ? BigDecimal.valueOf(1) : apsProcessOperationDo.getThickness();
-                                        BigDecimal workspeed = apsProcessOperationDo.getWorkspeed() == null ? BigDecimal.valueOf(1) : apsProcessOperationDo.getWorkspeed();
-                                        BigDecimal onceprocessmin = new BigDecimal(df.format(loadingmin.add(cuttingmin).add(apsProcessOperationDo.getSinglerollweight().multiply(BigDecimal.valueOf(1000000000)).divide(prowidth.multiply(thickness).multiply(workspeed).multiply(aluminumdensity), 2, BigDecimal.ROUND_HALF_UP))));
-                                        apsProcessOperationDo.setOnceprocessmin(onceprocessmin);
-                                        apsProcessOperationDo.setProcesstotaltime(new BigDecimal(df.format(BigDecimal.valueOf(apsProcessOperationDo.getPlanprocessrall()).multiply(onceprocessmin))));
-                                    } else if (apsProcessOperationDo.getTimeway().equals("40")) {
-                                        //如果计时方式=按单次加工时长计时，计划作业时长=(上料时长+下料时长+单次加工时长)*计划加工卷数
-                                        apsProcessOperationDo.setProcesstotaltime(new BigDecimal(df.format(loadingmin.add(cuttingmin).add(apsProcessOperationDo.getOnceprocessmin()).multiply(BigDecimal.valueOf(apsProcessOperationDo.getPlanprocessrall())))));
-                                    }
+//                                if (!apsProcessOperationDo.getProcessway().equals("合并加工")) {
+                                BigDecimal loadingmin = apsProcessOperationDo.getLoadingmin() == null ? BigDecimal.valueOf(0) : apsProcessOperationDo.getLoadingmin();
+                                BigDecimal cuttingmin = apsProcessOperationDo.getCuttingmin() == null ? BigDecimal.valueOf(0) : apsProcessOperationDo.getCuttingmin();
+                                if (apsProcessOperationDo.getTimeway().equals("10")) {
+                                    //如果计时方式=按设备运转速度计时，计划作业时长=计划加工卷数*(上料时长+下料时长+(输入单卷重/（输入物料宽度/1000*输入物料厚度/1000*设备运转速度/1000*铝的密度）))
+                                    BigDecimal prowidth = apsProcessOperationDo.getProwidth() == null ? BigDecimal.valueOf(1) : apsProcessOperationDo.getProwidth();
+                                    BigDecimal thickness = apsProcessOperationDo.getThickness() == null ? BigDecimal.valueOf(1) : apsProcessOperationDo.getThickness();
+                                    BigDecimal workspeed = apsProcessOperationDo.getWorkspeed() == null ? BigDecimal.valueOf(1) : apsProcessOperationDo.getWorkspeed();
+                                    BigDecimal onceprocessmin = new BigDecimal(df.format(loadingmin.add(cuttingmin).add(apsProcessOperationDo.getSinglerollweight().multiply(BigDecimal.valueOf(1000000000)).divide(prowidth.multiply(thickness).multiply(workspeed).multiply(aluminumdensity), 2, BigDecimal.ROUND_HALF_UP))));
+                                    apsProcessOperationDo.setOnceprocessmin(onceprocessmin);
+                                    apsProcessOperationDo.setProcesstotaltime(new BigDecimal(df.format(BigDecimal.valueOf(apsProcessOperationDo.getPlanprocessrall()).multiply(onceprocessmin))));
+                                } else if (apsProcessOperationDo.getTimeway().equals("40")) {
+                                    //如果计时方式=按单次加工时长计时，计划作业时长=(上料时长+下料时长+单次加工时长)*计划加工卷数
+                                    apsProcessOperationDo.setProcesstotaltime(new BigDecimal(df.format(loadingmin.add(cuttingmin).add(apsProcessOperationDo.getOnceprocessmin()).multiply(BigDecimal.valueOf(apsProcessOperationDo.getPlanprocessrall())))));
                                 }
+//                                }
                             } else {
                                 apsProcessOperationDo.setPlanprocessrall(0);
                             }
@@ -420,22 +420,22 @@ public class ApsProcessOperationServiceImpl extends ServiceImpl<ApsProcessOperat
                         apsProcessOperationDo.setBlankid(blanckdata.getStr("ID"));
                         apsProcessOperationDo.setCraftstepid(apsCraftRouteStepDo.getId());
 
-                        if (!apsProcessOperationDo.getProcessway().equals("合并加工")) {
-                            BigDecimal loadingmin = apsProcessOperationDo.getLoadingmin() == null ? BigDecimal.valueOf(0) : apsProcessOperationDo.getLoadingmin();
-                            BigDecimal cuttingmin = apsProcessOperationDo.getCuttingmin() == null ? BigDecimal.valueOf(0) : apsProcessOperationDo.getCuttingmin();
-                            if (apsProcessOperationDo.getTimeway().equals("10")) {
-                                //如果计时方式=按设备运转速度计时，计划作业时长=计划加工卷数*(上料时长+下料时长+(输入单卷重/（输入物料宽度/1000*输入物料厚度/1000*设备运转速度/1000*铝的密度）))
-                                BigDecimal prowidth = apsProcessOperationDo.getProwidth() == null ? BigDecimal.valueOf(1) : apsProcessOperationDo.getProwidth();
-                                BigDecimal thickness = apsProcessOperationDo.getThickness() == null ? BigDecimal.valueOf(1) : apsProcessOperationDo.getThickness();
-                                BigDecimal workspeed = apsProcessOperationDo.getWorkspeed() == null ? BigDecimal.valueOf(1) : apsProcessOperationDo.getWorkspeed();
-                                BigDecimal onceprocessmin = new BigDecimal(df.format(loadingmin.add(cuttingmin).add(apsProcessOperationDo.getSinglerollweight().multiply(BigDecimal.valueOf(1000000000)).divide(prowidth.multiply(thickness).multiply(workspeed).multiply(aluminumdensity), 2, BigDecimal.ROUND_HALF_UP))));
-                                apsProcessOperationDo.setOnceprocessmin(onceprocessmin);
-                                apsProcessOperationDo.setProcesstotaltime(new BigDecimal(df.format(BigDecimal.valueOf(apsProcessOperationDo.getPlanprocessrall()).multiply(onceprocessmin))));
-                            } else if (apsProcessOperationDo.getTimeway().equals("40")) {
-                                //如果计时方式=按单次加工时长计时，计划作业时长=(上料时长+下料时长+单次加工时长)*计划加工卷数
-                                apsProcessOperationDo.setProcesstotaltime(new BigDecimal(df.format(loadingmin.add(cuttingmin).add(apsProcessOperationDo.getOnceprocessmin()).multiply(BigDecimal.valueOf(apsProcessOperationDo.getPlanprocessrall())))));
-                            }
+//                        if (!apsProcessOperationDo.getProcessway().equals("合并加工")) {
+                        BigDecimal loadingmin = apsProcessOperationDo.getLoadingmin() == null ? BigDecimal.valueOf(0) : apsProcessOperationDo.getLoadingmin();
+                        BigDecimal cuttingmin = apsProcessOperationDo.getCuttingmin() == null ? BigDecimal.valueOf(0) : apsProcessOperationDo.getCuttingmin();
+                        if (apsProcessOperationDo.getTimeway().equals("10")) {
+                            //如果计时方式=按设备运转速度计时，计划作业时长=计划加工卷数*(上料时长+下料时长+(输入单卷重/（输入物料宽度/1000*输入物料厚度/1000*设备运转速度/1000*铝的密度）))
+                            BigDecimal prowidth = apsProcessOperationDo.getProwidth() == null ? BigDecimal.valueOf(1) : apsProcessOperationDo.getProwidth();
+                            BigDecimal thickness = apsProcessOperationDo.getThickness() == null ? BigDecimal.valueOf(1) : apsProcessOperationDo.getThickness();
+                            BigDecimal workspeed = apsProcessOperationDo.getWorkspeed() == null ? BigDecimal.valueOf(1) : apsProcessOperationDo.getWorkspeed();
+                            BigDecimal onceprocessmin = new BigDecimal(df.format(loadingmin.add(cuttingmin).add(apsProcessOperationDo.getSinglerollweight().multiply(BigDecimal.valueOf(1000000000)).divide(prowidth.multiply(thickness).multiply(workspeed).multiply(aluminumdensity), 2, BigDecimal.ROUND_HALF_UP))));
+                            apsProcessOperationDo.setOnceprocessmin(onceprocessmin);
+                            apsProcessOperationDo.setProcesstotaltime(new BigDecimal(df.format(BigDecimal.valueOf(apsProcessOperationDo.getPlanprocessrall()).multiply(onceprocessmin))));
+                        } else if (apsProcessOperationDo.getTimeway().equals("40")) {
+                            //如果计时方式=按单次加工时长计时，计划作业时长=(上料时长+下料时长+单次加工时长)*计划加工卷数
+                            apsProcessOperationDo.setProcesstotaltime(new BigDecimal(df.format(loadingmin.add(cuttingmin).add(apsProcessOperationDo.getOnceprocessmin()).multiply(BigDecimal.valueOf(apsProcessOperationDo.getPlanprocessrall())))));
                         }
+//                        }
 
                         //本道工序信息
                         previousProcessVo.setProcessId(processId);
@@ -683,22 +683,22 @@ public class ApsProcessOperationServiceImpl extends ServiceImpl<ApsProcessOperat
                         //输入物料ID对应前道工序作业输出物料只有一个后道工序作业），则不可编辑，自动计算=计划输入卷数
                         if (apsProcessOperationDos1.size() == 1) {
                             processOperationDo.setPlanprocessrall(processVo.get(0).getPlanprocessrall());
-                            if (!processOperationDo.getProcessway().equals("合并加工")) {
-                                BigDecimal loadingmin = processOperationDo.getLoadingmin() == null ? BigDecimal.valueOf(0) : processOperationDo.getLoadingmin();
-                                BigDecimal cuttingmin = processOperationDo.getCuttingmin() == null ? BigDecimal.valueOf(0) : processOperationDo.getCuttingmin();
-                                if (processOperationDo.getTimeway().equals("10")) {
-                                    //如果计时方式=按设备运转速度计时，计划作业时长=计划加工卷数*(上料时长+下料时长+(输入单卷重/（输入物料宽度/1000*输入物料厚度/1000*设备运转速度/1000*铝的密度）))
-                                    BigDecimal prowidth = processOperationDo.getProwidth() == null ? BigDecimal.valueOf(1) : processOperationDo.getProwidth();
-                                    BigDecimal thickness = processOperationDo.getThickness() == null ? BigDecimal.valueOf(1) : processOperationDo.getThickness();
-                                    BigDecimal workspeed = processOperationDo.getWorkspeed() == null ? BigDecimal.valueOf(1) : processOperationDo.getWorkspeed();
-                                    BigDecimal onceprocessmin = new BigDecimal(df.format(loadingmin.add(cuttingmin).add(processOperationDo.getSinglerollweight().multiply(BigDecimal.valueOf(1000000000)).divide(prowidth.multiply(thickness).multiply(workspeed).multiply(aluminumdensity), 2, BigDecimal.ROUND_HALF_UP))));
-                                    processOperationDo.setOnceprocessmin(onceprocessmin);
-                                    processOperationDo.setProcesstotaltime(new BigDecimal(df.format(BigDecimal.valueOf(processOperationDo.getPlanprocessrall()).multiply(onceprocessmin))));
-                                } else if (processOperationDo.getTimeway().equals("40")) {
-                                    //如果计时方式=按单次加工时长计时，计划作业时长=(上料时长+下料时长+单次加工时长)*计划加工卷数
-                                    processOperationDo.setProcesstotaltime(new BigDecimal(df.format(loadingmin.add(cuttingmin).add(processOperationDo.getOnceprocessmin()).multiply(BigDecimal.valueOf(processOperationDo.getPlanprocessrall())))));
-                                }
+//                            if (!processOperationDo.getProcessway().equals("合并加工")) {
+                            BigDecimal loadingmin = processOperationDo.getLoadingmin() == null ? BigDecimal.valueOf(0) : processOperationDo.getLoadingmin();
+                            BigDecimal cuttingmin = processOperationDo.getCuttingmin() == null ? BigDecimal.valueOf(0) : processOperationDo.getCuttingmin();
+                            if (processOperationDo.getTimeway().equals("10")) {
+                                //如果计时方式=按设备运转速度计时，计划作业时长=计划加工卷数*(上料时长+下料时长+(输入单卷重/（输入物料宽度/1000*输入物料厚度/1000*设备运转速度/1000*铝的密度）))
+                                BigDecimal prowidth = processOperationDo.getProwidth() == null ? BigDecimal.valueOf(1) : processOperationDo.getProwidth();
+                                BigDecimal thickness = processOperationDo.getThickness() == null ? BigDecimal.valueOf(1) : processOperationDo.getThickness();
+                                BigDecimal workspeed = processOperationDo.getWorkspeed() == null ? BigDecimal.valueOf(1) : processOperationDo.getWorkspeed();
+                                BigDecimal onceprocessmin = new BigDecimal(df.format(loadingmin.add(cuttingmin).add(processOperationDo.getSinglerollweight().multiply(BigDecimal.valueOf(1000000000)).divide(prowidth.multiply(thickness).multiply(workspeed).multiply(aluminumdensity), 2, BigDecimal.ROUND_HALF_UP))));
+                                processOperationDo.setOnceprocessmin(onceprocessmin);
+                                processOperationDo.setProcesstotaltime(new BigDecimal(df.format(BigDecimal.valueOf(processOperationDo.getPlanprocessrall()).multiply(onceprocessmin))));
+                            } else if (processOperationDo.getTimeway().equals("40")) {
+                                //如果计时方式=按单次加工时长计时，计划作业时长=(上料时长+下料时长+单次加工时长)*计划加工卷数
+                                processOperationDo.setProcesstotaltime(new BigDecimal(df.format(loadingmin.add(cuttingmin).add(processOperationDo.getOnceprocessmin()).multiply(BigDecimal.valueOf(processOperationDo.getPlanprocessrall())))));
                             }
+//                            }
                         } else {
                             processOperationDo.setPlanprocessrall(0);
                         }
@@ -844,22 +844,22 @@ public class ApsProcessOperationServiceImpl extends ServiceImpl<ApsProcessOperat
                     processOperationDo.setBlankid(blanckdata.getStr("ID"));
                     processOperationDo.setNextprocessid(null);
 
-                    if (!processOperationDo.getProcessway().equals("合并加工")) {
-                        BigDecimal loadingmin = processOperationDo.getLoadingmin() == null ? BigDecimal.valueOf(0) : processOperationDo.getLoadingmin();
-                        BigDecimal cuttingmin = processOperationDo.getCuttingmin() == null ? BigDecimal.valueOf(0) : processOperationDo.getCuttingmin();
-                        if (processOperationDo.getTimeway().equals("10")) {
-                            //如果计时方式=按设备运转速度计时，计划作业时长=计划加工卷数*(上料时长+下料时长+(输入单卷重/（输入物料宽度/1000*输入物料厚度/1000*设备运转速度/1000*铝的密度）))
-                            BigDecimal prowidth = processOperationDo.getProwidth() == null ? BigDecimal.valueOf(1) : processOperationDo.getProwidth();
-                            BigDecimal thickness = processOperationDo.getThickness() == null ? BigDecimal.valueOf(1) : processOperationDo.getThickness();
-                            BigDecimal workspeed = processOperationDo.getWorkspeed() == null ? BigDecimal.valueOf(1) : processOperationDo.getWorkspeed();
-                            BigDecimal onceprocessmin = new BigDecimal(df.format(loadingmin.add(cuttingmin).add(processOperationDo.getSinglerollweight().multiply(BigDecimal.valueOf(1000000000)).divide(prowidth.multiply(thickness).multiply(workspeed).multiply(aluminumdensity), 2, BigDecimal.ROUND_HALF_UP))));
-                            processOperationDo.setOnceprocessmin(onceprocessmin);
-                            processOperationDo.setProcesstotaltime(new BigDecimal(df.format(BigDecimal.valueOf(processOperationDo.getPlanprocessrall()).multiply(onceprocessmin))));
-                        } else if (processOperationDo.getTimeway().equals("40")) {
-                            //如果计时方式=按单次加工时长计时，计划作业时长=(上料时长+下料时长+单次加工时长)*计划加工卷数
-                            processOperationDo.setProcesstotaltime(new BigDecimal(df.format(loadingmin.add(cuttingmin).add(processOperationDo.getOnceprocessmin()).multiply(BigDecimal.valueOf(processOperationDo.getPlanprocessrall())))));
-                        }
+//                    if (!processOperationDo.getProcessway().equals("合并加工")) {
+                    BigDecimal loadingmin = processOperationDo.getLoadingmin() == null ? BigDecimal.valueOf(0) : processOperationDo.getLoadingmin();
+                    BigDecimal cuttingmin = processOperationDo.getCuttingmin() == null ? BigDecimal.valueOf(0) : processOperationDo.getCuttingmin();
+                    if (processOperationDo.getTimeway().equals("10")) {
+                        //如果计时方式=按设备运转速度计时，计划作业时长=计划加工卷数*(上料时长+下料时长+(输入单卷重/（输入物料宽度/1000*输入物料厚度/1000*设备运转速度/1000*铝的密度）))
+                        BigDecimal prowidth = processOperationDo.getProwidth() == null ? BigDecimal.valueOf(1) : processOperationDo.getProwidth();
+                        BigDecimal thickness = processOperationDo.getThickness() == null ? BigDecimal.valueOf(1) : processOperationDo.getThickness();
+                        BigDecimal workspeed = processOperationDo.getWorkspeed() == null ? BigDecimal.valueOf(1) : processOperationDo.getWorkspeed();
+                        BigDecimal onceprocessmin = new BigDecimal(df.format(loadingmin.add(cuttingmin).add(processOperationDo.getSinglerollweight().multiply(BigDecimal.valueOf(1000000000)).divide(prowidth.multiply(thickness).multiply(workspeed).multiply(aluminumdensity), 2, BigDecimal.ROUND_HALF_UP))));
+                        processOperationDo.setOnceprocessmin(onceprocessmin);
+                        processOperationDo.setProcesstotaltime(new BigDecimal(df.format(BigDecimal.valueOf(processOperationDo.getPlanprocessrall()).multiply(onceprocessmin))));
+                    } else if (processOperationDo.getTimeway().equals("40")) {
+                        //如果计时方式=按单次加工时长计时，计划作业时长=(上料时长+下料时长+单次加工时长)*计划加工卷数
+                        processOperationDo.setProcesstotaltime(new BigDecimal(df.format(loadingmin.add(cuttingmin).add(processOperationDo.getOnceprocessmin()).multiply(BigDecimal.valueOf(processOperationDo.getPlanprocessrall())))));
                     }
+//                    }
 
                     //本道工序信息
                     previousProcessVo.setProcessId(processId);
@@ -1216,22 +1216,22 @@ public class ApsProcessOperationServiceImpl extends ServiceImpl<ApsProcessOperat
                     //输入物料ID对应前道工序作业输出物料只有一个后道工序作业），则不可编辑，自动计算=计划输入卷数
                     if (apsProcessOperationDos.size() == 1) {
                         apsProcessOperationDo.setPlanprocessrall(planinrall);
-                        if (!apsProcessOperationDo.getProcessway().equals("合并加工")) {
-                            BigDecimal loadingmin = apsProcessOperationDo.getLoadingmin() == null ? BigDecimal.valueOf(0) : apsProcessOperationDo.getLoadingmin();
-                            BigDecimal cuttingmin = apsProcessOperationDo.getCuttingmin() == null ? BigDecimal.valueOf(0) : apsProcessOperationDo.getCuttingmin();
-                            if (apsProcessOperationDo.getTimeway().equals("10")) {
-                                //如果计时方式=按设备运转速度计时，计划作业时长=计划加工卷数*(上料时长+下料时长+(输入单卷重/（输入物料宽度/1000*输入物料厚度/1000*设备运转速度/1000*铝的密度）))
-                                BigDecimal prowidth = apsProcessOperationDo.getProwidth() == null ? BigDecimal.valueOf(1) : apsProcessOperationDo.getProwidth();
-                                BigDecimal thickness = apsProcessOperationDo.getThickness() == null ? BigDecimal.valueOf(1) : apsProcessOperationDo.getThickness();
-                                BigDecimal workspeed = apsProcessOperationDo.getWorkspeed() == null ? BigDecimal.valueOf(1) : apsProcessOperationDo.getWorkspeed();
-                                BigDecimal onceprocessmin = new BigDecimal(df.format(loadingmin.add(cuttingmin).add(apsProcessOperationDo.getSinglerollweight().multiply(BigDecimal.valueOf(1000000000)).divide(prowidth.multiply(thickness).multiply(workspeed).multiply(aluminumdensity), 2, BigDecimal.ROUND_HALF_UP))));
-                                apsProcessOperationDo.setOnceprocessmin(onceprocessmin);
-                                apsProcessOperationDo.setProcesstotaltime(new BigDecimal(df.format(BigDecimal.valueOf(apsProcessOperationDo.getPlanprocessrall()).multiply(onceprocessmin))));
-                            } else if (apsProcessOperationDo.getTimeway().equals("40")) {
-                                //如果计时方式=按单次加工时长计时，计划作业时长=(上料时长+下料时长+单次加工时长)*计划加工卷数
-                                apsProcessOperationDo.setProcesstotaltime(new BigDecimal(df.format(loadingmin.add(cuttingmin).add(apsProcessOperationDo.getOnceprocessmin()).multiply(BigDecimal.valueOf(apsProcessOperationDo.getPlanprocessrall())))));
-                            }
+//                        if (!apsProcessOperationDo.getProcessway().equals("合并加工")) {
+                        BigDecimal loadingmin = apsProcessOperationDo.getLoadingmin() == null ? BigDecimal.valueOf(0) : apsProcessOperationDo.getLoadingmin();
+                        BigDecimal cuttingmin = apsProcessOperationDo.getCuttingmin() == null ? BigDecimal.valueOf(0) : apsProcessOperationDo.getCuttingmin();
+                        if (apsProcessOperationDo.getTimeway().equals("10")) {
+                            //如果计时方式=按设备运转速度计时，计划作业时长=计划加工卷数*(上料时长+下料时长+(输入单卷重/（输入物料宽度/1000*输入物料厚度/1000*设备运转速度/1000*铝的密度）))
+                            BigDecimal prowidth = apsProcessOperationDo.getProwidth() == null ? BigDecimal.valueOf(1) : apsProcessOperationDo.getProwidth();
+                            BigDecimal thickness = apsProcessOperationDo.getThickness() == null ? BigDecimal.valueOf(1) : apsProcessOperationDo.getThickness();
+                            BigDecimal workspeed = apsProcessOperationDo.getWorkspeed() == null ? BigDecimal.valueOf(1) : apsProcessOperationDo.getWorkspeed();
+                            BigDecimal onceprocessmin = new BigDecimal(df.format(loadingmin.add(cuttingmin).add(apsProcessOperationDo.getSinglerollweight().multiply(BigDecimal.valueOf(1000000000)).divide(prowidth.multiply(thickness).multiply(workspeed).multiply(aluminumdensity), 2, BigDecimal.ROUND_HALF_UP))));
+                            apsProcessOperationDo.setOnceprocessmin(onceprocessmin);
+                            apsProcessOperationDo.setProcesstotaltime(new BigDecimal(df.format(BigDecimal.valueOf(apsProcessOperationDo.getPlanprocessrall()).multiply(onceprocessmin))));
+                        } else if (apsProcessOperationDo.getTimeway().equals("40")) {
+                            //如果计时方式=按单次加工时长计时，计划作业时长=(上料时长+下料时长+单次加工时长)*计划加工卷数
+                            apsProcessOperationDo.setProcesstotaltime(new BigDecimal(df.format(loadingmin.add(cuttingmin).add(apsProcessOperationDo.getOnceprocessmin()).multiply(BigDecimal.valueOf(apsProcessOperationDo.getPlanprocessrall())))));
                         }
+//                        }
 //                        ApsProcessOperationDo operationDo = processOperationDos.stream().filter(item -> item.getId().equals(apsProcessOperationDo.getPreviousprocessid())).findFirst().get();
 //                        apsProcessOperationDo.setPlanprocessrall(operationDo.getPlanprocessrall());
                     }
@@ -1540,22 +1540,22 @@ public class ApsProcessOperationServiceImpl extends ServiceImpl<ApsProcessOperat
         apsProcessOperationDo.setPlanprocessrall(rollnum);
         apsProcessOperationDo.setUnfinishroll(rollnum - apsProcessOperationDo.getReportroll());
 
-        if (!apsProcessOperationDo.getProcessway().equals("合并加工")) {
-            BigDecimal loadingmin = apsProcessOperationDo.getLoadingmin() == null ? BigDecimal.valueOf(0) : apsProcessOperationDo.getLoadingmin();
-            BigDecimal cuttingmin = apsProcessOperationDo.getCuttingmin() == null ? BigDecimal.valueOf(0) : apsProcessOperationDo.getCuttingmin();
-            if (apsProcessOperationDo.getTimeway().equals("10")) {
-                //如果计时方式=按设备运转速度计时，计划作业时长=计划加工卷数*(上料时长+下料时长+(输入单卷重/（输入物料宽度/1000*输入物料厚度/1000*设备运转速度/1000*铝的密度）))
-                BigDecimal prowidth = apsProcessOperationDo.getProwidth() == null ? BigDecimal.valueOf(1) : apsProcessOperationDo.getProwidth();
-                BigDecimal thickness = apsProcessOperationDo.getThickness() == null ? BigDecimal.valueOf(1) : apsProcessOperationDo.getThickness();
-                BigDecimal workspeed = apsProcessOperationDo.getWorkspeed() == null ? BigDecimal.valueOf(1) : apsProcessOperationDo.getWorkspeed();
-                BigDecimal onceprocessmin = new BigDecimal(df.format(loadingmin.add(cuttingmin).add(singlerollweight.multiply(BigDecimal.valueOf(1000000000)).divide(prowidth.multiply(thickness).multiply(workspeed).multiply(aluminumdensity), 2, BigDecimal.ROUND_HALF_UP))));
-                apsProcessOperationDo.setOnceprocessmin(onceprocessmin);
-                apsProcessOperationDo.setProcesstotaltime(new BigDecimal(df.format(BigDecimal.valueOf(apsProcessOperationDo.getPlanprocessrall()).multiply(onceprocessmin))));
-            } else if (apsProcessOperationDo.getTimeway().equals("40")) {
-                //如果计时方式=按单次加工时长计时，计划作业时长=(上料时长+下料时长+单次加工时长)*计划加工卷数
-                apsProcessOperationDo.setProcesstotaltime(new BigDecimal(df.format(loadingmin.add(cuttingmin).add(apsProcessOperationDo.getOnceprocessmin()).multiply(BigDecimal.valueOf(rollnum)))));
-            }
+//        if (!apsProcessOperationDo.getProcessway().equals("合并加工")) {
+        BigDecimal loadingmin = apsProcessOperationDo.getLoadingmin() == null ? BigDecimal.valueOf(0) : apsProcessOperationDo.getLoadingmin();
+        BigDecimal cuttingmin = apsProcessOperationDo.getCuttingmin() == null ? BigDecimal.valueOf(0) : apsProcessOperationDo.getCuttingmin();
+        if (apsProcessOperationDo.getTimeway().equals("10")) {
+            //如果计时方式=按设备运转速度计时，计划作业时长=计划加工卷数*(上料时长+下料时长+(输入单卷重/（输入物料宽度/1000*输入物料厚度/1000*设备运转速度/1000*铝的密度）))
+            BigDecimal prowidth = apsProcessOperationDo.getProwidth() == null ? BigDecimal.valueOf(1) : apsProcessOperationDo.getProwidth();
+            BigDecimal thickness = apsProcessOperationDo.getThickness() == null ? BigDecimal.valueOf(1) : apsProcessOperationDo.getThickness();
+            BigDecimal workspeed = apsProcessOperationDo.getWorkspeed() == null ? BigDecimal.valueOf(1) : apsProcessOperationDo.getWorkspeed();
+            BigDecimal onceprocessmin = new BigDecimal(df.format(loadingmin.add(cuttingmin).add(singlerollweight.multiply(BigDecimal.valueOf(1000000000)).divide(prowidth.multiply(thickness).multiply(workspeed).multiply(aluminumdensity), 2, BigDecimal.ROUND_HALF_UP))));
+            apsProcessOperationDo.setOnceprocessmin(onceprocessmin);
+            apsProcessOperationDo.setProcesstotaltime(new BigDecimal(df.format(BigDecimal.valueOf(apsProcessOperationDo.getPlanprocessrall()).multiply(onceprocessmin))));
+        } else if (apsProcessOperationDo.getTimeway().equals("40")) {
+            //如果计时方式=按单次加工时长计时，计划作业时长=(上料时长+下料时长+单次加工时长)*计划加工卷数
+            apsProcessOperationDo.setProcesstotaltime(new BigDecimal(df.format(loadingmin.add(cuttingmin).add(apsProcessOperationDo.getOnceprocessmin()).multiply(BigDecimal.valueOf(rollnum)))));
         }
+//        }
 
         //更新工序输出
         List<ApsProcessOperationOutMaterDo> apsProcessOperationOutMaterDoNewList = new ArrayList<>();