Merge branch 'master_chujiang_0805' into master_quotation

@@ -38,6 +38,7 @@ import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Propagation;
 import org.springframework.transaction.annotation.Propagation;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.transaction.annotation.Transactional;
 
 
+import org.springframework.context.ApplicationContext;
 import javax.annotation.Resource;
 import javax.annotation.Resource;
 import java.io.Serializable;
 import java.io.Serializable;
 import java.util.ArrayList;
 import java.util.ArrayList;
@@ -60,6 +61,8 @@ public class DraftRequestCarTicketServiceImpl extends BaseMpServiceImpl<DraftReq
     private ShipmentsPlanDetailService shipmentsPlanDetailService;
     private ShipmentsPlanDetailService shipmentsPlanDetailService;
     @Resource
     @Resource
     private MqProducerService mqProducerService;
     private MqProducerService mqProducerService;
+    @Resource
+    private ApplicationContext applicationContext;
 
 
     @Override
     @Override
     public PageResult<DraftRequestCarTicket> query(Integer pageIndex, Integer pageSize, QueryDraftRequestCarTicketVo vo) {
     public PageResult<DraftRequestCarTicket> query(Integer pageIndex, Integer pageSize, QueryDraftRequestCarTicketVo vo) {
@@ -326,7 +329,8 @@ public class DraftRequestCarTicketServiceImpl extends BaseMpServiceImpl<DraftReq
      */
      */
     @Transactional(propagation = Propagation.REQUIRES_NEW, rollbackFor = Exception.class)
     @Transactional(propagation = Propagation.REQUIRES_NEW, rollbackFor = Exception.class)
     public void createDraftAndNotify(CreateDraftRequestCarTicketVo vo) {
     public void createDraftAndNotify(CreateDraftRequestCarTicketVo vo) {
-        this.create(vo);
+        // 通过 Spring 代理调用 create，确保 @OpLog 切面生效，避免 OpLogUtil 空指针
+        applicationContext.getBean(DraftRequestCarTicketServiceImpl.class).create(vo);
         PurchaseOrderInfo info = purchaseOrderInfoService.findById(vo.getPurchaseOrderId());
         PurchaseOrderInfo info = purchaseOrderInfoService.findById(vo.getPurchaseOrderId());
         if (info == null) {
         if (info == null) {
             return;
             return;