From 389ecc990b7133f163643c833cc050c110a5905e Mon Sep 17 00:00:00 2001
From: caoyizhong <1270296080>
Date: Fri, 15 Dec 2023 11:38:34 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9PDA=E5=9B=BE=E7=89=87?=
 =?UTF-8?q?=E4=B8=8A=E4=BC=A0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../DistributionBillLadingAppController.java       |  2 +-
 .../distribution/dto/app/BillLadingAppDTO.java     |  1 +
 .../impl/DistrilbutionBillLadingServiceImpl.java   | 14 ++++++++++++--
 3 files changed, 14 insertions(+), 3 deletions(-)

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<DistrilbutionAppBillLadingZeroVO> 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<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);
 	}