Merge branch 'dev' into pre-production

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

@@ -68,6 +68,13 @@ public class DistributionDeliveryListExcel implements Serializable {
 	@ColumnWidth(20)
 	@ExcelProperty("客户名称")
 	private String consignee;
+
+	/**
+	 * 仓库
+	 */
+	@ColumnWidth(20)
+	@ExcelProperty("订单自编号")
+	private String orderCode;
 	/**
 	 * 仓库
 	 */

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

@@ -2553,6 +2553,7 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl<Distrib
 ////							distributionStockArticleVO.setParcelListVOS(DistributionParcelListWrapper.build().listVO(distributionParcelListService.getBaseMapper().selectList(Wrappers.<DistributionParcelListEntity>query().lambda().eq(DistributionParcelListEntity::getStockArticleId, rs.getStockArticleId()))));
 ////						}
 //					}
+					distributionStockArticleVO.setReservationNum(rs.getReservationNum());
 					distributionStockArticleVOS.add(distributionStockArticleVO);
 				});
 			}