diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/controller/DistrilbutionBillLadingController.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/controller/DistrilbutionBillLadingController.java index ae415d128..08f35f04c 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/controller/DistrilbutionBillLadingController.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/controller/DistrilbutionBillLadingController.java @@ -275,6 +275,23 @@ public class DistrilbutionBillLadingController extends BladeController { return R.status(distrilbutionBillLadingService.ownSaveOrUpdate(distrilbutionBillLading)); } + + + /** + * 提货单 上传签收图片 + */ + @PostMapping("/signImages") + @ApiOperationSupport(order = 1) + @ApiOperation(value = "上传签收图片", notes = "传入distrilbutionBillLading") + public R signImages(@Valid @RequestBody DistrilbutionBillLadingDTO distrilbutionBillLading) { + if(ObjectUtil.isEmpty(distrilbutionBillLading.getZeroType())){ + return R.fail(3003,"零担判断参数不能为空!!"); + } + return R.status(distrilbutionBillLadingService.signImages(distrilbutionBillLading)); + } + + + /** * 提货单 删除 */ diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/IDistrilbutionBillLadingService.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/IDistrilbutionBillLadingService.java index 053065452..80fe95b60 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/IDistrilbutionBillLadingService.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/IDistrilbutionBillLadingService.java @@ -212,4 +212,6 @@ public interface IDistrilbutionBillLadingService extends BaseService 0){ //部分 distributionStockArticle.setReservationStatus(OrderReservationStatusConstant.bufenyuyue.getValue()); - }else if(1 == 0){ + }else if(i == 0){ //全部 distributionStockArticle.setReservationStatus(OrderReservationStatusConstant.yiyueyue.getValue()); } @@ -618,6 +619,32 @@ public class DistrilbutionBillLadingServiceImpl extends BaseServiceImpl printEntityList = distributionPrintService.list(Wrappers.query().lambda().eq(DistributionPrintEntity::getBillLadingId, distrilbutionBillLading.getId())); + if (!printEntityList.isEmpty()) { + if (distrilbutionBillLading.getMark()) { + //要删除 + List collect = printEntityList.stream().map(DistributionPrintEntity::getId).collect(Collectors.toList()); + distributionPrintService.deleteLogic(collect); + //操作图片 + if (!distrilbutionBillLading.getPrintList().isEmpty()) { + addPrint(distrilbutionBillLading); + } + } + }else{ + //操作图片 + if (!distrilbutionBillLading.getPrintList().isEmpty()) { + addPrint(distrilbutionBillLading); + } + } + return false; + } + /** * 自提没有包件信息添加包件 * @param stockArticleId 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 8d1d5bd94..05a4a26c5 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 @@ -105,4 +105,6 @@ public class DistributionDatarepair { + + }