diff --git a/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/vo/app/DistributionAppPackageDetailVO.java b/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/vo/app/DistributionAppPackageDetailVO.java index 02b2c78f8..6ebaec1a6 100644 --- a/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/vo/app/DistributionAppPackageDetailVO.java +++ b/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; + } diff --git a/blade-service/logpm-basic/src/main/java/com/logpm/basic/mapper/BasicMaterialMapper.xml b/blade-service/logpm-basic/src/main/java/com/logpm/basic/mapper/BasicMaterialMapper.xml index f8ccd50a4..c61c01583 100644 --- a/blade-service/logpm-basic/src/main/java/com/logpm/basic/mapper/BasicMaterialMapper.xml +++ b/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 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 4f95819d7..bcea2f64b 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 @@ -936,6 +936,11 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl 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); }