Merge branch 'master' of http://bore.pub:10439/r/ERP_override

廖井涛

2024-07-07 465a0537a4803cf4e08acd06fea1c3963b54b5d3

Merge branch 'master' of http://bore.pub:10439/r/ERP_override

 north-glass-erp/src/main/java/com/example/erp/service/sd/OrderService.java

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

                });
            }else if(OrderDetails.get(i).getOtherColumns()==null){

                OrderDetails.get(i).setOtherColumns("{}");
            }
        }