Merge branch 'master' of http://10.153.19.25:10105/r/ERP_override

廖井涛

2 天以前 a8378db2feef3b08edc0a6594bec187051d3b754

 north-glass-erp/src/main/java/com/example/erp/service/mm/MaterialStoreService.java

@@ -65,7 +65,7 @@
            log.setContent(object.toString());

            DecimalFormat decimalFormat = new DecimalFormat("#0.00");
            singlePieceArea= Double.parseDouble(decimalFormat.format(width * height / 100000));
            singlePieceArea= Double.parseDouble(decimalFormat.format(width * height / 1000000));
            Integer jsonCount=materialStoreMapper.selectMaterialStoreJson(json);
            if(jsonCount==0){
                if(Long.parseLong(id)>0){