Merge remote-tracking branch 'origin/master'

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

@@ -320,7 +320,12 @@ public class ApsProcessOperationServiceImpl extends ServiceImpl<ApsProcessOperat
                             apsProcessOperationOutMaterDo.setSinglerollweight(outMaterDo.getSinglerollweight());
                             apsProcessOperationOutMaterDo.setNumunit(blanckdata.getStr("NUMBERUNIT"));
                             apsProcessOperationOutMaterDo.setPlanstockrollnum(0);
-                            apsProcessOperationOutMaterDo.setPlanprodrollnum(0);
+                            //没有后道工序作业，计划成品卷数=计划输出卷数-计划备料卷数
+                            if (StringUtils.isBlank(apsProcessOperationDo.getNextprocessid())) {
+                                apsProcessOperationOutMaterDo.setPlanprodrollnum(apsProcessOperationDo.getPlanprocessrall());
+                            } else {
+                                apsProcessOperationOutMaterDo.setPlanprodrollnum(0);
+                            }
                             apsProcessOperationOutMaterDo.setMainid(processId);
                             apsProcessOperationOutMaterDo.setBlankid(blanckdata.getStr("ID"));
                             //输出物料
@@ -838,8 +843,7 @@ public class ApsProcessOperationServiceImpl extends ServiceImpl<ApsProcessOperat
                         apsProcessOperationOutMaterDo1.setProwidth(wval);
                         BigDecimal lval = changeSize(apsProcessOperationOutMaterDo.getProlength(), apsProcessOperationOutMaterDo1.getLengthrule(), apsProcessOperationOutMaterDo1.getLengthchange());
                         apsProcessOperationOutMaterDo1.setProlength(lval);
-//                        apsProcessOperationOutMaterDo1.setPlanrollnum(planinrall * apsProcessOperationOutMaterDo1.getOutval());
-                        apsProcessOperationOutMaterDo1.setPlanrollnum(apsProcessOperationDo.getPlanprocessrall());
+                        apsProcessOperationOutMaterDo1.setPlanrollnum(apsProcessOperationDo.getPlanprocessrall() * apsProcessOperationOutMaterDo1.getOutval());
                         //输入物料的输入单卷重*该输出物料的宽度/输入物料的宽度/该输出物料的横切分卷数
 //                        String singlerollweight = df.format(apsProcessOperationOutMaterDo.getSinglerollweight().multiply(wval == null ? BigDecimal.valueOf(1) : wval).divide(apsProcessOperationOutMaterDo.getProwidth() == null ? BigDecimal.valueOf(1) : apsProcessOperationOutMaterDo.getProwidth(), 2, BigDecimal.ROUND_HALF_UP).divide(new BigDecimal(apsProcessOperationOutMaterDo1.getCrosscutnum().toString()), 2, BigDecimal.ROUND_HALF_UP));
 //                        apsProcessOperationOutMaterDo1.setSinglerollweight(new BigDecimal(singlerollweight));
@@ -860,6 +864,8 @@ public class ApsProcessOperationServiceImpl extends ServiceImpl<ApsProcessOperat
                         Integer planprodrollnum = 0;
                         if (StringUtils.isBlank(apsProcessOperationDo.getNextprocessid())) {
                             planprodrollnum = (planinrall * apsProcessOperationOutMaterDo1.getOutval()) - apsProcessOperationOutMaterDo1.getPlanstockrollnum();
+                            //没有后道工序作业，计划成品卷数=计划输出卷数-计划备料卷数
+                            apsProcessOperationOutMaterDo1.setPlanprodrollnum(apsProcessOperationOutMaterDo1.getPlanrollnum() - apsProcessOperationOutMaterDo1.getPlanstockrollnum());
                         } else {
                             planprodrollnum = apsProcessOperationOutMaterDo1.getPlanprodrollnum();
                         }