From 3727db5296b328572a193b981c1a58fad210822c Mon Sep 17 00:00:00 2001
From: "pref_mail@163.com" <pref_mail@163.com>
Date: Sat, 20 Jan 2024 09:50:17 +0800
Subject: [PATCH] =?UTF-8?q?=E5=88=A0=E9=99=A4=E4=BF=AE=E6=94=B9=E8=87=AA?=
 =?UTF-8?q?=E6=8F=90=E4=BB=BB=E5=8A=A1=E4=B8=AD=E5=8F=96=E6=B6=88=E7=9A=84?=
 =?UTF-8?q?=E9=99=90=E5=88=B6=E4=BB=A3=E7=A0=81=EF=BC=8C=E5=A2=9E=E5=8A=A0?=
 =?UTF-8?q?=E4=B8=80=E4=B8=AA=E6=96=B9=E6=B3=95=20=E7=94=A8=E4=BA=8E?=
 =?UTF-8?q?=E6=8F=90=E8=B4=A7=E5=8D=95=E7=9A=84=E5=9B=BE=E7=89=87=E4=B8=8A?=
 =?UTF-8?q?=E4=BC=A0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../DistrilbutionBillLadingController.java    | 17 +++++++++
 .../IDistrilbutionBillLadingService.java      |  2 ++
 .../DistrilbutionBillLadingServiceImpl.java   | 35 ++++++++++++++++---
 .../jobhandle/DistributionDatarepair.java     |  2 ++
 4 files changed, 52 insertions(+), 4 deletions(-)

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<Distrilbuti
 	 * @return
 	 */
 	R getReceivedImage(BillLadingAppDTO billLadingAppDTO);
+
+	boolean signImages(DistrilbutionBillLadingDTO distrilbutionBillLading);
 }
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 a15734165..8a37cf6a6 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
@@ -191,7 +191,7 @@ public class DistrilbutionBillLadingServiceImpl extends BaseServiceImpl<Distrilb
 					distrilbutionBillPackageService.update(updateWrapper1);
 				}
 			}catch (Exception e){
-				log.info("自提取消订单报错！{}",e.getMessage());
+				log.error("自提取消订单报错！{}",e.getMessage());
 				throw new ServiceException("系统异常！！");
 			}
 
@@ -316,7 +316,8 @@ public class DistrilbutionBillLadingServiceImpl extends BaseServiceImpl<Distrilb
 				if (!order) {
 					throw new ServiceException("修改失败！！");
 				}
-			}else{
+			}
+		/*	else{
 				updateOrder(distrilbutionBillLading);
 			}
 			if(distrilbutionBillLading.getStockArticleList().isEmpty() && distrilbutionBillLading.getStockDTOList().isEmpty()){
@@ -325,7 +326,7 @@ public class DistrilbutionBillLadingServiceImpl extends BaseServiceImpl<Distrilb
 				updateStockBill(distrilbutionBillLading);
 				//取消自提任务
 				baseMapper.deleteById(billLadingEntity.getId());
-			}
+			}*/
 			//修改库存品
 			if (!distrilbutionBillLading.getStockDTOList().isEmpty()) {
 				//全部库存品数据
@@ -560,7 +561,7 @@ public class DistrilbutionBillLadingServiceImpl extends BaseServiceImpl<Distrilb
 						if(i > 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<Distrilb
 		return true;
 	}
 
+
+	@Override
+	public boolean signImages(DistrilbutionBillLadingDTO distrilbutionBillLading) {
+
+
+		//修改图片
+		List<DistributionPrintEntity> printEntityList = distributionPrintService.list(Wrappers.<DistributionPrintEntity>query().lambda().eq(DistributionPrintEntity::getBillLadingId, distrilbutionBillLading.getId()));
+		if (!printEntityList.isEmpty()) {
+			if (distrilbutionBillLading.getMark()) {
+				//要删除
+				List<Long> 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 {
 
 
 
+
+
 }