Merge remote-tracking branch 'origin/master'

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

@@ -2139,7 +2139,7 @@ public class ApsBlankOrderServiceImpl extends ServiceImpl<ApsBlankOrderDao, ApsB
                     if (ObjectUtil.isNotEmpty(prolength)) {
                         outputResult += ("*长" + prolength);
                     }
-                    outputResult += ("mm " + apsProcessOutputProductDo.getOutputonerollweigth() + "吨 * " + apsProcessOutputProductDo.getPlanoutputrollcount() + "卷");
+                    outputResult += ("mm " + apsProcessOutputProductDo.getOutputonerollweigth() + "吨 * " + apsProcessOutputProductDo.getPlanoutputorderroll() + "卷");
 
                     endUpdateOutput.setOutputresult(outputResult);
                     isNeedUpdateBlank = true;

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

@@ -344,7 +344,9 @@ public class ApsProcessOperationServiceImpl extends ServiceImpl<ApsProcessOperat
                                 //如果没有后道工序作业，则自动填入=“{输出物料的输入物料描述} * {计划输出卷数 - 计划备料卷数}卷”
                                 outputfinishproduct = getInMeterInfo(outProducttype, outMeter, outMetalstate, tval, wval, lval) + apsProcessOperationOutMaterDo.getSinglerollweight() + UNIT_MAP.getOrDefault(apsProcessOperationOutMaterDo.getNumunit(), "") + " * " + blanckdata.getInt("ROLLNUM") + "卷";
                             }
-                            apsProcessOperationOutMaterDo.setOutputfinishproduct(outputfinishproduct);
+                            if (apsProcessOperationOutMaterDo.getPlanprodrollnum() > 0) {
+                                apsProcessOperationOutMaterDo.setOutputfinishproduct(outputfinishproduct);
+                            }
                             apsProcessOperationOutMaterDo.setOutmaterrequest(outputMeter);
                             previousProcessVo.setApsProcessOperationOutMaterDo(apsProcessOperationOutMaterDo);
 
@@ -498,7 +500,9 @@ public class ApsProcessOperationServiceImpl extends ServiceImpl<ApsProcessOperat
                         } else {
                             apsProcessOperationOutMaterDo.setPlanprodrollnum(0);
                         }
-                        apsProcessOperationOutMaterDo.setOutputfinishproduct(outputfinishproduct);
+                        if (apsProcessOperationOutMaterDo.getPlanprodrollnum() > 0) {
+                            apsProcessOperationOutMaterDo.setOutputfinishproduct(outputfinishproduct);
+                        }
                         apsProcessOperationOutMaterDo.setOutmaterrequest(outputMeter);
 
                         previousProcessVo.setApsProcessOperationOutMaterDo(apsProcessOperationOutMaterDo);
@@ -756,8 +760,8 @@ public class ApsProcessOperationServiceImpl extends ServiceImpl<ApsProcessOperat
                             } else {
                                 planprodrollnum = processOperationOutMaterDo.getPlanprodrollnum();
                             }
-                            if (planprodrollnum > 0) {
-                                outputfinishproduct = getInMeterInfo(outProducttype, outMeter, outMetalstate, tval, wval, lval) + "* " + planprodrollnum + "卷";
+                            if (processOperationOutMaterDo.getPlanprodrollnum() > 0) {
+                                outputfinishproduct = getInMeterInfo(outProducttype, outMeter, outMetalstate, tval, wval, lval) + processOperationOutMaterDo.getSinglerollweight() + UNIT_MAP.getOrDefault(processOperationOutMaterDo.getNumunit(), "") + " * " + planprodrollnum + "卷";
                             }
                             processOperationOutMaterDo.setOutputfinishproduct(outputfinishproduct);
                             processOperationOutMaterDo.setOutmaterrequest(outputMeter);
@@ -1247,8 +1251,8 @@ public class ApsProcessOperationServiceImpl extends ServiceImpl<ApsProcessOperat
                         } else {
                             planprodrollnum = apsProcessOperationOutMaterDo1.getPlanprodrollnum();
                         }
-                        if (planprodrollnum > 0) {
-                            outputfinishproduct = getInMeterInfo(outProducttype, outMeter, outMetalstate, tval, wval, lval) + "* " + planprodrollnum + "卷";
+                        if (apsProcessOperationOutMaterDo1.getPlanprodrollnum() > 0) {
+                            outputfinishproduct = getInMeterInfo(outProducttype, outMeter, outMetalstate, tval, wval, lval) + apsProcessOperationOutMaterDo1.getSinglerollweight() + UNIT_MAP.getOrDefault(apsProcessOperationOutMaterDo1.getNumunit(), "") + " * " + planprodrollnum + "卷";
                         }
                         apsProcessOperationOutMaterDo1.setOutputfinishproduct(outputfinishproduct);
 
@@ -1510,7 +1514,9 @@ public class ApsProcessOperationServiceImpl extends ServiceImpl<ApsProcessOperat
             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);
+        if (apsProcessOperationOutMaterDo.getPlanprodrollnum() > 0) {
+            apsProcessOperationOutMaterDo.setOutputfinishproduct(outputfinishproduct);
+        }
         apsProcessOperationOutMaterDo.setOutmaterrequest(outputMeter);
 
         if (StringUtils.isNotBlank(apsProcessOperationDo.getNextprocessid())) {