From cc409922bec7a1ff039df761e695faf231e62c3f Mon Sep 17 00:00:00 2001 From: caoyizhong <1270296080> Date: Mon, 25 Dec 2023 21:37:38 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E9=85=8D=E9=80=81=E6=9F=A5?= =?UTF-8?q?=E8=AF=A2=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../entity/DistributionParcelListEntity.java | 36 +++++++++++++++++++ .../vo/DistributionDeliveryInfoVO.java | 9 +++++ .../vo/DistributionParcelListVO.java | 35 ++++++++++++++++-- .../mapper/DistributionParcelListMapper.xml | 30 +++++++++++++++- .../mapper/DistributionSigndetailMapper.xml | 4 ++- 5 files changed, 109 insertions(+), 5 deletions(-) diff --git a/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/entity/DistributionParcelListEntity.java b/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/entity/DistributionParcelListEntity.java index 0703ee276..34464a350 100644 --- a/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/entity/DistributionParcelListEntity.java +++ b/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/entity/DistributionParcelListEntity.java @@ -70,6 +70,42 @@ public class DistributionParcelListEntity extends TenantEntity { */ @ApiModelProperty(value = "订单自编号") private String orderCode; + /** + * 预约号 + */ + @ApiModelProperty(value = "预约号") + @TableField(exist = false) + private String reservationCode; + /** + * 装车时间 + */ + @ApiModelProperty(value = "装车时间") + @TableField(exist = false) + private String scanTime; + /** + * 配送车次 + */ + @ApiModelProperty(value = "配送车次") + @TableField(exist = false) + private String dvehicleName; + /** + *签收车次 + */ + @ApiModelProperty(value = "签收车次") + @TableField(exist = false) + private String zvehicleName; + /** + *配送司机 + */ + @ApiModelProperty(value = "配送司机") + @TableField(exist = false) + private String driverName; + /** + *配送单号 + */ + @ApiModelProperty(value = "配送单号") + @TableField(exist = false) + private String noteNumber; /** * 仓库 */ 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 5a621d57e..0b4ac5f7c 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 @@ -335,6 +335,15 @@ public class DistributionDeliveryInfoVO extends DistributionDeliveryInfoEntity { */ @ApiModelProperty(value = "指派状态") private String assignStatusName; + + /** + * 签收人员 + */ + private String signingUser; + /** + * 签收时间 + */ + private String signingTime; // /** // * 配送方式 // */ diff --git a/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/vo/DistributionParcelListVO.java b/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/vo/DistributionParcelListVO.java index 048a87e6a..15ffde041 100644 --- a/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/vo/DistributionParcelListVO.java +++ b/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/vo/DistributionParcelListVO.java @@ -16,7 +16,9 @@ */ package com.logpm.distribution.vo; +import com.baomidou.mybatisplus.annotation.TableField; import com.logpm.distribution.entity.DistributionParcelListEntity; +import io.swagger.annotations.ApiModelProperty; import lombok.Data; import lombok.EqualsAndHashCode; @@ -127,9 +129,36 @@ public class DistributionParcelListVO extends DistributionParcelListEntity { */ private Date loadingTime; - - - + /** + * 预约号 + */ + @ApiModelProperty(value = "预约号") + @TableField(exist = false) + private String reservationCode; + /** + * 装车时间 + */ + @ApiModelProperty(value = "装车时间") + @TableField(exist = false) + private String scanTime; + /** + * 配送车次 + */ + @ApiModelProperty(value = "配送车次") + @TableField(exist = false) + private String dvehicleName; + /** + *签收车次 + */ + @ApiModelProperty(value = "签收车次") + @TableField(exist = false) + private String zvehicleName; + /** + *配送单号 + */ + @ApiModelProperty(value = "配送单号") + @TableField(exist = false) + private String noteNumber; } diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionParcelListMapper.xml b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionParcelListMapper.xml index ec2a9315e..9d74bc0e2 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionParcelListMapper.xml +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionParcelListMapper.xml @@ -134,17 +134,45 @@ ldpl.warehouse_entry_time_end warehouseEntryTimeEnd, ldpl.waybill_number waybillNumber, lwug.position_code goodsAllocation, - lwtg.tray_code pallet + lwtg.tray_code pallet, + ldr.reservation_code reservationCode, + ldl.scan_time scanTime, + lddl.vehicle_name dvehicleName, + ldl.vehicle_name zvehicleName, + lddl.driver_name driverName, + lddl.note_number noteNumber FROM logpm_distribution_parcel_list ldpl LEFT JOIN logpm_warehouse_updown_goods lwug ON ldpl.id = lwug.association_id LEFT JOIN logpm_warehouse_tray_goods lwtg ON ldpl.id = lwtg.association_id left join logpm_warehouse_warehouse lww on lww.id = ldpl.warehouse_id + LEFT JOIN logpm_distribution_reservation_package ldrp on ldrp.parce_list_id = ldpl.id + LEFT JOIN logpm_distribution_reservation ldr on ldr.id = ldrp.reservation_id + LEFT JOIN logpm_distribution_loadscan ldl on ldl.package_id = ldpl.id and ldl.type = 2 + LEFT JOIN logpm_distribution_delivery_list lddl on lddl.id = ldl.delivery_id ldpl.is_deleted = 0 and lww.name like concat('%',#{param.warehouse},'%') + + and ldr.reservation_code = #{param.reservationCode} + + + and lddl.vehicle_name = #{param.DvehicleName} + + + and ldl.vehicle_name = #{param.ZvehicleName} + + + and date_format(from_unixtime(ldl.scan_time),'%Y-%m-%d') = date_format(#{param.scanTime}),'%Y-%m-%d') + + + and lddl.driver_name = #{param.driverName} + + + and lddl.note_number = #{param.noteNumber} + and ldpl.order_package_grounding_status = #{param.orderPackageGroundingStatus} 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 fa3b7ed8a..7e82ba083 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 @@ -359,10 +359,12 @@ ldpl.firsts firsts, ldpl.SECOND SECOND, ldpl.third_product thirdProduct, - (select COALESCE (ldl.received_quantity ,0) from logpm_distribution_loadscan ldl WHERE ldl.package_id =ldpl.id) receivedQuantity + (select COALESCE (ldl.received_quantity ,0) from logpm_distribution_loadscan ldl WHERE ldl.package_id =ldpl.id and ldl.signfor_state = 2 ) receivedQuantity, + ldl.signing_user signingUser, ldl.signing_time signingTime FROM logpm_distribution_reservation_package ldrp JOIN logpm_distribution_parcel_list ldpl ON ldpl.id = ldrp.parce_list_id + LEFT JOIN logpm_distribution_loadscan ldl on ldl.package_id = ldpl.id ldrp.stock_article_id = #{param.id}