From 7e9a85dd0ed3a7ca7b741ef55df023d6841904c2 Mon Sep 17 00:00:00 2001 From: PigBaoBei <2739175034@qq.com> Date: Wed, 14 Aug 2024 11:33:15 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8E=A8=E9=80=81BUG=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../feign/IDistributionSignforClient.java | 2 +- .../feign/DistributionSignforClient.java | 4 +- .../service/IDistributionSignforService.java | 2 +- .../impl/DistributionSignforServiceImpl.java | 91 +++++++++---------- .../DistrilbutionBillLadingServiceImpl.java | 1 - .../oldproject/feign/SignPushClient.java | 4 +- .../jobhandle/DistributionDatarepair.java | 6 ++ .../mapper/WarehouseMappingDataMapper.java | 7 ++ .../mapper/WarehouseMappingDataMapper.xml | 5 + 9 files changed, 67 insertions(+), 55 deletions(-) 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 be055727d..739add728 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 @@ -54,7 +54,7 @@ public interface IDistributionSignforClient { @GetMapping(TOP+"push0ldSystemSignInfo") - void push0ldSystemSignInfo(@RequestParam("current") Long signingId); + Map push0ldSystemSignInfo(@RequestParam("current") Long signingId); /** 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 a347285fa..24e73250b 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 @@ -99,8 +99,8 @@ public class DistributionSignforClient implements IDistributionSignforClient { * @param signingId */ @Override - public void push0ldSystemSignInfo(Long signingId) { - distributionSignforService.push0ldSystemSignInfo(signingId); + public Map push0ldSystemSignInfo(Long signingId) { + return distributionSignforService.push0ldSystemSignInfo(signingId); } 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 fbb265899..b706f41b9 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 @@ -335,7 +335,7 @@ public interface IDistributionSignforService extends BaseService push0ldSystemSignInfo(Long signingId); SignforPageCountVO selectDistributionSignforPageCount( DistributionSignforVO distributionSignfor); 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 519785df1..e9feb3411 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 @@ -910,13 +910,13 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl().lambda() - .eq(DistributionLoadscanEntity::getReservationId, signforEntity.getReservationId()) - .ne(DistributionLoadscanEntity::getScanStatus, LoadingStatusConstant.quxiao.getValue())) + .eq(DistributionLoadscanEntity::getReservationId, signforEntity.getReservationId()) + .ne(DistributionLoadscanEntity::getScanStatus, LoadingStatusConstant.quxiao.getValue())) .intValue(); Integer nad = distributionLoadscaninvnMapper.selectCount(new QueryWrapper().lambda() - .eq(DistributionLoadscaninvnEntity::getReservationId, signforEntity.getReservationId()) - .ne(DistributionLoadscaninvnEntity::getScanStatus, LoadingStatusConstant.quxiao.getValue())) + .eq(DistributionLoadscaninvnEntity::getReservationId, signforEntity.getReservationId()) + .ne(DistributionLoadscaninvnEntity::getScanStatus, LoadingStatusConstant.quxiao.getValue())) .intValue(); signforEntity.setLoadedNumber(lad); signforEntity.setLoadedinNumber(nad); @@ -1592,13 +1592,13 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl push0ldSystemSignInfo(Long signingId) { try { log.info(">>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>> 推送老系统签收队列"); //得到审核的任务ＩＤ if (ObjectUtil.isEmpty(signingId)) { log.info(">>>>>>>>>>>>> clerkCheckPushDataHandler 签收ID为空"); - return; + return null; } //得到签收对象 @@ -1608,20 +1608,20 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl>>>>>>>>>>> clerkCheckPushDataHandler distributionSignforEntity {}", distributionSignforEntity); - return; + return null; } //　得到配送计划 DistributionDeliveryListEntity distributionDeliveryListEntity = distributionDeliveryListMapper.selectById(distributionSignforEntity.getDeliveryId()); if (ObjectUtil.isEmpty(distributionDeliveryListEntity)) { log.info(">>>>>>>>>>> clerkCheckPushDataHandler distributionDeliveryListEntity {}", distributionDeliveryListEntity); - return; + return null; } // 得到配送客户 DistributionReservationEntity distributionReservationEntity = distributionReservationMapper.selectById(distributionSignforEntity.getReservationId()); if (ObjectUtil.isEmpty(distributionReservationEntity)) { log.info(">>>>>>>>>>>> clerkCheckPushDataHandler distributionReservationEntity {}", distributionReservationEntity); - return; + return null; } @@ -1727,12 +1727,13 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl map = oldSystemDataPushClient.pushOldSystemSignInfo(delivery); + Map map = oldSystemDataPushClient.pushOldSystemSignInfo(delivery); + return map; } catch (Exception e) { log.error(">>>>> 推送老系统签收信息报错", e); } - + return null; } @@ -2466,7 +2467,7 @@ public class DistributionSignforServiceImpl extends BaseServiceImplquery().lambda() .eq(DistributionSignforEntity::getReservationId, distrilbutionloadingscanDTO.getReservationId()) ); @@ -2809,7 +2810,7 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl>>>> 签收异常报错", e); - throw new CustomerException("签收异常报错"+e.getMessage()); + throw new CustomerException("签收异常报错" + e.getMessage()); } } @@ -2981,7 +2982,7 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl>>> 签收推送报错", e); - // } + // try { + // sendMessage(orderPackageCode, distributionReservationEntity.getReservationCode(), + // deliveryListEntity.getTrainNumber(), deliveryListEntity.getVehicleName(), deliveryListEntity.getDriverName(), + // AuthUtil.getUserName(), myCurrentWarehouse.getId(), AuthUtil.getTenantId()); + // } catch (Exception e) { + //// throw new RuntimeException(e); + // log.error(">>>> 签收推送报错", e); + // } } else { //一个客户下出现重复包条码 @@ -3271,7 +3272,7 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl packageLockIds = new ArrayList<>(); @@ -3390,7 +3391,7 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl>>>>>>>>>>>>>>reservationId:{},deliveryId:{},orderPackageCode:{}", distributionLoadscanEntity.getReservationId(), distributionLoadscanEntity.getDeliveryId(), distributionLoadscanEntity.getOrderPackageCode()); //进行签收数量的修改 Integer i = distributionDeliveryListMapper.updateloadingTimeById(distrilbutionloadingscanDTO.getDeliveryId()); @@ -3422,7 +3423,7 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl>>>>包件已签收:{}",parcelListEntity.getOrderPackageCode()); + if (OrderPackageStatusConstant.yiqianshou.getValue().equals(parcelListEntity.getOrderPackageStatus())) { + log.info("司机一键签收 >>>>>包件已签收:{}", parcelListEntity.getOrderPackageCode()); continue; } //查询是否进行装车 @@ -6097,8 +6098,8 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl clerkCheckPushData(Long id) { - Map resultMap = new HashMap<>(); + public Map clerkCheckPushData(Long id) { + Map resultMap = new HashMap<>(); try { log.info(">>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>> 推送老系统签收队列"); //得到审核的任务ＩＤ if (ObjectUtil.isEmpty(id)) { log.info(">>>>>>>>>>>>> clerkCheckPushDataHandler 签收ID为空"); - resultMap.put("result",false); + resultMap.put("result", false); return resultMap; } @@ -6463,14 +6464,14 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl>>>>>>>>>>> clerkCheckPushDataHandler distributionSignforEntity {}", distributionSignforEntity); - resultMap.put("result",false); + resultMap.put("result", false); return resultMap; } //　得到配送计划 DistributionDeliveryListEntity distributionDeliveryListEntity = distributionDeliveryListMapper.selectById(distributionSignforEntity.getDeliveryId()); if (ObjectUtil.isEmpty(distributionDeliveryListEntity)) { log.info(">>>>>>>>>>> clerkCheckPushDataHandler distributionDeliveryListEntity {}", distributionDeliveryListEntity); - resultMap.put("result",false); + resultMap.put("result", false); return resultMap; } @@ -6478,7 +6479,7 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl>>>>>>>>>>> clerkCheckPushDataHandler distributionReservationEntity {}", distributionReservationEntity); - resultMap.put("result",false); + resultMap.put("result", false); return resultMap; } @@ -6587,7 +6588,7 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl>>> clerkCheckPushData SignPushDataDTO :{}", delivery); - resultMap= oldSystemDataPushClient.pushOldSystemSignInfo(delivery); + resultMap = oldSystemDataPushClient.pushOldSystemSignInfo(delivery); return resultMap; } catch (Exception e) { log.error(">>>>> 推送老系统签收信息报错", e); @@ -6752,7 +6753,7 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl list = new ArrayList<>(); if (!addvaluePackageVOS.isEmpty()) { - addvaluePackageVOS.forEach(a->{ + addvaluePackageVOS.forEach(a -> { DistributionAddvaluePackageDTO dto = Func.copy(a, DistributionAddvaluePackageDTO.class); list.add(dto); }); @@ -6858,11 +6859,11 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl ladingScanEntities = distributionBillLadingScanService.list(Wrappers.query().lambda() .eq(DistributionBillLadingScanEntity::getBillLadingId, Long.parseLong(s)) - .eq(DistributionBillLadingScanEntity::getMaterialType, "2") ); if (ladingScanEntities.isEmpty()){ return R.fail("无签收数据!!"); diff --git a/blade-service/logpm-old-project/src/main/java/com/logpm/oldproject/feign/SignPushClient.java b/blade-service/logpm-old-project/src/main/java/com/logpm/oldproject/feign/SignPushClient.java index 516b52037..8569711dd 100644 --- a/blade-service/logpm-old-project/src/main/java/com/logpm/oldproject/feign/SignPushClient.java +++ b/blade-service/logpm-old-project/src/main/java/com/logpm/oldproject/feign/SignPushClient.java @@ -48,15 +48,13 @@ public class SignPushClient implements IOldSignPushClient { result= true; }else { String msg = res.getString("msg"); - resultMap.put("msg",result); + resultMap.put("msg",msg); log.info(">>>> pushOldSystemSignInfo response msg:{}",msg); log.info(">>>> pushOldSystemSignInfo 推送配送ID signPushDataDTO ID:{}",signPushDataDTO.getId()); } } log.info(">>>> pushOldSystemSignInfo response url:{} body:{}",url,body); - log.info(">>>> pushOldSystemSignInfo 程序执行 end time : {} >> return result :{} ",System.currentTimeMillis(),result); - resultMap.put("result",result); 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 8176174fc..d3e5904f4 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 @@ -205,6 +205,9 @@ public class DistributionDatarepair { warehouseMappingDataMapper.updateClearSignforStatus(id, entries.getLong("warehouseId"), 1); log.info(">>> 推送成功 {}", id); } else { + String remarks = (String) map.get("msg"); + //进行错误记录 + warehouseMappingDataMapper.updateClearSignforRemarks(id, remarks); log.error(">>> 推送失败 id=" + id); } } @@ -220,11 +223,14 @@ public class DistributionDatarepair { @XxlJob("pushSingleNotification") public ReturnT pushSingleNotification(String params) { Map map = distributionSignforClient.clerkCheckPushData(Long.parseLong(params)); + Long id = Long.parseLong(params); Boolean b = (Boolean) map.get("b"); 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-patch/src/main/java/com/logpm/patch/mapper/WarehouseMappingDataMapper.java b/blade-service/logpm-patch/src/main/java/com/logpm/patch/mapper/WarehouseMappingDataMapper.java index 877736ec5..b5f7c3b6c 100644 --- a/blade-service/logpm-patch/src/main/java/com/logpm/patch/mapper/WarehouseMappingDataMapper.java +++ b/blade-service/logpm-patch/src/main/java/com/logpm/patch/mapper/WarehouseMappingDataMapper.java @@ -123,5 +123,12 @@ public interface WarehouseMappingDataMapper { List findStockAllocationInfo(); void updateClearSignforStatusBysignforId(@Param("singnforId")Long singnforId, @Param("dealStatus") Integer dealStatus); + + /** + * 修改备注 + * @param id + * @param msg + */ + void updateClearSignforRemarks(@Param("singnforId")Long id,@Param("remarks") String remarks); } diff --git a/blade-service/logpm-patch/src/main/java/com/logpm/patch/mapper/WarehouseMappingDataMapper.xml b/blade-service/logpm-patch/src/main/java/com/logpm/patch/mapper/WarehouseMappingDataMapper.xml index 04810b882..bc23cf9d8 100644 --- a/blade-service/logpm-patch/src/main/java/com/logpm/patch/mapper/WarehouseMappingDataMapper.xml +++ b/blade-service/logpm-patch/src/main/java/com/logpm/patch/mapper/WarehouseMappingDataMapper.xml @@ -354,6 +354,11 @@ set deal_status = #{dealStatus} where singnfor_id = #{singnforId} + + update clear_singnfor_status_record + set deal_status = #{dealStatus} + where remarks = #{remarks} +