Merge remote-tracking branch 'origin/master'

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

@@ -205,7 +205,7 @@ public class ApsProcessOperationServiceImpl extends ServiceImpl<ApsProcessOperat
                             map.put("CRAFTSTEPID", apsCraftRouteStepDo1.getId());
                             List<ApsCraftRouteOutMaterRequestDo> apsCraftRouteOutMaterRequestDo = apsCraftRouteOutMaterRequestService.listByMap(map).stream().collect(Collectors.toList());
                             if (apsCraftRouteOutMaterRequestDo.size() == 0) {
-                                return R.error("工艺步骤"+apsCraftRouteStepDo1.getProcessname()+"没输出");
+                                return R.error("工艺步骤" + apsCraftRouteStepDo1.getProcessname() + "没输出");
                             }
                             ApsProcessOperationOutMaterDo apsProcessOperationOutMaterDo = BeanUtil.toBean(apsCraftRouteOutMaterRequestDo.get(0), ApsProcessOperationOutMaterDo.class);
                             apsProcessOperationOutMaterDo.setId(SecurityUtil.getUUID());
@@ -250,6 +250,12 @@ public class ApsProcessOperationServiceImpl extends ServiceImpl<ApsProcessOperat
                             apsProcessOperationOutMaterDo.setOutputmaterial(outputMeter + "*" + blanckdata.getInt("ROLLNUM") + "卷");
                             apsProcessOperationDo.setPlanoutput("[1]" + outputMeter + "*" + blanckdata.getInt("ROLLNUM") + "卷");
                             //输出成品
+                            /*
+                            如果没有后道工序作业，则成品卷数=计划输出卷数 - 计划备料卷数，
+                            如果有后道工序作业，则成品卷数=计划成品卷数，
+                            如果成品卷数=0，则自动填入=（空）
+                            如果成品卷>0，则自动填入=“{输出物料的输入物料描述} * {成品卷数}卷”
+                             */
                             String outputfinishproduct = "";
                             if (StringUtils.isBlank(apsCraftRouteStepDo1.getNextstepid())) {
                                 //如果没有后道工序作业，则自动填入=“{输出物料的输入物料描述} * {计划输出卷数 - 计划备料卷数}卷”
@@ -335,7 +341,7 @@ public class ApsProcessOperationServiceImpl extends ServiceImpl<ApsProcessOperat
                         map.put("CRAFTSTEPID", apsCraftRouteStepDo.getId());
                         List<ApsCraftRouteOutMaterRequestDo> apsCraftRouteOutMaterRequestDo = apsCraftRouteOutMaterRequestService.listByMap(map).stream().collect(Collectors.toList());
                         if (apsCraftRouteOutMaterRequestDo.size() == 0) {
-                            return R.error("工艺步骤"+apsCraftRouteStepDo.getProcessname()+"没输出");
+                            return R.error("工艺步骤" + apsCraftRouteStepDo.getProcessname() + "没输出");
                         }
                         ApsProcessOperationOutMaterDo apsProcessOperationOutMaterDo = BeanUtil.toBean(apsCraftRouteOutMaterRequestDo.get(0), ApsProcessOperationOutMaterDo.class);
                         apsProcessOperationOutMaterDo.setId(SecurityUtil.getUUID());
@@ -380,6 +386,12 @@ public class ApsProcessOperationServiceImpl extends ServiceImpl<ApsProcessOperat
                         apsProcessOperationOutMaterDo.setOutputmaterial(outputMeter + "*" + blanckdata.getInt("ROLLNUM") + "卷");
                         apsProcessOperationDo.setPlanoutput("[1]" + outputMeter + "*" + blanckdata.getInt("ROLLNUM") + "卷");
                         //输出成品
+                        /*
+                        如果没有后道工序作业，则成品卷数=计划输出卷数 - 计划备料卷数，
+                        如果有后道工序作业，则成品卷数=计划成品卷数，
+                        如果成品卷数=0，则自动填入=（空）
+                        如果成品卷>0，则自动填入=“{输出物料的输入物料描述} * {成品卷数}卷”
+                         */
                         String outputfinishproduct = "";
                         if (StringUtils.isBlank(apsCraftRouteStepDo.getNextstepid())) {
                             //如果没有后道工序作业，则自动填入=“{输出物料的输入物料描述} * {计划输出卷数 - 计划备料卷数}卷”
@@ -602,15 +614,22 @@ public class ApsProcessOperationServiceImpl extends ServiceImpl<ApsProcessOperat
                         apsProcessOperationOutMaterDo1.setOutputmaterial(outputMeter + "*" + (planinrall * apsProcessOperationOutMaterDo1.getOutval()) + "卷");
                         planoutputList.add(outputMeter + "*" + (planinrall * apsProcessOperationOutMaterDo1.getOutval()) + "卷");
                         apsProcessOperationOutMaterDo1.setOutmaterrequest(outputMeter);
-                        //输出成品 没有后道工序作业，则自动填入=“{输出物料的输入物料描述} * {计划成品卷数}卷”
+                        //输出成品
+                        /*
+                        如果没有后道工序作业，则成品卷数=计划输出卷数 - 计划备料卷数，
+                        如果有后道工序作业，则成品卷数=计划成品卷数，
+                        如果成品卷数=0，则自动填入=（空）
+                        如果成品卷>0，则自动填入=“{输出物料的输入物料描述} * {成品卷数}卷”
+                         */
                         String outputfinishproduct = "";
+                        Integer planprodrollnum = 0;
                         if (StringUtils.isBlank(apsProcessOperationDo.getNextprocessid())) {
-                            //没有后道工序作业，则自动填入=“{输出物料的输入物料描述} * {计划成品卷数}卷”
-                            outputfinishproduct = getInMeterInfo(outProducttype, outMeter, outMetalstate, tval, wval, lval) + "* " + ((planinrall * apsProcessOperationOutMaterDo1.getOutval()) - apsProcessOperationOutMaterDo1.getPlanstockrollnum()) + "卷";
+                            planprodrollnum = (planinrall * apsProcessOperationOutMaterDo1.getOutval()) - apsProcessOperationOutMaterDo1.getPlanstockrollnum();
+                        } else {
+                            planprodrollnum = apsProcessOperationOutMaterDo1.getPlanprodrollnum();
                         }
-                        if (StringUtils.isNotBlank(apsProcessOperationDo.getNextprocessid()) && apsProcessOperationOutMaterDo1.getPlanprodrollnum() > 0) {
-                            //如果有后道工序作业，并且计划成品卷数>0，则自动填入=“{输出物料的输入物料描述} * {计划成品卷数}卷”
-                            outputfinishproduct = getInMeterInfo(outProducttype, outMeter, outMetalstate, tval, wval, lval) + "* " + apsProcessOperationOutMaterDo1.getPlanprodrollnum() + "卷";
+                        if (planprodrollnum > 0) {
+                            outputfinishproduct = getInMeterInfo(outProducttype, outMeter, outMetalstate, tval, wval, lval) + "* " + planprodrollnum + "卷";
                         }
                         apsProcessOperationOutMaterDo1.setOutputfinishproduct(outputfinishproduct);