diff --git a/src/main/java/com/dreamchaser/depository_manage/controller/PageController.java b/src/main/java/com/dreamchaser/depository_manage/controller/PageController.java index 0f45d033..345f62c1 100644 --- a/src/main/java/com/dreamchaser/depository_manage/controller/PageController.java +++ b/src/main/java/com/dreamchaser/depository_manage/controller/PageController.java @@ -3107,14 +3107,6 @@ public class PageController { @GetMapping("/ScanBarOrQrCodeOut_selectMaterial") public ModelAndView ScanBarOrQrCodeOut_selectMaterial(Integer pid, String mcode, Integer depositoryId) { ModelAndView mv = new ModelAndView(); - Map map = new HashMap<>(); - map.put("depositoryId", depositoryId); - map.put("pid", pid); - List midList = materialService.findInventoryForCompleteOutTask(map); - if (midList.size() > 0) { - List materialByIds = materialService.findMaterialByIds(midList); - mv.addObject("materialList", materialByIds); - } mv.addObject("mcode", mcode); mv.addObject("depositoryId", depositoryId); mv.addObject("pid", pid); diff --git a/src/main/java/com/dreamchaser/depository_manage/service/impl/MaterialServiceImpl.java b/src/main/java/com/dreamchaser/depository_manage/service/impl/MaterialServiceImpl.java index 9c7b5dc3..892935b8 100644 --- a/src/main/java/com/dreamchaser/depository_manage/service/impl/MaterialServiceImpl.java +++ b/src/main/java/com/dreamchaser/depository_manage/service/impl/MaterialServiceImpl.java @@ -2660,7 +2660,7 @@ public class MaterialServiceImpl implements MaterialService { MaterialAndPlace placeAndMaterialByMidAndPid = placeService.findPlaceAndMaterialByMidAndPid(0, inventory.getId()); if (placeAndMaterialByMidAndPid != null) { // 如果是默认库位 - midList.add(placeAndMaterialByMidAndPid.getMid()); + midList.add(placeAndMaterialByMidAndPid.getMid()); // 获取库存id } } } else { @@ -2668,7 +2668,7 @@ public class MaterialServiceImpl implements MaterialService { map.put("placeId", pid); List placeAndMaterialByCondition = placeService.findPlaceAndMaterialByCondition(map); for (MaterialAndPlaceForViewP materialAndPlaceForViewP : placeAndMaterialByCondition) { - midList.add(materialAndPlaceForViewP.getIid()); + midList.add(materialAndPlaceForViewP.getIid()); // 获取库存id } } diff --git a/src/main/java/com/dreamchaser/depository_manage/service/impl/RoleServiceImpl.java b/src/main/java/com/dreamchaser/depository_manage/service/impl/RoleServiceImpl.java index 57759467..35c601d2 100644 --- a/src/main/java/com/dreamchaser/depository_manage/service/impl/RoleServiceImpl.java +++ b/src/main/java/com/dreamchaser/depository_manage/service/impl/RoleServiceImpl.java @@ -364,10 +364,12 @@ public class RoleServiceImpl implements RoleService { // 用于查询当前可见的仓库id数量 Map paramForCount = new HashMap<>(); paramForCount.put("classes", paramForInsert.get("classes")); + paramForCount.put("depositoryIdList", map.get("roleIds")); for (Object userId : userIds ) { paramForInsert.put("userid", userId); paramForCount.put("userId", userId); + // 获取当前用户拥有的 Integer paramCount = roleMapper.findRoleAndDepositoryCountByCondition(paramForCount); result += (roleMapper.addUserOrPostRoleAndDepositorys(paramForInsert) + paramCount); } @@ -383,6 +385,7 @@ public class RoleServiceImpl implements RoleService { // 用于查询当前可见的仓库id数量 Map paramForCount = new HashMap<>(); paramForCount.put("classes", paramForInsert.get("classes")); + paramForCount.put("uidList", map.get("roleIds")); for (Object userId : userIds ) { paramForInsert.put("userid", userId);