Merge remote-tracking branch 'origin/mode-min-unit' into mode-min-unit

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

@@ -334,11 +334,6 @@ public class ApsProcessOperationServiceImpl extends ServiceImpl<ApsProcessOperat
                             String outputMeter = getOutMeterInfo(outProducttype, outMeter, outMetalstate, tval, wval, lval, apsProcessOperationOutMaterDo.getThickoffset(), apsProcessOperationOutMaterDo.getWidthoffset(), apsProcessOperationOutMaterDo.getLengthoffset()) + singlerollweight + UNIT_MAP.getOrDefault(blanckdata.getStr("NUMBERUNIT"), "");
                             apsProcessOperationOutMaterDo.setOutputmaterial(outputMeter + "*" + blanckdata.getInt("ROLLNUM") + "卷");
                             apsProcessOperationDo.setPlanoutput("[1]" + outputMeter + "*" + blanckdata.getInt("ROLLNUM") + "卷");
-                            if (apsProcessOperationOutMaterDo.getPlanrollnum() > 1) {
-                                apsProcessOperationDo.setIssubsection("是");
-                            } else {
-                                apsProcessOperationDo.setIssubsection("否");
-                            }
                             //输出成品
                             /*
                             如果没有后道工序作业，则成品卷数=计划输出卷数 - 计划备料卷数，
@@ -496,11 +491,6 @@ public class ApsProcessOperationServiceImpl extends ServiceImpl<ApsProcessOperat
                         String outputMeter = getOutMeterInfo(outProducttype, outMeter, outMetalstate, tval, wval, lval, apsProcessOperationOutMaterDo.getThickoffset(), apsProcessOperationOutMaterDo.getWidthoffset(), apsProcessOperationOutMaterDo.getLengthoffset()) + singlerollweight + UNIT_MAP.getOrDefault(blanckdata.getStr("NUMBERUNIT"), "");
                         apsProcessOperationOutMaterDo.setOutputmaterial(outputMeter + "*" + blanckdata.getInt("ROLLNUM") + "卷");
                         apsProcessOperationDo.setPlanoutput("[1]" + outputMeter + "*" + blanckdata.getInt("ROLLNUM") + "卷");
-                        if (blanckdata.getInt("ROLLNUM") > 1) {
-                            apsProcessOperationDo.setIssubsection("是");
-                        } else {
-                            apsProcessOperationDo.setIssubsection("否");
-                        }
                         //输出成品
                         /*
                         如果没有后道工序作业，则成品卷数=计划输出卷数 - 计划备料卷数，
@@ -758,7 +748,7 @@ public class ApsProcessOperationServiceImpl extends ServiceImpl<ApsProcessOperat
                             return R.error("工艺步骤" + apsProcessOperationDo1.getProcessname() + "没输出");
                         }
                         List<String> planoutputList = new ArrayList<>();
-                        Integer planrollnum = 0;
+                        Integer outval = 0;
                         for (ApsProcessOperationOutMaterDo apsProcessOperationOutMaterDo : apsProcessOperationOutMaterDos1) {
                             ApsProcessOperationOutMaterDo processOperationOutMaterDo = BeanUtil.toBean(apsProcessOperationOutMaterDo, ApsProcessOperationOutMaterDo.class);
                             processOperationOutMaterDo.setRoption(apsProcessOperationOutMaterDo.getId());
@@ -836,7 +826,7 @@ public class ApsProcessOperationServiceImpl extends ServiceImpl<ApsProcessOperat
                             processOperationOutMaterDo.setMoveleaveoutroll(processOperationOutMaterDo.getPlanmoverollnum() - processOperationOutMaterDo.getMoveoutroll() - processOperationOutMaterDo.getMovecancelroll());
                             processOperationOutMaterDo.setStockleaveoutroll(processOperationOutMaterDo.getPlanstockrollnum() - processOperationOutMaterDo.getStockoutroll() - processOperationOutMaterDo.getStockcancelroll());
 
-                            planrollnum += processOperationOutMaterDo.getPlanrollnum();
+                            outval += processOperationOutMaterDo.getOutval();
                             apsProcessOperationOutMaterDoList.add(processOperationOutMaterDo);
                         }
                         previousProcessVo.setApsProcessOperationOutMaterDos(apsProcessOperationOutMaterDoList);
@@ -877,7 +867,7 @@ public class ApsProcessOperationServiceImpl extends ServiceImpl<ApsProcessOperat
                             }
                         }
                         processOperationDo.setPlanoutput(planoutsb.toString());
-                        if (planrollnum > 1) {
+                        if (outval > 1) {
                             apsProcessOperationDo.setIssubsection("是");
                         } else {
                             apsProcessOperationDo.setIssubsection("否");
@@ -946,7 +936,7 @@ public class ApsProcessOperationServiceImpl extends ServiceImpl<ApsProcessOperat
                         return R.error("工艺步骤" + apsProcessOperationDo.getProcessname() + "没输出");
                     }
                     List<String> planoutputList = new ArrayList<>();
-                    Integer planrollnum = 0;
+                    Integer outval = 0;
                     for (ApsProcessOperationOutMaterDo apsProcessOperationOutMaterDo : apsProcessOperationOutMaterDos1) {
                         ApsProcessOperationOutMaterDo processOperationOutMaterDo = BeanUtil.toBean(apsProcessOperationOutMaterDo, ApsProcessOperationOutMaterDo.class);
                         processOperationOutMaterDo.setId(SecurityUtil.getUUID());
@@ -1003,7 +993,7 @@ public class ApsProcessOperationServiceImpl extends ServiceImpl<ApsProcessOperat
                         processOperationOutMaterDo.setMoveleaveoutroll(processOperationOutMaterDo.getPlanmoverollnum() - processOperationOutMaterDo.getMoveoutroll() - processOperationOutMaterDo.getMovecancelroll());
                         processOperationOutMaterDo.setStockleaveoutroll(processOperationOutMaterDo.getPlanstockrollnum() - processOperationOutMaterDo.getStockoutroll() - processOperationOutMaterDo.getStockcancelroll());
 
-                        planrollnum += processOperationOutMaterDo.getPlanrollnum();
+                        outval += processOperationOutMaterDo.getOutval();
                         apsProcessOperationOutMaterDoList.add(processOperationOutMaterDo);
                     }
                     previousProcessVo.setApsProcessOperationOutMaterDos(apsProcessOperationOutMaterDoList);
@@ -1044,7 +1034,7 @@ public class ApsProcessOperationServiceImpl extends ServiceImpl<ApsProcessOperat
                         }
                     }
                     processOperationDo.setPlanoutput(planoutsb.toString());
-                    if (planrollnum > 1) {
+                    if (outval > 1) {
                         apsProcessOperationDo.setIssubsection("是");
                     } else {
                         apsProcessOperationDo.setIssubsection("否");
@@ -1356,7 +1346,7 @@ public class ApsProcessOperationServiceImpl extends ServiceImpl<ApsProcessOperat
                     //输出
                     List<ApsProcessOperationOutMaterDo> apsProcessOperationOutMaterDoList1 = processOperationOutMaterDoList.stream().filter(apoom -> apsProcessOperationDo.getId().equals(apoom.getMainid())).collect(Collectors.toList());
                     List<String> planoutputList = new ArrayList<>();
-                    Integer planrollnum = 0;
+                    Integer outval = 0;
                     for (ApsProcessOperationOutMaterDo apsProcessOperationOutMaterDo1 : apsProcessOperationOutMaterDoList1) {
                         String outProducttype = apsProcessOperationOutMaterDo1.getProducttype();
                         if (apsProcessOperationOutMaterDo1.getProducttyperule().equals("不变")) {
@@ -1415,7 +1405,7 @@ public class ApsProcessOperationServiceImpl extends ServiceImpl<ApsProcessOperat
                         apsProcessOperationOutMaterDo1.setMoveleaveoutroll(apsProcessOperationOutMaterDo1.getPlanmoverollnum() - apsProcessOperationOutMaterDo1.getMoveoutroll() - apsProcessOperationOutMaterDo1.getMovecancelroll());
                         apsProcessOperationOutMaterDo1.setStockleaveoutroll(apsProcessOperationOutMaterDo1.getPlanstockrollnum() - apsProcessOperationOutMaterDo1.getStockoutroll() - apsProcessOperationOutMaterDo1.getStockcancelroll());
 
-                        planrollnum += apsProcessOperationOutMaterDo1.getPlanrollnum();
+                        outval += apsProcessOperationOutMaterDo1.getOutval();
                         apsProcessOperationOutMaterDoNewList.add(apsProcessOperationOutMaterDo1);
                         if (StringUtils.isNotBlank(apsProcessOperationDo.getNextprocessid())) {
                             operationOutMaterDos.add(apsProcessOperationOutMaterDo1);
@@ -1434,7 +1424,7 @@ public class ApsProcessOperationServiceImpl extends ServiceImpl<ApsProcessOperat
                         }
                     }
                     apsProcessOperationDo.setPlanoutput(planoutsb.toString());
-                    if (planrollnum > 1) {
+                    if (outval > 1) {
                         apsProcessOperationDo.setIssubsection("是");
                     } else {
                         apsProcessOperationDo.setIssubsection("否");
@@ -1686,7 +1676,7 @@ public class ApsProcessOperationServiceImpl extends ServiceImpl<ApsProcessOperat
         //更新工序输出
         List<ApsProcessOperationOutMaterDo> apsProcessOperationOutMaterDoNewList = new ArrayList<>();
         List<String> planoutputList = new ArrayList<>();
-        Integer planrollnum = 0;
+        Integer outval = 0;
         for (ApsProcessOperationOutMaterDo apsProcessOperationOutMaterDo : apsProcessOperationOutMaterDos) {
             String outProducttype = apsProcessOperationOutMaterDo.getProducttype();
             if (apsProcessOperationOutMaterDo.getProducttyperule().equals("不变")) {
@@ -1740,7 +1730,7 @@ public class ApsProcessOperationServiceImpl extends ServiceImpl<ApsProcessOperat
             apsProcessOperationOutMaterDo.setMoveleaveoutroll(apsProcessOperationOutMaterDo.getPlanmoverollnum() - apsProcessOperationOutMaterDo.getMoveoutroll() - apsProcessOperationOutMaterDo.getMovecancelroll());
             apsProcessOperationOutMaterDo.setStockleaveoutroll(apsProcessOperationOutMaterDo.getPlanstockrollnum() - apsProcessOperationOutMaterDo.getStockoutroll() - apsProcessOperationOutMaterDo.getStockcancelroll());
 
-            planrollnum += apsProcessOperationOutMaterDo.getPlanrollnum();
+            outval += apsProcessOperationOutMaterDo.getOutval();
             apsProcessOperationOutMaterDoNewList.add(apsProcessOperationOutMaterDo);
             if (StringUtils.isNotBlank(apsProcessOperationDo.getNextprocessid())) {
                 operationOutMaterDos.add(apsProcessOperationOutMaterDo);
@@ -1759,7 +1749,7 @@ public class ApsProcessOperationServiceImpl extends ServiceImpl<ApsProcessOperat
             }
         }
         apsProcessOperationDo.setPlanoutput(planoutsb.toString());
-        if (planrollnum > 1) {
+        if (outval > 1) {
             apsProcessOperationDo.setIssubsection("是");
         } else {
             apsProcessOperationDo.setIssubsection("否");
@@ -1953,7 +1943,7 @@ public class ApsProcessOperationServiceImpl extends ServiceImpl<ApsProcessOperat
             Map<String, Object> map = new HashMap<>();
             map.put("MAINID", apsProcessOperationDo.getId());
             List<ApsProcessOperationOutMaterDo> apsProcessOperationOutMaterDos = apsProcessOperationOutMaterService.listByMap(map).stream().collect(Collectors.toList());
-            Integer planrollnum = 0;
+            Integer outval = 0;
             for (ApsProcessOperationOutMaterDo apsProcessOperationOutMaterDo : apsProcessOperationOutMaterDos) {
                 Integer curOutMaterCancelRoll = curcancelroll;//输出物料本次取消卷数
                 if (cancelProcessOperationVo.getUpdatecuropration()) {
@@ -2012,7 +2002,7 @@ public class ApsProcessOperationServiceImpl extends ServiceImpl<ApsProcessOperat
                         curMoveCancelRoll = curMoveCancelRoll - cancelroll;
                     }
                 }
-                planrollnum += apsProcessOperationOutMaterDo.getPlanrollnum();
+                outval += apsProcessOperationOutMaterDo.getOutval();
                 apsProcessOperationOutMaterDoList.add(apsProcessOperationOutMaterDo);
             }
 
@@ -2073,7 +2063,7 @@ public class ApsProcessOperationServiceImpl extends ServiceImpl<ApsProcessOperat
             Optional<Date> maxDate = apsProcessOperationProcessEquDos.stream()
                     .map(ApsProcessOperationProcessEquDo::getPlanenddate).max(Comparator.naturalOrder());
             apsProcessOperationDo.setPlanenddate(new Date(maxDate.get().getTime()));
-            if (planrollnum > 1) {
+            if (outval > 1) {
                 apsProcessOperationDo.setIssubsection("是");
             } else {
                 apsProcessOperationDo.setIssubsection("否");