计划流转卷数初始化调整

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

@@ -506,7 +506,6 @@ public class ApsProcessOperationServiceImpl extends ServiceImpl<ApsProcessOperat
                         apsProcessOperationOutMaterDo.setOutval(1);
                         apsProcessOperationOutMaterDo.setSplittrainno(1);
                         apsProcessOperationOutMaterDo.setPlanrollnum(blanckdata.getInt("ROLLNUM"));
-                        apsProcessOperationOutMaterDo.setPlanmoverollnum(blanckdata.getInt("ROLLNUM"));
                         //输入单卷重*输出宽度/输入宽度
                         String singlerollweight = df.format(blanckdata.getBigDecimal("SINGLEROLLWEIGHT").multiply(wval == null ? BigDecimal.valueOf(1) : wval).divide(blanckdata.getBigDecimal("PROWIDTH") == null ? BigDecimal.valueOf(1) : blanckdata.getBigDecimal("PROWIDTH"), 3, BigDecimal.ROUND_HALF_UP));
                         apsProcessOperationOutMaterDo.setSinglerollweight(new BigDecimal(singlerollweight));
@@ -539,6 +538,7 @@ public class ApsProcessOperationServiceImpl extends ServiceImpl<ApsProcessOperat
                         apsProcessOperationOutMaterDo.setOutmaterrequest(outputMeter);
                         apsProcessOperationOutMaterDo.setProdleaveoutroll(apsProcessOperationOutMaterDo.getPlanprodrollnum());
                         apsProcessOperationOutMaterDo.setMoveleaveoutroll(apsProcessOperationOutMaterDo.getPlanrollnum() - apsProcessOperationOutMaterDo.getPlanprodrollnum());
+                        apsProcessOperationOutMaterDo.setPlanmoverollnum(apsProcessOperationOutMaterDo.getPlanrollnum() - apsProcessOperationOutMaterDo.getPlanprodrollnum() - apsProcessOperationOutMaterDo.getPlanstockrollnum());
 
                         previousProcessVo.setApsProcessOperationOutMaterDo(apsProcessOperationOutMaterDo);
                         newProcessIds.add(previousProcessVo);
@@ -1039,7 +1039,6 @@ public class ApsProcessOperationServiceImpl extends ServiceImpl<ApsProcessOperat
                         processOperationOutMaterDo.setMovecancelroll(0);
                         processOperationOutMaterDo.setStockcancelroll(0);
                         processOperationOutMaterDo.setPlanrollnum(blanckdata.getInt("ROLLNUM"));
-                        processOperationOutMaterDo.setPlanmoverollnum(blanckdata.getInt("ROLLNUM"));
                         //输入单卷重*输出宽度/输入宽度
                         String singlerollweight = df.format(blanckdata.getBigDecimal("SINGLEROLLWEIGHT").multiply(wval == null ? BigDecimal.valueOf(1) : wval).divide(blanckdata.getBigDecimal("PROWIDTH") == null ? BigDecimal.valueOf(1) : blanckdata.getBigDecimal("PROWIDTH"), 3, BigDecimal.ROUND_HALF_UP));
                         processOperationOutMaterDo.setSinglerollweight(new BigDecimal(singlerollweight));
@@ -1053,6 +1052,7 @@ public class ApsProcessOperationServiceImpl extends ServiceImpl<ApsProcessOperat
                         processOperationOutMaterDo.setProdleaveoutroll(processOperationOutMaterDo.getPlanprodrollnum() - processOperationOutMaterDo.getProdoutroll() - processOperationOutMaterDo.getProdcancelroll());
                         processOperationOutMaterDo.setMoveleaveoutroll(processOperationOutMaterDo.getPlanmoverollnum() - processOperationOutMaterDo.getMoveoutroll() - processOperationOutMaterDo.getMovecancelroll());
                         processOperationOutMaterDo.setStockleaveoutroll(processOperationOutMaterDo.getPlanstockrollnum() - processOperationOutMaterDo.getStockoutroll() - processOperationOutMaterDo.getStockcancelroll());
+                        processOperationOutMaterDo.setPlanmoverollnum(processOperationOutMaterDo.getPlanrollnum() - processOperationOutMaterDo.getPlanprodrollnum() - processOperationOutMaterDo.getPlanstockrollnum());
 
                         outval += processOperationOutMaterDo.getOutval();
                         if (hasFirst) {