From e92f04a480afcd318fa7b74a9546a3c0b177a17b Mon Sep 17 00:00:00 2001 From: PigBaoBei <2739175034@qq.com> Date: Thu, 15 Aug 2024 11:03:05 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8E=A8=E9=80=81=E9=9B=B6=E6=8B=85=E8=B0=83?= =?UTF-8?q?=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../feign/IDistributionSignforClient.java | 12 +++++++ .../feign/DistributionSignforClient.java | 9 +++++ .../service/IDistributionSignforService.java | 7 ++++ .../impl/DistributionSignforServiceImpl.java | 35 +++++++++++++++++++ .../jobhandle/DistributionDatarepair.java | 26 ++++++++++++++ .../impl/WarehouseWaybillServiceImpl.java | 1 + 6 files changed, 90 insertions(+) diff --git a/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/feign/IDistributionSignforClient.java b/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/feign/IDistributionSignforClient.java index 739add728..3f3da7ac1 100644 --- a/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/feign/IDistributionSignforClient.java +++ b/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/feign/IDistributionSignforClient.java @@ -40,6 +40,7 @@ public interface IDistributionSignforClient { String API_PREFIX = "signfor/client"; String TOP = API_PREFIX + "/top"; String CLERKCHECKPUSHDATA = API_PREFIX + "/clerkCheckPushData"; + String CLERKINVENTORYCHECKDATA = API_PREFIX + "/clerkInventoryCheckPushData"; /** * 获取签收管理列表 @@ -64,4 +65,15 @@ public interface IDistributionSignforClient { */ @GetMapping(CLERKCHECKPUSHDATA) Map clerkCheckPushData(@RequestParam("id") Long id); + + + /** + * 推送老系统零担信息 + * @param params + * @return + */ + @GetMapping(CLERKINVENTORYCHECKDATA) + Map clerkInventoryCheckPushData(@RequestParam("orderPackageCode")String orderPackageCode); + + } diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/feign/DistributionSignforClient.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/feign/DistributionSignforClient.java index 24e73250b..41bd963a3 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/feign/DistributionSignforClient.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/feign/DistributionSignforClient.java @@ -116,6 +116,15 @@ public class DistributionSignforClient implements IDistributionSignforClient { } + @Override + public Map clerkInventoryCheckPushData(String orderPackageCode) { + + + + return null; + } + + private void buildNameAndPhone(List pushOldPackageSigning) { for (SignPushDataUnitDTO signPushDataUnitDTO : pushOldPackageSigning) { User user = bladeRedis.get(RedisKeyConstant.USER_NAME_PHONE_KEY + signPushDataUnitDTO.getAdministratorsId()); diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/IDistributionSignforService.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/IDistributionSignforService.java index b706f41b9..b0e022919 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/IDistributionSignforService.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/IDistributionSignforService.java @@ -368,4 +368,11 @@ public interface IDistributionSignforService extends BaseService checkAddValuePCPackageList(Long reservationId); + + /** + * + * @param orderCode + * @return + */ + Map clerkCheckPushZeroData(String orderCode); } diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionSignforServiceImpl.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionSignforServiceImpl.java index e5d5697cf..920339148 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionSignforServiceImpl.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionSignforServiceImpl.java @@ -6557,10 +6557,12 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl pushOldPackageLoading = distributionSignforMapper.selectPushOldPackageLoading(distributionSignforEntity.getReservationId(), distributionSignforEntity.getDeliveryId()); List pushOldPackageSigning = distributionSignforMapper.selectPushOldPackageSigning(distributionSignforEntity.getReservationId(), distributionSignforEntity.getDeliveryId()); if (Func.isNotEmpty(pushOldPackageLoading)) { + pushOldPackageLoading = handleSignPushDataUnitDTOList(pushOldPackageLoading); buildNameAndPhone(pushOldPackageLoading); signPushDataUnitDTOS.addAll(pushOldPackageLoading); } if (Func.isNotEmpty(pushOldPackageSigning)) { + pushOldPackageLoading = handleSignPushDataUnitDTOList(pushOldPackageSigning); buildNameAndPhone(pushOldPackageSigning); signPushDataUnitDTOS.addAll(pushOldPackageSigning); } @@ -6615,6 +6617,28 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl handleSignPushDataUnitDTOList(List pushOldPackageLoading) { + pushOldPackageLoading.stream().forEach(k->{ + if (k.getGoods_type() == 3){ + String unitNo = k.getUnitNo(); + int indexOfUnitNo = unitNo.lastIndexOf("-"); + if (indexOfUnitNo>0){ + unitNo.substring(indexOfUnitNo); + k.setUnitNo(unitNo); + } + String orderSelfNum = k.getOrderSelfNum(); + int indexOfOrderSelfNum = orderSelfNum.lastIndexOf("-"); + if (indexOfUnitNo>0){ + orderSelfNum.substring(indexOfUnitNo); + k.setOrderSelfNum(orderSelfNum); + } + } + }); + + + return pushOldPackageLoading; + } + @Override public DistributionSignforExcelDTO distributionSignforDetailExcel(Long id) { DistributionSignforExcelDTO distributionSignforExcelDTO = new DistributionSignforExcelDTO(); @@ -6779,6 +6803,17 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl clerkCheckPushZeroData(String orderCode) { + + + + + + + return null; + } + private void buildNameAndPhone(List pushOldPackageSigning) { for (SignPushDataUnitDTO signPushDataUnitDTO : pushOldPackageSigning) { User user = bladeRedis.get(RedisKeyConstant.USER_NAME_PHONE_KEY + signPushDataUnitDTO.getAdministratorsId()); diff --git a/blade-service/logpm-patch/src/main/java/com/logpm/patch/jobhandle/DistributionDatarepair.java b/blade-service/logpm-patch/src/main/java/com/logpm/patch/jobhandle/DistributionDatarepair.java index ce78e7278..c1db983ed 100644 --- a/blade-service/logpm-patch/src/main/java/com/logpm/patch/jobhandle/DistributionDatarepair.java +++ b/blade-service/logpm-patch/src/main/java/com/logpm/patch/jobhandle/DistributionDatarepair.java @@ -241,6 +241,32 @@ public class DistributionDatarepair { return ReturnT.SUCCESS; } + /** + * 转库存品包件推送老系统 + *订单自编号 + * @return + */ + @XxlJob("pushInventorySingleNotification") + public ReturnT pushInventorySingleNotification(String params) { + Map map = distributionSignforClient.clerkInventoryCheckPushData(params); + Long id = Long.parseLong(params); + Boolean b = (Boolean) map.get("result"); + log.info(">>> 推送反馈信息 map :{}",map); + if (b != null && b) { + warehouseMappingDataMapper.updateClearSignforStatusBysignforId(Long.parseLong(params), 1); + log.info(">>> 推送成功 {}", Long.parseLong(params)); + } else { + String remarks = (String) map.get("msg"); + warehouseMappingDataMapper.updateClearSignforRemarks(id, remarks); + log.error(">>> 推送失败 id=" + Long.parseLong(params)); + } + return ReturnT.SUCCESS; + } + + + + + /** * 推送自提签收老系统系统 * diff --git a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/WarehouseWaybillServiceImpl.java b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/WarehouseWaybillServiceImpl.java index 4557d09d6..7d9878c11 100644 --- a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/WarehouseWaybillServiceImpl.java +++ b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/WarehouseWaybillServiceImpl.java @@ -472,6 +472,7 @@ public class WarehouseWaybillServiceImpl extends BaseServiceImpl