diff --git a/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/vo/DistributionDeliveryInfoVO.java b/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/vo/DistributionDeliveryInfoVO.java index 0b4ac5f7c..8357c3b0e 100644 --- a/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/vo/DistributionDeliveryInfoVO.java +++ b/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/vo/DistributionDeliveryInfoVO.java @@ -43,6 +43,11 @@ public class DistributionDeliveryInfoVO extends DistributionDeliveryInfoEntity { @ApiModelProperty(value = "仓库") private String warehouse; + + /** + * 签收ID + */ + private Long signId; /** * 运单号 */ @@ -344,6 +349,9 @@ public class DistributionDeliveryInfoVO extends DistributionDeliveryInfoEntity { * 签收时间 */ private String signingTime; + + + // /** // * 配送方式 // */ diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionDeliveryInfoMapper.xml b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionDeliveryInfoMapper.xml index f4463ad16..c6f206e14 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionDeliveryInfoMapper.xml +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionDeliveryInfoMapper.xml @@ -65,6 +65,7 @@ SELECT ldr.reservation_num, ldr.id id, + lds.id signId, ldr.is_urgent isUrgent, ldr.mall_name mallName, ldr.reservation_code reservationCode, @@ -561,6 +562,7 @@ FROM SELECT ldr.reservation_num, ldr.id id, + lds.id signId, ldr.is_urgent isUrgent, ldr.mall_name mallName, ldr.reservation_code reservationCode, diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionSignforMapper.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionSignforMapper.java index 7c36f4079..8d6629a93 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionSignforMapper.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionSignforMapper.java @@ -124,7 +124,6 @@ public interface DistributionSignforMapper extends BaseMapper - + 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 5e12749af..49a18b8af 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 @@ -1050,7 +1050,7 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl