diff --git a/blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/feign/IBasicdataClientClient.java b/blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/feign/IBasicdataClientClient.java index f81c54658..5789c6a83 100644 --- a/blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/feign/IBasicdataClientClient.java +++ b/blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/feign/IBasicdataClientClient.java @@ -86,5 +86,6 @@ public interface IBasicdataClientClient { * @param mallId * @return */ + @GetMapping(API_PREFIX+"/getMallById") BasicdataClientEntity getMallById(Long mallId); } diff --git a/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/vo/app/DistributionAppDeliveryListVO.java b/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/vo/app/DistributionAppDeliveryListVO.java index 0bd951461..0a5538edd 100644 --- a/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/vo/app/DistributionAppDeliveryListVO.java +++ b/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/vo/app/DistributionAppDeliveryListVO.java @@ -60,6 +60,11 @@ public class DistributionAppDeliveryListVO extends DistributionDeliveryListEntit */ @ApiModelProperty(value = "完成装车客户数") private Integer loadCusNub; + /** + * 装车客户数 + */ + @ApiModelProperty(value = "装车件数") + private Integer scannedNumber; /** * 配车状态 diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionLoadscanMapper.xml b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionLoadscanMapper.xml index 44825f6fb..107fdee5a 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionLoadscanMapper.xml +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionLoadscanMapper.xml @@ -265,7 +265,6 @@ ldl.is_deleted = 0 AND ldl.delivery_id = #{deliveryId} AND ldl.scan_status != '1' - AND ldl.is_abnormal_loading = 1