From 4f0f518ec2f4e4793c9c562824662712ed852c0f Mon Sep 17 00:00:00 2001 From: "pref_mail@163.com" Date: Thu, 18 Jul 2024 12:16:34 +0800 Subject: [PATCH] =?UTF-8?q?fix:=E4=BF=AE=E5=A4=8D=E6=AC=A7=E6=B4=BE?= =?UTF-8?q?=E6=95=B0=E6=8D=AE=E5=9B=9E=E4=BC=A0=20=E5=9C=A8=E6=B2=A1?= =?UTF-8?q?=E6=9C=89=E5=A2=9E=E5=8A=A0=E8=AE=A1=E5=88=92=E7=9A=84=E6=83=85?= =?UTF-8?q?=E5=86=B5=20=E5=B0=86=E6=B2=A1=E6=9C=89=E8=AE=A1=E5=88=92?= =?UTF-8?q?=E7=9A=84=E5=8C=85=E4=BB=B6=E5=9B=9E=E4=BC=A0=E5=88=B0=E4=BA=86?= =?UTF-8?q?=E6=AC=A7=E6=B4=BE=E7=B3=BB=E7=BB=9F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/DistributionAsyncServiceImpl.java | 36 ++++++------------- 1 file changed, 11 insertions(+), 25 deletions(-) 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 8d98f5082..3f1eee7b3 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 @@ -1535,29 +1535,15 @@ public class DistributionAsyncServiceImpl implements IDistributionAsyncService { } if (Func.isNotEmpty(brand.get("欧派"))) { - - // 重新筛选出欧派的包件 - for (DistributionReservationStockarticleEntity distributionReservationStockarticleEntity : distributionReservationStockarticleEntities) { - - // 查询预约单下面的包件信息 - log.info(">>>>>>>>>>>>>>>>>>>>> 欧派循环包件信息 {} ", distributionReservationStockarticleEntity); - List distributionParcelListEntities = buildOpByReservationId(distributionReservationStockarticleEntity); - - - for (DistributionParcelListEntity distributionParcelListEntity : distributionParcelListEntities) { - // todo 查询签收信息 - DistributionSignforEntity distributionSignfor = distributionSignforMapper.getByReservationId(distributionReservationStockarticleEntity.getReservationId()); - OrderStatusDTO orderStatusDTO = new OrderStatusDTO(); - orderStatusDTO.setUnitNo(distributionParcelListEntity.getOrderPackageCode()); //单号 - orderStatusDTO.setUsername(distributionSignfor.getSigneeName()); //操作人名称 - orderStatusDTO.setStatus("7"); - orderStatusDTO.setOperationTime(distributionSignfor.getSigningTime()); //时间 - ouPaiFactoryClinet.newSystemHandleStatusData(orderStatusDTO); - log.info(">>>>>>>>>>>>>>>>>进入newSystemHandleStatusData orderStatusDTO值 ：{}", orderStatusDTO); - } + List oupai = brand.get("欧派"); + for (MtReceiveContentDTO mtReceiveContentDTO : oupai) { + OrderStatusDTO orderStatusDTO = new OrderStatusDTO(); + orderStatusDTO.setUnitNo(mtReceiveContentDTO.getUnitNo()); //包条 + orderStatusDTO.setUsername(distributionSignforEntity.getSigneeName()); //操作人名称 + orderStatusDTO.setStatus("7"); + orderStatusDTO.setOperationTime(distributionSignforEntity.getSigningTime()); //时间 + ouPaiFactoryClinet.newSystemHandleStatusData(orderStatusDTO); } - -// orderMainClinet.sendReceiveInfoByNewSystem(mtReceiveDTO); } if (Func.isNotEmpty(brand.get("志邦"))) { List zb = brand.get("志邦"); @@ -3021,7 +3007,7 @@ public class DistributionAsyncServiceImpl implements IDistributionAsyncService { } orderList.add(order); - if (distributionStockArticleEntity.getIsZero().equals(IsOrNoConstant.no.getValue())){ + if (distributionStockArticleEntity.getIsZero().equals(IsOrNoConstant.no.getValue())) { //构建包件信息 List distributionParcelListEntities = distributionReservationMapper.selectPackageByReservationAndStockArticle(reservationEntity.getId(), distributionStockArticleEntity.getId(), distributionStockArticleEntity.getWarehouseId()); if (!distributionParcelListEntities.isEmpty()) { @@ -3040,7 +3026,7 @@ public class DistributionAsyncServiceImpl implements IDistributionAsyncService { } } } - }else { + } else { //整理零担的数据 List distributionParcelNumberVOS = distributionReservationMapper.selectReservationZeroOrderDetail(distributionStockArticleEntity.getId(), reservationEntity.getId()); if (!distributionParcelNumberVOS.isEmpty()) { @@ -3115,7 +3101,7 @@ public class DistributionAsyncServiceImpl implements IDistributionAsyncService { } pushInstallDTO.setOrder(orderList); pushInstallDTO.setOrder_detail(orderDetailList); - log.info(">>>>>>>>>>>>>>安装推送整理数据:{}",JSONObject.toJSON(pushInstallDTO)); + log.info(">>>>>>>>>>>>>>安装推送整理数据:{}", JSONObject.toJSON(pushInstallDTO)); String jsonString = JSONObject.toJSONString(pushInstallDTO); rabbitTemplate.convertAndSend(RabbitConstant.PUSH_INSTALL_PLATFORM_EXCHANGE, RabbitConstant.PUSH_INSTALL_PLATFORM_ROUTING, jsonString);