Merge branch 'dev' into pre-production

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

blade-service/logpm-distribution/src/main/java/com/logpm/distribution/controller/DistributionSignforController.java

@@ -345,6 +345,8 @@ public class DistributionSignforController extends BladeController {
 			distributionDeliveryListService.maintenanceDeliveryInfo(distributionSignfor.getDeliveryId());
 			DistributionSignforDTO distributionSignforDTO = new DistributionSignforDTO();
 			distributionSignforDTO.setId(distributionSignfor.getId());
+			distributionSignforDTO.setClerkSignRemarks(distributionSignfor.getClerkSignRemarks());
+			distributionSignforDTO.setMap(distributionSignfor.getMap());
 			distributionSignforService.updateSign(distributionSignforDTO);
 			distributionStockupInfoService.maintenanceStockUp(distributionSignfor.getReservationId(),1);
 		}

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();
+//		this.updatePicture(distributionSignforDTO);
-		distributionSignfor.setExamineUserId(user.getUserId());
+//		this.updateById(distributionSignfor);
-		distributionSignfor.setSigningStatus(SignforStatusConstant.yiqianshou.getValue());
-		//复核时间为签收时间
-		String format = sdf.format(new Date());
-		distributionSignfor.setSigningTime(format);
-		distributionSignfor.setExamineUserName(user.getNickName());
-		this.updatePicture(distributionSignforDTO);
-		this.updateById(distributionSignfor);
 		//修改预约单的签收状态和装车状态
 		//查询签收信息
 		DistributionReservationEntity reservationEntity = distributionReservationService.getById(distributionSignfor.getReservationId());
@@ -6217,8 +6210,16 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl<Distribution
 	public R updateSign(DistributionSignforDTO distributionSignfor) {
 		distributionSignfor.setSigneeId(AuthUtil.getUser().getUserId());
 		distributionSignfor.setSigneeName(AuthUtil.getUser().getUserName());
+		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);