From 1653d47271f148c91de2ceda8e0aac7416d2eb76 Mon Sep 17 00:00:00 2001
From: PigBaoBei <2739175034@qq.com>
Date: Tue, 5 Mar 2024 14:49:26 +0800
Subject: [PATCH] =?UTF-8?q?=E6=89=AB=E6=8F=8F=E8=AE=B0=E5=BD=95=E4=BF=AE?=
 =?UTF-8?q?=E5=A4=8D=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../warehouse/vo/WarehouseScanRecordVO.java      |  2 +-
 .../warehouse/mapper/WarehouseStockMapper.xml    | 16 +++++++---------
 .../service/impl/WarehouseStockServiceImpl.java  |  9 ++-------
 3 files changed, 10 insertions(+), 17 deletions(-)

diff --git a/blade-service-api/logpm-warehouse-api/src/main/java/com/logpm/warehouse/vo/WarehouseScanRecordVO.java b/blade-service-api/logpm-warehouse-api/src/main/java/com/logpm/warehouse/vo/WarehouseScanRecordVO.java
index c3bec83c8..413bbeb09 100644
--- a/blade-service-api/logpm-warehouse-api/src/main/java/com/logpm/warehouse/vo/WarehouseScanRecordVO.java
+++ b/blade-service-api/logpm-warehouse-api/src/main/java/com/logpm/warehouse/vo/WarehouseScanRecordVO.java
@@ -52,7 +52,7 @@ public class WarehouseScanRecordVO extends WarehouseScanRecordEntity {
 	 * 二级扫描类型(扫描详情)
 	 */
 	@ApiModelProperty(value = "扫描详情")
-	private Date date;
+	private String date;
 
 
 	/**
diff --git a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/mapper/WarehouseStockMapper.xml b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/mapper/WarehouseStockMapper.xml
index 40a699be6..3d00d59c9 100644
--- a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/mapper/WarehouseStockMapper.xml
+++ b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/mapper/WarehouseStockMapper.xml
@@ -103,7 +103,6 @@
         '取消装车' AS `scanNodeType`,
         '配送' AS `nodeName`
         FROM
-
         `logpm_distribution_parcel_list` `ldpl`
         JOIN `logpm_distribution_loadscan` `ldl` ON
         `ldpl`.`id` = `ldl`.`package_id`
@@ -143,8 +142,8 @@
             <if test="param.thirdProduct != null and param.thirdProduct != '' ">
                 and ldpl.third_product like concat('%',#{param.thirdProduct},'%')
             </if>
-            <if test="param.date != null  ">
-                and ldl.update_time like concat(#{param.date},'%')
+            <if test="param.date != null ">
+                and DATE(ldpl.warehouse_entry_time_end)= #{param.date}
             </if>
         </where>
         UNION ALL
@@ -245,7 +244,7 @@
                 and ldpl.third_product like concat('%',#{param.thirdProduct},'%')
             </if>
             <if test="param.date != null  ">
-                and ldl.create_time like concat(#{param.date},'%')
+                and DATE(ldl.create_time) = #{param.date}
             </if>
         </where>
         UNION ALL
@@ -346,7 +345,7 @@
                 and ldpl.third_product like concat('%',#{param.thirdProduct},'%')
             </if>
             <if test="param.date != null  ">
-                and ldl.update_time like concat(#{param.date},'%')
+                and DATE(ldl.update_time) = #{param.date}
             </if>
         </where>
         UNION ALL
@@ -406,7 +405,6 @@
         `lds`.`create_time` AS `operatorTime`,
         `lds`.`create_user` AS `operatorId`,(
         CASE
-
         WHEN ( `lds`.`conditions` = 1 ) THEN
         '配送备货'
         WHEN ( `lds`.`conditions` = 2 ) THEN
@@ -453,7 +451,7 @@
                 and ldpl.third_product like concat('%',#{param.thirdProduct},'%')
             </if>
             <if test="param.date != null  ">
-                and lds.create_time like concat(#{param.date},'%')
+                and DATE(lds.create_time) =#{param.date}
             </if>
         </where>
         UNION ALL
@@ -553,7 +551,7 @@
                 and ldpl.third_product like concat('%',#{param.thirdProduct},'%')
             </if>
             <if test="param.date != null  ">
-                and lwug.create_time like concat(#{param.date},'%')
+                and DATE(lwug.create_time) =#{param.date}
             </if>
         </where>
         UNION ALL
@@ -653,7 +651,7 @@
                 and ldpl.third_product like concat('%',#{param.thirdProduct},'%')
             </if>
             <if test="param.date != null  ">
-                and lwtg.create_time like concat(#{param.date},'%')
+                and DATE(lwtg.create_time) =#{param.date}
             </if>
         </where>
 
diff --git a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/WarehouseStockServiceImpl.java b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/WarehouseStockServiceImpl.java
index 687ab921b..64400fc18 100644
--- a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/WarehouseStockServiceImpl.java
+++ b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/WarehouseStockServiceImpl.java
@@ -67,7 +67,6 @@ public class WarehouseStockServiceImpl extends BaseServiceImpl<WarehouseStockMap
 		warehouseScanRecordVO.setWarehouseIdList(this.loginPerson());
 		BasicdataWarehouseEntity myCurrentWarehouse = basicdataWarehouseClient.getMyCurrentWarehouse();
 
-		try {
 			if (Func.isEmpty(myCurrentWarehouse)){
 				return null;
 			}
@@ -76,12 +75,8 @@ public class WarehouseStockServiceImpl extends BaseServiceImpl<WarehouseStockMap
 				return null;
 			}
 			String operatorTime = warehouseScanRecordVO.getOperatorTime();
-			SimpleDateFormat sf = new SimpleDateFormat(DateUtil.PATTERN_DATE);
-			Date parse = sf.parse(operatorTime);
-			warehouseScanRecordVO.setDate(parse);
-		} catch (ParseException e) {
-			throw new RuntimeException(e);
-		}
+			warehouseScanRecordVO.setDate(operatorTime);
+
 		List<WarehouseScanRecordVO> result = new ArrayList<>();
 		warehouseScanRecordVO.setWarehouseId(myCurrentWarehouse.getId());
 		List<WarehouseScanRecordVO> warehouseScanRecordVOS = baseMapper.selectWarehouseStockPage(page, warehouseScanRecordVO);