From d7cd50d096e36633336074a5fabe2def98302ffd Mon Sep 17 00:00:00 2001 From: "pref_mail@163.com" Date: Wed, 18 Dec 2024 18:52:28 +0800 Subject: [PATCH] =?UTF-8?q?1.=E4=BF=AE=E6=94=B9=E9=83=A8=E5=88=86=E6=97=A5?= =?UTF-8?q?=E5=BF=97=E8=BE=93=E5=87=BA=202.=E5=8F=96=E6=B6=88=E4=B8=80?= =?UTF-8?q?=E4=BB=B6=E8=A3=85=E8=BD=A6/=E7=AD=BE=E6=94=B6=E7=9A=84?= =?UTF-8?q?=E4=B8=8B=E6=9E=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../api/DistributionSignforAppController.java | 42 +++++++++---------- .../DistributionSignforController.java | 15 +------ .../impl/DistributionAsyncServiceImpl.java | 20 +++++---- .../impl/DistributionStockupServiceImpl.java | 2 +- 4 files changed, 37 insertions(+), 42 deletions(-) diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/api/DistributionSignforAppController.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/api/DistributionSignforAppController.java index 933af664c..1a56e5809 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/api/DistributionSignforAppController.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/api/DistributionSignforAppController.java @@ -305,27 +305,27 @@ public class DistributionSignforAppController { public R oneclick(@Valid @RequestBody DistributionSignforDTO distributionSignfor) { distributionSignfor.setIsClerk(false); R r = distributionSignforService.oneclickPDA(distributionSignfor); - List packageCodes = (List) r.getData(); - try { - String orderPackageCodes = null; - for (String packageCode : packageCodes) { - if (StringUtils.isBlank(orderPackageCodes)) { - orderPackageCodes = packageCode; - } else { - orderPackageCodes = orderPackageCodes + "," + packageCode; - } - } - log.info("##############oneclick: 开始执行下架:{}", packageCodes); - - BasicdataWarehouseEntity myCurrentWarehouse = warehouseClient.getMyCurrentWarehouse(); - if(orderPackageCodes!=null){ - updownTypeClient.downPackageOrDelTray(orderPackageCodes, myCurrentWarehouse.getId(), "司机一键签收下架解托"); - } - log.info("##############oneclick: 结束执行下架:{}", packageCodes); - - } catch (Exception e) { - log.error("##############oneclick: 更新包件下架状态失败 packageCodes={}", packageCodes); - } +// List packageCodes = (List) r.getData(); +// try { +// String orderPackageCodes = null; +// for (String packageCode : packageCodes) { +// if (StringUtils.isBlank(orderPackageCodes)) { +// orderPackageCodes = packageCode; +// } else { +// orderPackageCodes = orderPackageCodes + "," + packageCode; +// } +// } +// log.info("##############oneclick: 开始执行下架:{}", packageCodes); +// +// BasicdataWarehouseEntity myCurrentWarehouse = warehouseClient.getMyCurrentWarehouse(); +// if(orderPackageCodes!=null){ +// updownTypeClient.downPackageOrDelTray(orderPackageCodes, myCurrentWarehouse.getId(), "司机一键签收下架解托"); +// } +// log.info("##############oneclick: 结束执行下架:{}", packageCodes); +// +// } catch (Exception e) { +// log.warn("##############oneclick: 更新包件下架状态失败 packageCodes={}", packageCodes); +// } return r; } diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/controller/DistributionSignforController.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/controller/DistributionSignforController.java index 93657a038..c868e47b5 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/controller/DistributionSignforController.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/controller/DistributionSignforController.java @@ -336,7 +336,6 @@ public class DistributionSignforController extends BladeController { BasicdataWarehouseEntity myCurrentWarehouse = warehouseClient.getMyCurrentWarehouse(); R r = distributionSignforService.oneclick(distributionSignfor); - List packageCodes = (List)r.getData(); try{ Map data = (Map) r.getData(); if (Func.isNotEmpty(data)){ @@ -345,19 +344,9 @@ public class DistributionSignforController extends BladeController { distributionAsyncService.handlPakcage(packageIds, myCurrentWarehouse.getId()); // distributionAsyncService.sendReviewFactory(signId,myCurrentWarehouse.getName() ,myCurrentWarehouse.getId()); PC对于的批量签收同样需要复核 } - String orderPackageCodes = null; - for (String packageCode : packageCodes) { - if(StringUtils.isBlank(orderPackageCodes)){ - orderPackageCodes = packageCode; - }else{ - orderPackageCodes = orderPackageCodes + "," +packageCode; - } - } - if(StringUtils.isNotBlank(orderPackageCodes)){ - updownTypeClient.downPackageOrDelTray(orderPackageCodes,myCurrentWarehouse.getId(),"文员一键签收下架解托"); - } + }catch (Exception e){ - log.error("##############oneclick: 更新包件下架状态失败 packageCodes={}",packageCodes); + log.warn("##############oneclick: 更新包件下架状态失败 r={}",r); } return r; } 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 ae62944d8..3388e5e8b 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 @@ -126,6 +126,7 @@ import org.springblade.common.constant.reservation.ReservationStockupStatusConst import org.springblade.common.constant.signing.SignforStatusConstant; import org.springblade.common.constant.stockup.StockupStatusConstant; import org.springblade.common.constant.stockup.StockupTypeConstant; +import org.springblade.common.exception.CustomerException; import org.springblade.core.log.exception.ServiceException; import org.springblade.core.secure.BladeUser; import org.springblade.core.secure.utils.AuthUtil; @@ -2154,8 +2155,9 @@ public class DistributionAsyncServiceImpl implements IDistributionAsyncService { .eq(DistributionStockupInfoEntity::getReservationId, reservationId) ); if (ObjectUtils.isNull(distributionStockupInfoEntity)) { - log.info("预约数据不存在！！"); - throw new ServiceException("预约数据不存在！！"); + log.warn("预约数据不存在！！"); +// throw new ServiceException("预约数据不存在！！"); + return ; } String stockUpType = distributionStockupInfoEntity.getStockUpType(); //维护备货时间 @@ -2174,8 +2176,10 @@ public class DistributionAsyncServiceImpl implements IDistributionAsyncService { .apply("inventory_status in (1,3)") ); if (ObjectUtils.isNull(one)) { - log.info("自提库存品数据为空！！"); - throw new ServiceException("自提库存品数据为空!!"); + log.warn("自提库存品数据为空！！"); + return ; + +// throw new ServiceException("自提库存品数据为空!!"); } DistributionDeliveryDetailsEntity entity = new DistributionDeliveryDetailsEntity(); entity.setId(one.getId()); @@ -2196,8 +2200,10 @@ public class DistributionAsyncServiceImpl implements IDistributionAsyncService { .apply("stock_list_status in (1,3)") ); if (ObjectUtils.isNull(one1)) { - log.info("预约库存品数据为空！！"); - throw new ServiceException("预约库存品数据为空!!"); + log.warn("预约库存品数据为空！！"); + return ; + +// throw new CustomerException("预约库存品数据为空!!"); } DistributionReservationStocklistEntity reservationStocklistEntity = new DistributionReservationStocklistEntity(); reservationStocklistEntity.setId(one1.getId()); @@ -3165,7 +3171,7 @@ public class DistributionAsyncServiceImpl implements IDistributionAsyncService { pushInstallDTO.setBalance_people("1"); pushInstallDTO.setBalance_type(client.getDefaultPaymentMethods()); } else { - log.error(method + ">>>>>>>>>>>>>查询客户信息失败" + reservationEntity.getReceivingUnit()); + log.warn(method + ">>>>>>>>>>>>>查询客户信息失败" + reservationEntity.getReceivingUnit()); } List orderList = new ArrayList<>(); diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionStockupServiceImpl.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionStockupServiceImpl.java index 318567b00..5c935ddf1 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionStockupServiceImpl.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionStockupServiceImpl.java @@ -4537,7 +4537,7 @@ public class DistributionStockupServiceImpl extends BaseServiceImpl