修改库存查询功能

src/main/java/com/dreamchaser/depository_manage/controller/MaterialController.java

@@ -130,18 +130,42 @@ public class MaterialController {
             size = ObjectFormatUtil.toInteger(map.get("size"));
         }
         if (!(map.containsKey("depositoryId") || map.containsKey("code") || map.containsKey("mname"))) {
+            // 用于标识是一次就查询成功
+            boolean flag = true;
             for (Depository depository : depositoryByAdminorg) {
                 Integer did = depository.getId();
                 didList.add(did);
                 map.put("depositoryId", did);
-                List<InventoryP> inventory = materialService.findInventory(map);
+                List<InventoryP> inventory = null;
+                if (!flag) {
+                    // 如果不是一次成功
+                    page = ObjectFormatUtil.toInteger(map.get("page"));
+                    if (size - list.size() != size) {
+                        // 如果当前不是崭新一页
+                        map.put("begin", 0);
+                    } else {
+                        map.put("begin", (page - 1) * size - total);
+                    }
+                    map.put("size", size - list.size());
 
+                }
+                if (!map.containsKey("begin")) {
+                    inventory = materialService.findInventory(map);
+                } else {
+                    inventory = materialService.findInventoryByDepository(map);
+                }
                 total += materialService.findInventoryCount(map);
+
+
                 if (list.size() < size) {
                     list.addAll(inventory);
+                    // 如果本次没有达到数目
+                    if (list.size() < size) {
+                        flag = false;
                     }
                 }
-            if (list.size() < size) {
+            }
+
             for (RoleAndDepository roleAndDepository : depositoryAndRole) {
                 Integer depositoryId = roleAndDepository.getDepositoryId();
                 if (didList.contains(depositoryId)) {
@@ -163,10 +187,11 @@ public class MaterialController {
                     map.put("begin", (page - 1) * size - total);
                 }
                 map.put("size", size - list.size());
+                if (list.size() < size) {
                     List<InventoryP> materialByDepository = materialService.findInventoryByDepository(map);
                     list.addAll(materialByDepository);
-                    total += materialService.findMaterialByDepositoryCount(map);
                 }
+                total += materialService.findMaterialByDepositoryCount(map);
             }
         } else {
             List<InventoryP> inventory = materialService.findInventory(map);
@@ -653,8 +678,7 @@ public class MaterialController {
                     }
                 }
             }
-        }
-        else {
+        } else {
             // 获取当前要转移的库位
             Place place = placeService.findPlaceById(placeId);
             if (Integer.compare(place.getId(), 0) != 0) {
@@ -796,8 +820,7 @@ public class MaterialController {
                 mp.setSplitInfoList(splitInfoByMid);
                 return new RestResponse(mp);
             }
-        }
-        else {
+        } else {
             return new RestResponse(null);
         }
 

src/main/resources/templates/pages/application/application-in.html

@@ -875,7 +875,7 @@
                                 }
                                 var unit = $("#unit" + idNumber);
                                 unit.empty();
-                                $("#unit" + idNumber).append(new Option(material.baseUnit, "-1"));
+                                $("#unit" + idNumber).append(new Option(material.unit, "-1"));
                                 var unitList = material["splitInfoList"];
                                 for (let i = 0; i < unitList.length; i++) {
                                     $("#unit" + idNumber).append(new Option(unitList[i].newUnit, unitList[i].newUnit));