物料导出BUG修复

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

@@ -44,6 +44,24 @@ public class DistributionAppPackageDetailVO implements Serializable {
 	@ApiModelProperty(value = "订单自编号")
 	private Integer isAbnormal;
 
+	/**
+	 * 客户
+	 */
+	@ApiModelProperty(value = "客户")
+	private String client;
+
+	/**
+	 * 电话
+	 */
+	@ApiModelProperty(value = "电话")
+	private String phone;
+
+	/**
+	 * 地址
+	 */
+	@ApiModelProperty(value = "地址")
+	private String address;
+
 
 
 }

blade-service/logpm-basic/src/main/java/com/logpm/basic/mapper/BasicMaterialMapper.xml

@@ -49,6 +49,7 @@
         where is_deleted = 0
         and product_code = #{materialCode}
         and `name` = #{materialName}
+        and hide = 1
     </select>
 
 </mapper>

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

@@ -936,6 +936,11 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl<Distribution
 	@Override
 	public R signingPackageDetail(Long reservationId) {
 		List<DistributionAppPackageDetailVO> details = baseMapper.signingPackageDetail(reservationId);
+		DistributionReservationEntity reservationEntity = distributionReservationService.getById(reservationId);
+		String str = reservationEntity.getReceivingUnit()+"("+reservationEntity.getConsignee()+")";
+		details.get(0).setClient(str);
+		details.get(0).setAddress(reservationEntity.getDeliveryAddress());
+		details.get(0).setPhone(reservationEntity.getDeliveryPhone());
 		return R.data(details);
 	}