From 44f995e43bd6f64a87f7a4f36a4b6ea2db6c490f Mon Sep 17 00:00:00 2001 From: PigBaoBei <2739175034@qq.com> Date: Wed, 22 Nov 2023 17:44:13 +0800 Subject: [PATCH] =?UTF-8?q?=E9=85=8D=E9=80=81=E4=BB=BB=E5=8A=A1=E5=A2=9E?= =?UTF-8?q?=E5=8A=A0=E7=AD=BE=E6=94=B6=E6=95=B0=E9=87=8F=E3=80=81=E7=AD=BE?= =?UTF-8?q?=E6=94=B6=E6=98=8E=E7=BB=86=E5=A2=9E=E5=8A=A0=E5=8F=B8=E6=9C=BA?= =?UTF-8?q?=E4=BF=A1=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../entity/DistributionDeliveryListEntity.java | 7 +++++++ .../distribution/vo/DistributionSigndetailVO.java | 12 ++++++++++++ .../mapper/DistributionDeliveryListMapper.xml | 7 +++++++ .../mapper/DistributionSigndetailMapper.xml | 8 ++++++++ .../impl/DistributionDeliveryListServiceImpl.java | 2 ++ .../service/impl/DistributionSignforServiceImpl.java | 1 - .../java/com/logpm/distribution/TestService.java | 2 +- 7 files changed, 37 insertions(+), 2 deletions(-) diff --git a/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/entity/DistributionDeliveryListEntity.java b/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/entity/DistributionDeliveryListEntity.java index 9f3b2c909..9abb6a5c4 100644 --- a/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/entity/DistributionDeliveryListEntity.java +++ b/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/entity/DistributionDeliveryListEntity.java @@ -268,6 +268,13 @@ public class DistributionDeliveryListEntity extends TenantEntity { @TableField(exist = false) private String clineName; + /** + * 签收件数 + */ + @ApiModelProperty(value = "客户名称") + @TableField(exist = false) + private Integer signingNumber; + diff --git a/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/vo/DistributionSigndetailVO.java b/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/vo/DistributionSigndetailVO.java index 42adbdc00..9de6459dd 100644 --- a/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/vo/DistributionSigndetailVO.java +++ b/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/vo/DistributionSigndetailVO.java @@ -79,6 +79,18 @@ public class DistributionSigndetailVO extends DistributionSigndetailEntity { @ApiModelProperty(value = "订单自编号") private String orderCode; + /** + * 司机名称 + */ + @ApiModelProperty(value = "司机名称") + private String driverName; + + /** + * 车牌号 + */ + @ApiModelProperty(value = "车牌号") + private String vehicleName; + /** * 签收数 */ diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionDeliveryListMapper.xml b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionDeliveryListMapper.xml index e543f063f..5533b0d46 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionDeliveryListMapper.xml +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionDeliveryListMapper.xml @@ -188,6 +188,13 @@ WHERE lddl.id = lds.delivery_id ) scannedNumber, + (SELECT + COALESCE (sum(lds.received_quantity), 0) + FROM + logpm_distribution_signfor lds + WHERE + lddl.id = lds.delivery_id + ) signingNumber, GROUP_CONCAT(DISTINCT ldr.consignee SEPARATOR ',') clineName FROM logpm_distribution_delivery_list lddl left JOIN logpm_distribution_signfor lds on lddl.id = lds.delivery_id diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionSigndetailMapper.xml b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionSigndetailMapper.xml index f15b56997..1840ef057 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionSigndetailMapper.xml +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionSigndetailMapper.xml @@ -119,6 +119,11 @@ ldr.service_number serviceNumber, ldsa.order_code orderCode, lddl.train_number trainNumber, + case lddl.type + when 1 then '商配' + when 2 then '市配' + else '' + end serveType, lddl.type type, ldsa.mall_name mallName, ldsa.warehouse warehouse, @@ -131,6 +136,9 @@ ldr.delivery_address deliveryAddress, lds.signing_time signingTime, lds.sjsigning_time sjsigningTime, + lddl.driver_name driverName, + lddl.vehicle_name vehicleName, + lddl.kind, (SELECT GROUP_CONCAT(ldpl.material_name SEPARATOR ',') FROM logpm_distribution_parcel_list ldpl WHERE ldpl.stock_article_id = ldsa.id) materialName, (SELECT COALESCE (count(*) ,0) FROM logpm_distribution_reservation_package ldrpp WHERE ldsa.id = ldrpp.stock_article_id and ldrpp.reservation_id =ldrs.reservation_id) totalNumber, (select COALESCE (count(*) ,0) from logpm_distribution_loadscan ldl WHERE ldl.order_id =ldsa.id and ldl.signfor_state =2) signfornum diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionDeliveryListServiceImpl.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionDeliveryListServiceImpl.java index 2861530e2..557e240f5 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionDeliveryListServiceImpl.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionDeliveryListServiceImpl.java @@ -189,6 +189,7 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl collect = myWatchWarehouse.stream().map(BasicdataWarehouseEntity::getId).collect(Collectors.toList()); distributionDeliveryList.setWarehouseIdList(collect); List distributionDeliveryListEntities = baseMapper.selectDistributionDeliveryListPage(page, distributionDeliveryList); + return page.setRecords(distributionDeliveryListEntities); } @@ -1429,6 +1430,7 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl