From e01fcb97487308ea6fd5dd23c8731f732c5c0896 Mon Sep 17 00:00:00 2001
From: PigBaoBei <2739175034@qq.com>
Date: Tue, 30 Jul 2024 17:39:28 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AE=A2=E6=88=B7=E5=88=97=E8=A1=A8=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9=E8=81=94=E7=B3=BB=E4=BA=BABUG=E3=80=81=E5=A4=8D?=
 =?UTF-8?q?=E6=A0=B8=E6=96=87=E5=91=98=E5=A4=87=E6=B3=A8BUG=E4=BF=AE?=
 =?UTF-8?q?=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../impl/BasicdataStoreContactServiceImpl.java |  1 +
 .../DistributionSignforController.java         |  1 +
 .../impl/DistributionSignforServiceImpl.java   | 18 +++++++++---------
 3 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/impl/BasicdataStoreContactServiceImpl.java b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/impl/BasicdataStoreContactServiceImpl.java
index f8196eaa0..473975570 100644
--- a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/impl/BasicdataStoreContactServiceImpl.java
+++ b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/impl/BasicdataStoreContactServiceImpl.java
@@ -116,6 +116,7 @@ public class BasicdataStoreContactServiceImpl extends BaseServiceImpl<BasicdataS
 			basicdataClientEntity.setId(shopId);
 			basicdataClientEntity.setLinkman(basicdataStoreContact.getLinkman());
 			basicdataClientEntity.setPhone(basicdataStoreContact.getPhone());
+			basicdataClientService.updateById(basicdataClientEntity);
 		}
 		return this.saveOrUpdate(basicdataStoreContact);
 	}
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 1dac023ea..0761d2993 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
@@ -346,6 +346,7 @@ public class DistributionSignforController extends BladeController {
 			DistributionSignforDTO distributionSignforDTO = new DistributionSignforDTO();
 			distributionSignforDTO.setId(distributionSignfor.getId());
 			distributionSignforDTO.setClerkSignRemarks(distributionSignfor.getClerkSignRemarks());
+			distributionSignforDTO.setMap(distributionSignfor.getMap());
 			distributionSignforService.updateSign(distributionSignforDTO);
 			distributionStockupInfoService.maintenanceStockUp(distributionSignfor.getReservationId(),1);
 		}
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 4ba61ba58..5406f9b3d 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
@@ -668,15 +668,8 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl<Distribution
 			log.error("文员复核查询配送计划失败,deliveryId:{}", distributionSignfor.getDeliveryId());
 			return R.fail("操作失败,请核对计划信息!!!");
 		}
-		BladeUser user = AuthUtil.getUser();
-		distributionSignfor.setExamineUserId(user.getUserId());
-		distributionSignfor.setSigningStatus(SignforStatusConstant.yiqianshou.getValue());
-		//复核时间为签收时间
-		String format = sdf.format(new Date());
-		distributionSignfor.setSigningTime(format);
-		distributionSignfor.setExamineUserName(user.getNickName());
-		this.updatePicture(distributionSignforDTO);
-		this.updateById(distributionSignfor);
+//		this.updatePicture(distributionSignforDTO);
+//		this.updateById(distributionSignfor);
 		//修改预约单的签收状态和装车状态
 		//查询签收信息
 		DistributionReservationEntity reservationEntity = distributionReservationService.getById(distributionSignfor.getReservationId());
@@ -6220,6 +6213,13 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl<Distribution
 		distributionSignfor.setClerkSignRemarks(distributionSignfor.getClerkSignRemarks());
 		Date date = new Date();
 		SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+		BladeUser user = AuthUtil.getUser();
+		distributionSignfor.setExamineUserId(user.getUserId());
+		distributionSignfor.setSigningStatus(SignforStatusConstant.yiqianshou.getValue());
+		//复核时间为签收时间
+		String format = sdf.format(new Date());
+		distributionSignfor.setSigningTime(format);
+		distributionSignfor.setExamineUserName(user.getNickName());
 		distributionSignfor.setSigningTime(sdf.format(date));
 		boolean isSuccess = this.updatePicture(distributionSignfor);
 		log.info(">>>> updateSign isSuccess ={}", isSuccess);