From 6727b83847bc2d8df2c5a62f69a394f52c309e55 Mon Sep 17 00:00:00 2001 From: "pref_mail@163.com" Date: Tue, 23 Apr 2024 19:52:35 +0800 Subject: [PATCH] =?UTF-8?q?fix:=201.=E4=BF=AE=E5=A4=8D=E6=8E=A8=E9=80=81?= =?UTF-8?q?=E8=80=81=E7=B3=BB=E7=BB=9F=E7=9A=84=E7=AD=BE=E6=94=B6=E6=95=B0?= =?UTF-8?q?=E6=8D=AE=20=E5=A2=9E=E5=8A=A0=20=E8=A3=85=E8=BD=A6=E8=8A=82?= =?UTF-8?q?=E7=82=B9=E7=9A=84=E4=BD=9C=E4=B8=9A=E4=BA=BA=20=E5=92=8C?= =?UTF-8?q?=E7=AD=BE=E6=94=B6=E4=BD=9C=E4=B8=9A=E7=9A=84=E4=BD=9C=E4=B8=9A?= =?UTF-8?q?=E4=BA=BA=202.=E5=A2=9E=E5=8A=A0=E9=85=8D=E9=80=81=E5=8F=B8?= =?UTF-8?q?=E6=9C=BA=E5=A4=9A=E4=B8=AA=E6=83=85=E5=86=B5=E4=B8=8B=E5=8F=96?= =?UTF-8?q?=E4=B8=BB=E5=8F=B8=E6=9C=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../common/constant/RedisKeyConstant.java | 1 + .../logpm/oldproject/dto/SignPushDataDTO.java | 7 ++- .../oldproject/dto/SignPushDataUnitDTO.java | 18 ++++++- .../mapper/DistributionSignforMapper.java | 3 +- .../mapper/DistributionSignforMapper.xml | 46 +++++++++++++--- .../ClerkCheckPushDataQueueHandler.java | 53 +++++++++++++++---- 6 files changed, 108 insertions(+), 20 deletions(-) diff --git a/blade-biz-common/src/main/java/org/springblade/common/constant/RedisKeyConstant.java b/blade-biz-common/src/main/java/org/springblade/common/constant/RedisKeyConstant.java index 6abd63ee5..24a213156 100644 --- a/blade-biz-common/src/main/java/org/springblade/common/constant/RedisKeyConstant.java +++ b/blade-biz-common/src/main/java/org/springblade/common/constant/RedisKeyConstant.java @@ -19,6 +19,7 @@ public class RedisKeyConstant { public static final String TASK_QUEST_CHILD_KEY ="cache:task-quest-child-key:"; public static final String BASIC_DATA_WAREHOUSE_LIST_KEY ="cache:basic-data-warehouse-list:"; + public static final String USER_NAME_PHONE_KEY ="cache:user:id:"; diff --git a/blade-service-api/logpm-old-project-api/src/main/java/com/logpm/oldproject/dto/SignPushDataDTO.java b/blade-service-api/logpm-old-project-api/src/main/java/com/logpm/oldproject/dto/SignPushDataDTO.java index 41c5180af..ed7bacd15 100644 --- a/blade-service-api/logpm-old-project-api/src/main/java/com/logpm/oldproject/dto/SignPushDataDTO.java +++ b/blade-service-api/logpm-old-project-api/src/main/java/com/logpm/oldproject/dto/SignPushDataDTO.java @@ -106,7 +106,7 @@ public class SignPushDataDTO { private Date createTime; /** - * 操作人 + * 操作人ID */ private Long administratorsId; @@ -115,6 +115,11 @@ public class SignPushDataDTO { */ private String administratorsName; + /** + * 操作人电话 + */ + private String administratorsPhone; + /** * 操作人 */ diff --git a/blade-service-api/logpm-old-project-api/src/main/java/com/logpm/oldproject/dto/SignPushDataUnitDTO.java b/blade-service-api/logpm-old-project-api/src/main/java/com/logpm/oldproject/dto/SignPushDataUnitDTO.java index b1e8db802..a08f8d95c 100644 --- a/blade-service-api/logpm-old-project-api/src/main/java/com/logpm/oldproject/dto/SignPushDataUnitDTO.java +++ b/blade-service-api/logpm-old-project-api/src/main/java/com/logpm/oldproject/dto/SignPushDataUnitDTO.java @@ -64,6 +64,10 @@ public class SignPushDataUnitDTO { * 签收时间 */ private Date signTime; + /** + * + */ + private Date operateTime; /** * 0未下架;1已下架 @@ -99,9 +103,19 @@ public class SignPushDataUnitDTO { private int signNum; /** - * 创建人 + * 扫描人ID + */ + private long administratorsId; + + /** + * 扫描人电话 + */ + private String administratorsPhone; + + /** + * 扫描人名称 */ - private long administrators_id; + private String administratorsName; /** * 标识状态：1=标记[无用]，2=pda回库，3=pc回库，4=pda签收, 5=pc签收 diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionSignforMapper.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionSignforMapper.java index ab576ba84..4b606d0a9 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionSignforMapper.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionSignforMapper.java @@ -264,7 +264,8 @@ public interface DistributionSignforMapper extends BaseMapper selectPushOldPackage(@Param("reservationId") Long reservationId,@Param("deliveryId") Long deliveryId); + List selectPushOldPackageLoading(@Param("reservationId") Long reservationId,@Param("deliveryId") Long deliveryId); + List selectPushOldPackageSigning(@Param("reservationId") Long reservationId,@Param("deliveryId") Long deliveryId); /** * 推送老系统库存品包件 diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionSignforMapper.xml b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionSignforMapper.xml index 33141b860..8f326210d 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionSignforMapper.xml +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionSignforMapper.xml @@ -1167,7 +1167,7 @@ GROUP BY ldr.id - SELECT ldpl.id AS id, ldpl.warehouse_id AS warehouse_id, @@ -1178,8 +1178,8 @@ ldpl.order_package_code AS unitNo, ldpl.quantity AS num, ldl.signfor_state AS type, - ldl.scan_time AS loadingTime, - ldl.signing_time AS signTime, + ldl.scan_time AS operateTime, + ldl.created_user AS administratorsId, IF ( ldl.id IS NOT NULL, 1, ldl.id ) AS is_loading, 1 is_out, @@ -1193,10 +1193,42 @@ INNER JOIN logpm_distribution_parcel_list AS ldpl ON ldl.package_id = ldpl.id AND ldpl.is_deleted = 0 WHERE - ldl.reservation_id = #{reservationId} - AND ldl.delivery_id = #{deliveryId} - AND ldl.scan_status != 1 - AND ldl.is_deleted = 0 + ldl.reservation_id = #{reservationId} + AND ldl.delivery_id = #{deliveryId} + AND ldl.scan_status != 1 + AND ldl.is_deleted = 0 + +