工序作业输出成品调整

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

@@ -344,7 +344,7 @@ public class ApsProcessOperationServiceImpl extends ServiceImpl<ApsProcessOperat
                             String outputfinishproduct = "";
                             if (StringUtils.isBlank(apsCraftRouteStepDo1.getNextstepid())) {
                                 //如果没有后道工序作业，则自动填入=“{输出物料的输入物料描述} * {计划输出卷数 - 计划备料卷数}卷”
-                                outputfinishproduct = getInMeterInfo(outProducttype, outMeter, outMetalstate, tval, wval, lval) + "* " + blanckdata.getInt("ROLLNUM") + "卷";
+                                outputfinishproduct = getInMeterInfo(outProducttype, outMeter, outMetalstate, tval, wval, lval) + apsProcessOperationOutMaterDo.getSinglerollweight()+UNIT_MAP.getOrDefault(apsProcessOperationOutMaterDo.getNumunit(), "")+ " * " + blanckdata.getInt("ROLLNUM") + "卷";
                             }
                             apsProcessOperationOutMaterDo.setOutputfinishproduct(outputfinishproduct);
                             apsProcessOperationOutMaterDo.setOutmaterrequest(outputMeter);
@@ -497,7 +497,7 @@ public class ApsProcessOperationServiceImpl extends ServiceImpl<ApsProcessOperat
                         String outputfinishproduct = "";
                         if (StringUtils.isBlank(apsCraftRouteStepDo.getNextstepid())) {
                             //如果没有后道工序作业，则自动填入=“{输出物料的输入物料描述} * {计划输出卷数 - 计划备料卷数}卷”
-                            outputfinishproduct = getInMeterInfo(outProducttype, outMeter, outMetalstate, tval, wval, lval) + "* " + blanckdata.getInt("ROLLNUM") + "卷";
+                            outputfinishproduct = getInMeterInfo(outProducttype, outMeter, outMetalstate, tval, wval, lval) + apsProcessOperationOutMaterDo.getSinglerollweight()+UNIT_MAP.getOrDefault(apsProcessOperationOutMaterDo.getNumunit(), "")+ " * " + blanckdata.getInt("ROLLNUM") + "卷";
                             apsProcessOperationOutMaterDo.setPlanprodrollnum(blanckdata.getInt("ROLLNUM"));
                         } else {
                             apsProcessOperationOutMaterDo.setPlanprodrollnum(0);
@@ -1332,7 +1332,7 @@ public class ApsProcessOperationServiceImpl extends ServiceImpl<ApsProcessOperat
         String outputfinishproduct = "";
         if (StringUtils.isBlank(apsProcessOperationDo.getNextprocessid())) {
             //如果没有后道工序作业，则自动填入=“{输出物料的输入物料描述} * {计划输出卷数 - 计划备料卷数}卷”
-            outputfinishproduct = getInMeterInfo(apsProcessOperationOutMaterDo.getProducttype(), apsProcessOperationOutMaterDo.getMetal(), apsProcessOperationOutMaterDo.getMetalstate(), apsProcessOperationOutMaterDo.getThickness(), apsProcessOperationOutMaterDo.getProwidth(), apsProcessOperationOutMaterDo.getProlength()) + "* " + rollnum + "卷";
+            outputfinishproduct = getInMeterInfo(apsProcessOperationOutMaterDo.getProducttype(), apsProcessOperationOutMaterDo.getMetal(), apsProcessOperationOutMaterDo.getMetalstate(), apsProcessOperationOutMaterDo.getThickness(), apsProcessOperationOutMaterDo.getProwidth(), apsProcessOperationOutMaterDo.getProlength())+ apsProcessOperationOutMaterDo.getSinglerollweight()+UNIT_MAP.getOrDefault(apsProcessOperationOutMaterDo.getNumunit(), "")+ " * " + rollnum + "卷";
             apsProcessOperationOutMaterDo.setPlanprodrollnum(rollnum);
         }
         apsProcessOperationOutMaterDo.setOutputfinishproduct(outputfinishproduct);