From ced193510a641bd416d9b3c261f8e3146aeb5845 Mon Sep 17 00:00:00 2001
From: caoyizhong <1270296080>
Date: Tue, 26 Dec 2023 15:05:44 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=8C=85=E4=BB=B6=E6=98=8E?=
 =?UTF-8?q?=E7=BB=86=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../entity/DistributionParcelListEntity.java  | 22 ++++++++++++++++++-
 .../vo/DistributionParcelListVO.java          |  6 +++++
 .../mapper/DistributionParcelListMapper.xml   | 10 +++++++--
 .../DistributionParcelListWrapper.java        | 10 ++++++++-
 4 files changed, 44 insertions(+), 4 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 34464a350..851a8a1aa 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
@@ -81,13 +81,33 @@ public class DistributionParcelListEntity extends TenantEntity {
 	 */
 	@ApiModelProperty(value = "装车时间")
 	@TableField(exist = false)
-	private String scanTime;
+	private Date scanTimes;
+
+	/**
+	 * 签收时间
+	 */
+	@ApiModelProperty(value = "签收时间")
+	@TableField(exist = false)
+	private Date signingTimes;
+
 	/**
 	 * 配送车次
 	 */
 	@ApiModelProperty(value = "配送车次")
 	@TableField(exist = false)
 	private String dvehicleName;
+	/**
+	 * 实际装车人
+	 */
+	@ApiModelProperty(value = "签收人")
+	@TableField(exist = false)
+	private String signingUser;
+	/**
+	 * 装车人
+	 */
+	@ApiModelProperty(value = "装车人")
+	@TableField(exist = false)
+	private String scanUser;
 	/**
 	 *签收车次
 	 */
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 15ffde041..8f8917b08 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
@@ -128,6 +128,12 @@ public class DistributionParcelListVO extends DistributionParcelListEntity {
 	 * 签收数量
 	 */
 	private Date  loadingTime;
+	/**
+	 * 实际装车人
+	 */
+	@ApiModelProperty(value = "签收人")
+	@TableField(exist = false)
+	private String signingUser;
 
 	/**
 	 * 预约号
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 9d74bc0e2..8a38b4674 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
@@ -136,11 +136,14 @@
         lwug.position_code goodsAllocation,
         lwtg.tray_code pallet,
         ldr.reservation_code reservationCode,
-        ldl.scan_time scanTime,
+        ldl.scan_time scanTimes,
         lddl.vehicle_name dvehicleName,
         ldl.vehicle_name zvehicleName,
         lddl.driver_name driverName,
-        lddl.note_number noteNumber
+        lddl.note_number noteNumber,
+        ldl.signing_time signingTimes,
+        ldl.signing_user signingUser,
+        ldl.scan_user scanUser
         FROM
         logpm_distribution_parcel_list ldpl
         LEFT JOIN logpm_warehouse_updown_goods lwug ON ldpl.id = lwug.association_id
@@ -167,6 +170,9 @@
             <if test="param.scanTime !='' and param.scanTime != null">
                 and date_format(from_unixtime(ldl.scan_time),'%Y-%m-%d') = date_format(#{param.scanTime}),'%Y-%m-%d')
             </if>
+            <if test="param.signingTime !='' and param.signingTime != null">
+                and date_format(from_unixtime(lddl.signing_time),'%Y-%m-%d') = date_format(#{param.signingTime}),'%Y-%m-%d')
+            </if>
             <if test="param.driverName !='' and param.driverName != null">
                 and lddl.driver_name = #{param.driverName}
             </if>
diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/wrapper/DistributionParcelListWrapper.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/wrapper/DistributionParcelListWrapper.java
index 7a4252b15..a16cf1902 100644
--- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/wrapper/DistributionParcelListWrapper.java
+++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/wrapper/DistributionParcelListWrapper.java
@@ -1,5 +1,6 @@
 package com.logpm.distribution.wrapper;
 
+import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
 import com.logpm.distribution.entity.DistributionParcelListEntity;
 import com.logpm.distribution.vo.DistributionParcelListVO;
 import com.logpm.warehouse.feign.IWarehouseTrayGoodsClient;
@@ -11,6 +12,7 @@ import org.springblade.core.tool.utils.Func;
 import org.springblade.core.tool.utils.SpringUtil;
 import org.springblade.system.cache.DictBizCache;
 
+import java.text.SimpleDateFormat;
 import java.util.Objects;
 
 /**
@@ -33,8 +35,14 @@ public class DistributionParcelListWrapper extends BaseEntityWrapper<Distributio
 	public DistributionParcelListVO entityVO(DistributionParcelListEntity entity) {
 //		IWarehouseUpdownGoodsClient warehouseUpdownGoodsClient = SpringUtil.getBean(IWarehouseUpdownGoodsClient.class);
 //		IWarehouseTrayGoodsClient warehouseTrayGoodsClient = SpringUtil.getBean(IWarehouseTrayGoodsClient.class);
-
 		DistributionParcelListVO parcelListVO = Objects.requireNonNull(BeanUtil.copy(entity,DistributionParcelListVO.class));
+		SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+		if(ObjectUtils.isNotNull(entity.getScanTimes())){
+			parcelListVO.setScanTime(format.format(entity.getScanTimes()));
+		}
+		if(ObjectUtils.isNotNull(entity.getSigningTimes())){
+			parcelListVO.setSigningTime(format.format(entity.getSigningTimes()));
+		}
 		parcelListVO.setOrderPackageStatusName(DictBizCache.getValue(DictBizConstant.ORDER_PACKAGE_STATUS, entity.getOrderPackageStatus()));
 		parcelListVO.setOrderPackageFreezeStatusName(DictBizCache.getValue(DictBizConstant.ORDER_PACKAGE_FREEZE_STATUS, entity.getOrderPackageFreezeStatus()));
 		parcelListVO.setOrderPackageGroundingStatusName(DictBizCache.getValue(DictBizConstant.ORDER_PACKAGE_GROUNDING_STATUS, entity.getOrderPackageGroundingStatus()));