合并相关文件

你好啊

2024-08-06 a27ce393f9924c044dfe743b220f0300f33e79d3

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

@@ -30,6 +30,9 @@

    public Boolean saveMaterialStore(Map<String,Object> object) {
        boolean saveState = true;
        //设置回滚点
        Object savePoint = TransactionAspectSupport.currentTransactionStatus().createSavepoint();
        try {
            String id = "";
            String type = "";
            String json = "";
@@ -61,7 +64,16 @@
            }else{
                materialStoreMapper.insertMaterialStore(type,json);
            }
        } catch (Exception e) {
            TransactionAspectSupport.currentTransactionStatus().rollbackToSavepoint(savePoint);
            //将异常传入数据库
            SysError sysError = new SysError();
            sysError.setError(e+Arrays.toString(e.getStackTrace()));
            sysError.setFunc("saveMaterialStore");
            sysErrorService.insert(sysError);
            saveState = false;

        }
        return saveState;

    }
@@ -94,8 +106,8 @@
            TransactionAspectSupport.currentTransactionStatus().rollbackToSavepoint(savePoint);
            //将异常传入数据库
            SysError sysError = new SysError();
            sysError.setError(e.toString());
            sysError.setFunc("saveOrder");
            sysError.setError(e+Arrays.toString(e.getStackTrace()));
            sysError.setFunc("deleteMaterialStore");
            sysErrorService.insert(sysError);
            saveState = false;