1.干线bug修复

blade-service/logpm-statisticsdata/src/main/java/com/logpm/statistics/listener/mq/WaybillCheckListener.java

@@ -206,6 +206,7 @@ public class WaybillCheckListener {
 		String destinationWarehouseName = waybillEntity.getDestinationWarehouseName();
 		Integer trunklineCompleteOrNot = waybillEntity.getTrunklineCompleteOrNot();
 		Integer pickupCompleteOrNot = waybillEntity.getPickupCompleteOrNot();
+		Date signTime = waybillEntity.getSignTime();
 
 		//		BigDecimal pickupFee = Objects.isNull(waybillEntity.getPickupFee())?BigDecimal.ZERO:waybillEntity.getPickupFee();
 		BigDecimal warehouseManagementFee = Objects.isNull(waybillEntity.getWarehouseManagementFee()) ? BigDecimal.ZERO : waybillEntity.getWarehouseManagementFee();
@@ -259,6 +260,7 @@ public class WaybillCheckListener {
 		orderInfoEntity.setConsignee(consignee);
 		orderInfoEntity.setTypeService(serviceType);
 		orderInfoEntity.setSignStatus(0);
+		orderInfoEntity.setSignDate(signTime);
 		orderInfoEntity.setSyncFeeStatus(0);
 		orderInfoEntity.setCreateReconciliationOrderStatus(0);
 		orderInfoEntity.setConfirmBalanceOrderStatus(0);
@@ -485,6 +487,7 @@ public class WaybillCheckListener {
 		String destinationWarehouseName = waybillEntity.getDestinationWarehouseName();
 		Integer trunklineCompleteOrNot = waybillEntity.getTrunklineCompleteOrNot();
 		Integer pickupCompleteOrNot = waybillEntity.getPickupCompleteOrNot();
+		Date signTime = waybillEntity.getSignTime();
 
 		//单价计算
 //		BigDecimal pickupFee = Objects.isNull(waybillEntity.getPickupFee())?BigDecimal.ZERO:waybillEntity.getPickupFee();
@@ -551,6 +554,7 @@ public class WaybillCheckListener {
 			orderInfoEntity.setConsigneeId(consigneeId);
 			orderInfoEntity.setConsignee(consignee);
 			orderInfoEntity.setTypeService(serviceType);
+			orderInfoEntity.setSignDate(signTime);
 			orderInfoEntity.setSignStatus(0);
 			orderInfoEntity.setSyncFeeStatus(0);
 			orderInfoEntity.setCreateReconciliationOrderStatus(0);

blade-service/logpm-statisticsdata/src/main/java/com/logpm/statistics/vo/StatisticsOrderInfoExportVO.java

@@ -79,10 +79,10 @@ public class StatisticsOrderInfoExportVO implements Serializable {
 	@ExcelProperty(value = "支付方式")
 	private String payWay; // 支付方式
 
-	@ExcelProperty(value = "物料品类")
+	@ExcelProperty(value = "品类名称")
 	private String goodsName; // 物料品类
 
-	@ExcelProperty(value = "物料品类单价")
+	@ExcelProperty(value = "品类单价")
 	private String goodsPrice; // 物料品类
 
 	@ExcelProperty(value = "订单数量")