修改PDA图片上传

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不能为空 !");

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<DistrilbutionAppBillLadingZeroVO> list; //零担数据集合

blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistrilbutionBillLadingServiceImpl.java

@@ -2090,7 +2090,13 @@ public class DistrilbutionBillLadingServiceImpl extends BaseServiceImpl<Distrilb
 	 */
 	@Override
 	public R updateReceivedImage(BillLadingAppDTO billLadingAppDTO) {
-
+		//修改数据
+		if(ObjectUtils.isNotNull(billLadingAppDTO.getRemark())){
+			DistrilbutionBillLadingEntity billLadingEntity = new DistrilbutionBillLadingEntity();
+			billLadingEntity.setId(billLadingAppDTO.getBillLadingId());
+			billLadingEntity.setRemark(billLadingAppDTO.getRemark());
+			baseMapper.updateById(billLadingEntity);
+		}
 		//查询全部的图片
 		List<DistributionPrintEntity> printEntityList = distributionPrintService.list(Wrappers.<DistributionPrintEntity>query().lambda()
 			.eq(DistributionPrintEntity::getBillLadingId, billLadingAppDTO.getBillLadingId())
@@ -2146,7 +2152,7 @@ public class DistrilbutionBillLadingServiceImpl extends BaseServiceImpl<Distrilb
 		List<DistributionPrintEntity> list = distributionPrintService.list(Wrappers.<DistributionPrintEntity>query().lambda()
 			.eq(DistributionPrintEntity::getBillLadingId, billLadingAppDTO.getBillLadingId())
 		);
-		Map<String,List<BillLadingAppDTO.Print>> map = new HashMap<>();
+		Map<String,Object> map = new HashMap<>();
 		if(!list.isEmpty()){
 			List<BillLadingAppDTO.Print> list1 = new ArrayList<>();
 			list.forEach(i ->{
@@ -2158,9 +2164,13 @@ public class DistrilbutionBillLadingServiceImpl extends BaseServiceImpl<Distrilb
 				list1.add(print);
 			});
 			map.put("list",list1);
+			//查询提货备注
+			DistrilbutionBillLadingEntity billLadingEntity = baseMapper.selectById(billLadingAppDTO.getBillLadingId());
+			map.put("remark",billLadingEntity.getRemark());
 			return R.data(map);
 		}
 		map.put("list",null);
+		map.put("remark",null);
 		return R.data(map);
 	}