From 30555a77374716b3aea03d8211d2e7371a104caf Mon Sep 17 00:00:00 2001 From: PigBaoBei <2739175034@qq.com> Date: Tue, 2 Jul 2024 09:21:53 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8E=A8=E9=80=81=E5=AE=89=E8=A3=85=E5=B9=B3?= =?UTF-8?q?=E5=8F=B0=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/logpm/distribution/dto/PushInstallDTO.java | 2 +- .../service/impl/DistributionAsyncServiceImpl.java | 9 ++++++--- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/dto/PushInstallDTO.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/dto/PushInstallDTO.java index 99066f7f4..c081b5f3d 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/dto/PushInstallDTO.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/dto/PushInstallDTO.java @@ -59,7 +59,7 @@ public class PushInstallDTO implements Serializable { private String level3_type; private String materials; private String order_no; - private String num; + private String number; } diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionAsyncServiceImpl.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionAsyncServiceImpl.java index e2864e061..aea27bf4c 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionAsyncServiceImpl.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionAsyncServiceImpl.java @@ -3064,7 +3064,8 @@ public class DistributionAsyncServiceImpl implements IDistributionAsyncService { orderDetail.setLevel1_type(distributionParcelListEntity.getFirsts()); orderDetail.setLevel2_type(distributionParcelListEntity.getSecond()); orderDetail.setLevel3_type(distributionParcelListEntity.getThirdProduct()); - orderDetail.setNum(distributionParcelListEntity.getQuantity() + ""); + orderDetail.setPackage_code(distributionParcelListEntity.getOrderPackageCode()); + orderDetail.setNumber(distributionParcelListEntity.getQuantity() + ""); orderDetailList.add(orderDetail); } } @@ -3081,7 +3082,8 @@ public class DistributionAsyncServiceImpl implements IDistributionAsyncService { orderDetail.setLevel1_type(distributionParcelNumberVO.getFirsts()); // orderDetail.setLevel2_type(distributionParcelListEntity.getSecond()); // orderDetail.setLevel3_type(distributionParcelListEntity.getThirdProduct()); - orderDetail.setNum(distributionParcelNumberVO.getReservationNum() + ""); + orderDetail.setNumber(distributionParcelNumberVO.getReservationNum() + ""); + orderDetail.setPackage_code(distributionStockArticleEntity.getOrderCode()); orderDetailList.add(orderDetail); } } @@ -3132,7 +3134,8 @@ public class DistributionAsyncServiceImpl implements IDistributionAsyncService { // orderDetail.setLevel2_type(distributionParcelListEntity.getSecond()); // orderDetail.setLevel3_type(distributionParcelListEntity.getThirdProduct()); // orderDetail.setLevel3_type(distributionParcelListEntity.getThirdProduct()); - orderDetail.setNum(disStockListDetailEntity.getNum() + ""); + orderDetail.setNumber(disStockListDetailEntity.getNum() + ""); + orderDetail.setPackage_code(disStockListDetailEntity.getStockPackageCode()); orderDetailList.add(orderDetail); } }