From f752acdecd7864f512e2e1ab808205bbadfa6fc3 Mon Sep 17 00:00:00 2001 From: PigBaoBei <2739175034@qq.com> Date: Mon, 8 Jul 2024 15:18:39 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E7=AD=BE=E6=94=B6=E6=96=B9?= =?UTF-8?q?=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../LoadScanSigningTypeStatusConstant.java | 2 +- .../vo/DistributionParcelListVO.java | 4 ++++ .../mapper/DistributionDeliveryInfoMapper.xml | 2 +- .../DistributionDeliveryInfoServiceImpl.java | 19 +++++++++++++++++- .../DistributionDeliveryListServiceImpl.java | 20 ++++++++++++++++++- .../WarehouseRetentionRecordServiceImpl.java | 7 +++---- 6 files changed, 46 insertions(+), 8 deletions(-) diff --git a/blade-biz-common/src/main/java/org/springblade/common/constant/loading/LoadScanSigningTypeStatusConstant.java b/blade-biz-common/src/main/java/org/springblade/common/constant/loading/LoadScanSigningTypeStatusConstant.java index 0922121a2..c603f9e9e 100644 --- a/blade-biz-common/src/main/java/org/springblade/common/constant/loading/LoadScanSigningTypeStatusConstant.java +++ b/blade-biz-common/src/main/java/org/springblade/common/constant/loading/LoadScanSigningTypeStatusConstant.java @@ -7,7 +7,7 @@ package org.springblade.common.constant.loading; */ public enum LoadScanSigningTypeStatusConstant { - sijiqianshou("司机签收",1), + sijiqianshou("司机扫描签收",1), sijipiliangqianshou("司机批量签收",2), wenyuanpiliangqianshou("文员批量签收",3); 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 1b0f7cef6..9aa7df879 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 @@ -146,6 +146,10 @@ public class DistributionParcelListVO extends DistributionParcelListEntity { @TableField(exist = false) private String signingUser; + @ApiModelProperty(value = "签收人") + @TableField(exist = false) + private String signingType; + /** * 预约号 */ diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionDeliveryInfoMapper.xml b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionDeliveryInfoMapper.xml index 5d41b9868..ad4f6d58b 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionDeliveryInfoMapper.xml +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionDeliveryInfoMapper.xml @@ -131,7 +131,7 @@