陆运修改

Signed-off-by: sunhz <mpcoo@foxmail.com>

blade-service-api/blade-land-api/src/main/java/org/springblade/land/excel/CdAcctExcel.java

@@ -19,18 +19,15 @@ public class CdAcctExcel implements Serializable {
 
 	private static final long serialVersionUID = 1L;
 
-	@ExcelProperty("客户名称")
-	private String corpName;
-
-	@ExcelProperty("客户简称")
-	private String corpShortName;
-
 	@ExcelProperty("货运日期")
-	@DateTimeFormat("yyyy-MM-dd HH:mm:ss")
+	@DateTimeFormat("yyyy-MM-dd HH:mm")
 	private Date arrivalTime;
 
-	@ExcelProperty("业务员")
-	private String salesmanName;
+	@ExcelProperty("物流运输")
+	private String dispatchDeptName;
+
+	@ExcelProperty("运输调度")
+	private String dispatcherName;
 
 	@ExcelProperty("货运地点")
 	private String addressDetail;
@@ -48,21 +45,18 @@ public class CdAcctExcel implements Serializable {
 	private String ctnDetail;
 
 	@ExcelProperty("车队")
-	private String fleetName;
-
-	@ExcelProperty("车队简称")
 	private String fleetShortName;
 
 	@ExcelProperty("车号")
 	private String plateNo;
 
-	@ExcelProperty("运费")
+	@ExcelProperty("应付运费")
 	private BigDecimal landAmountC;
 
-	@ExcelProperty("杂费")
+	@ExcelProperty("应付杂费")
 	private BigDecimal extraAmountC;
 
-	@ExcelProperty("杂费明细")
+	@ExcelProperty("应付杂费明细")
 	private String extraAmountItemC;
 
 	@ExcelProperty("备注")

blade-service-api/blade-land-api/src/main/java/org/springblade/land/excel/KhAcctExcel.java

@@ -20,18 +20,18 @@ public class KhAcctExcel implements Serializable {
 	private static final long serialVersionUID = 1L;
 
 	@ExcelProperty("客户名称")
-	private String corpName;
-
-	@ExcelProperty("客户简称")
 	private String corpShortName;
 
 	@ExcelProperty("货运日期")
-	@DateTimeFormat("yyyy-MM-dd HH:mm:ss")
+	@DateTimeFormat("yyyy-MM-dd HH:mm")
 	private Date arrivalTime;
 
 	@ExcelProperty("业务员")
 	private String salesmanName;
 
+	@ExcelProperty("物流运输")
+	private String dispatchDeptName;
+
 	@ExcelProperty("货运地点")
 	private String addressDetail;
 
@@ -48,21 +48,18 @@ public class KhAcctExcel implements Serializable {
 	private String ctnDetail;
 
 	@ExcelProperty("车队")
-	private String fleetName;
-
-	@ExcelProperty("车队简称")
 	private String fleetShortName;
 
 	@ExcelProperty("车号")
 	private String plateNo;
 
-	@ExcelProperty("运费")
+	@ExcelProperty("应收运费")
 	private BigDecimal landAmountD;
 
-	@ExcelProperty("杂费")
+	@ExcelProperty("应收杂费")
 	private BigDecimal extraAmountD;
 
-	@ExcelProperty("杂费明细")
+	@ExcelProperty("应收杂费明细")
 	private String extraAmountItemD;
 
 	@ExcelProperty("备注")

blade-service-api/blade-land-api/src/main/java/org/springblade/land/excel/PtAcctExcel.java

@@ -20,18 +20,21 @@ public class PtAcctExcel implements Serializable {
 	private static final long serialVersionUID = 1L;
 
 	@ExcelProperty("客户名称")
-	private String corpName;
-
-	@ExcelProperty("客户简称")
 	private String corpShortName;
 
 	@ExcelProperty("货运日期")
-	@DateTimeFormat("yyyy-MM-dd HH:mm:ss")
+	@DateTimeFormat("yyyy-MM-dd HH:mm")
 	private Date arrivalTime;
 
 	@ExcelProperty("业务员")
 	private String salesmanName;
 
+	@ExcelProperty("运输调度")
+	private String dispatcherName;
+
+	@ExcelProperty("物流运输")
+	private String dispatchDeptName;
+
 	@ExcelProperty("货运地点")
 	private String addressDetail;
 
@@ -48,9 +51,6 @@ public class PtAcctExcel implements Serializable {
 	private String ctnDetail;
 
 	@ExcelProperty("车队")
-	private String fleetName;
-
-	@ExcelProperty("车队简称")
 	private String fleetShortName;
 
 	@ExcelProperty("车号")

blade-service/blade-land/src/main/java/org/springblade/land/service/impl/OrderServiceImpl.java

@@ -149,18 +149,6 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
 					detail.setAgentName(agent.getData().getCname());
 				}
 			}
-			if (!ObjectUtil.isEmpty(detail.getAgentId())) {
-				R<CorpsDesc> agent = corpsDescClient.getCorpMessage(detail.getAgentId());
-				if (agent.isSuccess() && agent.getData() != null) {
-					detail.setAgentName(agent.getData().getCname());
-				}
-			}
-			if (!ObjectUtil.isEmpty(detail.getPolId())) {
-				BasicPortDesc pol = portClient.getPort(detail.getPolId());
-				if (pol != null) {
-					detail.setPolName(pol.getName());
-				}
-			}
 			if (!ObjectUtil.isEmpty(detail.getPodId())) {
 				BasicPortDesc pod = portClient.getPort(detail.getPodId());
 				if (pod != null) {