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 @@
and ldpl.third_product like concat('%',#{param.thirdProduct},'%')
-
- and ldl.update_time like concat(#{param.date},'%')
+
+ and DATE(ldpl.warehouse_entry_time_end)= #{param.date}
UNION ALL
@@ -245,7 +244,7 @@
and ldpl.third_product like concat('%',#{param.thirdProduct},'%')
- and ldl.create_time like concat(#{param.date},'%')
+ and DATE(ldl.create_time) = #{param.date}
UNION ALL
@@ -346,7 +345,7 @@
and ldpl.third_product like concat('%',#{param.thirdProduct},'%')
- and ldl.update_time like concat(#{param.date},'%')
+ and DATE(ldl.update_time) = #{param.date}
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},'%')
- and lds.create_time like concat(#{param.date},'%')
+ and DATE(lds.create_time) =#{param.date}
UNION ALL
@@ -553,7 +551,7 @@
and ldpl.third_product like concat('%',#{param.thirdProduct},'%')
- and lwug.create_time like concat(#{param.date},'%')
+ and DATE(lwug.create_time) =#{param.date}
UNION ALL
@@ -653,7 +651,7 @@
and ldpl.third_product like concat('%',#{param.thirdProduct},'%')
- and lwtg.create_time like concat(#{param.date},'%')
+ and DATE(lwtg.create_time) =#{param.date}
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 result = new ArrayList<>();
warehouseScanRecordVO.setWarehouseId(myCurrentWarehouse.getId());
List warehouseScanRecordVOS = baseMapper.selectWarehouseStockPage(page, warehouseScanRecordVO);