Browse Source

修改仓库管理员赋权的时候的bug

lwx_dev
erdanergou 3 years ago
parent
commit
d63a8fd097
  1. 8
      src/main/java/com/dreamchaser/depository_manage/controller/PageController.java
  2. 4
      src/main/java/com/dreamchaser/depository_manage/service/impl/MaterialServiceImpl.java
  3. 3
      src/main/java/com/dreamchaser/depository_manage/service/impl/RoleServiceImpl.java

8
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<String, Object> map = new HashMap<>();
map.put("depositoryId", depositoryId);
map.put("pid", pid);
List<Integer> midList = materialService.findInventoryForCompleteOutTask(map);
if (midList.size() > 0) {
List<Inventory> materialByIds = materialService.findMaterialByIds(midList);
mv.addObject("materialList", materialByIds);
}
mv.addObject("mcode", mcode);
mv.addObject("depositoryId", depositoryId);
mv.addObject("pid", pid);

4
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<MaterialAndPlaceForViewP> placeAndMaterialByCondition = placeService.findPlaceAndMaterialByCondition(map);
for (MaterialAndPlaceForViewP materialAndPlaceForViewP : placeAndMaterialByCondition) {
midList.add(materialAndPlaceForViewP.getIid());
midList.add(materialAndPlaceForViewP.getIid()); // 获取库存id
}
}

3
src/main/java/com/dreamchaser/depository_manage/service/impl/RoleServiceImpl.java

@ -364,10 +364,12 @@ public class RoleServiceImpl implements RoleService {
// 用于查询当前可见的仓库id数量
Map<String, Object> 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<String, Object> paramForCount = new HashMap<>();
paramForCount.put("classes", paramForInsert.get("classes"));
paramForCount.put("uidList", map.get("roleIds"));
for (Object userId : userIds
) {
paramForInsert.put("userid", userId);

Loading…
Cancel
Save