Merge remote-tracking branch 'origin/master'

op-modules/op-mes/src/main/java/com/op/mes/service/impl/MesReportWorkConsumeServiceImpl.java

@@ -368,12 +368,14 @@ public class MesReportWorkConsumeServiceImpl implements IMesReportWorkConsumeSer
         }
 
         for(MesReportWorkConsume lib0:liblist0){
+            if(StringUtils.isNotBlank(lib0.getErfmg())){
                 //bom用量=单位数量/订单理论数量*报工数量
                 lib0.setQuantitySplitBom(new BigDecimal(lib0.getErfmg())
                         .divide(lib0.getQuantitySplit(),6,BigDecimal.ROUND_HALF_UP)
                         .multiply(actPro)
                 );
             }
+        }