diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/api/DistributionAddvalueAppController.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/api/DistributionAddvalueAppController.java index 01723cbfe..763797fc2 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/api/DistributionAddvalueAppController.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/api/DistributionAddvalueAppController.java @@ -5,10 +5,8 @@ import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport; import com.logpm.distribution.dto.DistributionAddvaluePackageDTO; import com.logpm.distribution.dto.app.DistributionAppAddvalueDTO; import com.logpm.distribution.service.IDistributionAddvalueService; -import com.logpm.distribution.service.impl.DistributionAddvalueServiceImpl; import com.logpm.distribution.vo.DistributionAddvalueDetailVO; -import com.logpm.distribution.vo.DistributionAddvaluePackageVO; -import com.logpm.distribution.vo.app.*; +import com.logpm.distribution.vo.app.DistributionAppAddvalueVO; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.AllArgsConstructor; diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/api/DistributionBillLadingAppController.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/api/DistributionBillLadingAppController.java index 6c1b23821..79d1b41d7 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/api/DistributionBillLadingAppController.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/api/DistributionBillLadingAppController.java @@ -74,11 +74,18 @@ public class DistributionBillLadingAppController extends BladeController { @ApiOperationSupport(order = 1) @ApiOperation(value = "分页列表", notes = "传入stockupDTO") public R> pageList(@RequestBody BillLadingAppDTO billLadingAppDTO) { - Query query = new Query(); - query.setCurrent(billLadingAppDTO.getCurrent()); - query.setSize(billLadingAppDTO.getSize()); - IPage pages = distrilbutionBillLadingService.pageListApp(Condition.getPage(query), billLadingAppDTO); - return R.data(pages); + IPage pages = null; + try { + Query query = new Query(); + query.setCurrent(billLadingAppDTO.getCurrent()); + query.setSize(billLadingAppDTO.getSize()); + pages = distrilbutionBillLadingService.pageListApp(Condition.getPage(query), billLadingAppDTO); + return R.data(pages); + } catch (Exception e) { + log.error("自提列表信息异常", e); + return R.fail(e.getMessage()); + } + } @ResponseBody @@ -126,20 +133,14 @@ public class DistributionBillLadingAppController extends BladeController { @ApiOperation(value = "自提扫描id") @GetMapping("/scan") public R scan(@ApiIgnore @RequestParam Map distrilbutionBillLading){ - Resp scan = distrilbutionBillLadingService.getScan(distrilbutionBillLading); - - //获取传入类型 - String type =distrilbutionBillLading.get("type").toString(); - if(scan.getCode()==200){ - if("2".equals(type)){ - BasicdataWarehouseEntity myCurrentWarehouse = basicdataWarehouseClient.getMyCurrentWarehouse(); - String coding = distrilbutionBillLading.get("coding").toString(); - -// warehouseUpdownTypeClient.downPackageOrDelTray(coding, myCurrentWarehouse.getId(),"签收下架解托"); - }else if("1".equals(type)){ - //todo 这里需要增加对备货库存品的下架逻辑 但是备货是会进行下架的 - log.warn("库存品下架的逻辑"); - } + Resp scan = null; + try { + scan = distrilbutionBillLadingService.getScan(distrilbutionBillLading); + } catch (Exception e) { + log.error("自提扫描id异常", e); + scan = new Resp(); + scan.setCode(500); + scan.setMsg(e.getMessage()); } return scan; @@ -170,29 +171,44 @@ public class DistributionBillLadingAppController extends BladeController { @PostMapping("/zeroBillBatch") @ApiOperation(value = "零担自提批量签收") public R zeroBillBatch(@RequestBody BillLadingAppDTO billLadingAppDTO) { - log.debug("=====零担自提签收：{}",billLadingAppDTO); - if (ObjectUtils.isNull(billLadingAppDTO.getBillLadingId())) { - return R.fail(3002, "自提id不能为空 !"); - } - if(billLadingAppDTO.getList().isEmpty()){ - return R.fail(3002, "零担数据不能为空 !"); - } + R b = null; + try { + log.debug("=====零担自提签收：{}",billLadingAppDTO); + if (ObjectUtils.isNull(billLadingAppDTO.getBillLadingId())) { + return R.fail(3002, "自提id不能为空 !"); + } + if(billLadingAppDTO.getList().isEmpty()){ + return R.fail(3002, "零担数据不能为空 !"); + } - R b = distrilbutionBillLadingService.zeroBill(billLadingAppDTO); + b = distrilbutionBillLadingService.zeroBill(billLadingAppDTO); + } catch (Exception e) { + log.error("零担自提批量签收", e); + b = new Resp(); + b.setCode(500); + b.setMsg(e.getMessage()); + } return b; } @PostMapping("/zeroBillPack") @ApiOperation(value = "零担自提单个签收") public R zeroBillPack(@RequestBody BillLadingAppDTO billLadingAppDTO) { - log.debug("=====零担自提签收：{}",billLadingAppDTO); - if (ObjectUtils.isNull(billLadingAppDTO.getBillLadingId())) { - return R.fail(3002, "自提id不能为空 !"); - } - if(ObjectUtils.isNull(billLadingAppDTO.getBillLadingZeroVO())){ - return R.fail(3002, "零担数据不能为空 !"); + R b = null; + try { + log.debug("=====零担自提签收：{}",billLadingAppDTO); + if (ObjectUtils.isNull(billLadingAppDTO.getBillLadingId())) { + return R.fail(3002, "自提id不能为空 !"); + } + if(ObjectUtils.isNull(billLadingAppDTO.getBillLadingZeroVO())){ + return R.fail(3002, "零担数据不能为空 !"); + } + b = distrilbutionBillLadingService.zeroBillPack(billLadingAppDTO); + } catch (Exception e) { + log.error("零担自提单个签收", e); + b = new Resp(); + b.setCode(500); + b.setMsg(e.getMessage()); } - - R b = distrilbutionBillLadingService.zeroBillPack(billLadingAppDTO); return b; } @@ -201,18 +217,26 @@ public class DistributionBillLadingAppController extends BladeController { @ApiOperation(value = "添加自提单签收图片") public R updateReceivedImage(@RequestBody BillLadingAppDTO billLadingAppDTO) { - log.debug("=====签收图片自提签收：{}",billLadingAppDTO); - if (ObjectUtils.isNull(billLadingAppDTO.getBillLadingId())) { - return R.fail(3002, "自提id不能为空 !"); - } - List list = distributionBillLadingScanService.list(Wrappers.query().lambda().eq(DistributionBillLadingScanEntity::getBillLadingId, billLadingAppDTO.getBillLadingId())); - if (Func.isEmpty(list)){ - return R.fail(3002, "请扫描货物后提交签收图片 !"); - } - if(ObjectUtils.isNull(billLadingAppDTO.getPrintList()) || billLadingAppDTO.getPrintList().isEmpty()){ - throw new ServiceException("图片对象不能为空！！"); + R b = null; + try { + log.debug("=====签收图片自提签收：{}",billLadingAppDTO); + if (ObjectUtils.isNull(billLadingAppDTO.getBillLadingId())) { + return R.fail(3002, "自提id不能为空 !"); + } + List list = distributionBillLadingScanService.list(Wrappers.query().lambda().eq(DistributionBillLadingScanEntity::getBillLadingId, billLadingAppDTO.getBillLadingId())); + if (Func.isEmpty(list)){ + return R.fail(3002, "请扫描货物后提交签收图片 !"); + } + if(ObjectUtils.isNull(billLadingAppDTO.getPrintList()) || billLadingAppDTO.getPrintList().isEmpty()){ + throw new ServiceException("图片对象不能为空！！"); + } + b = distrilbutionBillLadingService.updateReceivedImage(billLadingAppDTO); + } catch (Exception e) { + log.error("零担自提单个签收", e); + b = new Resp(); + b.setCode(500); + b.setMsg(e.getMessage()); } - R b = distrilbutionBillLadingService.updateReceivedImage(billLadingAppDTO); return b; } 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 a89a6b54a..0f6d267ab 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 @@ -49,10 +49,6 @@ public class DistributionSignforAppController { private final IDistributionSignforService distributionSignforService; - private final IDistributionDeliveryListService distributionDeliveryListService; - - private final IDistributionReservationService reservationService; - private final IWarehouseUpdownTypeClient updownTypeClient; private final IBasicdataWarehouseClient warehouseClient; 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 97614f74b..295386065 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 @@ -283,7 +283,12 @@ public class DistributionReservationController extends BladeController { @ApiOperationSupport(order = 7) @ApiOperation(value = "转市配任务") public R deliveryTask(@RequestBody DistributionDeliveryAllocationDTO allocationDTO) { - R result = reservationService.deliveryTask(allocationDTO); + R result = null; + try { + result = reservationService.deliveryTask(allocationDTO); + } catch (Exception e) { + return R.fail(e.getMessage()); + } return result; } 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 9cfc5e413..b7b18d73e 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 @@ -1265,7 +1265,7 @@ public class DistributionReservationServiceImpl extends BaseServiceImpl ids = Func.toLongList(reservationIds); - Integer stockListTotal = distributionReservationStocklistMapper.getStockListTotal(ids); +// Integer stockListTotal = distributionReservationStocklistMapper.getStockListTotal(ids); DistributionDeliveryListEntity distributionDeliveryListEntity = new DistributionDeliveryListEntity(); String numberMa = trainNumberMa(); @@ -1289,7 +1289,7 @@ public class DistributionReservationServiceImpl extends BaseServiceImpl reservationEntityList = baseMapper.selectList(Wrappers.query().lambda().in(DistributionReservationEntity::getId, ids)); + List reservationEntityList = baseMapper.selectList(Wrappers.query().lambda().eq(DistributionReservationEntity::getId, ids)); //判断是否存在预约进行了配送任务的提交 boolean match = reservationEntityList.stream().anyMatch(r -> ReservationStatusConstant.daipeisong.getValue().equals(r.getReservationStatus())); if (match) { @@ -1407,7 +1407,7 @@ public class DistributionReservationServiceImpl extends BaseServiceImpl