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

guoyuji

2024-09-24 2f9b500fb9f81fb4d74d7156097f72bae7f6b0cb

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

@@ -410,6 +410,10 @@

        deliveryMapper.updateDeliveryToExamine(deliveryId,type);

        Log log = new Log();
        log.setContent(object.toString());
        log.setFunction("updateDeliveryToExamine修改:"+deliveryId);
        logService.saveLog(log);
        return true;


@@ -438,6 +442,11 @@
            deliveryDetailMapper.deleteDeliveryDetail(deliveryId);
            deliveryMapper.deleteDelivery(deliveryId);

            Log log = new Log();
            log.setContent(object.toString());
            log.setFunction("deleteDelivery删除:"+deliveryId);
            logService.saveLog(log);

            return true;
        }catch (Exception e) {
            TransactionAspectSupport.currentTransactionStatus().rollbackToSavepoint(savePoint);