From ad52132be59db650bbe52c3b7470798e7d963f31 Mon Sep 17 00:00:00 2001 From: "0.0" <1092404103.qq.com> Date: Thu, 13 Jul 2023 18:10:19 +0800 Subject: [PATCH] =?UTF-8?q?1.=E4=BF=AE=E6=94=B9=E8=A3=85=E8=BD=A6=E6=89=AB?= =?UTF-8?q?=E6=8F=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../DistributionSignforController.java | 10 + .../dto/DistrilbutionloadingscanDTO.java | 44 ++-- .../DistributionDeliveryListMapper.java | 14 ++ .../mapper/DistributionDeliveryListMapper.xml | 58 +++++ .../mapper/DistributionLoadscanMapper.xml | 5 - .../mapper/DistributionSignforMapper.java | 4 +- .../mapper/DistributionSignforMapper.xml | 5 +- .../DistributionDeliveryListServiceImpl.java | 231 ++++++++++++++---- 8 files changed, 298 insertions(+), 73 deletions(-) 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 fd81ad176..3c6d7d0f9 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 @@ -17,6 +17,7 @@ package com.logpm.distribution.controller; import com.logpm.distribution.dto.DistributionSignforDTO; +import com.logpm.distribution.dto.DistrilbutionloadingscanDTO; import com.logpm.distribution.service.IDistributionReservationService; import com.logpm.distribution.vo.DistributionSignforsnmbVO; import com.logpm.distribution.vo.DistributionstatisticsnmbVO; @@ -119,6 +120,15 @@ public class DistributionSignforController extends BladeController { IPage pages = distributionSignforService.selectDistributionSignforPage(Condition.getPage(query), distributionSignfor); return R.data(pages); } +// /** +// * 签收管理 签收 +// */ +// @GetMapping("/signfor") +// @ApiOperationSupport(order = 2) +// public R signfor(@Valid @RequestBody DistrilbutionsignforDTO distrilbutionloadingscanDTO) { +// R msg = distributionSignforService.signfor(distrilbutionloadingscanDTO); +// return msg; +// } /** * 签收管理 新增 diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/dto/DistrilbutionloadingscanDTO.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/dto/DistrilbutionloadingscanDTO.java index 207c88b49..b6dbf1de2 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/dto/DistrilbutionloadingscanDTO.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/dto/DistrilbutionloadingscanDTO.java @@ -47,26 +47,26 @@ public class DistrilbutionloadingscanDTO { @NotEmpty(message = "车辆信息Id不能为空") private String loadingId; - /** - *司机姓名 - */ - @ApiModelProperty(value = "司机姓名") - @NotEmpty(message = "司机姓名不能为空") - private String driverName; - - /** - *司机手机 - */ - @ApiModelProperty(value = "司机手机") - @NotEmpty(message = "司机手机不能为空") - private String driverPhone; +// /** +// *司机姓名 +// */ +// @ApiModelProperty(value = "司机姓名") +// @NotEmpty(message = "司机姓名不能为空") +// private String barcodedriverName; +// +// /** +// *司机手机 +// */ +// @ApiModelProperty(value = "司机手机") +// @NotEmpty(message = "司机手机不能为空") +// private String driverPhone; - /** - *车牌号 - */ - @ApiModelProperty(value = "车牌号") - @NotEmpty(message = "车牌号不能为空") - private String vehicleName; +// /** +// *车牌号 +// */ +// @ApiModelProperty(value = "车牌号") +// @NotEmpty(message = "车牌号不能为空") +// private String vehicleName; /** * 扫描物品 @@ -75,6 +75,12 @@ public class DistrilbutionloadingscanDTO { // @NotEmpty(message = "扫描物品不能为空") private Integer type; + /** + * 是否库存品 + */ + @ApiModelProperty(value = "是否库存品(1-包件,2-库存品)") +// @NotEmpty(message = "扫描物品不能为空") + private Integer stockType; /** * 库存品扫描物品 diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionDeliveryListMapper.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionDeliveryListMapper.java index 6a4bd1c35..a05249cc1 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionDeliveryListMapper.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionDeliveryListMapper.java @@ -22,6 +22,8 @@ import com.logpm.distribution.dto.DistrilbutionloadingscanDTO; import com.logpm.distribution.entity.DistributionDeliveryListEntity; import com.logpm.distribution.vo.DistributionDeliveryListPrintReponseVO; import com.logpm.distribution.vo.DistributionDeliveryListPrintRequestVO; +import com.logpm.distribution.entity.DistributionLoadscanEntity; +import com.logpm.distribution.entity.DistributionParcelListEntity; import com.logpm.distribution.vo.DistributionDeliveryListVO; import com.logpm.distribution.excel.DistributionDeliveryListExcel; import com.baomidou.mybatisplus.core.mapper.BaseMapper; @@ -92,5 +94,17 @@ public interface DistributionDeliveryListMapper extends BaseMapper selectdeliverywork(@Param("barcode")String barcode,@Param("deliveryId") Long deliveryId); + List customListPage(IPage page, @Param("qw") QueryWrapper queryWrapper); + + List selectdeliverypallet(@Param("barcode")String barcode,@Param("deliveryId") Long deliveryId); + + List selectOrderpallet(@Param("barcode")String barcode,@Param("deliveryId") Long deliveryId); } diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionDeliveryListMapper.xml b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionDeliveryListMapper.xml index aaabcd3b0..13ab16f7f 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionDeliveryListMapper.xml +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionDeliveryListMapper.xml @@ -277,6 +277,48 @@ + + + + + diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionLoadscanMapper.xml b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionLoadscanMapper.xml index 6e5984bc6..204727c8c 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionLoadscanMapper.xml +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionLoadscanMapper.xml @@ -156,11 +156,6 @@ UPDATE logpm_distribution_loadscan scan_status = 1, - loaded_nub = - CASE - WHEN ( loaded_nub - 1 ) < 0 THEN - package_nub ELSE ( loaded_nub - 1 ) - END, diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionSignforMapper.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionSignforMapper.java index c1ef357b0..aa334b4f0 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionSignforMapper.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionSignforMapper.java @@ -100,5 +100,7 @@ public interface DistributionSignforMapper extends BaseMapper - UPDATE logpm_distribution_signfor lds set loaded_number = ( loaded_number + 1 ) WHERE lds.is_deleted =0 and lds.reservation_id = #{id} + UPDATE logpm_distribution_signfor lds set loaded_number = ( loaded_number + #{nub} ) WHERE lds.is_deleted =0 and lds.reservation_id = #{reservationId} + + + UPDATE logpm_distribution_signfor lds set loaded_number = ( loaded_number - #{nub} ) WHERE lds.is_deleted =0 and lds.reservation_id = #{id} and loaded_number !=0 diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionDeliveryListServiceImpl.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionDeliveryListServiceImpl.java index 91806b928..70b2e25ec 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionDeliveryListServiceImpl.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionDeliveryListServiceImpl.java @@ -69,6 +69,7 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl distributionLoadscanEntities = distributionLoadscanMapper.selectList(new QueryWrapper().lambda() - .eq(DistributionLoadscanEntity::getDeliveryId, distrilbutionloadingscanDTO.getDeliveryId()) - .eq(DistributionLoadscanEntity::getPacketBarCode, distrilbutionloadingscanDTO.getBarcode()) - ); + if (distrilbutionloadingscanDTO.getStockType() ==1) { + //查询该包条是否属于该配送任务 + List distributionLoadscanEntities = baseMapper.selectdeliverywork(distrilbutionloadingscanDTO.getBarcode(), distrilbutionloadingscanDTO.getDeliveryId()); +// List distributionLoadscanEntities = distributionLoadscanMapper.selectList(new QueryWrapper().lambda() +// .eq(DistributionLoadscanEntity::getDeliveryId, distrilbutionloadingscanDTO.getDeliveryId()) +// .eq(DistributionLoadscanEntity::getPacketBarCode, distrilbutionloadingscanDTO.getBarcode()) +// ); // List distributionDeliveryListEntities = distributionDeliveryListMapper.selectList(new QueryWrapper() // .lambda().eq(DistributionDeliveryListEntity::getState, 1).like(DistributionDeliveryListEntity::getDriverId, user.getUserId()) // ); - if (distributionLoadscanEntities.size() <= 0) { - return R.fail(3001, "窜货"); - } - //获取当前用户司机 + if (distributionLoadscanEntities.size() <= 0) { + return R.fail(3001, "窜货"); + } // BladeUser user = AuthUtil.getUser(); - for (DistributionLoadscanEntity distributionLoadscanEntity : distributionLoadscanEntities) { - if (distributionLoadscanEntity.getScanStatus() != 1) {return R.fail(3002, "重复扫码");} - //依次更新该装车记录,设置车辆 - distributionLoadscanMapper.updateSumById(distributionLoadscanEntity.getId(), distrilbutionloadingscanDTO); + for (DistributionLoadscanEntity distributionLoadscanEntity : distributionLoadscanEntities) { + //查询是否重复扫码 + List distributionLoadscanEntitiesflag = distributionLoadscanMapper.selectList(new QueryWrapper().lambda() + .eq(DistributionLoadscanEntity::getDeliveryId, distributionLoadscanEntity.getReservationId()) + .eq(DistributionLoadscanEntity::getPacketBarCode, distributionLoadscanEntity.getPacketBarCode()) + ); + if (distributionLoadscanEntitiesflag.size() > 0) { + return R.fail(3002, "重复扫码"); + } + //依次插入该装车记录,设置车辆 + distributionLoadscanEntity.setDriverId(distrilbutionloadingscanDTO.getLoadingId()); + distributionLoadscanEntity.setDriverName(distributionDeliverySelfEntity.getDriverName()); + distributionLoadscanEntity.setVehicleName(distributionDeliverySelfEntity.getVehicleNub()); + distributionLoadscanEntity.setScanStatus(2); + distributionLoadscanEntity.setType(2); + distributionLoadscanEntity.setScanTime(new Date()); + if (null != distributionDeliverySelfEntity.getDriverPhone()) { + distributionLoadscanEntity.setDriverPhone(distributionDeliverySelfEntity.getDriverPhone()); + } + distributionLoadscanEntity.setVehicleId(distributionDeliverySelfEntity.getVehicleId()); + distributionLoadscanEntity.setLoadingId(distrilbutionloadingscanDTO.getLoadingId()); + //distributionLoadscanEntity.setVehicleName(distributionDeliverySelfEntity.); + //依次更新该装车记录,设置车辆 + // distributionLoadscanMapper.updateSumById(distributionLoadscanEntity.getId(), distrilbutionloadingscanDTO); // distributionLoadscanordMapper.updateSumById(distributionLoadscanEntity.getOrderId(),distrilbutionloadingscanDTO); // distributionLoadscanresMapper.updateSumById(distributionLoadscanEntity.getReservationId(),distrilbutionloadingscanDTO); - //查询本车次是否第一次扫码,没有则更新上车时间 - Integer i = distributionDeliveryListMapper.updateloadingTimeById(distrilbutionloadingscanDTO.getDeliveryId()); - //更新签收表的装车数量 - Integer j = distributionSignforMapper.updateloadByReservationId(distributionLoadscanEntity.getReservationId()); - //判断是商配还是市配 + //查询本车次是否第一次扫码,没有则更新上车时间 + Integer i = distributionDeliveryListMapper.updateloadingTimeById(distrilbutionloadingscanDTO.getDeliveryId()); + //更新签收表的装车数量 + Integer j = distributionSignforMapper.updateloadByReservationId(distributionLoadscanEntity.getReservationId(),distributionLoadscanEntity.getPackageNub()); + //判断是商配还是市配 // DistributionDeliveryListEntity distributionDeliveryListEntity = distributionDeliveryListMapper.selectById(distrilbutionloadingscanDTO.getDeliveryId()); // if (distributionDeliveryListEntity.getType().equals("1")) { // //判断签收表有无客户信息,没有就加入信息 @@ -287,10 +312,9 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl distributionParcelListEntities = distributionParcelListMapper.selectList(new QueryWrapper().lambda() // .eq(DistributionParcelListEntity::getPacketBarCode, distrilbutionloadingscanDTO.getBarcode())); @@ -316,37 +340,120 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl distributionLoadscanEntities = baseMapper.selectdeliverywork(distrilbutionloadingscanDTO.getBarcode(), distrilbutionloadingscanDTO.getDeliveryId()); + if (distributionLoadscanEntities.size() <= 0) { + return R.fail(3001, "窜货"); + } + +// BladeUser user = AuthUtil.getUser(); + for (DistributionLoadscanEntity distributionLoadscanEntity : distributionLoadscanEntities) { + //查询是否重复扫码 + List distributionLoadscanEntitiesflag = distributionLoadscanMapper.selectList(new QueryWrapper().lambda() + .eq(DistributionLoadscanEntity::getDeliveryId, distributionLoadscanEntity.getReservationId()) + .eq(DistributionLoadscanEntity::getPacketBarCode, distributionLoadscanEntity.getPacketBarCode()) + ); + if (distributionLoadscanEntitiesflag.size() > 0) { + return R.fail(3002, "重复扫码"); + } + //依次插入该装车记录,设置车辆 + distributionLoadscanEntity.setDriverName(distributionDeliverySelfEntity.getDriverName()); + distributionLoadscanEntity.setScanStatus(2); + distributionLoadscanEntity.setType(2); + distributionLoadscanEntity.setScanTime(new Date()); + distributionLoadscanEntity.setLoadingId(distrilbutionloadingscanDTO.getLoadingId()); + distributionLoadscanEntity.setVehicleName(distributionDeliverySelfEntity.getVehicleNub()); + if (null != distributionDeliverySelfEntity.getDriverPhone()) { + distributionLoadscanEntity.setDriverPhone(distributionDeliverySelfEntity.getDriverPhone()); + } + distributionLoadscanEntity.setVehicleId(distributionDeliverySelfEntity.getVehicleId()); + //distributionLoadscanEntity.setVehicleName(distributionDeliverySelfEntity.); + //依次更新该装车记录,设置车辆 + // distributionLoadscanMapper.updateSumById(distributionLoadscanEntity.getId(), distrilbutionloadingscanDTO); +// distributionLoadscanordMapper.updateSumById(distributionLoadscanEntity.getOrderId(),distrilbutionloadingscanDTO); +// distributionLoadscanresMapper.updateSumById(distributionLoadscanEntity.getReservationId(),distrilbutionloadingscanDTO); + //查询本车次是否第一次扫码,没有则更新上车时间 + Integer i = distributionDeliveryListMapper.updateloadingTimeById(distrilbutionloadingscanDTO.getDeliveryId()); + //更新签收表的装车数量 + Integer j = distributionSignforMapper.updateloadByReservationId(distributionLoadscanEntity.getReservationId(),distributionLoadscanEntity.getPackageNub()); + //判断是商配还是市配 + } + distributionLoadscanService.saveBatch(distributionLoadscanEntities); + + } } else if (distrilbutionloadingscanDTO.getType() == 2) { //TODO 托盘扫描 //查询该包条是否属于该配送任务 - List distributionLoadscanEntities = distributionLoadscanMapper.selectList(new QueryWrapper().lambda() - .eq(DistributionLoadscanEntity::getDeliveryId, distrilbutionloadingscanDTO.getDeliveryId()) - .eq(DistributionLoadscanEntity::getTrayId, distrilbutionloadingscanDTO.getBarcode()) - ); - if (distributionLoadscanEntities.size() < 0) { + List distributionLoadscanEntities = baseMapper.selectdeliverypallet(distrilbutionloadingscanDTO.getBarcode(),distrilbutionloadingscanDTO.getDeliveryId()); + if (distributionLoadscanEntities.size() <= 0) { return R.fail(3001, "窜货"); } for (DistributionLoadscanEntity distributionLoadscanEntity : distributionLoadscanEntities) { - if (distributionLoadscanEntity.getScanState() != 1) { - return R.fail(3003, "有扫描过的货物"); + //查询是否重复扫码 + List distributionLoadscanEntitiesflag = distributionLoadscanMapper.selectList(new QueryWrapper().lambda() + .eq(DistributionLoadscanEntity::getDeliveryId, distributionLoadscanEntity.getReservationId()) + .eq(DistributionLoadscanEntity::getPacketBarCode, distributionLoadscanEntity.getPacketBarCode()) + ); + if (distributionLoadscanEntitiesflag.size() > 0) { + return R.fail(3002, "有扫描过的货物"); } if (distributionLoadscanEntity.getDeliveryId() != distrilbutionloadingscanDTO.getDeliveryId()) { return R.fail(3004, "有其他车次货物"); } - //依次更新该装车记录,设置车辆 - distributionLoadscanMapper.updateSumById(distributionLoadscanEntity.getId(), distrilbutionloadingscanDTO); -// distributionLoadscanordMapper.updateSumById(distributionLoadscanEntity.getOrderId(),distrilbutionloadingscanDTO); -// distributionLoadscanresMapper.updateSumById(distributionLoadscanEntity.getReservationId(),distrilbutionloadingscanDTO); + //依次插入该装车记录,设置车辆 + distributionLoadscanEntity.setDriverId(distrilbutionloadingscanDTO.getLoadingId()); + distributionLoadscanEntity.setDriverName(distributionDeliverySelfEntity.getDriverName()); + distributionLoadscanEntity.setScanStatus(2); + distributionLoadscanEntity.setType(2); + distributionLoadscanEntity.setScanTime(new Date()); + distributionLoadscanEntity.setTrayNo(distributionLoadscanEntity.getPacketBarCode()); + distributionLoadscanEntity.setLoadingId(distrilbutionloadingscanDTO.getLoadingId()); + distributionLoadscanEntity.setVehicleName(distributionDeliverySelfEntity.getVehicleNub()); + if (null != distributionDeliverySelfEntity.getDriverPhone()) { + distributionLoadscanEntity.setDriverPhone(distributionDeliverySelfEntity.getDriverPhone()); + } + distributionLoadscanEntity.setVehicleId(distributionDeliverySelfEntity.getVehicleId()); //查询本车次是否第一次扫码,没有则更新上车时间 Integer i = distributionDeliveryListMapper.updateloadingTimeById(distrilbutionloadingscanDTO.getDeliveryId()); //更新签收表的装车数量 - Integer j = distributionSignforMapper.updateloadByReservationId(distributionLoadscanEntity.getReservationId()); -// Integer c = distributionSignforMapper.selectCount(new QueryWrapper().lambda().eq(DistributionSignforEntity::get)); + Integer j = distributionSignforMapper.updateloadByReservationId(distributionLoadscanEntity.getReservationId(),distributionLoadscanEntity.getPackageNub()); } + distributionLoadscanService.saveBatch(distributionLoadscanEntities); } else if (distrilbutionloadingscanDTO.getType() == 3) { - + //订单扫描 + //查询订单是否属于该配送任务 + List distributionLoadscanEntities = baseMapper.selectOrderpallet(distrilbutionloadingscanDTO.getBarcode(),distrilbutionloadingscanDTO.getDeliveryId()); + for (DistributionLoadscanEntity distributionLoadscanEntity : distributionLoadscanEntities) { + //查询是否重复扫码 + List distributionLoadscanEntitiesflag = distributionLoadscanMapper.selectList(new QueryWrapper().lambda() + .eq(DistributionLoadscanEntity::getDeliveryId, distributionLoadscanEntity.getReservationId()) + .eq(DistributionLoadscanEntity::getPacketBarCode, distributionLoadscanEntity.getPacketBarCode()) + ); + if (distributionLoadscanEntitiesflag.size() > 0) { + return R.fail(3002, "重复扫描"); + } + //依次插入该装车记录,设置车辆 + distributionLoadscanEntity.setDriverId(distrilbutionloadingscanDTO.getLoadingId()); + distributionLoadscanEntity.setDriverName(distributionDeliverySelfEntity.getDriverName()); + distributionLoadscanEntity.setScanStatus(2); + distributionLoadscanEntity.setType(2); + distributionLoadscanEntity.setScanTime(new Date()); + distributionLoadscanEntity.setScanState(1); + distributionLoadscanEntity.setLoadingId(distrilbutionloadingscanDTO.getLoadingId()); + distributionLoadscanEntity.setVehicleName(distributionDeliverySelfEntity.getVehicleNub()); + if (null != distributionDeliverySelfEntity.getDriverPhone()) { + distributionLoadscanEntity.setDriverPhone(distributionDeliverySelfEntity.getDriverPhone()); + } + distributionLoadscanEntity.setVehicleId(distributionDeliverySelfEntity.getVehicleId()); + //查询本车次是否第一次扫码,没有则更新上车时间 + Integer i = distributionDeliveryListMapper.updateloadingTimeById(distrilbutionloadingscanDTO.getDeliveryId()); + //更新签收表的装车数量 + Integer j = distributionSignforMapper.updateloadByReservationId(distributionLoadscanEntity.getReservationId(),distributionLoadscanEntity.getPackageNub()); + } + distributionLoadscanService.saveBatch(distributionLoadscanEntities); } return R.success("成功"); @@ -362,6 +469,33 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl distributionLoadscanEntities = distributionLoadscanMapper.selectList(new QueryWrapper().lambda() - .eq(DistributionLoadscanEntity::getDeliveryId, distrilbutionloadingscanDTO.getDeliveryId()) - .eq(DistributionLoadscanEntity::getPacketBarCode, distrilbutionloadingscanDTO.getBarcode()) - ); - if (distributionLoadscanEntities.size() < 0) { - return R.fail(3001, "窜货"); - } - for (DistributionLoadscanEntity distributionLoadscanEntity : distributionLoadscanEntities) { - //更新该装车记录 - distributionLoadscanMapper.updatecutSumById(distributionLoadscanEntity.getId(), distrilbutionloadingscanDTO); + if (distrilbutionloadingscanDTO.getStockType()==1) { + //查询该包条是否属于该配送任务 + List distributionLoadscanEntities = baseMapper.selectdeliverywork(distrilbutionloadingscanDTO.getBarcode(), distrilbutionloadingscanDTO.getDeliveryId()); + if (distributionLoadscanEntities.size() >0) { + return R.fail(3001, "窜货"); + } + for (DistributionLoadscanEntity distributionLoadscanEntity : distributionLoadscanEntities) { + //取消装车，更新该装车记录 + distributionLoadscanMapper.updatecutSumById(distributionLoadscanEntity.getId(), distrilbutionloadingscanDTO); // distributionLoadscanordMapper.updatecutSumById(distributionLoadscanEntity.getOrderId(),distrilbutionloadingscanDTO); // distributionLoadscanresMapper.updatecutSumById(distributionLoadscanEntity.getReservationId(),distrilbutionloadingscanDTO); + //更新签收表的装车数量 + Integer j = distributionSignforMapper.updateloadreduceByReservationId(distributionLoadscanEntity.getReservationId(),distributionLoadscanEntity.getPackageNub()); + } } } else if (distrilbutionloadingscanDTO.getType() == 2) { //TODO 托盘扫描 @@ -407,6 +542,8 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl