增加文员自主上传图片

blade-biz-common/src/main/java/org/springblade/common/launch/LauncherServiceImpl.java

@@ -41,10 +41,10 @@ public class LauncherServiceImpl implements LauncherService {
 		PropsUtil.setProperty(props, "spring.cloud.nacos.config.server-addr", LauncherConstant.nacosAddr(profile));
 
 
-		PropsUtil.setProperty(props,  "spring.cloud.nacos.discovery.username","nacos");
-		PropsUtil.setProperty(props,  "spring.cloud.nacos.discovery.password","Nacos123123");
-		PropsUtil.setProperty(props,  "spring.cloud.nacos.config.username","nacos");
-		PropsUtil.setProperty(props,  "spring.cloud.nacos.config.password","Nacos123123");
+//		PropsUtil.setProperty(props,  "spring.cloud.nacos.discovery.username","nacos");
+//		PropsUtil.setProperty(props,  "spring.cloud.nacos.discovery.password","Nacos123123");
+//		PropsUtil.setProperty(props,  "spring.cloud.nacos.config.username","nacos");
+//		PropsUtil.setProperty(props,  "spring.cloud.nacos.config.password","Nacos123123");
 
 		PropsUtil.setProperty(props, "spring.cloud.sentinel.transport.dashboard", LauncherConstant.sentinelAddr(profile));
 

blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/vo/DistributionDeliveryInfoVO.java

@@ -361,6 +361,11 @@ public class DistributionDeliveryInfoVO extends DistributionDeliveryInfoEntity {
 	 */
 	private String isHaveAbnormalPackage;
 
+	/**
+	 * 簽收人
+	 */
+	private String signeeName;
+
 
 
 //	/**

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

@@ -424,6 +424,13 @@ public class DistributionSignforController extends BladeController {
 	}
 
 
+	@PostMapping("/signforackPC")
+	@ApiOperationSupport(order = 2)
+	@ApiOperation(value = "PC图片上传", notes = "传入ids")
+	public R signforackPC(@Valid @RequestBody DistributionSignforDTO distributionSignfor) {
+		R msg	= distributionSignforService.signforackPC(distributionSignfor);
+		return msg;
+	}
 
 
 

blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionDeliveryInfoMapper.xml

@@ -92,6 +92,7 @@
         lds.reservation_id reservationId,
         lds.received_quantity receivedQuantity,
         lds.is_have_abnormal_package isHaveAbnormalPackage,
+        lds.signee_name signeeName,
         (SELECT
        ldss.forklift_name
         FROM
@@ -115,8 +116,8 @@
         else '已审核'
         END signingStatus,
         CASE
-        WHEN lds.driver_signing ='1' THEN '未签收'
-        else '已签收'
+        WHEN lds.driver_signing ='1' THEN '未完成'
+        else '已完成'
         END driverSigning
         FROM
         logpm_distribution_signfor lds
@@ -649,6 +650,7 @@ FROM
         lds.reservation_id reservationId,
         lds.received_quantity receivedQuantity,
         lds.is_have_abnormal_package isHaveAbnormalPackage,
+        lds.signee_name signeeName,
         (SELECT
         ldss.forklift_name
         FROM
@@ -672,8 +674,8 @@ FROM
         else '已审核'
         END signingStatus,
         CASE
-        WHEN lds.driver_signing ='1' THEN '未签收'
-        else '已签收'
+        WHEN lds.driver_signing ='1' THEN '未完成'
+        else '已完成'
         END driverSigning
         FROM
         logpm_distribution_signfor lds

blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/IDistributionSignforService.java

@@ -260,4 +260,11 @@ public interface IDistributionSignforService extends BaseService<DistributionSig
 	 * @param aLong
 	 */
 	void maintenanceSignfor(Long aLong);
+
+	/**
+	 * PC配送详情文员上传图片
+	 * @param distributionSignfor
+	 * @return
+	 */
+	R signforackPC(DistributionSignforDTO distributionSignfor);
 }

blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionDeliveryInfoServiceImpl.java

@@ -111,7 +111,7 @@ public class DistributionDeliveryInfoServiceImpl extends BaseServiceImpl<Distrib
 			if (Func.isNotBlank(orderPackageStatus)) {
 				if (!orderPackageStatus.equals("70")) {
 					reservationPackageDTO.put("unSigning", "70");
-					reservationPackageDTO.remove(orderPackageStatus);
+					reservationPackageDTO.remove("orderPackageStatus");
 				}
 			}
 		}

blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionSignforServiceImpl.java

@@ -666,6 +666,47 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl<Distribution
 		this.updateById(signforEntity);
 	}
 
+	@Override
+	@Transactional
+	public R signforackPC(DistributionSignforDTO distributionSignfor) {
+		DistributionSignforEntity signforEntity = distributionSignforMapper.getByReservationId(distributionSignfor.getReservationId());
+		if (Func.isEmpty(signforEntity)){
+			log.error("预约查询签收信息错误");
+			return R.fail("请联系管理员!!!");
+		}
+		if (signforEntity.getReceivedQuantity() <= 0){
+			log.error("signforack############未进行签收上传图片");
+			return R.fail("无签收数据");
+		}
+		SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd hh:mm:ss");
+		log.info("=============签收图片数据为：{}", distributionSignfor.getMap());
+		if (ObjectUtils.isNotNull(distributionSignfor.getMap())) {
+			List<DistributionSignPrintEntity> distributionSignPrintList = new ArrayList<>();
+			distributionSignfor.getMap().forEach((k, v) -> {
+				v.stream().forEach(i -> {
+					DistributionSignPrintEntity distributionSignPrint = new DistributionSignPrintEntity();
+					BeanUtils.copyProperties(i, distributionSignPrint);
+					distributionSignPrint.setId(null);
+					distributionSignPrint.setReservationId(distributionSignfor.getReservationId());
+					distributionSignPrintList.add(distributionSignPrint);
+				});
+			});
+			iDistributionSignPrintService.saveBatch(distributionSignPrintList);
+		}
+		//修改签收表司机签收数量
+		boolean update = this.update(new UpdateWrapper<DistributionSignforEntity>().lambda()
+				.eq(DistributionSignforEntity::getReservationId, distributionSignfor.getReservationId())
+				.eq(DistributionSignforEntity::getDeliveryId, distributionSignfor.getDeliveryId())
+				.set(DistributionSignforEntity::getSjsigningTime, simpleDateFormat.format(new Date()))
+				.set(DistributionSignforEntity::getDriverSigning,SignforStatusConstant.yiqianshou.getValue())
+//			.set(StringUtils.isNotBlank(distributionSignfor.getDeliverySignPictures()), DistributionSignforEntity::getDeliverySignPictures, distributionSignfor.getDeliverySignPictures())
+				.set(DistributionSignforEntity::getDriverSigning, "2")
+				.set(StringUtils.isNotBlank(distributionSignfor.getDriverRemarks()), DistributionSignforEntity::getDriverRemarks, distributionSignfor.getDriverRemarks())
+//				.set(StringUtils.isNotBlank(distributionSignfor.getSigneeName()), DistributionSignforEntity::getSigneeName, distributionSignfor.getSigneeName())
+		);
+		return R.status(update);
+	}
+
 	private boolean judgmentSignIsHavePackage(Long reservationId) {
 		boolean flag = false;
 		List<DistributionParcelListEntity> distributionParcelListEntities = distributionReservationMapper.selectPackageListByReservationId(reservationId);