From 4381564ca91170ec59fccfeeca579e82de94bfaa Mon Sep 17 00:00:00 2001
From: jishenghua <752718920@qq.com>
Date: Thu, 25 Jul 2024 23:51:58 +0800
Subject: [PATCH] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E8=BF=9B=E9=94=80=E5=AD=98?=
 =?UTF-8?q?=E7=BB=9F=E8=AE=A1=E6=97=A5=E6=9C=9F=E5=8F=82=E6=95=B0=E7=9A=84?=
 =?UTF-8?q?bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/java/com/jsh/erp/controller/DepotItemController.java  | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/jshERP-boot/src/main/java/com/jsh/erp/controller/DepotItemController.java b/jshERP-boot/src/main/java/com/jsh/erp/controller/DepotItemController.java
index 10055c625..fd773d0c2 100644
--- a/jshERP-boot/src/main/java/com/jsh/erp/controller/DepotItemController.java
+++ b/jshERP-boot/src/main/java/com/jsh/erp/controller/DepotItemController.java
@@ -492,6 +492,8 @@ public class DepotItemController {
             if(categoryId != null){
                 categoryIdList = materialService.getListByParentId(categoryId);
             }
+            beginTime = Tools.parseDayToTime(beginTime, BusinessConstants.DAY_FIRST_TIME);
+            endTime = Tools.parseDayToTime(endTime,BusinessConstants.DAY_LAST_TIME);
             List<Long> depotList = parseListByDepotIds(depotIds);
             List<DepotItemVo4WithInfoEx> dataList = depotItemService.getInOutStock(StringUtil.toNull(materialParam),
                     categoryIdList, endTime,(currentPage-1)*pageSize, pageSize);
@@ -575,6 +577,7 @@ public class DepotItemController {
             if(categoryId != null){
                 categoryIdList = materialService.getListByParentId(categoryId);
             }
+            endTime = Tools.parseDayToTime(endTime,BusinessConstants.DAY_LAST_TIME);
             List<Long> depotList = parseListByDepotIds(depotIds);
             List<DepotItemVo4WithInfoEx> dataList = depotItemService.getInOutStock(StringUtil.toNull(materialParam),
                     categoryIdList, endTime, null, null);