lazhaoqian 4 years ago
parent
commit
0a69e5fc21

+ 8 - 0
blade-service/blade-deliver-goods/src/main/java/org/springblade/deliver/goods/receiving/ExportReCeVingController.java

@@ -38,6 +38,8 @@ import org.springblade.core.tool.utils.Func;
 import org.springblade.deliver.goods.entity.Delivery;
 import org.springblade.deliver.goods.service.IDeliveryService;
 import org.springblade.deliver.goods.vo.DeliveryVO;
+import org.springblade.system.user.entity.User;
+import org.springblade.system.user.feign.IUserClient;
 import org.springframework.web.bind.annotation.*;
 
 import javax.validation.Valid;
@@ -61,6 +63,8 @@ public class ExportReCeVingController extends BladeController {
 
 	private IStorageClient iStorageClient;//库存信息
 
+	private IUserClient iUserClient;//获取用户信息
+
 	/**
 	 * 详情
 	 */
@@ -123,6 +127,10 @@ public class ExportReCeVingController extends BladeController {
 				{
 					e.setStorageName(storageDesc.getCname());
 				}
+				R<User> user = iUserClient.userInfoById(e.getCreateUser());
+				if (user.isSuccess() && user.getData() != null){
+					e.setCreateUserName(user.getData().getName());
+				}
 
 			});
 		}

+ 7 - 0
blade-service/blade-deliver-goods/src/main/java/org/springblade/deliver/goods/receiving/ImportReCeVingController.java

@@ -38,6 +38,8 @@ import org.springblade.core.tool.utils.Func;
 import org.springblade.deliver.goods.entity.Delivery;
 import org.springblade.deliver.goods.service.IDeliveryService;
 import org.springblade.deliver.goods.vo.DeliveryVO;
+import org.springblade.system.user.entity.User;
+import org.springblade.system.user.feign.IUserClient;
 import org.springframework.web.bind.annotation.*;
 
 import javax.validation.Valid;
@@ -60,6 +62,7 @@ public class ImportReCeVingController extends BladeController {
 	private ICorpsDescClient corpsDescClient;//获取客户信息
 
 	private IStorageClient iStorageClient;//库存信息
+	private IUserClient iUserClient;//获取用户信息
 
 	/**
 	 * 详情
@@ -121,6 +124,10 @@ public class ImportReCeVingController extends BladeController {
 				{
 					e.setStorageName(storageDesc.getCname());
 				}
+				R<User> user = iUserClient.userInfoById(e.getCreateUser());
+				if (user.isSuccess() && user.getData() != null){
+					e.setCreateUserName(user.getData().getName());
+				}
 
 			});
 		}

+ 8 - 0
blade-service/blade-deliver-goods/src/main/java/org/springblade/deliver/goods/receiving/ReCeVingController.java

@@ -41,6 +41,8 @@ import org.springblade.core.tool.utils.Func;
 import org.springblade.deliver.goods.entity.Delivery;
 import org.springblade.deliver.goods.service.IDeliveryService;
 import org.springblade.deliver.goods.vo.DeliveryVO;
+import org.springblade.system.user.entity.User;
+import org.springblade.system.user.feign.IUserClient;
 import org.springframework.web.bind.annotation.*;
 
 import javax.validation.Valid;
@@ -64,6 +66,8 @@ public class ReCeVingController extends BladeController {
 
 	private IStorageClient iStorageClient;//库存信息
 
+	private IUserClient iUserClient;//获取用户信息
+
 
 	/**
 	 * 详情
@@ -127,6 +131,10 @@ public class ReCeVingController extends BladeController {
 				{
 					e.setStorageName(storageDesc.getCname());
 				}
+				R<User> user = iUserClient.userInfoById(e.getCreateUser());
+				if (user.isSuccess() && user.getData() != null){
+					e.setCreateUserName(user.getData().getName());
+				}
 
 			});
 		}