零担PC签收BUG修复

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

@@ -1089,7 +1089,15 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl<Distribution
 		String driverPhone = "";
 		String vehicleNub = "";
 		Long loadingId = null;
-		List<DistributionDeliverySelfVO> deliverySelfInfo = distributionDeliverySelfMapper.getDeliverySelfInfo(deliveryListEntity.getId());
+
+
+		List<DistributionDeliverySelfVO> deliverySelfInfo = null;
+		if (deliveryListEntity.getKind().equals(ServiceConstant.DELIVERLIST_KIND_SELF)) {
+			 deliverySelfInfo = distributionDeliverySelfMapper.getDeliverySelfInfo(deliveryListEntity.getId());
+		} else {
+			DistributionDeliveryTripartiteVO deliveryTripartiteInfo = distributionDeliveryTripartiteMapper.getDeliveryTripartiteInfo(deliveryListEntity.getId());
+			BeanUtils.copyProperties(deliverySelfInfo, deliveryTripartiteInfo);
+		}
 		//查询该车次负责司机
 		for (DistributionReservationZeroPackageEntity reservationZeroPackageEntity : reservationZeroPackageEntities) {
 			//查询订单

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

@@ -1939,6 +1939,7 @@ public class DistributionStockArticleServiceImpl extends BaseServiceImpl<Distrib
 			DistributionStockArticleEntity stockArticleEntity = this.findStockArticleByOrderCodeAndWarehouseId(s, warehouseId);
 			DistributionStockArticleEntity t = new DistributionStockArticleEntity();
 			if (Func.isEmpty(stockArticleEntity)) {
+				t.setId(stockArticleEntity.getId());
 				log.error(method + "订单不存在orderCode:{}", s);
 				throw new RuntimeException("订单不存在");
 			}