From 0d6ef0453cd952c5d13c2d8ccaaadcc0c4d6ec1b Mon Sep 17 00:00:00 2001 From: PigBaoBei <2739175034@qq.com> Date: Mon, 22 Jan 2024 13:51:32 +0800 Subject: [PATCH] =?UTF-8?q?PDA=E8=A3=85=E8=BD=A6=E4=BB=B6=E6=95=B0?= =?UTF-8?q?=E8=B0=83=E6=95=B4=E3=80=81Feign=E6=8E=A5=E5=8F=A3bug=E4=BF=AE?= =?UTF-8?q?=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/logpm/basicdata/feign/IBasicdataClientClient.java | 1 + .../distribution/vo/app/DistributionAppDeliveryListVO.java | 5 +++++ .../logpm/distribution/mapper/DistributionLoadscanMapper.xml | 1 - .../service/impl/DistributionDeliveryListServiceImpl.java | 1 - 4 files changed, 6 insertions(+), 2 deletions(-) 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