From 651dfb24aa82ea28e6348907bc02dc8c84a6e13f Mon Sep 17 00:00:00 2001
From: jiazx0107@163.com <jiazx0107@163.com>
Date: 星期四, 29 六月 2023 19:33:12 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 igds-inout/src/main/java/com/ld/igds/m/service/HMAtockChangeService.java |    7 ++++---
 1 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/igds-inout/src/main/java/com/ld/igds/m/service/HMAtockChangeService.java b/igds-inout/src/main/java/com/ld/igds/m/service/HMAtockChangeService.java
index 9206fc1..f086af0 100644
--- a/igds-inout/src/main/java/com/ld/igds/m/service/HMAtockChangeService.java
+++ b/igds-inout/src/main/java/com/ld/igds/m/service/HMAtockChangeService.java
@@ -30,8 +30,9 @@
 
             String str = (String) param.get("depotId");
             if (StringUtils.isNotEmpty(str)) {
-                hql += " and depotId =:depotId";
-                args.put("depotId", str);
+                hql += " and depotIdIn =:depotIdIn or depotIdOut =:depotIdOut";
+                args.put("depotIdIn", str);
+                args.put("depotIdOut", str);
             }
 
         }
@@ -106,7 +107,7 @@
             args.put("startTime", DateUtil.getCurZero(date));
             args.put("endTime", DateUtil.getNextZero(date));
         }
-        hql += " order by  updateTime desc";
+        hql += " order by  updateTime desc limit 20";
         return this.query(hql, args);
     }
 

--
Gitblit v1.9.3