From 48d187b248909155bde1dc9bed1b0e20e7cf1919 Mon Sep 17 00:00:00 2001 From: PigBaoBei <2739175034@qq.com> Date: Mon, 13 May 2024 14:00:57 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E9=85=8D=E9=80=81=E5=88=97=E8=A1=A8?= =?UTF-8?q?=E5=AF=BC=E5=87=BA=E5=A2=9E=E5=8A=A0=E8=AE=A2=E5=8D=95=E8=87=AA?= =?UTF-8?q?=E7=BC=96=E5=8F=B7=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../distribution/excel/DistributionDeliveryListExcel.java | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/excel/DistributionDeliveryListExcel.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/excel/DistributionDeliveryListExcel.java index faeae066e..03040c59b 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/excel/DistributionDeliveryListExcel.java +++ b/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; /** * 仓库 */ From a58aec641e6c6fdb069d99c0ad27c761e54b1121 Mon Sep 17 00:00:00 2001 From: PigBaoBei <2739175034@qq.com> Date: Mon, 13 May 2024 14:18:42 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E5=95=86=E9=85=8D=E8=AE=A1=E5=88=92?= =?UTF-8?q?=E9=A2=84=E7=BA=A6=E6=95=B0=E9=87=8F=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/DistributionDeliveryListServiceImpl.java | 1 + 1 file changed, 1 insertion(+) diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionDeliveryListServiceImpl.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionDeliveryListServiceImpl.java index 2979bc019..79483d786 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionDeliveryListServiceImpl.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionDeliveryListServiceImpl.java @@ -2553,6 +2553,7 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImplquery().lambda().eq(DistributionParcelListEntity::getStockArticleId, rs.getStockArticleId())))); //// } // } + distributionStockArticleVO.setReservationNum(rs.getReservationNum()); distributionStockArticleVOS.add(distributionStockArticleVO); }); }