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

guoyujie

38 分钟以前 d5bb894f9be2e0a3b62d475b60b44f2ab138528c

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

@@ -60,6 +60,8 @@
            }

            Log log = new Log();
            log.setOperatorId(object.get("userId").toString());
            log.setOperator(object.get("userName").toString());
            log.setContent(object.toString());

            DecimalFormat decimalFormat = new DecimalFormat("#0.00");
@@ -104,6 +106,14 @@
        return map;
    }

    public Map<String, Object> getSelectMaterialStores(MaterialStore materialStore) {


        Map<String, Object> map = new HashMap<>();
        map.put("data", materialStoreMapper.getSelectMaterialStores(materialStore));
        return map;
    }

    public String deleteMaterialStore(Map<String,Object> object) {
        String saveState = "true";
        //设置回滚点
@@ -123,6 +133,8 @@

            }
            Log log = new Log();
            log.setOperatorId(object.get("userId").toString());
            log.setOperator(object.get("userName").toString());
            log.setContent(object.toString());
            log.setFunction("deleteMaterialStore删除："+id);
            logService.saveLog(log);