diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/appcontroller/DistributionBillLadingAppController.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/appcontroller/DistributionBillLadingAppController.java index 6950f2931..4043e6f20 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/appcontroller/DistributionBillLadingAppController.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/appcontroller/DistributionBillLadingAppController.java @@ -192,7 +192,7 @@ public class DistributionBillLadingAppController extends BladeController { @GetMapping("/getReceivedImage") @ApiOperation(value = "查询自提单签收图片") - public R getReceivedImage(@RequestBody BillLadingAppDTO billLadingAppDTO) { + public R getReceivedImage(BillLadingAppDTO billLadingAppDTO) { log.debug("=====查询自提单签收图片:{}",billLadingAppDTO); if (ObjectUtils.isNull(billLadingAppDTO.getBillLadingId())) { return R.fail(3002, "自提id不能为空 !"); diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/dto/app/BillLadingAppDTO.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/dto/app/BillLadingAppDTO.java index a6faa9fc9..041286e0c 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/dto/app/BillLadingAppDTO.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/dto/app/BillLadingAppDTO.java @@ -24,6 +24,7 @@ public class BillLadingAppDTO implements Serializable { private Integer scanStatus;//扫码类型 private String orderSelfNumbering;//订单自编码 + private String remark;//备注 private Long warehouseId;//仓库ID private List list; //零担数据集合 diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistrilbutionBillLadingServiceImpl.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistrilbutionBillLadingServiceImpl.java index 609068b31..d645ec842 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistrilbutionBillLadingServiceImpl.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistrilbutionBillLadingServiceImpl.java @@ -2090,7 +2090,13 @@ public class DistrilbutionBillLadingServiceImpl extends BaseServiceImpl printEntityList = distributionPrintService.list(Wrappers.query().lambda() .eq(DistributionPrintEntity::getBillLadingId, billLadingAppDTO.getBillLadingId()) @@ -2146,7 +2152,7 @@ public class DistrilbutionBillLadingServiceImpl extends BaseServiceImpl list = distributionPrintService.list(Wrappers.query().lambda() .eq(DistributionPrintEntity::getBillLadingId, billLadingAppDTO.getBillLadingId()) ); - Map> map = new HashMap<>(); + Map map = new HashMap<>(); if(!list.isEmpty()){ List list1 = new ArrayList<>(); list.forEach(i ->{ @@ -2158,9 +2164,13 @@ public class DistrilbutionBillLadingServiceImpl extends BaseServiceImpl