From 46fee1f8481fb9cd549d07bc6a83788735bd14d5 Mon Sep 17 00:00:00 2001
From: "0.0" <1092404103.qq.com>
Date: Thu, 20 Jul 2023 08:58:24 +0800
Subject: [PATCH] =?UTF-8?q?1.=E6=96=87=E5=91=98=E7=AD=BE=E6=94=B6=E6=97=B6?=
 =?UTF-8?q?=E9=97=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../entity/DistributionSignforEntity.java     |  2 +-
 .../DistributionSignforController.java        | 21 ++++++++++++++++++-
 .../service/IDistributionSignforService.java  |  4 ++++
 .../impl/DistributionSignforServiceImpl.java  | 16 ++++++++++++++
 4 files changed, 41 insertions(+), 2 deletions(-)

diff --git a/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/entity/DistributionSignforEntity.java b/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/entity/DistributionSignforEntity.java
index 19be6ee51..b71948e7f 100644
--- a/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/entity/DistributionSignforEntity.java
+++ b/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/entity/DistributionSignforEntity.java
@@ -174,7 +174,7 @@ public class DistributionSignforEntity extends TenantEntity {
 	@ApiModelProperty(value = "送货司机手机号")
 	private String deliveryDriverPhone;
 	/**
-	 * 签收时间
+	 * 文员签收时间
 	 */
 	@ApiModelProperty(value = "签收时间")
 //	@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/controller/DistributionSignforController.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/controller/DistributionSignforController.java
index f705332cc..8cad46e6b 100644
--- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/controller/DistributionSignforController.java
+++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/controller/DistributionSignforController.java
@@ -123,7 +123,7 @@ public class DistributionSignforController extends BladeController {
 	}
 
 	/**
-	 * 签收管理  签收
+	 * 司机扫描签收管理  签收
 	 */
 	@GetMapping("/signfor")
 	@ApiOperationSupport(order = 2)
@@ -132,6 +132,25 @@ public class DistributionSignforController extends BladeController {
 		return msg;
 	}
 
+	/**
+	 * 司机扫描签收管理  不在单子签收
+	 */
+	@GetMapping("/signforcontinue")
+	@ApiOperationSupport(order = 2)
+	public R signforcontinue(@Valid @RequestBody DistrilbutionAppsignforDTO distrilbutionloadingscanDTO) {
+		R msg	= distributionSignforService.signfor(distrilbutionloadingscanDTO);
+		return msg;
+	}
+	/**
+	 * 司机签收管理  确认签收
+	 */
+	@GetMapping("/signforack")
+	@ApiOperationSupport(order = 2)
+	public R signforack(@Valid @RequestBody DistributionSignforEntity distributionSignfor) {
+		R msg	= distributionSignforService.signforack(distributionSignfor);
+		return msg;
+	}
+
 	/**
 	 * 签收管理 新增
 	 */
diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/IDistributionSignforService.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/IDistributionSignforService.java
index 04eb15d40..82c1ff3ea 100644
--- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/IDistributionSignforService.java
+++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/IDistributionSignforService.java
@@ -74,4 +74,8 @@ public interface IDistributionSignforService extends BaseService<DistributionSig
 	 * 签收管理  详情
 	 */
 	DistributionSignforVO getOneCustom(Long id);
+	/**
+	 * 签收管理  司机签收
+	 */
+	R signforack(DistributionSignforEntity distributionSignfor);
 }
diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionSignforServiceImpl.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionSignforServiceImpl.java
index 2416c9857..b03a0c0e3 100644
--- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionSignforServiceImpl.java
+++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionSignforServiceImpl.java
@@ -35,6 +35,7 @@ import com.logpm.distribution.service.IDistributionSignforService;
 import com.logpm.distribution.vo.DistributionSignforsnmbVO;
 import com.logpm.distribution.vo.DistributionstatisticsnmbVO;
 import lombok.AllArgsConstructor;
+import org.apache.commons.lang.StringUtils;
 import org.springblade.core.tool.api.R;
 import org.springframework.stereotype.Service;
 import com.baomidou.mybatisplus.core.conditions.Wrapper;
@@ -103,6 +104,7 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl<Distribution
 			.eq(DistributionLoadscanEntity::getPacketBarCode, distrilbutionloadingscanDTO.getBarcode())
 		);
 		if (distributionLoadscanEntities.size()<0){
+			//TODO 查询库存品
 			return R.fail(3006,"该货物并未装车处理");
 		}
 		//修改装车表状态
@@ -133,5 +135,19 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl<Distribution
 		return baseMapper.selectOneCustom(id);
 	}
 
+	@Override
+	public R signforack(DistributionSignforEntity distributionSignfor) {
+		SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd hh:mm:ss");
+		//修改签收表司机签收数量
+		boolean update = this.update(new UpdateWrapper<DistributionSignforEntity>().lambda()
+			.eq(DistributionSignforEntity::getId, distributionSignfor.getId())
+			.set(DistributionSignforEntity::getSigningTime, simpleDateFormat.format(new Date()))
+			.set(StringUtils.isNotBlank(distributionSignfor.getDeliverySignPictures()), DistributionSignforEntity::getDeliverySignPictures, distributionSignfor.getDeliverySignPictures())
+			.set(DistributionSignforEntity::getDriverSigning, "2")
+			.set(StringUtils.isNotBlank(distributionSignfor.getDriverRemarks()), DistributionSignforEntity::getDriverRemarks, distributionSignfor.getDriverRemarks())
+		);
+		return R.status(update);
+	}
+
 
 }