From a62c42fc364e945a1e292678f702f8d0416b0664 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期日, 13 二月 2022 11:21:31 +0800
Subject: [PATCH] #
---
src/main/java/zy/cloud/wms/manager/controller/DeliveryController.java | 7 ++++++-
1 files changed, 6 insertions(+), 1 deletions(-)
diff --git a/src/main/java/zy/cloud/wms/manager/controller/DeliveryController.java b/src/main/java/zy/cloud/wms/manager/controller/DeliveryController.java
index bc5a5fa..87bfabf 100644
--- a/src/main/java/zy/cloud/wms/manager/controller/DeliveryController.java
+++ b/src/main/java/zy/cloud/wms/manager/controller/DeliveryController.java
@@ -21,6 +21,8 @@
import zy.cloud.wms.manager.service.CstmrService;
import zy.cloud.wms.manager.service.OrderDetlService;
import zy.cloud.wms.manager.service.OrderService;
+import zy.cloud.wms.system.entity.Host;
+import zy.cloud.wms.system.service.HostService;
import java.util.*;
@@ -37,6 +39,8 @@
private OrderDetlService orderDetlService;
@Autowired
private CstmrService cstmrService;
+ @Autowired
+ private HostService hostService;
@RequestMapping(value = "/delivery/head/page/auth")
@ManagerAuth
@@ -77,6 +81,7 @@
}
Date now = new Date();
+ Host host = hostService.selectById(getHostId());
// 杩斿洖瑙嗗浘瀵硅薄
List<Map<String, Object>> vos = new ArrayList<>();
length = Optional.ofNullable(length).orElse(10);
@@ -94,7 +99,7 @@
vo.setCstmrContacts(cstmr.getContacts());
vo.setCstmrAddr(cstmr.getAddr());
}
- vo.setCompany("娴欐睙涓壃绔嬪簱鎶�鏈湁闄愬叕鍙�");
+ vo.setCompany(host.getMemo());
vo.setOrderId(orderId);
vo.setOrderNo(order.getOrderNo());
vo.setTime(DateUtils.convert(now, DateUtils.yyyyMMdd_F));
--
Gitblit v1.9.1