From ca412ade3b178fbc8ba0a4b6215a040acdede954 Mon Sep 17 00:00:00 2001
From: zhangback <zhangback@163.com>
Date: 星期二, 09 十二月 2025 10:29:47 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/yagwly_fa_master' into yagwly_fa_master

---
 tms/src/main/java/com/ruoyi/tms/service/impl/TmsConsignorServiceImpl.java |   11 +++++++++--
 1 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/tms/src/main/java/com/ruoyi/tms/service/impl/TmsConsignorServiceImpl.java b/tms/src/main/java/com/ruoyi/tms/service/impl/TmsConsignorServiceImpl.java
index a81f135..378d90e 100644
--- a/tms/src/main/java/com/ruoyi/tms/service/impl/TmsConsignorServiceImpl.java
+++ b/tms/src/main/java/com/ruoyi/tms/service/impl/TmsConsignorServiceImpl.java
@@ -2,12 +2,15 @@
 
 import java.util.List;
 
+import com.ruoyi.common.enums.SystemDataNoEnum;
 import com.ruoyi.common.utils.DateUtils;
 import javax.annotation.Resource;
 
 import com.ruoyi.common.utils.SecurityUtils;
+import com.ruoyi.system.service.ISystemDataNoService;
 import com.ruoyi.tms.domain.TmsCustomerInfo;
 import com.ruoyi.tms.mapper.TmsCustomerInfoMapper;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.stereotype.Service;
 import org.springframework.scheduling.annotation.Async;
@@ -40,6 +43,8 @@
 
     @Resource
     private TmsCustomerInfoMapper tmsCustomerInfoMapper;
+    @Autowired
+    ISystemDataNoService systemDataNoService;
 
 
     /**
@@ -107,11 +112,13 @@
      * @return 缁撴灉
      */
     @Override
-    public int insertTmsConsignor(TmsConsignor tmsConsignor)
+    public TmsConsignor insertTmsConsignor(TmsConsignor tmsConsignor)
     {
+        tmsConsignor.setConsignorCode(systemDataNoService.getNoByKey(SystemDataNoEnum.ZXH));
         tmsConsignor.setCreateBy(SecurityUtils.getUsername());
         tmsConsignor.setCreateTime(DateUtils.getNowDate());
-        return tmsConsignorMapper.insertTmsConsignor(tmsConsignor);
+        tmsConsignorMapper.insertTmsConsignor(tmsConsignor);
+        return tmsConsignor;
     }
 
     /**

--
Gitblit v1.8.0