diff --git a/src/main/java/com/dreamchaser/depository_manage/controller/DepositoryRecordController.java b/src/main/java/com/dreamchaser/depository_manage/controller/DepositoryRecordController.java index 14475517..47e09c67 100644 --- a/src/main/java/com/dreamchaser/depository_manage/controller/DepositoryRecordController.java +++ b/src/main/java/com/dreamchaser/depository_manage/controller/DepositoryRecordController.java @@ -983,19 +983,33 @@ public class DepositoryRecordController { StringBuilder depositoryName = new StringBuilder(); double sumQuantity = 0; double sumPrice = 0.0; + List depositoryIdList = new ArrayList<>(); + List mnameForMobiles = new ArrayList<>(); for (ApplicationOutRecordMinP applicationOutRecordMin : applicationOutMinByParentId) { // 获取子订单信息 // 获取出库物料信息 Inventory inventory = materialService.findInventoryById(applicationOutRecordMin.getMid()); - if (inventory.getBrand() == null) { + String brand = inventory.getBrand(); + String version = inventory.getVersion(); + if (brand == null) { inventory.setBrand(""); + brand = ""; + } + if(version == null){ + inventory.setVersion(""); + version = ""; + } + // 获取出库物料仓库Id + Integer depositoryId = applicationOutRecordMin.getDepositoryId(); + if(!depositoryIdList.contains(depositoryId)){ + depositoryIdList.add(depositoryId); } - // 获取出库物料仓库信息 - Depository depository = depositoryService.findDepositoryById(applicationOutRecordMin.getDepositoryId()); - mname.append(inventory.getMname()).append(","); + String inventoryMname = inventory.getMname(); + mname.append(inventoryMname).append(","); mcode.append(inventory.getCode()).append(","); - mversion.append(inventory.getBrand()).append(" ").append(inventory.getVersion()).append(","); - depositoryName.append(depository.getDname()).append(","); + String mversionItem = brand + " "+version; + mversion.append(mversionItem).append(","); + mnameForMobiles.add(inventoryMname+":"+mversionItem); sumQuantity += applicationOutRecordMin.getQuantity(); String unit = applicationOutRecordMin.getUnit(); if ("-1".equals(unit)) { @@ -1017,9 +1031,15 @@ public class DepositoryRecordController { outRecordP.setMcode(mcode.toString()); outRecordP.setMname(mname.toString()); outRecordP.setMversion(mversion.toString()); + List depositoryList = depositoryService.findDepositoryByIds(depositoryIdList); + for (Depository depository:depositoryList + ) { + depositoryName.append(depository.getDname()).append(","); + } outRecordP.setDepositoryName(depositoryName.toString()); outRecordP.setQuantity(sumQuantity); outRecordP.setPrice(sumPrice); + outRecordP.setMnameStringList(mnameForMobiles); } return new RestResponse(list, countBy, 200); 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 59d5067f..c86defe1 100644 --- a/src/main/java/com/dreamchaser/depository_manage/controller/PageController.java +++ b/src/main/java/com/dreamchaser/depository_manage/controller/PageController.java @@ -72,6 +72,7 @@ public class PageController { /** * 初始化路由跳转 + * * @param request * @return */ @@ -98,6 +99,7 @@ public class PageController { /** * 用于正常登录 + * * @param request * @return */ @@ -116,6 +118,7 @@ public class PageController { /** * 用于跳转到物料选择树页面 + * * @param map 查询条件 * @return */ @@ -146,6 +149,7 @@ public class PageController { /** * 初始化系统 + * * @param request * @return */ @@ -172,6 +176,7 @@ public class PageController { /** * 账号注册，弃用 + * * @return */ @GetMapping("/register") @@ -182,6 +187,7 @@ public class PageController { /** * 系统首页 + * * @param request * @return */ @@ -197,10 +203,10 @@ public class PageController { } UserByPort userToken = AuthenticationTokenPool.getUserToken(token); boolean b = DeviceUtil.checkAgentIsMobile(header); - List list = getUserSimpleTaskP(userToken,userKey,token); + List list = getUserSimpleTaskP(userToken, userKey, token); mv.addObject("myTaskList", list); if (b) { - List noticeByUnRead = noticeService.findNoticeByUnRead(userToken,userKey,token); + List noticeByUnRead = noticeService.findNoticeByUnRead(userToken, userKey, token); mv.addObject("notices", noticeByUnRead); mv.setViewName("pages/other/welcome_mobile"); } else { @@ -222,7 +228,7 @@ public class PageController { map.put("startDate", days.get(1)); map.put("endDate", days.get(0)); map.put("userAgent", Md5.crypt(header)); - mv.addObject("notices", noticeService.findNoticeByCondition(map, userToken,userKey,token)); + mv.addObject("notices", noticeService.findNoticeByCondition(map, userToken, userKey, token)); } // 查询当前用户所在部门 Integer maindeparment = userToken.getMaindeparment(); @@ -270,8 +276,8 @@ public class PageController { userKey = (String) request.getSession().getAttribute("userKey"); } UserByPort userToken = AuthenticationTokenPool.getUserToken(token); - List list = getUserSimpleTaskP(userToken,userKey,token); - List userSimpleApplyP = getUserSimpleApplyP(userToken,userKey,token); + List list = getUserSimpleTaskP(userToken, userKey, token); + List userSimpleApplyP = getUserSimpleApplyP(userToken, userKey, token); mv.addObject("myTaskList", list); mv.addObject("myApplyList", userSimpleApplyP); @@ -291,12 +297,13 @@ public class PageController { map.put("startDate", days.get(1)); map.put("endDate", days.get(0)); map.put("userAgent", Md5.crypt(header)); - mv.addObject("notices", noticeService.findNoticeByCondition(map, userToken,userKey,token)); + mv.addObject("notices", noticeService.findNoticeByCondition(map, userToken, userKey, token)); return mv; } /** * 仓库创建页面 + * * @param request * @return */ @@ -311,7 +318,7 @@ public class PageController { UserByPort userByPort = AuthenticationTokenPool.getUserToken(token); ModelAndView mv = new ModelAndView(); mv.setViewName("pages/warehouse/depository_add"); - Map administration = LinkInterfaceUtil.findAdministration(userKey,token); + Map administration = LinkInterfaceUtil.findAdministration(userKey, token); List administrationPList = (List) administration.get("administrationPList"); mv.addObject("administrationPList", administrationPList); return mv; @@ -319,6 +326,7 @@ public class PageController { /** * 仓库查询页面 + * * @param request * @return */ @@ -335,7 +343,7 @@ public class PageController { mv.setViewName("pages/warehouse/depository-out"); Map map = new HashMap<>(); map.put("parentId", 0); - List depositoryAll = depositoryService.findDepositoryByCondition(map,userKey,token); + List depositoryAll = depositoryService.findDepositoryByCondition(map, userKey, token); Integer role = userToken.getIsadmin(); if (role == null) { role = 1; @@ -352,7 +360,8 @@ public class PageController { /** * 拆零记录编辑页面 - * @param id 待编辑拆零记录id + * + * @param id 待编辑拆零记录id * @param request * @return */ @@ -383,6 +392,7 @@ public class PageController { /** * 拆零记录查询页面 + * * @param request * @return */ @@ -413,6 +423,7 @@ public class PageController { /** * 物料查询页面 + * * @param request * @return */ @@ -443,6 +454,7 @@ public class PageController { /** * 物料添加页面 + * * @return */ @GetMapping("/material_add") @@ -526,11 +538,11 @@ public class PageController { } - /** * 专用于卡片仓库树形菜单页面 - * @param type 类型 - * @param clickObj 点击卡片 + * + * @param type 类型 + * @param clickObj 点击卡片 * @param flagForGroup 是否为组合 * @param request * @return @@ -555,6 +567,7 @@ public class PageController { /** * 物料树形菜单页面 + * * @param map 条件 * @return */ @@ -668,6 +681,7 @@ public class PageController { /** * 物料类型创建页面 + * * @return */ @GetMapping("/materialType_add") @@ -680,6 +694,7 @@ public class PageController { /** * 物料类型查询页面 + * * @param request * @return */ @@ -708,6 +723,7 @@ public class PageController { /** * 跳转到入库页面 + * * @return */ @GetMapping("/application_in") @@ -719,6 +735,7 @@ public class PageController { /** * 跳转到库存多选处理页面 + * * @return */ @GetMapping("/application_multi") @@ -743,7 +760,8 @@ public class PageController { /** * 跳转到入库申请页面（从库存查询跳转） - * @param mid 当前库存记录 + * + * @param mid 当前库存记录 * @param depositoryId 仓库id * @return */ @@ -772,6 +790,7 @@ public class PageController { /** * 跳转到入库批量处理页面 + * * @return */ @GetMapping("/application_in_multi") @@ -783,6 +802,7 @@ public class PageController { /** * 跳转到出库申请页面 + * * @param request * @return */ @@ -811,6 +831,7 @@ public class PageController { /** * 跳转到出库申请页面 + * * @param request * @return */ @@ -823,7 +844,8 @@ public class PageController { /** * 用于跳转到出库申请页面(从库存页面跳转而来) - * @param code 当前物料编码 + * + * @param code 当前物料编码 * @param depositoryId 当前仓库id * @param request * @return @@ -873,6 +895,7 @@ public class PageController { /** * 库存转移页面 + * * @return */ @GetMapping("/application_transfer") @@ -884,6 +907,7 @@ public class PageController { /** * 跳转到入库查询页面 + * * @param request * @return */ @@ -915,6 +939,7 @@ public class PageController { /** * 跳转到出库查询页面 + * * @param request * @return */ @@ -946,6 +971,7 @@ public class PageController { /** * 跳转到拆单创建页面 + * * @return */ @GetMapping("/split_add") @@ -957,6 +983,7 @@ public class PageController { /** * 跳转到用户列表 + * * @param request * @return */ @@ -971,7 +998,7 @@ public class PageController { UserByPort userToken = AuthenticationTokenPool.getUserToken(token); ModelAndView mv = new ModelAndView(); mv.setViewName("pages/user/table-user"); - List administrationPList = LinkInterfaceUtil.findAllCompany(userKey,token); + List administrationPList = LinkInterfaceUtil.findAllCompany(userKey, token); mv.addObject("administrationPList", administrationPList); return mv; } @@ -979,6 +1006,7 @@ public class PageController { /** * 跳转到库存查询页面 + * * @param request * @return */ @@ -1011,6 +1039,7 @@ public class PageController { /** * 跳转到我的任务页面 + * * @return */ @GetMapping("/my_task") @@ -1020,6 +1049,7 @@ public class PageController { /** * 跳转到我的申请页面 + * * @return */ @GetMapping("/my_apply") @@ -1029,6 +1059,7 @@ public class PageController { /** * 跳转到公告编辑页面 + * * @return */ @GetMapping("/notice_edit") @@ -1038,6 +1069,7 @@ public class PageController { /** * 跳转到公告创建页面 + * * @return */ @GetMapping("/notice_add") @@ -1047,6 +1079,7 @@ public class PageController { /** * 跳转到公告查询页面 + * * @return */ @GetMapping("/notice_out") @@ -1057,7 +1090,8 @@ public class PageController { /** * 跳转到库存详情页面 - * @param id 待查看库存 + * + * @param id 待查看库存 * @param request * @return */ @@ -1187,7 +1221,8 @@ public class PageController { /** * 组合信息编辑 - * @param id 待编辑组合信息 + * + * @param id 待编辑组合信息 * @param request * @return */ @@ -1291,6 +1326,7 @@ public class PageController { /** * 出库可视化 + * * @param request * @return */ @@ -1363,6 +1399,7 @@ public class PageController { /** * 库存可视化 + * * @param request * @return */ @@ -1382,7 +1419,8 @@ public class PageController { /** * 添加给用户添加权限 - * @param userId 用户id + * + * @param userId 用户id * @param classes 类型 * @param request * @return @@ -1398,7 +1436,7 @@ public class PageController { UserByPort userToken = AuthenticationTokenPool.getUserToken(token); ModelAndView mv = new ModelAndView(); mv.setViewName("pages/user/user-add"); - UserByPort userByPort = LinkInterfaceUtil.FindUserById(userId, userKey,token); + UserByPort userByPort = LinkInterfaceUtil.FindUserById(userId, userKey, token); UserByPortP userByPortP = new UserByPortP(userByPort); mv.addObject("userByPort", userByPortP); mv.addObject("classes", classes); @@ -1407,6 +1445,7 @@ public class PageController { /** * 跟用户添加类型权限 + * * @param userId * @param classes * @param request @@ -1423,7 +1462,7 @@ public class PageController { UserByPort userToken = AuthenticationTokenPool.getUserToken(token); ModelAndView mv = new ModelAndView(); mv.setViewName("pages/user/user-addForIn"); - UserByPort userByPort = LinkInterfaceUtil.FindUserById(userId, userKey,token); + UserByPort userByPort = LinkInterfaceUtil.FindUserById(userId, userKey, token); UserByPortP userByPortP = new UserByPortP(userByPort); mv.addObject("userByPort", userByPortP); mv.addObject("classes", classes); @@ -1433,7 +1472,8 @@ public class PageController { /** * 编辑用户仓库权限 - * @param id 待编辑权限id + * + * @param id 待编辑权限id * @param request * @return */ @@ -1451,7 +1491,7 @@ public class PageController { RoleAndDepository roleAndDepositoryById = roleService.findRoleAndDepositoryById(id); UserByPortP userByPortP = null; if (roleAndDepositoryById != null) { - UserByPort userByPort = LinkInterfaceUtil.FindUserById(roleAndDepositoryById.getUserId(), userKey,token); + UserByPort userByPort = LinkInterfaceUtil.FindUserById(roleAndDepositoryById.getUserId(), userKey, token); userByPortP = new UserByPortP(userByPort); userByPortP.setDepositoryName(roleAndDepositoryById.getDepositoryName()); } @@ -1463,7 +1503,8 @@ public class PageController { /** * 编辑用户类型权限 - * @param id 待编辑权限id + * + * @param id 待编辑权限id * @param request * @return */ @@ -1481,7 +1522,7 @@ public class PageController { RoleAndMaterialType roleAndMaterialTypeById = roleService.findRoleAndMaterialTypeById(id); UserByPortP userByPortP = null; if (roleAndMaterialTypeById != null) { - UserByPort userByPort = LinkInterfaceUtil.FindUserById(roleAndMaterialTypeById.getUid(), userKey,token); + UserByPort userByPort = LinkInterfaceUtil.FindUserById(roleAndMaterialTypeById.getUid(), userKey, token); userByPortP = new UserByPortP(userByPort); userByPortP.setMaterialTypeName(roleAndMaterialTypeById.getTname()); } @@ -1494,7 +1535,8 @@ public class PageController { /** * 给岗位权限 - * @param id 待赋权岗位 + * + * @param id 待赋权岗位 * @param depositoryId 赋权仓库 * @param request * @return @@ -1512,8 +1554,8 @@ public class PageController { mv.setViewName("pages/post/postRole_edit"); Map userParam = new HashMap<>(); userParam.put("position", id); - List userByPortList = LinkInterfaceUtil.FindUserByMap(userParam, userKey,token); - Post postById = LinkInterfaceUtil.findPostById(id, userKey,token); + List userByPortList = LinkInterfaceUtil.FindUserByMap(userParam, userKey, token); + Post postById = LinkInterfaceUtil.findPostById(id, userKey, token); PostP pp = new PostP(postById); Map param = new HashMap<>(); param.put("depositoryId", depositoryId); @@ -1529,7 +1571,8 @@ public class PageController { /** * 用户详情 - * @param id 待查询用户id + * + * @param id 待查询用户id * @param request * @return */ @@ -1547,7 +1590,7 @@ public class PageController { mv.addObject("depositories", depositoryService.findDepositoryAll()); Map map = new HashMap<>(); map.put("number", id.toString()); - UserByPort userByPort = LinkInterfaceUtil.FindUserByMap(map, userKey,token).get(0); + UserByPort userByPort = LinkInterfaceUtil.FindUserByMap(map, userKey, token).get(0); mv.addObject("user", userByPort); return mv; } @@ -1555,7 +1598,8 @@ public class PageController { /** * 编辑仓库 - * @param id 待编辑仓库id + * + * @param id 待编辑仓库id * @param request * @return */ @@ -1576,8 +1620,8 @@ public class PageController { mv.addObject("record", depositoryRecordById); Integer cid = depositoryRecordById.getCid(); - List postList = LinkInterfaceUtil.findCompanyBySuperior(cid.toString(), userKey,token); - List administrationPList = LinkInterfaceUtil.findAllCompany(userKey,token); + List postList = LinkInterfaceUtil.findCompanyBySuperior(cid.toString(), userKey, token); + List administrationPList = LinkInterfaceUtil.findAllCompany(userKey, token); // 部门列表 mv.addObject("postList", postList); // 公司列表 @@ -1590,7 +1634,8 @@ public class PageController { } /** - *查询当前仓库的子仓库 + * 查询当前仓库的子仓库 + * * @param parentId 当前仓库id * @param request * @return @@ -1610,7 +1655,7 @@ public class PageController { Map param = new HashMap<>(); param.put("parentId", parentId); mv.addObject("parentId", parentId); - mv.addObject("depositories", depositoryService.findDepositoryByCondition(param,userKey,token)); + mv.addObject("depositories", depositoryService.findDepositoryByCondition(param, userKey, token)); } else { throw new MyException("缺少必要参数！"); } @@ -1619,6 +1664,7 @@ public class PageController { /** * 库位或托盘编辑 + * * @param id 库位id * @return */ @@ -1642,6 +1688,7 @@ public class PageController { /** * 给仓库插入库位或托盘 + * * @param depositoryId 待插入的仓库id * @return */ @@ -1659,6 +1706,7 @@ public class PageController { /** * 批量为仓库插入库位或托盘 + * * @param depositoryId 仓库id * @return */ @@ -1676,6 +1724,7 @@ public class PageController { /** * 查看当前仓库的子仓库，若没有子仓库则跳转到库位列表 + * * @param parentId 当前仓库id * @param request * @return @@ -1694,9 +1743,9 @@ public class PageController { Map param = new HashMap<>(); param.put("parentId", parentId); mv.addObject("parentId", parentId); - List depositoryRecordPByCondition = depositoryService.findDepositoryByCondition(param, userKey,token); + List depositoryRecordPByCondition = depositoryService.findDepositoryByCondition(param, userKey, token); param.put("state", 2); - List depositoryRecordPByConditionForState = depositoryService.findDepositoryByCondition(param, userKey,token); + List depositoryRecordPByConditionForState = depositoryService.findDepositoryByCondition(param, userKey, token); Integer role = userByPort.getIsadmin(); if (role == null) { role = 1; @@ -1724,6 +1773,7 @@ public class PageController { /** * 查看当前仓库的管理员 + * * @param id 待查看id * @return */ @@ -1765,7 +1815,8 @@ public class PageController { /** * 查看当前岗位拥有的仓库权限 - * @param id 待查看岗位id + * + * @param id 待查看岗位id * @param classes 类别 * @return */ @@ -1780,6 +1831,7 @@ public class PageController { /** * 查看当前库存所在仓库的管理员（未使用） + * * @param id 库存id * @return */ @@ -1794,6 +1846,7 @@ public class PageController { /** * 查看当前物料类型下的子类型 + * * @param parentId 当前类型id * @param request * @return @@ -1835,6 +1888,7 @@ public class PageController { /** * 查看当前物料类型详情 + * * @param id 类型id * @return */ @@ -1855,7 +1909,8 @@ public class PageController { /** * 出库申请审批 - * @param id 待审批id + * + * @param id 待审批id * @param request * @return */ @@ -1941,7 +1996,7 @@ public class PageController { } } // 申请人 - UserByPort userByPort = LinkInterfaceUtil.FindUserById(recordP.getApplicantId(), userKey,token); + UserByPort userByPort = LinkInterfaceUtil.FindUserById(recordP.getApplicantId(), userKey, token); // 部门负责人 String departmentheads = recordP.getDepartmenthead(); String[] split = departmentheads.split(","); @@ -1950,7 +2005,7 @@ public class PageController { if ("".equals(value)) { continue; } - UserByPort departmenthead = LinkInterfaceUtil.FindUserById(ObjectFormatUtil.toInteger(value.trim()), userKey,token); + UserByPort departmenthead = LinkInterfaceUtil.FindUserById(ObjectFormatUtil.toInteger(value.trim()), userKey, token); departmentHeadName.append(departmenthead.getName()).append(","); } @@ -1967,7 +2022,7 @@ public class PageController { continue; } Integer managerid = ObjectFormatUtil.toInteger(s.trim()); - UserByPort user = LinkInterfaceUtil.FindUserById(managerid, userKey,token); + UserByPort user = LinkInterfaceUtil.FindUserById(managerid, userKey, token); depositoryManager.add(user); depositoryManagerNames.append(user.getName()).append(","); } @@ -1994,7 +2049,8 @@ public class PageController { /** * 出库出库申请详情 - * @param id 待查看id + * + * @param id 待查看id * @param request * @return */ @@ -2032,7 +2088,7 @@ public class PageController { for (String approverId : airapproverId ) { if (!"".equals(approverId)) { - UserByPort userByPort = LinkInterfaceUtil.FindUserById(ObjectFormatUtil.toInteger(approverId), userKey,token); + UserByPort userByPort = LinkInterfaceUtil.FindUserById(ObjectFormatUtil.toInteger(approverId), userKey, token); airapproverName.append(userByPort.getName()).append(","); } } @@ -2042,7 +2098,7 @@ public class PageController { mv.addObject("placeCode", placeCode); if (Integer.compare(flagForGroup, 2) != 0) { // 如果不是组合 - UserByPort userByPort = LinkInterfaceUtil.FindUserById(applicationInRecordPById.getApplicantId(), userKey,token); + UserByPort userByPort = LinkInterfaceUtil.FindUserById(applicationInRecordPById.getApplicantId(), userKey, token); applicationInRecordPById.setApplicantName(userByPort.getName()); applicationInRecordPById.setApplicantTime(DateUtil.TimeStampToDateTime(Long.valueOf(applicationInRecordPById.getApplicantTime()))); if (applicationInRecordPById.getPrice() != null) { @@ -2071,7 +2127,8 @@ public class PageController { /** * 入库申请审批 - * @param id 待审批id + * + * @param id 待审批id * @param request * @return */ @@ -2109,7 +2166,7 @@ public class PageController { for (String approverId : airapproverId ) { if (!"".equals(approverId)) { - UserByPort userByPort = LinkInterfaceUtil.FindUserById(ObjectFormatUtil.toInteger(approverId), userKey,token); + UserByPort userByPort = LinkInterfaceUtil.FindUserById(ObjectFormatUtil.toInteger(approverId), userKey, token); airapproverName.append(userByPort.getName()).append(","); } } @@ -2119,7 +2176,7 @@ public class PageController { mv.addObject("placeCode", placeCode); if (Integer.compare(flagForGroup, 2) != 0) { // 如果不是组合 - UserByPort userByPort = LinkInterfaceUtil.FindUserById(applicationInRecordPById.getApplicantId(), userKey,token); + UserByPort userByPort = LinkInterfaceUtil.FindUserById(applicationInRecordPById.getApplicantId(), userKey, token); applicationInRecordPById.setApplicantName(userByPort.getName()); applicationInRecordPById.setApplicantTime(DateUtil.TimeStampToDateTime(Long.valueOf(applicationInRecordPById.getApplicantTime()))); if (applicationInRecordPById.getPrice() != null) { @@ -2148,7 +2205,8 @@ public class PageController { /** * 出库申请的申请物料详情 - * @param id 待查看详情id + * + * @param id 待查看详情id * @param request * @return */ @@ -2176,7 +2234,7 @@ public class PageController { // 获取处理人 Integer checkId = recordMinP.getCheckId(); if (checkId != null) { - UserByPort userByPort = LinkInterfaceUtil.FindUserById(checkId, userKey,token); + UserByPort userByPort = LinkInterfaceUtil.FindUserById(checkId, userKey, token); // 设置处理人姓名 recordMinP.setCheckerName(userByPort.getName()); @@ -2289,48 +2347,46 @@ public class PageController { StringBuilder depositoryName = new StringBuilder(); // 展示出库的库位编码 StringBuilder placeCode = new StringBuilder(); + List placeIdList = new ArrayList<>(); // 展示当前子订单的处理人 + List outDisPoserIdList = new ArrayList<>(); StringBuilder outDisposer = new StringBuilder(); // 当前订单总数 Double sumQuantity = 0.0; - // 每个物料数量 - StringBuilder quantityByMaterial = new StringBuilder(); List recordMinPList = new ArrayList<>(); // 当前总额 double sumPrice = 0.0; + // 出库仓库id列表 + List depositoryIdList = new ArrayList<>(); for (ApplicationOutRecordMinP recordMinP : applicationOutRecordMinByParent) { // 获取子订单信息 // 获取出库物料信息 Inventory inventoryById = materialService.findInventoryById(recordMinP.getMid()); - // 获取出库物料仓库信息 - Depository depository = depositoryService.findDepositoryById(recordMinP.getDepositoryId()); - + // 获取出库物料仓库Id + Integer depositoryId = recordMinP.getDepositoryId(); + if (!depositoryIdList.contains(depositoryId)) { + depositoryIdList.add(depositoryId); + } recordMinP.setMname(inventoryById.getMname()); - recordMinP.setDepositoryName(depository.getDname()); Integer checkId = recordMinP.getCheckId(); if (checkId != null) { // 如果当前子订单已经处理 // 获取当前处理人 - UserByPort disposer = LinkInterfaceUtil.FindUserById(checkId, userKey,token); - outDisposer.append(disposer.getName()).append(","); - recordMinP.setCheckerName(disposer.getName()); - // 获取出库库位 - Place placeById = placeService.findPlaceById(recordMinP.getPlaceId()); - if (placeById != null) { - placeCode.append(placeById.getCode()).append(","); - recordMinP.setPlaceCode(placeById.getCode()); + if (!outDisPoserIdList.contains(checkId)) { + outDisPoserIdList.add(checkId); + } + Integer placeId = recordMinP.getPlaceId(); + if (!placeIdList.contains(placeId)) { + placeIdList.add(placeId); } } else { - outDisposer.append("暂未处理,"); - recordMinP.setCheckerName("暂未处理"); + outDisposer = new StringBuilder("暂未完全处理"); } mname.append(inventoryById.getMname()).append(","); mcode.append(inventoryById.getCode()).append(","); - depositoryName.append(depository.getDname()).append(","); - quantityByMaterial.append(recordMinP.getQuantity()).append(","); sumQuantity += recordMinP.getQuantity(); // 获取当前计量单位 String unit = recordMinP.getUnit(); @@ -2365,8 +2421,33 @@ public class PageController { } recordMinPList.add(recordMinP); } + + List depositoryByIds = depositoryService.findDepositoryByIds(depositoryIdList); + for (Depository depository : depositoryByIds + ) { + depositoryName.append(depository.getDname()).append(","); + } + + if (outDisPoserIdList.size() > 0) { + for (Integer outDispositorId : outDisPoserIdList + ) { + UserByPort disposer = LinkInterfaceUtil.FindUserById(outDispositorId, userKey, token); + outDisposer.append(disposer.getName()).append(","); + } + } + if (placeIdList.size() > 0) { + List placeByIdS = placeService.findPlaceByIdS(placeIdList); + for (Place place : placeByIdS) { + int placeId = place.getId(); + if(placeId == 0){ + placeCode.append("默认库位").append(","); + }else{ + placeCode.append(place.getKingdeecode()).append(","); + } + } + } // 申请人 - UserByPort userByPort = LinkInterfaceUtil.FindUserById(applicationOutRecordPById.getApplicantId(), userKey,token); + UserByPort userByPort = LinkInterfaceUtil.FindUserById(applicationOutRecordPById.getApplicantId(), userKey, token); // 部门负责人 String departmentHead = applicationOutRecordPById.getDepartmenthead(); String[] split = departmentHead.split(","); @@ -2379,7 +2460,7 @@ public class PageController { if ("".equals(value)) { continue; } - UserByPort departmenthead = LinkInterfaceUtil.FindUserById(ObjectFormatUtil.toInteger(value), userKey,token); + UserByPort departmenthead = LinkInterfaceUtil.FindUserById(ObjectFormatUtil.toInteger(value), userKey, token); departmentHeadName.append(departmenthead.getName()).append(","); } // 仓储中心负责人 @@ -2395,7 +2476,7 @@ public class PageController { continue; } Integer managerid = ObjectFormatUtil.toInteger(s); - UserByPort user = LinkInterfaceUtil.FindUserById(managerid, userKey,token); + UserByPort user = LinkInterfaceUtil.FindUserById(managerid, userKey, token); depositoryManager.add(user); depositoryManagerNames.append(user.getName()); } @@ -2403,7 +2484,7 @@ public class PageController { Integer adminorgId = applicationOutRecordPById.getAdminorgId(); Integer constructionUnitId = applicationOutRecordPById.getConstructionUnitId(); if (adminorgId != null) { - Administration company = LinkInterfaceUtil.getCompany(adminorgId, userKey,token); + Administration company = LinkInterfaceUtil.getCompany(adminorgId, userKey, token); applicationOutRecordPById.setAdminorgName(company.getName()); mv.addObject("adisplay", "table-row"); } else { @@ -2424,8 +2505,6 @@ public class PageController { mv.addObject("display", "none"); } - - applicationOutRecordPById.setApplicantName(userByPort.getName()); applicationOutRecordPById.setDepartmentheadName(departmentHeadName.toString()); applicationOutRecordPById.setDepositoryManagerName(depositoryManagerNames.toString()); @@ -2450,8 +2529,9 @@ public class PageController { /** * 跳转到组合出库申请 - * @param gid 组合id - * @param type 类型 + * + * @param gid 组合id + * @param type 类型 * @param request * @return */ @@ -2479,7 +2559,8 @@ public class PageController { /** * 组合申请入库id - * @param gid 组合id + * + * @param gid 组合id * @param type 类型 * @return */ @@ -2499,7 +2580,8 @@ public class PageController { /** * 库存盘点审批 - * @param id 待审批id + * + * @param id 待审批id * @param request * @return */ @@ -2524,7 +2606,7 @@ public class PageController { stp.setCreateTime(DateUtil.TimeStampToDateTime(stockTaking.getCreateTime())); // 获取申请人 - UserByPort userByPort = LinkInterfaceUtil.FindUserById(stockTaking.getOriginator(), userKey,token); + UserByPort userByPort = LinkInterfaceUtil.FindUserById(stockTaking.getOriginator(), userKey, token); // 设置盘点发起人姓名 stp.setOriginatorName(userByPort.getName()); @@ -2602,7 +2684,7 @@ public class PageController { // 获取申请人 - UserByPort userByPort = LinkInterfaceUtil.FindUserById(stockTaking.getOriginator(), userKey,token); + UserByPort userByPort = LinkInterfaceUtil.FindUserById(stockTaking.getOriginator(), userKey, token); // 设置盘点发起人姓名 stp.setOriginatorName(userByPort.getName()); @@ -2645,7 +2727,7 @@ public class PageController { userKey = (String) request.getSession().getAttribute("userKey"); } UserByPort userToken = AuthenticationTokenPool.getUserToken(token); - Administration company = LinkInterfaceUtil.getCompany(userToken.getMaindeparment(), userKey,token); + Administration company = LinkInterfaceUtil.getCompany(userToken.getMaindeparment(), userKey, token); userToken.setMaindeparmentname(company.getName()); mv.addObject("userInfo", userToken); return mv; @@ -2688,6 +2770,7 @@ public class PageController { /** * 公司查看（弃用） + * * @param request * @return */ @@ -2702,7 +2785,7 @@ public class PageController { UserByPort userToken = AuthenticationTokenPool.getUserToken(token); ModelAndView mv = new ModelAndView(); mv.setViewName("pages/company/company-out"); - List administrationPList = LinkInterfaceUtil.findAllCompany(userKey,token); + List administrationPList = LinkInterfaceUtil.findAllCompany(userKey, token); mv.addObject("administrationPList", administrationPList); mv.addObject("level", 3); mv.addObject("parentId", "313"); @@ -2711,6 +2794,7 @@ public class PageController { /** * 公司添加（弃用） + * * @return */ @GetMapping("/company_add") @@ -2725,7 +2809,8 @@ public class PageController { /** * 查看公司详情 - * @param id 待查看公司id + * + * @param id 待查看公司id * @param request * @return */ @@ -2749,14 +2834,14 @@ public class PageController { JSONObject paramObject = JSONObject.parseObject(jsonString); String post = null; try { - post = HttpUtils.send(url, paramObject, HTTP.UTF_8, userKey,token); + post = HttpUtils.send(url, paramObject, HTTP.UTF_8, userKey, token); } catch (IOException e) { e.printStackTrace(); } JSONObject jsonObject = JSONObject.parseObject(post); JSONObject data = (JSONObject) jsonObject.get("data"); Administration administration = JSONObject.toJavaObject(data, Administration.class); - String SuperiorName = LinkInterfaceUtil.getCompany(administration.getSuperior(), userKey,token).getName(); + String SuperiorName = LinkInterfaceUtil.getCompany(administration.getSuperior(), userKey, token).getName(); mv.addObject("record", administration); mv.addObject("SuperiorName", SuperiorName); } else { @@ -2768,8 +2853,9 @@ public class PageController { /** * 获取当前公司下的子公司 + * * @param parentId 待查看id - * @param level 等级 + * @param level 等级 * @param request * @return */ @@ -2786,7 +2872,7 @@ public class PageController { if (parentId != null) { mv.addObject("parentId", parentId); mv.addObject("level", level + 1); - List administrationPList = LinkInterfaceUtil.findCompanyBySuperior(parentId.toString(), userKey,token); + List administrationPList = LinkInterfaceUtil.findCompanyBySuperior(parentId.toString(), userKey, token); if (administrationPList.size() > 0) { mv.addObject("administrationPList", administrationPList); mv.setViewName("pages/company/company-out"); @@ -2801,6 +2887,7 @@ public class PageController { /** * 获取当前行政组织下的岗位 + * * @param organization 待查看行政组织 * @param request * @return @@ -2824,7 +2911,7 @@ public class PageController { JSONObject paramObject = JSONObject.parseObject(jsonString); String post = null; try { - post = HttpUtils.send(url, paramObject, HTTP.UTF_8, userKey,token); + post = HttpUtils.send(url, paramObject, HTTP.UTF_8, userKey, token); } catch (IOException e) { e.printStackTrace(); } @@ -2850,7 +2937,8 @@ public class PageController { /** * 行政组织详情 - * @param id id + * + * @param id id * @param request * @return */ @@ -2866,7 +2954,7 @@ public class PageController { ModelAndView mv = new ModelAndView(); mv.setViewName("pages/post/post-view"); if (id != null) { - Post object = LinkInterfaceUtil.findPostById(id, userKey,token); + Post object = LinkInterfaceUtil.findPostById(id, userKey, token); mv.addObject("record", object); } else { throw new MyException("缺少必要参数！"); @@ -2894,7 +2982,7 @@ public class PageController { JSONObject paramObject = JSONObject.parseObject(jsonString); String post = null; try { - post = HttpUtils.send(url, paramObject, HTTP.UTF_8, userKey,token); + post = HttpUtils.send(url, paramObject, HTTP.UTF_8, userKey, token); } catch (IOException e) { e.printStackTrace(); } @@ -2935,7 +3023,7 @@ public class PageController { UserByPort userToken = AuthenticationTokenPool.getUserToken(token); ModelAndView mv = new ModelAndView(); mv.setViewName("pages/post/postRole_add"); - Post postById = LinkInterfaceUtil.findPostById(id, userKey,token); + Post postById = LinkInterfaceUtil.findPostById(id, userKey, token); mv.addObject("post", postById); mv.addObject("classes", classes); return mv; @@ -3074,7 +3162,7 @@ public class PageController { } UserByPort userByPort = AuthenticationTokenPool.getUserToken(token); // 获取当前key值存储在redis中的值 - List range = redisPool.getRedisTemplateByDb(15).opsForList().range("WMS_temporaryValue_In" + userByPort.getNumber(), 0, -1); + List range = redisPool.getRedisTemplateByDb(15).opsForList().range("WMS_temporaryValue_In" + userByPort.getNumber(), 0, -1); if (range != null && range.size() > 0) { mv.setViewName("pages/application/application-in_temporaryValue"); } else { @@ -3104,7 +3192,7 @@ public class PageController { token = (String) request.getSession().getAttribute("userToken"); } UserByPort userToken = AuthenticationTokenPool.getUserToken(token); - List range = redisPool.getRedisTemplateByDb(15).boundListOps("WMS_temporaryValue_Out" + userToken.getNumber()).range(0, -1); + List range = redisPool.getRedisTemplateByDb(15).boundListOps("WMS_temporaryValue_Out" + userToken.getNumber()).range(0, -1); // 获取当前用户是否存在可见仓库 List union = roleService.findDepositoryIdForWareHouseVisiblePermissionByUser(userToken); if (union.size() > 0) { @@ -3173,7 +3261,7 @@ public class PageController { StringBuilder departmentHeadName = new StringBuilder(); StringBuilder departmentHeadId = new StringBuilder(); - List departmentHeadByUser = PublicConfig.findDepartmentHeadByUser(userToken.getMaindeparment(), userKey,token); + List departmentHeadByUser = PublicConfig.findDepartmentHeadByUser(userToken.getMaindeparment(), userKey, token); for (UserByPort departmentHead : departmentHeadByUser ) { departmentHeadName.append(departmentHead.getName()).append(","); @@ -3356,7 +3444,7 @@ public class PageController { token = (String) request.getSession().getAttribute("userToken"); userKey = (String) request.getSession().getAttribute("userKey"); } - NoticeP noticeById = noticeService.findNoticeById(id,userKey,token); + NoticeP noticeById = noticeService.findNoticeById(id, userKey, token); UserByPort userToken = AuthenticationTokenPool.getUserToken(token); if (Integer.compare(noticeById.getUserId(), userToken.getId()) == 0) { String header = request.getHeader("user-agent"); @@ -3381,6 +3469,7 @@ public class PageController { /** * 跳转到行政组织 树 + * * @return */ @GetMapping("/selectDepartment") @@ -3390,6 +3479,7 @@ public class PageController { /** * 全部公告页 + * * @param request * @return */ @@ -3424,6 +3514,7 @@ public class PageController { /** * 添加施工单位页 + * * @return */ @GetMapping("/constructionUnitAdd") @@ -3434,6 +3525,7 @@ public class PageController { /** * 施工单位查询 + * * @return */ @GetMapping("/constructionUnitOut") @@ -3443,6 +3535,7 @@ public class PageController { /** * 施工单位编辑 + * * @param id 施工单位id * @return */ @@ -3526,7 +3619,7 @@ public class PageController { * @param userToken 当前用户 * @return */ - public List getUserSimpleTaskP(UserByPort userToken,String userKey,String token) { + public List getUserSimpleTaskP(UserByPort userToken, String userKey, String token) { Map paramForTask = new HashMap<>(); paramForTask.put("isDone", 0); paramForTask.put("userId", userToken.getId()); @@ -3536,28 +3629,28 @@ public class PageController { List list = new ArrayList<>(); // 查询出库任务 - List myTaskOut = depositoryRecordService.findMyTaskOut(paramForTask, userKey,token); + List myTaskOut = depositoryRecordService.findMyTaskOut(paramForTask, userKey, token); for (SimpleApplicationOutOrInRecordP simpleApplicationOutOrInRecordP : myTaskOut) { SimpleTaskP simpleTaskP = new SimpleTaskP(simpleApplicationOutOrInRecordP); list.add(simpleTaskP); } // 查询盘点任务 - List task = stockTakingService.findMyTask(paramForTask, userKey,token); + List task = stockTakingService.findMyTask(paramForTask, userKey, token); for (SimpleStockTakingP simpleStockTakingP : task) { SimpleTaskP simpleTaskP = new SimpleTaskP(simpleStockTakingP); list.add(simpleTaskP); } // 查询入库任务 - List myTaskIn = depositoryRecordService.findMyTaskIn(paramForTask, userKey,token); + List myTaskIn = depositoryRecordService.findMyTaskIn(paramForTask, userKey, token); for (SimpleApplicationOutOrInRecordP simpleApplicationOutOrInRecordP : myTaskIn) { SimpleTaskP simpleTaskP = new SimpleTaskP(simpleApplicationOutOrInRecordP); list.add(simpleTaskP); } String key = "user:" + userToken.getId().toString(); - String minRecord = (String) redisPool.getRedisTemplateByDb(15).opsForHash().get(key, "minRecord"); + String minRecord = (String) redisPool.getRedisTemplateByDb(15).opsForHash().get(key, "minRecord"); if (minRecord != null) { // 获取子订单键值 String[] split = minRecord.replace("[", "").replace("]", "").split(","); @@ -3568,7 +3661,7 @@ public class PageController { Integer minRecordId = ObjectFormatUtil.toInteger(s.split(":")[1].trim()); ApplicationOutRecordMinP applicationOutMinById = depositoryRecordService.findApplicationOutMinById(minRecordId); ApplicationOutRecordP applicationOutRecordPById = depositoryRecordService.findApplicationOutRecordPById(applicationOutMinById.getParentId()); - UserByPort userByPort = LinkInterfaceUtil.FindUserById(applicationOutRecordPById.getApplicantId(), userKey,token); + UserByPort userByPort = LinkInterfaceUtil.FindUserById(applicationOutRecordPById.getApplicantId(), userKey, token); applicationOutRecordPById.setApplicantName(userByPort.getName()); SimpleTaskP simpleTaskP = new SimpleTaskP(applicationOutRecordPById, applicationOutMinById); list.add(simpleTaskP); @@ -3584,7 +3677,7 @@ public class PageController { * @param userToken 当前用户 * @return */ - public List getUserSimpleApplyP(UserByPort userToken,String userKey,String token) { + public List getUserSimpleApplyP(UserByPort userToken, String userKey, String token) { Map paramForApply = new HashMap<>(); paramForApply.put("applicantId", userToken.getId()); paramForApply.put("size", 4); @@ -3594,14 +3687,14 @@ public class PageController { List list = new ArrayList<>(); // 查询入库申请 - List applicationInRecordPByCondition = depositoryRecordService.findApplicationInRecordPByCondition(paramForApply, userToken,userKey,token); + List applicationInRecordPByCondition = depositoryRecordService.findApplicationInRecordPByCondition(paramForApply, userToken, userKey, token); for (ApplicationInRecordP applicationInRecordP : applicationInRecordPByCondition) { SimpleTaskP simpleTask = new SimpleTaskP(applicationInRecordP); list.add(simpleTask); } - List applicationOutRecordPlist = depositoryRecordService.findApplicationOutRecordPByCondition(paramForApply,userToken, userKey,token); + List applicationOutRecordPlist = depositoryRecordService.findApplicationOutRecordPByCondition(paramForApply, userToken, userKey, token); for (ApplicationOutRecordP applicationOutRecordP : applicationOutRecordPlist) { SimpleTaskP simpleTask = new SimpleTaskP(applicationOutRecordP); list.add(simpleTask); diff --git a/src/main/java/com/dreamchaser/depository_manage/mapper/PlaceMapper.java b/src/main/java/com/dreamchaser/depository_manage/mapper/PlaceMapper.java index d0c0253b..32ef2670 100644 --- a/src/main/java/com/dreamchaser/depository_manage/mapper/PlaceMapper.java +++ b/src/main/java/com/dreamchaser/depository_manage/mapper/PlaceMapper.java @@ -24,6 +24,14 @@ public interface PlaceMapper { */ Place findPlaceById(Integer id); + + /** + * 根据id批量查询库位 + * @param ids 待查询id列表 + * @return + */ + List findPlaceByIdS(List ids); + /** * 根据条件查找库位 * @param map diff --git a/src/main/java/com/dreamchaser/depository_manage/mapper/PlaceMapper.xml b/src/main/java/com/dreamchaser/depository_manage/mapper/PlaceMapper.xml index c67d494f..abd04288 100644 --- a/src/main/java/com/dreamchaser/depository_manage/mapper/PlaceMapper.xml +++ b/src/main/java/com/dreamchaser/depository_manage/mapper/PlaceMapper.xml @@ -323,6 +323,18 @@ FROM place p WHERE p.id = #{id} + + + + +