解决 在库订单数据导出不含有页面展示的全部数据，如库位，托盘等数

blade-biz-common/src/main/java/org/springblade/common/launch/LauncherServiceImpl.java

@@ -41,10 +41,10 @@ public class LauncherServiceImpl implements LauncherService {
 		PropsUtil.setProperty(props, "spring.cloud.nacos.config.server-addr", LauncherConstant.nacosAddr(profile));
 
 
-		PropsUtil.setProperty(props,  "spring.cloud.nacos.discovery.username","nacos");
-		PropsUtil.setProperty(props,  "spring.cloud.nacos.discovery.password","Nacos123123");
-		PropsUtil.setProperty(props,  "spring.cloud.nacos.config.username","nacos");
-		PropsUtil.setProperty(props,  "spring.cloud.nacos.config.password","Nacos123123");
+//		PropsUtil.setProperty(props,  "spring.cloud.nacos.discovery.username","nacos");
+//		PropsUtil.setProperty(props,  "spring.cloud.nacos.discovery.password","Nacos123123");
+//		PropsUtil.setProperty(props,  "spring.cloud.nacos.config.username","nacos");
+//		PropsUtil.setProperty(props,  "spring.cloud.nacos.config.password","Nacos123123");
 
 		PropsUtil.setProperty(props, "spring.cloud.sentinel.transport.dashboard", LauncherConstant.sentinelAddr(profile));
 

blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/entity/DistributionStockArticleEntity.java

@@ -450,5 +450,17 @@ public class DistributionStockArticleEntity extends TenantEntity {
 
 	@ApiModelProperty(value = "配载件数")
 	private Integer carsLoadNum;
-
+	/**
+	 * 未入库数量
+	 */
+	@TableField(exist = false)
+	private Integer unreceivedQuantity;
+	/**
+	 * 创建用户id和时间
+	 */
+	@TableField(exist = false)
+	private Long createUser;
+	@TableField(exist = false)
+	@JsonFormat(locale="zh", timezone="GMT+8", pattern="yyyy-MM-dd HH:mm:ss")
+	private Date createTime;
 }

blade-service/logpm-distribution/src/main/java/com/logpm/distribution/excel/DistributionStockArticleExcel.java

@@ -17,13 +17,17 @@
 package com.logpm.distribution.excel;
 
 
+import com.alibaba.excel.annotation.ExcelIgnore;
 import com.alibaba.excel.annotation.ExcelProperty;
 import com.alibaba.excel.annotation.write.style.ColumnWidth;
 import com.alibaba.excel.annotation.write.style.ContentRowHeight;
 import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.baomidou.mybatisplus.annotation.TableField;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 import java.io.Serializable;
+import java.math.BigDecimal;
 import java.util.Date;
 
 
@@ -40,6 +44,12 @@ import java.util.Date;
 public class DistributionStockArticleExcel implements Serializable {
 
 	private static final long serialVersionUID = 1L;
+	/**
+	 * 运单号
+	 */
+	@ColumnWidth(20)
+	@ExcelProperty("运单号")
+	private String waybillNumber;
 	/**
 	 * 服务号
 	 */
@@ -73,8 +83,7 @@ public class DistributionStockArticleExcel implements Serializable {
 	/**
 	 * 仓库
 	 */
-	@ColumnWidth(20)
-	@ExcelProperty("仓库编码")
+	@ExcelIgnore
 	private String warehouseCode;
 	/**
 	 * 入库时间
@@ -82,12 +91,30 @@ public class DistributionStockArticleExcel implements Serializable {
 	@ColumnWidth(20)
 	@ExcelProperty("入库时间")
 	private Date warehouseEntryTime;
+	/**
+	 *  最新入库时间
+	 */
+	@ColumnWidth(20)
+	@ExcelProperty("最新入库时间")
+	private Date warehouseEntryTimeEnd;
 	/**
 	 * 在库时间
 	 */
 	@ColumnWidth(20)
 	@ExcelProperty("在库时间")
 	private String storeTime;
+	/**
+	 * 收货单位
+	 */
+	@ColumnWidth(20)
+	@ExcelProperty("收货单位")
+	private String consigneeUnit;
+	/**
+	 * 收货人
+	 */
+	@ColumnWidth(20)
+	@ExcelProperty("收货人")
+	private String consigneePerson;
 	/**
 	 * 订单总件数
 	 */
@@ -101,35 +128,105 @@ public class DistributionStockArticleExcel implements Serializable {
 	@ExcelProperty("在库件数")
 	private Integer handQuantity;
 	/**
-	 * 是否齐套
+	 * 未入库数量
 	 */
 	@ColumnWidth(20)
-	@ExcelProperty("是否齐套")
-	private String completeSet;
+	@ExcelProperty("未入库数量")
+	private Integer unreceivedQuantity;
+	/**
+	 * 分拣件数
+	 */
+	@ColumnWidth(20)
+	@ExcelProperty("分拣件数")
+	private Integer sortingQuantity;
+	/**
+	 * 配送件数
+	 */
+	@ColumnWidth(20)
+	@ExcelProperty("配送件数")
+	private Integer deliveryQuantity;
+	/**
+	 * 中转件数
+	 */
+	@ColumnWidth(20)
+	@ExcelProperty("中转件数")
+	private Integer transferQuantity;
+	/**
+	 * 中转件数
+	 */
+	@ColumnWidth(20)
+	@ExcelProperty("签收件数")
+	private Integer signinQuantity;
+	/**
+	 * 上架状态
+	 */
+	@ColumnWidth(20)
+	@ExcelProperty("上架状态")
+	private String groundingStatusName;
+	/**
+	 * 订单来源
+	 */
+	@ColumnWidth(20)
+	@ExcelProperty("订单来源")
+	private String resource;
 	/**
 	 * 品牌
 	 */
 	@ColumnWidth(20)
 	@ExcelProperty("品牌")
 	private String brand;
+	/**
+	 * 所在托盘
+	 */
+	@ColumnWidth(20)
+	@ExcelProperty("所在托盘")
+	private String trays;
+	/**
+	 * 冻结状态
+	 */
+	@ColumnWidth(20)
+	@ExcelProperty("冻结状态")
+	private String freezeStatusName;
+	/**
+	 * 订单状态
+	 */
+	@ColumnWidth(20)
+	@ExcelProperty("订单状态")
+	private String orderStatusName;
+	/**
+	 * 预约状态
+	 */
+	@ColumnWidth(20)
+	@ExcelProperty("预约状态")
+	private String reservationStatusName;
+	/**
+	 * 备货状态
+	 */
+	@ColumnWidth(20)
+	@ExcelProperty("备货状态")
+	private String stockupStatusName;
+	/**
+	 * 是否齐套
+	 */
+	@ColumnWidth(20)
+	@ExcelProperty("是否齐套")
+	private String completeSetName;
 	/**
 	 * 服务类型
 	 */
+	@ExcelIgnore
+	private String typeService;
+
 	@ColumnWidth(20)
 	@ExcelProperty("服务类型")
-	private String typeService;
+	private String typeServerName;
+
 	/**
 	 * 顾客名字
 	 */
 	@ColumnWidth(20)
 	@ExcelProperty("顾客名字")
 	private String customerName;
-	/**
-	 * 运单号
-	 */
-	@ColumnWidth(20)
-	@ExcelProperty("运单号")
-	private String waybillNumber;
 	/**
 	 * 顾客电话
 	 */
@@ -143,23 +240,30 @@ public class DistributionStockArticleExcel implements Serializable {
 	@ExcelProperty("顾客地址")
 	private String customerAddress;
 	/**
-	 * 收货人
+	 * 增值服务
 	 */
 	@ColumnWidth(20)
-	@ExcelProperty("收货人")
-	private String consigneePerson;
+	@ExcelProperty("增值服务")
+	private BigDecimal fee;
 	/**
-	 * 收货单位
+	 * 创建人
 	 */
 	@ColumnWidth(20)
-	@ExcelProperty("收货单位")
-	private String consigneeUnit;
+	@ExcelProperty("创建人")
+	private String createUserName;
 	/**
-	 * 订单来源
+	 * 创建时间
 	 */
 	@ColumnWidth(20)
-	@ExcelProperty("订单来源")
-	private String resource;
+	@ExcelProperty("创建时间")
+	private Date createTime;
+//	/**
+//	 * 配载件数
+//	 */
+//	@ColumnWidth(20)
+//	@ExcelProperty("配载件数")
+//	private Integer carsLoadNum;
+
 	/**
 	 * 类型;1 预约单  2库存单
 	 */

blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionStockArticleMapper.xml

@@ -729,6 +729,7 @@
                ldsa.status,
                ldsa.is_deleted,
                ldsa.create_dept,
+               ldsa.incoming_num,
                ldsa.reserve1,
                ldsa.reserve2,
                ldsa.reserve3,
@@ -767,7 +768,7 @@
                ldsa.rate,
                ldsa.advance_id,
                ldsa.waybill_id,
-               group_concat(DISTINCT ldpl.waybill_number) as waybillNumber,
+                ldsa.waybill_number AS waybillNumber,
                ldsa.consignee_unit,
                ldsa.collect_fee,
                ldsa.storage_fee,

blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionStockArticleServiceImpl.java

@@ -71,7 +71,9 @@ import org.springblade.core.tool.utils.Func;
 import org.springblade.core.tool.utils.ObjectUtil;
 import org.springblade.system.cache.DictBizCache;
 import org.springblade.system.entity.DictBiz;
+import org.springblade.system.entity.User;
 import org.springblade.system.feign.IDictBizClient;
+import org.springblade.system.feign.IUserClient;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
@@ -125,7 +127,7 @@ public class DistributionStockArticleServiceImpl extends BaseServiceImpl<Distrib
 	private final DistributionParcelNumberMapper distributionParcelNumberMapper;
 	private final IWarehouseTrayGoodsClient warehouseTrayGoodsClient;
 	private final IWarehouseUpdownGoodsClient warehouseUpdownGoodsClient;
-
+	private final IUserClient userClient;
 
 	@Override
 	public IPage<DistributionStockArticleVO> selectDistributionStockArticlePage(IPage<DistributionStockArticleVO> page, DistributionStockArticleVO distributionStockArticle) {
@@ -163,9 +165,17 @@ public class DistributionStockArticleServiceImpl extends BaseServiceImpl<Distrib
 
 		List<DistributionStockArticleEntity> list = baseMapper.exportDistributionStockArticle(paramMap, idArr);
 		List<DistributionStockArticleExcel> excelList = new ArrayList<>();
-		list.forEach(li -> {
+		list.parallelStream().forEach(li -> {
+			li.setCreateUserName(userClient.userInfoById(li.getCreateUser()).getData().getName());
+			DistributionStockArticleVO distributionStockArticleVO = DistributionStockArticleWrapper.build().entityVO(li);
 			DistributionStockArticleExcel excel = new DistributionStockArticleExcel();
-			BeanUtil.copyProperties(li,excel);
+			if (distributionStockArticleVO.getTotalNumber() != null &&
+				distributionStockArticleVO.getHandQuantity() != null) {
+				distributionStockArticleVO.setUnreceivedQuantity(
+					distributionStockArticleVO.getTotalNumber() - distributionStockArticleVO.getHandQuantity()
+				);
+			}
+			BeanUtil.copyProperties(distributionStockArticleVO,excel);
 			excelList.add(excel);
 		});