diff --git a/blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/controller/AftersalesWorkOrderController.java b/blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/controller/AftersalesWorkOrderController.java index 72d9df1d2..0242af750 100644 --- a/blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/controller/AftersalesWorkOrderController.java +++ b/blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/controller/AftersalesWorkOrderController.java @@ -470,7 +470,7 @@ public class AftersalesWorkOrderController extends BladeController { return R.fail(s.getMessage()); }catch (Exception e){ log.error("客服操作确定修改》》》{}",e.getMessage()); - return R.fail("系统异常!!"); + return R.fail("系统错误:"+e.getMessage()); } } diff --git a/blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/service/impl/AftersalesWorkOrderServiceImpl.java b/blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/service/impl/AftersalesWorkOrderServiceImpl.java index 6de7491c0..6946b04f0 100644 --- a/blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/service/impl/AftersalesWorkOrderServiceImpl.java +++ b/blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/service/impl/AftersalesWorkOrderServiceImpl.java @@ -47,6 +47,7 @@ import org.springblade.common.annotations.LogpmAsync; import org.springblade.common.constant.DictBizConstant; import org.springblade.common.constant.DictTimeoutEnum; import org.springblade.common.constant.aftersales.*; +import org.springblade.common.exception.CustomerException; import org.springblade.core.log.exception.ServiceException; import org.springblade.core.mp.base.BaseServiceImpl; import org.springblade.core.secure.BladeUser; @@ -2405,17 +2406,17 @@ public class AftersalesWorkOrderServiceImpl extends BaseServiceImpl inOrder(@ApiParam(value = "主键集合", required = true) @RequestParam String ids) { -// try { + try { Boolean isSuccess = distributionIBusinessPreOrderService.inOrder(ids); return R.data(isSuccess); -// }catch (Exception e){ -// log.error("预入库信息入库失败",e); -// return R.fail(500,e.getMessage()); -// } + }catch (Exception e){ + log.error("预入库信息入库失败",e); + return R.fail(500,e.getMessage()); + } } diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/controller/DistributionDeliveryListController.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/controller/DistributionDeliveryListController.java index b3064b83a..0cd669011 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/controller/DistributionDeliveryListController.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/controller/DistributionDeliveryListController.java @@ -495,7 +495,7 @@ public class DistributionDeliveryListController extends BladeController { }catch (Exception e){ log.error("#############signforPC:",e); - return R.fail("签收失败"); + return R.fail("签收失败"+e.getMessage()); } } diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/controller/DistributionReservationController.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/controller/DistributionReservationController.java index 9073ac6df..97614f74b 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/controller/DistributionReservationController.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/controller/DistributionReservationController.java @@ -178,8 +178,14 @@ public class DistributionReservationController extends BladeController { @ApiOperationSupport(order = 4) @ApiOperation(value = "新增", notes = "传入distrbutionReservation") public R autonomouslySave(@Valid @RequestBody DistributionReservationDTO distributionReservationDTO) { - R result = reservationService.insertAutonomouslyReservation(distributionReservationDTO); - return result; + try{ + R result = reservationService.insertAutonomouslyReservation(distributionReservationDTO); + + return result; + }catch (Exception e){ + return R.fail(e.getMessage()); + } + } /** diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionReservationServiceImpl.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionReservationServiceImpl.java index d5e2cf810..cc22cf5f2 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionReservationServiceImpl.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionReservationServiceImpl.java @@ -55,6 +55,7 @@ import org.springblade.common.constant.signing.SignforStatusConstant; import org.springblade.common.constant.stockup.StockAssignStatusConstant; import org.springblade.common.constant.stockup.StockupStatusConstant; import org.springblade.common.constant.stockup.StockupTypeConstant; +import org.springblade.common.exception.CustomerException; import org.springblade.common.serviceConstant.ServiceConstant; import org.springblade.common.utils.AddressUtil; import org.springblade.common.utils.CommonUtil; @@ -2953,7 +2954,7 @@ public class DistributionReservationServiceImpl extends BaseServiceImpl packageIds = distributionParcelListEntities.stream().map(DistributionParcelListEntity::getId).collect(Collectors.toList()); packageLockIds.addAll(packageIds); @@ -3044,7 +3045,7 @@ public class DistributionReservationServiceImpl extends BaseServiceImpl zero.getReservationNum() <= 0); if (inputFlag) { //判断零担品类录入是否都为0 - throw new RuntimeException(s.getOrderCode() + "此零担订单数量录入错误!!!"); + throw new CustomerException(s.getOrderCode() + "此零担订单数量录入错误!!!"); } //存在零担订单的包件信息 parcelNumberVOS.forEach(p -> { @@ -3077,7 +3078,7 @@ public class DistributionReservationServiceImpl extends BaseServiceImpl { if (l.getHandQuantity() > 0) { @@ -3124,7 +3125,7 @@ public class DistributionReservationServiceImpl extends BaseServiceImpl keyongshuliang) { - throw new RuntimeException("库存品库内数量不足!!!"); + throw new CustomerException("库存品库内数量不足!!!"); } if (Func.isNotBlank(i.getServiceNumber())) { serviceNumber.add(i.getServiceNumber()); 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 81f382356..b055eefdb 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 @@ -3133,7 +3133,7 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl packageLockIds.contains(any)); if (flag) { //正在操作,请稍后重试 - throw new RuntimeException("该包件正在被操作,请稍后再试!!!"); + throw new CustomerException("该包件正在被操作,请稍后再试!!!"); } else { packageLockIds.addAll(a); bladeRedis.setEx("warehouseId:" + myCurrentWarehouse.getId() + "trainNumber:" + deliveryListEntity.getTrainNumber() + "orderPackageCode:", packageLockIds, 60L); @@ -3160,8 +3160,8 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl> printPreviewVOS = warehouseWaybillService.printBatch(ids, tempId); return R.data(printPreviewVOS); } catch (Exception e) { - throw new RuntimeException(e); + return R.fail(e.getMessage()); } } diff --git a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/WarehouseUpdownStockupAreaServiceImpl.java b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/WarehouseUpdownStockupAreaServiceImpl.java index 603b9530e..21e15c535 100644 --- a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/WarehouseUpdownStockupAreaServiceImpl.java +++ b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/WarehouseUpdownStockupAreaServiceImpl.java @@ -250,7 +250,7 @@ public class WarehouseUpdownStockupAreaServiceImpl extends BaseServiceImpl 1) { boolean flag = warehouseUpdownStockupAreaEntityList.stream().anyMatch(item -> !item.getAssociationType().equals("3")); if (flag) { - log.error(method + "多条上架记录AssociationValue:{},warehouseId:{}", code, warehouseId); + log.warn(method + "多条上架记录AssociationValue:{},warehouseId:{}", code, warehouseId); throw new RuntimeException("多条上架记录"); } else { - log.info(method + "零担备货库位存在多条上架记录AssociationValue:{},warehouseId:{}", code, warehouseId); + log.warn(method + "零担备货库位存在多条上架记录AssociationValue:{},warehouseId:{}", code, warehouseId); } } WarehouseUpdownStockupAreaEntity warehouseUpdownStockupArea = warehouseUpdownStockupAreaEntityList.get(0); @@ -297,7 +297,7 @@ public class WarehouseUpdownStockupAreaServiceImpl extends BaseServiceImpl iterator = warehouseUpdownStockupAreaEntityList.iterator(); while (iterator.hasNext()){ diff --git a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/WarehouseWarehousingEntryServiceImpl.java b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/WarehouseWarehousingEntryServiceImpl.java index 9296a1a2c..f189b793e 100644 --- a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/WarehouseWarehousingEntryServiceImpl.java +++ b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/WarehouseWarehousingEntryServiceImpl.java @@ -237,7 +237,7 @@ public class WarehouseWarehousingEntryServiceImpl extends BaseServiceImpl