From b3b36b4aa6243a979e726596c73b65529aaaacd3 Mon Sep 17 00:00:00 2001
From: PigBaoBei <2739175034@qq.com>
Date: Thu, 13 Jun 2024 19:29:30 +0800
Subject: [PATCH] =?UTF-8?q?=E5=B7=B2=E7=AD=BE=E8=AE=A2=E5=8D=95BUG?=
 =?UTF-8?q?=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../vo/DistributionSignforStockArticleVO.java | 20 ++++-
 .../DistributionSignForStockArticleExcel.java | 86 +++++++++----------
 .../mapper/DistributionStockArticleMapper.xml | 14 +--
 .../DistributionStockArticleServiceImpl.java  |  1 +
 4 files changed, 70 insertions(+), 51 deletions(-)

diff --git a/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/vo/DistributionSignforStockArticleVO.java b/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/vo/DistributionSignforStockArticleVO.java
index a9e77c376..7bf35c4eb 100644
--- a/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/vo/DistributionSignforStockArticleVO.java
+++ b/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/vo/DistributionSignforStockArticleVO.java
@@ -192,7 +192,7 @@ public class DistributionSignforStockArticleVO implements Serializable {
 	 * 审核人
 	 */
 	@ApiModelProperty(value = "审核人")
-	private String examineUserNames;
+	private String examineUserName;
 
 	/**
 	 * 最早入库时间
@@ -230,6 +230,24 @@ public class DistributionSignforStockArticleVO implements Serializable {
 	@ApiModelProperty(value = "创建人")
 	private String reservationIds;
 
+	/**
+	 * 预约编码
+	 */
+	@ApiModelProperty(value = "预约编码")
+	private String reservationCode;
+
+	/**
+	 * 车次号
+	 */
+	@ApiModelProperty(value = "车次号")
+	private String trainNumber;
+
+	/**
+	 * 预约数量
+	 */
+	@ApiModelProperty(value = "预约数量")
+	private Integer reservationNum;
+
 
 	/**
 	 * 创建时间
diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/excel/DistributionSignForStockArticleExcel.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/excel/DistributionSignForStockArticleExcel.java
index a7f3346c1..4e644eecc 100644
--- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/excel/DistributionSignForStockArticleExcel.java
+++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/excel/DistributionSignForStockArticleExcel.java
@@ -141,12 +141,12 @@ public class DistributionSignForStockArticleExcel implements Serializable {
 	@ExcelProperty("备货数")
 	private Integer stockUpNumber;
 
-	/**
-	 * 预约数
-	 */
-	@ColumnWidth(20)
-	@ExcelProperty("预约数")
-	private Integer reservationNumber;
+//	/**
+//	 * 预约数
+//	 */
+//	@ColumnWidth(20)
+//	@ExcelProperty("预约数")
+//	private Integer reservationNumber;
 
 	/**
 	 * 订单状态
@@ -183,40 +183,40 @@ public class DistributionSignForStockArticleExcel implements Serializable {
 	@ExcelProperty("服务类型")
 	private String typeServiceName;
 
-	/**
-	 * 预约信息
-	 */
-	@ColumnWidth(20)
-	@ExcelProperty("预约信息")
-	private String reservationInfo;
+//	/**
+//	 * 预约信息
+//	 */
+//	@ColumnWidth(20)
+//	@ExcelProperty("预约信息")
+//	private String reservationInfo;
 
-	/**
-	 * 车次信息
-	 */
-	@ColumnWidth(20)
-	@ExcelProperty("车次信息")
-	private String deliveryListInfo;
+//	/**
+//	 * 车次信息
+//	 */
+//	@ColumnWidth(20)
+//	@ExcelProperty("车次信息")
+//	private String deliveryListInfo;
 
-	/**
-	 * 司机信息
-	 */
-	@ColumnWidth(20)
-	@ExcelProperty("司机信息")
-	private String driverName;
+//	/**
+//	 * 司机信息
+//	 */
+//	@ColumnWidth(20)
+//	@ExcelProperty("司机信息")
+//	private String driverName;
 
-	/**
-	 * 车辆信息
-	 */
-	@ColumnWidth(20)
-	@ExcelProperty("车辆信息")
-	private String vehicleName;
+//	/**
+//	 * 车辆信息
+//	 */
+//	@ColumnWidth(20)
+//	@ExcelProperty("车辆信息")
+//	private String vehicleName;
 
-	/**
-	 * 审核人
-	 */
-	@ColumnWidth(20)
-	@ExcelProperty("审核人")
-	private String examineUserNames;
+//	/**
+//	 * 审核人
+//	 */
+//	@ColumnWidth(20)
+//	@ExcelProperty("审核人")
+//	private String examineUserNames;
 
 	/**
 	 * 最早入库时间
@@ -253,12 +253,12 @@ public class DistributionSignForStockArticleExcel implements Serializable {
 	@ExcelProperty("创建人")
 	private String createUserName;
 
-
-	/**
-	 * 复核时间
-	 */
-	@ColumnWidth(20)
-	@ExcelProperty("复核时间")
-	private Date signinTime;
+//
+//	/**
+//	 * 复核时间
+//	 */
+//	@ColumnWidth(20)
+//	@ExcelProperty("复核时间")
+//	private Date signinTime;
 
 }
diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionStockArticleMapper.xml b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionStockArticleMapper.xml
index a80d2aa99..3e809e19e 100644
--- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionStockArticleMapper.xml
+++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionStockArticleMapper.xml
@@ -1467,13 +1467,13 @@
     <select id="signforListDetail" resultType="com.logpm.distribution.vo.DistributionSignforStockArticleVO">
         SELECT
         ldr.id,
-        ldr.reservation_code,
-        ldrs.reservation_num,
-        lds.examine_user_name AS '审核人',
-        lds.signing_time AS '审核时间',
-        lddl.train_number,
-        lddl.vehicle_name,
-        lddl.driver_name
+        ldr.reservation_code AS reservationCode,
+        ldrs.reservation_num AS reservationNum,
+        lds.examine_user_name AS examineUserName,
+        lds.signing_time AS signingTime,
+        lddl.train_number AS trainNumber,
+        lddl.vehicle_name AS vehicleName,
+        lddl.driver_name AS driverName
         FROM
         logpm_distribution_reservation_stockarticle AS ldrs
         LEFT JOIN logpm_distribution_reservation AS ldr ON ldrs.reservation_id = ldr.id
diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionStockArticleServiceImpl.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionStockArticleServiceImpl.java
index b838a02d5..8725dcb46 100644
--- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionStockArticleServiceImpl.java
+++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionStockArticleServiceImpl.java
@@ -2636,6 +2636,7 @@ public class DistributionStockArticleServiceImpl extends BaseServiceImpl<Distrib
 				R<User> userR = userClient.userInfoById(a.getCreateUser());
 				a.setCreateUserName(userR.getData().getName());
 			}
+
 			DistributionSignForStockArticleExcel stockArticleExcel = BeanUtil.copy(a, DistributionSignForStockArticleExcel.class);
 			signForStockArticleExcels.add(stockArticleExcel);
 		});