From 870a9dc9c0d82ba328e1a781de7283c8e9263dbe Mon Sep 17 00:00:00 2001
From: jishenghua <752718920@qq.com>
Date: Thu, 17 Apr 2025 10:44:56 +0800
Subject: [PATCH] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E5=95=86=E5=93=81=E5=BA=93?=
 =?UTF-8?q?=E5=AD=98=E9=80=89=E6=8B=A9=E5=A4=9A=E4=B8=AA=E4=BB=93=E5=BA=93?=
 =?UTF-8?q?=E4=B9=8B=E5=90=8E=E7=9C=8B=E6=B5=81=E6=B0=B4=E7=9A=84=E6=9F=A5?=
 =?UTF-8?q?=E8=AF=A2bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/jsh/erp/service/DepotItemService.java | 12 ++++----
 .../com/jsh/erp/service/DepotService.java     | 29 +++++++++++++++++++
 2 files changed, 35 insertions(+), 6 deletions(-)

diff --git a/jshERP-boot/src/main/java/com/jsh/erp/service/DepotItemService.java b/jshERP-boot/src/main/java/com/jsh/erp/service/DepotItemService.java
index 56e8409c..6cba8ff3 100644
--- a/jshERP-boot/src/main/java/com/jsh/erp/service/DepotItemService.java
+++ b/jshERP-boot/src/main/java/com/jsh/erp/service/DepotItemService.java
@@ -169,11 +169,11 @@ public class DepotItemService {
 
     public List<DepotItemVo4DetailByTypeAndMId> findDetailByDepotIdsAndMaterialIdList(String depotIds, Boolean forceFlag, Boolean inOutManageFlag, String sku, String batchNumber,
                                                                                       String number, String beginTime, String endTime, Long mId, Integer offset, Integer rows)throws Exception {
-        Long depotId = null;
+        String[] depotIdArrOld = null;
         if(StringUtil.isNotEmpty(depotIds)) {
-            depotId = Long.parseLong(depotIds);
+            depotIdArrOld = depotIds.split(",");
         }
-        List<Long> depotList = depotService.parseDepotList(depotId);
+        List<Long> depotList = depotService.parseDepotListByArr(depotIdArrOld);
         Long[] depotIdArray = StringUtil.listToLongArray(depotList);
         List<DepotItemVo4DetailByTypeAndMId> list =null;
         try{
@@ -186,11 +186,11 @@ public class DepotItemService {
 
     public Long findDetailByDepotIdsAndMaterialIdCount(String depotIds, Boolean forceFlag, Boolean inOutManageFlag, String sku, String batchNumber,
                                                        String number, String beginTime, String endTime, Long mId)throws Exception {
-        Long depotId = null;
+        String[] depotIdArrOld = null;
         if(StringUtil.isNotEmpty(depotIds)) {
-            depotId = Long.parseLong(depotIds);
+            depotIdArrOld = depotIds.split(",");
         }
-        List<Long> depotList = depotService.parseDepotList(depotId);
+        List<Long> depotList = depotService.parseDepotListByArr(depotIdArrOld);
         Long[] depotIdArray = StringUtil.listToLongArray(depotList);
         Long result =null;
         try{
diff --git a/jshERP-boot/src/main/java/com/jsh/erp/service/DepotService.java b/jshERP-boot/src/main/java/com/jsh/erp/service/DepotService.java
index 85ad11c2..ff26d4dc 100644
--- a/jshERP-boot/src/main/java/com/jsh/erp/service/DepotService.java
+++ b/jshERP-boot/src/main/java/com/jsh/erp/service/DepotService.java
@@ -268,6 +268,12 @@ public class DepotService {
         return id;
     }
 
+    /**
+     * 根据单个仓库查询
+     * @param depotId
+     * @return
+     * @throws Exception
+     */
     public List<Long> parseDepotList(Long depotId) throws Exception {
         List<Long> depotList = new ArrayList<>();
         if(depotId !=null) {
@@ -283,6 +289,29 @@ public class DepotService {
         return depotList;
     }
 
+    /**
+     * 根据多个仓库查询
+     * @param depotIdArr
+     * @return
+     * @throws Exception
+     */
+    public List<Long> parseDepotListByArr(String[] depotIdArr) throws Exception {
+        List<Long> depotList = new ArrayList<>();
+        if(depotIdArr !=null) {
+            for (int i = 0; i < depotIdArr.length; i++) {
+                depotList.add(Long.parseLong(depotIdArr[i]));
+            }
+        } else {
+            //未选择仓库时默认为当前用户有权限的仓库
+            JSONArray depotArr = findDepotByCurrentUser();
+            for(Object obj: depotArr) {
+                JSONObject object = JSONObject.parseObject(obj.toString());
+                depotList.add(object.getLong("id"));
+            }
+        }
+        return depotList;
+    }
+
     public JSONArray findDepotByCurrentUser() throws Exception {
         JSONArray arr = new JSONArray();
         String type = "UserDepot";