From 48957db41e337c324e6732fd72aa7a07f8175c70 Mon Sep 17 00:00:00 2001 From: kilo Date: Sat, 11 Nov 2023 15:36:05 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=AD=BE=E6=94=B6?= =?UTF-8?q?=E4=BA=BA=E3=80=81=E5=A2=9E=E5=8A=A0=E5=B8=82=E9=85=8D=E5=A4=87?= =?UTF-8?q?=E8=B4=A7=E5=AE=A2=E6=88=B7=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../entity/DistributionStockupEntity.java | 4 +++ .../mapper/DistributionStockupMapper.xml | 20 ++++++++++++--- .../DistributionDeliveryListServiceImpl.java | 24 ++++++++++++------ .../impl/DistributionSignforServiceImpl.java | 25 ++++++++++++------- .../impl/DistributionStockupServiceImpl.java | 3 ++- 5 files changed, 54 insertions(+), 22 deletions(-) diff --git a/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/entity/DistributionStockupEntity.java b/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/entity/DistributionStockupEntity.java index 38bed5305..864ee936b 100644 --- a/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/entity/DistributionStockupEntity.java +++ b/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/entity/DistributionStockupEntity.java @@ -202,6 +202,10 @@ public class DistributionStockupEntity extends TenantEntity { @ApiModelProperty(value = "仓库Id") private Long warehouseId; + @ApiModelProperty(value = "仓库Id") + @TableField(exist = false) + private String consignee; + @ApiModelProperty(value = "仓库Id") @TableField(exist = false) private List warehouseIdList; diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionStockupMapper.xml b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionStockupMapper.xml index 61538875b..d1d8406ac 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionStockupMapper.xml +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionStockupMapper.xml @@ -234,10 +234,12 @@ lds.loader_name loaderName, lds.forklift_id forkliftId,lds.loader_id loaderId,lds.fix_time fixTime,lds.assign_time assignTime, lds.type_service typeService,lds.outbound_date outboundDate,lds.stockup_code stockupCode, - COALESCE(GROUP_CONCAT(DISTINCT lwug.position_code SEPARATOR ','), '') - stockipAllocation,COALESCE(GROUP_CONCAT(DISTINCT lwtg.tray_code SEPARATOR ','), '') pallet + COALESCE(GROUP_CONCAT(DISTINCT lwug.position_code SEPARATOR ','), '') stockipAllocation, + COALESCE(GROUP_CONCAT(DISTINCT lwtg.tray_code SEPARATOR ','), '') pallet, + COALESCE ( group_concat( DISTINCT ldr.consignee SEPARATOR ',' ), '' ) AS consignee from logpm_distribution_stockup lds LEFT JOIN logpm_distribution_stockup_info ldsi on ldsi.stockup_id =lds.id + LEFT JOIN logpm_distribution_reservation ldr ON ldsi.reservation_id = ldr.id LEFT JOIN logpm_distribution_reservation_package ldrp on ldrp.reservation_id = ldsi.reservation_id LEFT JOIN logpm_warehouse_updown_goods lwug on lwug.association_id = ldrp.parce_list_id LEFT JOIN logpm_warehouse_tray_goods lwtg on lwtg.association_id = ldrp.parce_list_id @@ -247,6 +249,10 @@ and lds.type_service = #{param.typeService} + and + ldr.consignee = + #{param.consignee} + and TO_DAYS(lds.stockup_date)=TO_DAYS( #{param.stockupDate}) and TO_DAYS(lds.outbound_date)=TO_DAYS( #{param.outboundDate}) and lds.stockup_date between #{param.startDate} and #{param.entDate} @@ -325,10 +331,12 @@ lds.loader_name loaderName, lds.forklift_id forkliftId,lds.loader_id loaderId,lds.fix_time fixTime,lds.assign_time assignTime, lds.type_service typeService,lds.outbound_date outboundDate,lds.stockup_code stockupCode, - COALESCE(GROUP_CONCAT(DISTINCT lwug.position_code SEPARATOR ','), '') - stockipAllocation,COALESCE(GROUP_CONCAT(DISTINCT lwtg.tray_code SEPARATOR ','), '') pallet + COALESCE(GROUP_CONCAT(DISTINCT lwug.position_code SEPARATOR ','), '')stockipAllocation, + COALESCE(GROUP_CONCAT(DISTINCT lwtg.tray_code SEPARATOR ','), '') pallet, + COALESCE(GROUP_CONCAT(DISTINCT ldr.consignee SEPARATOR ','), '') consignee from logpm_distribution_stockup lds LEFT JOIN logpm_distribution_stockup_info ldsi on ldsi.stockup_id = lds.id + LEFT JOIN logpm_distribution_reservation ldr on ldsi.reservation_id = ldr.id LEFT JOIN logpm_distrilbution_bill_stock ldbs on ldbs.bill_lading_id = ldsi.reservation_id LEFT JOIN logpm_distribution_parcel_list ldpl on ldpl.stock_article_id = ldbs.stock_article_id LEFT JOIN logpm_warehouse_tray_goods lwtg on lwtg.association_id = ldpl.id @@ -339,6 +347,10 @@ and lds.type_service = #{param.typeService} + and + ldr.consignee = + #{param.consignee} + and TO_DAYS(lds.stockup_date)=TO_DAYS( #{param.stockupDate}) and TO_DAYS(lds.outbound_date)=TO_DAYS( #{param.outboundDate}) and lds.stockup_date between #{param.startDate} and #{param.entDate} 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 d9505be3a..490792790 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 @@ -551,7 +551,8 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl loadscanEntityList.getLoadedNub()) { @@ -2700,8 +2705,10 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl Date: Sat, 11 Nov 2023 15:42:25 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=A4=87=E8=B4=A7?= =?UTF-8?q?=E8=B4=A7=E4=BD=8D=E6=9F=A5=E8=AF=A2=E5=88=A4=E7=A9=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../distribution/mapper/DistributionStockupMapper.xml | 8 ++++---- .../service/impl/DistributionStockupServiceImpl.java | 1 + 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionStockupMapper.xml b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionStockupMapper.xml index 61538875b..f79f61788 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionStockupMapper.xml +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionStockupMapper.xml @@ -165,7 +165,7 @@ LEFT JOIN logpm_distribution_parcel_list ldpl on ldpl.order_code = ldsl.incoming_batch LEFT JOIN logpm_warehouse_updown_goods lwug on lwug.association_id = ldpl.id and lwug.association_type = '3' and ldsl.warehouse_id = lwug.warehouse_id - where ldrs.id = #{param.deliveryDetailsId} + where ldrs.id = #{param.deliveryDetailsId} and lwug.allocation_id is not null diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionStockupServiceImpl.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionStockupServiceImpl.java index 91ca358eb..b9168f351 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionStockupServiceImpl.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionStockupServiceImpl.java @@ -2051,6 +2051,7 @@ public class DistributionStockupServiceImpl extends BaseServiceImpl 0) { //存在 queryWrapper.eq("coding",packetBarCode);