From e9b406bc3788b57b0c81ffb66e0fdbcb07870f1d Mon Sep 17 00:00:00 2001 From: erdanergou Date: Thu, 20 Jul 2023 09:20:55 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=95=B0=E6=8D=AE=E7=B1=BB?= =?UTF-8?q?=E5=9E=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../config/PublicConfig.java | 24 +- .../controller/CompanyController.java | 2 +- .../controller/DepositoryController.java | 98 ++--- .../DepositoryRecordController.java | 292 ++++++------- .../controller/DownLoadFileController.java | 2 +- .../controller/GroupController.java | 124 +++--- .../controller/MaterialController.java | 146 +++---- .../controller/MaterialTypeController.java | 2 +- .../controller/NoticeController.java | 8 +- .../controller/PageController.java | 261 ++++++----- .../controller/PlaceController.java | 44 +- .../controller/QyWxOperationController.java | 4 +- .../controller/SplitController.java | 12 +- .../controller/StockTakingController.java | 18 +- .../controller/UserController.java | 14 +- .../ExcelDepositoryInfoConverter.java | 10 +- .../ExcelMaterialTypeInfoConverter.java | 16 +- .../AccesstoAddressMapper.java | 2 +- .../AccesstoAddressMapper.xml | 8 +- .../depository_mapper/BusinessTypeMapper.java | 8 +- .../depository_mapper/BusinessTypeMapper.xml | 10 +- .../depository_mapper/CompanyMapper.java | 12 +- .../depository_mapper/CompanyMapper.xml | 12 +- .../ConstructionUnitMapper.java | 6 +- .../ConstructionUnitMapper.xml | 8 +- .../depository_mapper/DepositoryMapper.java | 24 +- .../depository_mapper/DepositoryMapper.xml | 30 +- .../DepositoryRecordMapper.java | 38 +- .../DepositoryRecordMapper.xml | 112 ++--- .../depository_mapper/GroupMapper.java | 16 +- .../depository_mapper/GroupMapper.xml | 32 +- .../depository_mapper/MaterialMapper.java | 18 +- .../depository_mapper/MaterialMapper.xml | 80 ++-- .../depository_mapper/MaterialTypeMapper.xml | 6 +- .../depository_mapper/NoticeMapper.java | 8 +- .../depository_mapper/NoticeMapper.xml | 12 +- .../depository_mapper/PlaceMapper.java | 26 +- .../depository_mapper/PlaceMapper.xml | 60 +-- .../depository_mapper/QrCodeMapper.xml | 6 +- .../depository_mapper/RoleMapper.java | 16 +- .../depository_mapper/RoleMapper.xml | 34 +- .../depository_mapper/SplitUnitMapper.java | 22 +- .../depository_mapper/SplitUnitMapper.xml | 68 +-- .../depository_mapper/StockTakingMapper.java | 25 +- .../depository_mapper/StockTakingMapper.xml | 36 +- .../TransferRecordMapper.java | 2 +- .../TransferRecordMapper.xml | 18 +- .../depository_mapper/UserMapper.java | 130 ------ .../depository_mapper/UserMapper.xml | 381 ---------------- .../entity/AccesstoAddress.java | 4 +- .../entity/Administration.java | 4 +- .../entity/ApplicationInRecord.java | 10 +- .../entity/ApplicationOutRecord.java | 16 +- .../entity/ApplicationOutRecordMin.java | 14 +- .../entity/BusinessType.java | 4 +- .../depository_manage/entity/Company.java | 4 +- .../entity/ConstructionUnit.java | 2 +- .../depository_manage/entity/CsvInfo.java | 12 - .../depository_manage/entity/Depository.java | 10 +- .../entity/DepositoryRecord.java | 12 +- .../depository_manage/entity/Govthreeing.java | 6 +- .../depository_manage/entity/Group.java | 2 +- .../depository_manage/entity/GroupInfo.java | 8 +- .../depository_manage/entity/Inventory.java | 12 +- .../depository_manage/entity/Material.java | 9 +- .../entity/MaterialAndBarCode.java | 10 +- .../entity/MaterialAndPlace.java | 14 +- .../entity/MaterialAndProducedDate.java | 12 +- .../entity/MaterialForGroup.java | 8 +- .../entity/MaterialType.java | 2 +- .../depository_manage/entity/Notice.java | 6 +- .../depository_manage/entity/Place.java | 12 +- .../depository_manage/entity/Post.java | 10 +- .../entity/PostOrUserRole.java | 6 +- .../depository_manage/entity/Role.java | 49 --- .../entity/SimpleApplicationInRecord.java | 4 +- .../entity/SimpleApplicationOutRecord.java | 4 +- .../entity/SimpleDepositoryRecord.java | 4 +- .../depository_manage/entity/SplitInfo.java | 8 +- .../entity/SplitInventory.java | 12 +- .../entity/SplitInventoryView.java | 16 +- .../entity/StandingBook.java | 130 ------ .../depository_manage/entity/StockTaking.java | 4 +- .../entity/StockTakingChild.java | 10 +- .../entity/TransferRecord.java | 118 +---- .../depository_manage/entity/User.java | 2 +- .../depository_manage/entity/UserByPort.java | 14 +- .../entity/materialOnly.java | 4 +- .../entity/qywxDepartment.java | 6 +- .../depository_manage/entity/qywxLabel.java | 2 +- .../hrNew_mapper/AdministrativeMapper.java | 18 + .../hrNew_mapper/AdministrativeMapper.xml | 26 ++ .../hrNew_mapper/UserMapper.java | 33 ++ .../hrNew_mapper/UserMapper.xml | 81 ++++ .../pojo/AdministrationP.java | 2 +- .../pojo/ApplicationInRecordP.java | 10 +- .../pojo/ApplicationModel.java | 8 +- .../pojo/ApplicationOutRecordMinP.java | 14 +- .../pojo/ApplicationOutRecordP.java | 16 +- .../pojo/DepositoryRecordP.java | 12 +- .../depository_manage/pojo/GroupInfoP.java | 4 +- .../pojo/InventoryByMTAndDepository.java | 2 +- .../depository_manage/pojo/InventoryP.java | 12 +- .../pojo/MaterialAndPlaceForViewP.java | 10 +- .../depository_manage/pojo/MaterialOnlyP.java | 7 +- .../depository_manage/pojo/MaterialP.java | 10 +- .../depository_manage/pojo/NoticeP.java | 6 +- .../depository_manage/pojo/PlaceP.java | 12 +- .../depository_manage/pojo/PostP.java | 10 +- .../pojo/ResultForGroupReturn.java | 4 +- .../pojo/RoleAndDepository.java | 8 +- .../pojo/RoleAndMaterialType.java | 6 +- .../pojo/SimpleApplicationOutMinRecordP.java | 8 +- .../pojo/SimpleApplicationOutOrInRecordP.java | 2 +- .../pojo/SimpleDepositoryRecordP.java | 2 +- .../depository_manage/pojo/SplitInfoP.java | 8 +- .../depository_manage/pojo/Statistic.java | 14 - .../pojo/StockTakingChildP.java | 6 +- .../depository_manage/pojo/StockTakingP.java | 6 +- .../depository_manage/pojo/UserByPortP.java | 4 +- .../depository_manage/pojo/UserP.java | 2 - .../service/AccessAddressService.java | 2 +- .../service/BusinessTypeService.java | 8 +- .../service/CompanyService.java | 12 +- .../service/ConstructionUnitService.java | 6 +- .../service/DepositoryRecordService.java | 54 +-- .../service/DepositoryService.java | 28 +- .../service/ExcelService.java | 2 +- .../service/GroupService.java | 20 +- .../service/MaterialService.java | 28 +- .../service/NoticeService.java | 10 +- .../service/PlaceService.java | 38 +- .../service/RoleService.java | 23 +- .../service/SplitUnitService.java | 26 +- .../service/StockTakingService.java | 10 +- .../service/UserService.java | 21 +- .../impl/AccessAddressServiceImpl.java | 2 +- .../service/impl/BusinessTypeServiceImpl.java | 8 +- .../service/impl/CompanyServiceImpl.java | 18 +- .../impl/ConstructionUnitServiceImpl.java | 6 +- .../impl/DepositoryRecordServiceImpl.java | 410 +++++++++--------- .../service/impl/DepositoryServiceImpl.java | 114 ++--- .../service/impl/ExcelServiceImpl.java | 28 +- .../service/impl/GroupServiceImpl.java | 104 ++--- .../service/impl/MaterialServiceImpl.java | 136 +++--- .../service/impl/NoticeServiceImpl.java | 12 +- .../service/impl/PlaceServiceImpl.java | 44 +- .../service/impl/QyWxOperationService.java | 104 ++--- .../service/impl/RoleServiceImpl.java | 56 +-- .../service/impl/SplitUnitServiceImpl.java | 102 ++--- .../service/impl/StockTakingServiceImpl.java | 308 +++++++------ .../service/impl/UserServiceImpl.java | 35 ++ .../depository_manage/BarChartTest.java | 6 +- .../depository_manage/InterfaceTest.java | 2 +- .../InventoryLineChartTest.java | 6 +- .../depository_manage/LineChartTest.java | 6 +- .../depository_manage/MoreDatasourceTest.java | 44 ++ .../{SomeTest.java => QyWxCallBackTest.java} | 14 +- 158 files changed, 2264 insertions(+), 2891 deletions(-) delete mode 100644 src/main/java/com/dreamchaser/depository_manage/depository_mapper/UserMapper.java delete mode 100644 src/main/java/com/dreamchaser/depository_manage/depository_mapper/UserMapper.xml delete mode 100644 src/main/java/com/dreamchaser/depository_manage/entity/CsvInfo.java delete mode 100644 src/main/java/com/dreamchaser/depository_manage/entity/Role.java delete mode 100644 src/main/java/com/dreamchaser/depository_manage/entity/StandingBook.java create mode 100644 src/main/java/com/dreamchaser/depository_manage/hrNew_mapper/AdministrativeMapper.java create mode 100644 src/main/java/com/dreamchaser/depository_manage/hrNew_mapper/AdministrativeMapper.xml create mode 100644 src/main/java/com/dreamchaser/depository_manage/hrNew_mapper/UserMapper.java create mode 100644 src/main/java/com/dreamchaser/depository_manage/hrNew_mapper/UserMapper.xml delete mode 100644 src/main/java/com/dreamchaser/depository_manage/pojo/Statistic.java create mode 100644 src/main/java/com/dreamchaser/depository_manage/service/impl/UserServiceImpl.java create mode 100644 src/test/java/com/dreamchaser/depository_manage/MoreDatasourceTest.java rename src/test/java/com/dreamchaser/depository_manage/{SomeTest.java => QyWxCallBackTest.java} (96%) diff --git a/src/main/java/com/dreamchaser/depository_manage/config/PublicConfig.java b/src/main/java/com/dreamchaser/depository_manage/config/PublicConfig.java index 8d0c11c9..79069488 100644 --- a/src/main/java/com/dreamchaser/depository_manage/config/PublicConfig.java +++ b/src/main/java/com/dreamchaser/depository_manage/config/PublicConfig.java @@ -32,7 +32,7 @@ public class PublicConfig { public static String external_url_6666 = "http://kpi.hxgk.group/kpiapi"; // 高权限部门列表 - public static List roleAdminorgList = Arrays.asList(361, 102, 268); + public static List roleAdminorgList = Arrays.asList(361L, 102L, 268L); // 定义登录存储在redis中的前缀 public static String LoginRedisPrefix = "HXGK_GO_ZhixingCollege:ScanCode:Authentication:LoginApi_dev_"; @@ -49,11 +49,11 @@ public class PublicConfig { * @param userToken 待获取人员 * @return */ - public static List findDepartmentHeadByUser(Integer maindeparment, String userKey, String userToken) { + public static List findDepartmentHeadByUser(Long maindeparment, String userKey, String userToken) { List userByPortList = new ArrayList<>(); - if (Integer.compare(maindeparment, 361) == 0) { + if (Long.compare(maindeparment, 361) == 0) { // 如果申请人部门为仓储 - UserByPort userByPort = FindUserById(119, userKey, userToken); + UserByPort userByPort = FindUserById(119L, userKey, userToken); userByPortList.add(userByPort); return userByPortList; } @@ -95,7 +95,7 @@ public class PublicConfig { * @param positionName 查询职位 * @return */ - public static List findUserByAdminorgAndPosition(Integer maindepartment, String positionName, String userKey, String userToken) { + public static List findUserByAdminorgAndPosition(Long maindepartment, String positionName, String userKey, String userToken) { List userByPortList = new ArrayList<>(); String url = PublicConfig.external_url + "/org/positionlist"; Map map = new HashMap<>(); @@ -129,7 +129,7 @@ public class PublicConfig { if (emptype > 10) { continue; } - if (Integer.compare(userByPort.getPosition(), position.getId()) == 0) { + if (Long.compare(userByPort.getPosition(), position.getId()) == 0) { userByPortList.add(userByPort); } @@ -178,7 +178,7 @@ public class PublicConfig { } // 获取当前登录用户所在部门的企业微信id - public static JSONObject getUserPortByQyWx(Integer mainPortId) { + public static JSONObject getUserPortByQyWx(Long mainPortId) { String url = external_url + "/org/getgovcont"; Map map = new HashMap<>(); map.put("id", mainPortId); @@ -329,7 +329,7 @@ public class PublicConfig { * @param userToken 登录用户 * @return 查询结果 */ - public static UserByPort FindUserById(Integer id, String userKey, String userToken) { + public static UserByPort FindUserById(Long id, String userKey, String userToken) { String url = external_url + "/staff/archivescont"; Map map = new HashMap<>(); map.put("id", id); @@ -346,7 +346,7 @@ public class PublicConfig { JSONObject data = (JSONObject) jsonObject.get("data"); UserByPort userByPort = JSONObject.toJavaObject(data, UserByPort.class); if ("300732".equals(userByPort.getNumber())) { - userByPort.setMaindeparment(361); + userByPort.setMaindeparment(361L); userByPort.setMaindeparmentname("仓储中心"); } @@ -360,7 +360,7 @@ public class PublicConfig { * @param userToken 登录用户 * @return 查询结果 */ - public static List FindUserByAdminorg(Integer id, String userKey, String userToken) { + public static List FindUserByAdminorg(Long id, String userKey, String userToken) { String url = external_url + "/staff/archiveslist"; Map map = new HashMap<>(); map.put("adminorg", id); @@ -393,7 +393,7 @@ public class PublicConfig { * @param * @return 查询结果 */ - public static Administration getCompany(Integer id, String userKey, String userToken) { + public static Administration getCompany(Long id, String userKey, String userToken) { String url = external_url + "/org/getgovcont"; Map map = new HashMap<>(); map.put("id", id); @@ -453,7 +453,7 @@ public class PublicConfig { * @param * @return 查询结果 */ - public static Post findPostById(Integer id, String userKey, String userToken) { + public static Post findPostById(Long id, String userKey, String userToken) { String url = external_url + "/org/getpositioncont"; Map map = new HashMap<>(); map.put("id", id); diff --git a/src/main/java/com/dreamchaser/depository_manage/controller/CompanyController.java b/src/main/java/com/dreamchaser/depository_manage/controller/CompanyController.java index aed58cfd..fed060c5 100644 --- a/src/main/java/com/dreamchaser/depository_manage/controller/CompanyController.java +++ b/src/main/java/com/dreamchaser/depository_manage/controller/CompanyController.java @@ -384,7 +384,7 @@ public class CompanyController { } UserByPort userToken = AuthenticationTokenPool.getUserToken(token); Map userParam = new HashMap<>(); - Integer postId = ObjectFormatUtil.toInteger(map.get("postId")); + Long postId = ObjectFormatUtil.toLong(map.get("postId")); userParam.put("position", postId); List userByPortList = PublicConfig.FindUserByMap(userParam, userKey,token); Post postById = PublicConfig.findPostById(postId, userKey,token); diff --git a/src/main/java/com/dreamchaser/depository_manage/controller/DepositoryController.java b/src/main/java/com/dreamchaser/depository_manage/controller/DepositoryController.java index c7b68e9c..b55b9f3f 100644 --- a/src/main/java/com/dreamchaser/depository_manage/controller/DepositoryController.java +++ b/src/main/java/com/dreamchaser/depository_manage/controller/DepositoryController.java @@ -145,12 +145,12 @@ public class DepositoryController { String finalUserKey = userKey; String finalToken = token; if (map.containsKey("id")) { - Integer id = ObjectFormatUtil.toInteger(map.get("id")); + Long id = ObjectFormatUtil.toLong(map.get("id")); HandlesOtherFunctionalThreadPool.execute(() -> RealDeleteSonDepository(id.toString(), finalUserKey, finalToken)); return CrudUtil.deleteHandle(depositoryService.deleteDepositoryRecordById(id), 1); } else if (map.containsKey("ids")) { - List ids = ObjectFormatUtil.objToList(map.get("ids"), Integer.class); - for (Integer integer : ids) { + List ids = ObjectFormatUtil.objToList(map.get("ids"), Long.class); + for (Long integer : ids) { String id = integer.toString(); HandlesOtherFunctionalThreadPool.execute(() -> RealDeleteSonDepository(id, finalUserKey, finalToken)); } @@ -171,7 +171,7 @@ public class DepositoryController { // 获取当前仓库所有子仓库 List depositoryRecordPByCondition = depositoryService.findDepositoryByCondition(param, userKey, token); for (Depository depository : depositoryRecordPByCondition) { - Integer id = depository.getId(); // 获取当前仓库id + Long id = depository.getId(); // 获取当前仓库id RealDeleteSonDepository(id.toString(), userKey, token); // 递归查询仓库 depositoryService.deleteDepositoryRecordById(id); // 删除仓库 } @@ -208,9 +208,9 @@ public class DepositoryController { token = (String) request.getSession().getAttribute("userToken"); } UserByPort userToken = AuthenticationTokenPool.getUserToken(token); - Integer maindeparment = userToken.getMaindeparment(); + Long maindeparment = userToken.getMaindeparment(); // 获取当前用户是否存在可见仓库 - Map depositoryAllNameAndId = new HashMap<>(); + Map depositoryAllNameAndId = new HashMap<>(); if (PublicConfig.roleAdminorgList.contains(maindeparment)) { depositoryAllNameAndId = depositoryService.findAllDepositoryNameAndId(); } else { @@ -237,13 +237,13 @@ public class DepositoryController { String finalUserKey = userKey; String finalToken = token; if (map.containsKey("id")) { - Integer id = ObjectFormatUtil.toInteger(map.get("id")); + Long id = ObjectFormatUtil.toLong(map.get("id")); HandlesOtherFunctionalThreadPool.execute(() -> UpdateSonState(id.toString(), 3, true, finalUserKey, finalToken)); return CrudUtil.deleteHandle(depositoryService.changeStateToDeletedById(id), 1); } else if (map.containsKey("ids")) { - List ids = ObjectFormatUtil.objToList(map.get("ids"), Integer.class); - for (Integer integer : ids) { + List ids = ObjectFormatUtil.objToList(map.get("ids"), Long.class); + for (Long integer : ids) { String id = integer.toString(); HandlesOtherFunctionalThreadPool.execute(() -> UpdateSonState(id, 3, true, finalUserKey, finalToken)); } @@ -317,7 +317,7 @@ public class DepositoryController { // 获取当前仓库所有子仓库 List depositoryRecordPByCondition = depositoryService.findDepositoryByCondition(param, userKey, token); for (Depository depository : depositoryRecordPByCondition) { - int depositoryId = depository.getId(); + Long depositoryId = depository.getId(); UpdateSonState(String.valueOf(depositoryId), state, envelop, userKey, token); Map map = new HashMap<>(); map.put("id", depositoryId); @@ -386,7 +386,7 @@ public class DepositoryController { show_weekday.add("周日"); // 获取各仓库名称以及id - Map depositoryAllNameAndId = new HashMap<>(); + Map depositoryAllNameAndId = new HashMap<>(); if (PublicConfig.roleAdminorgList.contains(userByPort.getMaindeparment())) { depositoryAllNameAndId = depositoryService.findAllDepositoryNameAndId(); } else { @@ -483,7 +483,7 @@ public class DepositoryController { show_weekday.add("周日"); // 获取各仓库名称以及id - Map depositoryAllNameAndId = new HashMap<>(); + Map depositoryAllNameAndId = new HashMap<>(); if (PublicConfig.roleAdminorgList.contains(userByPort.getMaindeparment())) { depositoryAllNameAndId = depositoryService.findAllDepositoryNameAndId(); } else { @@ -529,7 +529,7 @@ public class DepositoryController { show_weekday.add("周日"); // 获取各仓库名称以及id - Map depositoryAllNameAndId = new HashMap<>(); + Map depositoryAllNameAndId = new HashMap<>(); if (PublicConfig.roleAdminorgList.contains(userByPort.getMaindeparment())) { depositoryAllNameAndId = depositoryService.findAllDepositoryNameAndId(); } else { @@ -649,7 +649,7 @@ public class DepositoryController { } // 获取面积图图数据 - public Map getLineChartData(Map depositoryAllNameAndId, String type, String barOrLine) { + public Map getLineChartData(Map depositoryAllNameAndId, String type, String barOrLine) { // 获取遍历器 Iterator it = depositoryAllNameAndId.keySet().iterator(); @@ -790,7 +790,7 @@ public class DepositoryController { for (Depository depository : depositoryList ) { // 获取当前仓库id - Integer depositoryId = depository.getId(); + Long depositoryId = depository.getId(); // 判断当前当前仓库各物料类型的库存是否存在 List inventoryByMTAndDepositories = inventoryForMTAndDepository.get(depositoryId); if (inventoryByMTAndDepositories == null || inventoryByMTAndDepositories.size() == 0) { @@ -856,7 +856,7 @@ public class DepositoryController { token = (String) request.getSession().getAttribute("userToken"); userKey = (String) request.getSession().getAttribute("userKey"); } - Material materialById = materialService.findMaterialById(ObjectFormatUtil.toInteger(mid)); + Material materialById = materialService.findMaterialById(ObjectFormatUtil.toLong(mid)); Map param = new HashMap<>(); param.put("depositoryId", materialById.getDepositoryId()); List depositoryId = depositoryService.findDepositoryByCondition(param, userKey, token); @@ -918,9 +918,9 @@ public class DepositoryController { return true; } // 查询当前仓库 - Depository depositoryById = depositoryService.findDepositoryById(ObjectFormatUtil.toInteger(did.trim())); + Depository depositoryById = depositoryService.findDepositoryById(ObjectFormatUtil.toLong(did.trim())); // 查询当前仓库及子仓库 - List childForDepositoryByParent = findChildForDepositoryByParent(depositoryById); + List childForDepositoryByParent = findChildForDepositoryByParent(depositoryById); List depositories = depositoryService.selectDepositoryRecordByIds(childForDepositoryByParent); for (Depository depository : depositories) { String depositoryId = depository.getId().toString(); @@ -1005,7 +1005,7 @@ public class DepositoryController { List roleAndDepositoryByCondition = roleService.findRoleAndDepositoryByCondition(paramForUserManager); for (RoleAndDepository roleAndDepository : roleAndDepositoryByCondition) { int classes = roleAndDepository.getClasses(); - Integer userId = roleAndDepository.getUserId(); + Long userId = roleAndDepository.getUserId(); if (classes == 1) { // 如果是对人设置的权限 UserByPort userByPort = PublicConfig.FindUserById(userId, userKey, token); @@ -1059,7 +1059,7 @@ public class DepositoryController { // 构造库位树 @GetMapping("/treeMenus_Place") - public RestResponse InitTreeMenus_Place(@RequestParam(value = "depositoryId") Integer depositoryId) { + public RestResponse InitTreeMenus_Place(@RequestParam(value = "depositoryId") Long depositoryId) { List list = new ArrayList<>(); list = depositoryService.InitTreeMenus_Place(depositoryId); return new RestResponse(list); @@ -1074,7 +1074,7 @@ public class DepositoryController { // 根据id获取仓库信息 @GetMapping("/findDepositoryByDid") - public RestResponse findDepositoryByDid(@RequestParam(value = "depositoryId") Integer depositoryId) { + public RestResponse findDepositoryByDid(@RequestParam(value = "depositoryId") Long depositoryId) { Depository depositoryRecordById = depositoryService.findDepositoryById(depositoryId); return new RestResponse(depositoryRecordById); } @@ -1092,7 +1092,7 @@ public class DepositoryController { depositoryAndRole.addAll(roleService.findDepositoryAndRole(userToken.getPosition())); // 查询当前用户部门拥有的仓库 List depositoryByAdminorg = depositoryService.findDepositoryByAdminorg(userToken.getMaindeparment().toString()); - List depositoryIdList = new ArrayList<>(); + List depositoryIdList = new ArrayList<>(); for (Depository depository : depositoryByAdminorg ) { depositoryIdList.add(depository.getId()); @@ -1117,7 +1117,7 @@ public class DepositoryController { public RestResponse createQrCode(@RequestBody Map map) { - Integer depositoryId = ObjectFormatUtil.toInteger(map.get("depositoryId")); + Long depositoryId = ObjectFormatUtil.toLong(map.get("depositoryId")); Depository depository = depositoryService.findDepositoryById(depositoryId); String qrCode = depositoryService.findQrCodeByDepository(depository.getId()); try { @@ -1138,7 +1138,7 @@ public class DepositoryController { @GetMapping("/allBarCodeImgForDepository") public void allBarCodeImgForDepository(@RequestParam Map map, HttpServletRequest request, HttpServletResponse response) { // 获取当前仓库id - Integer id = ObjectFormatUtil.toInteger(map.get("id")); + Long id = ObjectFormatUtil.toLong(map.get("id")); // 获取当前仓库 Depository depository = depositoryService.findDepositoryById(id); List placeByDid = placeService.findPlaceByDid(depository.getId()); @@ -1243,7 +1243,7 @@ public class DepositoryController { */ @PostMapping("/findWarehouseVisiblePermission") public RestResponse findWarehouseVisiblePermission(@RequestBody Map map) { - List list = roleService.findDepositoryIdForWarehouseVisiblePermissionByCondition(map); + List list = roleService.findDepositoryIdForWarehouseVisiblePermissionByCondition(map); return new RestResponse(list); } @@ -1272,12 +1272,12 @@ public class DepositoryController { * @param d 待查询仓库 * @return */ - public List findChildForDepositoryByParent(Depository d) { + public List findChildForDepositoryByParent(Depository d) { // 用于存储最终返回结果 - List result = new ArrayList<>(); + List result = new ArrayList<>(); result.add(d.getId()); // 父级 - List parentId = new ArrayList<>(); + List parentId = new ArrayList<>(); parentId.add(d.getId()); // 查询所有仓库正常使用的仓库 List depositoryAll = depositoryService.findDepositoryAll(); @@ -1297,8 +1297,8 @@ public class DepositoryController { * @param id 待判断id * @return */ - public Boolean isTrueForParent(List parentList, Integer id) { - for (Integer aLong : parentList) { + public Boolean isTrueForParent(List parentList, Long id) { + for (Long aLong : parentList) { if (Long.compare(aLong, id) == 0) { return true; } @@ -1313,7 +1313,7 @@ public class DepositoryController { * @return */ Map getBarChartData(UserByPort userByPort) { - Map depositoryAllNameAndId = new HashMap<>(); + Map depositoryAllNameAndId = new HashMap<>(); if (PublicConfig.roleAdminorgList.contains(userByPort.getMaindeparment())) { depositoryAllNameAndId = depositoryService.findAllDepositoryNameAndId(); } else { @@ -1352,7 +1352,7 @@ public class DepositoryController { * @return */ // 获取柱状图数据 - public Map getInventoryLineChartData(Map depositoryAllNameAndId) { + public Map getInventoryLineChartData(Map depositoryAllNameAndId) { // 每天各仓库入库数目 Map show_data = new HashMap<>(); @@ -1369,7 +1369,7 @@ public class DepositoryController { while (it.hasNext()) { String key = it.next().toString(); - Integer val = depositoryAllNameAndId.get(key); + Long val = depositoryAllNameAndId.get(key); String dname = key.split(",")[0]; Double inventoryByDname = getInventoryByDname(dname, toDayInventoryByDName); Map map = new HashMap<>(); @@ -1441,9 +1441,9 @@ public class DepositoryController { DepositoryService depositoryService; // 操作depository的service DepositoryRecordService depositoryRecordService; // 操作订单的service Map todayInventory; // 当前仓库的额度 - Map depositoryAllNameAndId; // 仓库名称与仓库id的映射 + Map depositoryAllNameAndId; // 仓库名称与仓库id的映射 - distributeTasks(Map depositoryAllNameAndId, String type, int taskType, UserByPort userByPort, List depositoryName) { + distributeTasks(Map depositoryAllNameAndId, String type, int taskType, UserByPort userByPort, List depositoryName) { this.depositoryAllNameAndId = depositoryAllNameAndId;// 仓库名称与仓库id映射 this.taskType = taskType; // 任务类型 this.type = type; // 请求类型 @@ -1585,11 +1585,11 @@ public class DepositoryController { class getApplicationRecordByDate implements Callable { String key; List days; - Map depositoryAllNameAndId; + Map depositoryAllNameAndId; String type; - getApplicationRecordByDate(String type, String key, List days, Map depositoryAllNameAndId) { + getApplicationRecordByDate(String type, String key, List days, Map depositoryAllNameAndId) { this.key = key; this.depositoryAllNameAndId = depositoryAllNameAndId; this.days = days; @@ -1598,7 +1598,7 @@ public class DepositoryController { @Override public Object call() throws Exception { - Map result = new HashMap<>(); + Map result = new HashMap<>(); Map map = new HashMap<>(); map.put("type", "line"); Map areaStyleItem = new HashMap<>(); @@ -1606,7 +1606,7 @@ public class DepositoryController { int i; List drCountbyDrName = new ArrayList<>(); - Integer val = (Integer) depositoryAllNameAndId.get(key); + Long val = (Long) depositoryAllNameAndId.get(key); for (i = days.size() - 1; i > 0; i--) { // 遍历 Map并计算各仓库的入库数 // 获取一段时间内的库存额度 @@ -1626,11 +1626,11 @@ public class DepositoryController { class GetBarChartData implements Callable { // 仓库名称与id对应 - Map depositoryAllNameAndId; + Map depositoryAllNameAndId; // 要查询的类型 String type; - public GetBarChartData(Map depositoryAllNameAndId, String type) { + public GetBarChartData(Map depositoryAllNameAndId, String type) { this.depositoryAllNameAndId = depositoryAllNameAndId; this.type = type; } @@ -1657,13 +1657,13 @@ public class DepositoryController { class getBarChartDataForApplicationRecord implements Callable { String key; List days; - Map depositoryAllNameAndId; + Map depositoryAllNameAndId; String type; - getBarChartDataForApplicationRecord(String type, String key, List days, Map depositoryAllNameAndId) { + getBarChartDataForApplicationRecord(String type, String key, List days, Map depositoryAllNameAndId) { this.key = key; this.depositoryAllNameAndId = depositoryAllNameAndId; this.days = days; @@ -1673,7 +1673,7 @@ public class DepositoryController { @Override public Object call() throws Exception { - Map result = new HashMap<>(); + Map result = new HashMap<>(); Map map = new HashMap<>(); map.put("type", "bar"); Map emphasisItem = new HashMap<>(); @@ -1691,7 +1691,7 @@ public class DepositoryController { int i; List drCountbyDrName = new ArrayList<>(); - Integer val = depositoryAllNameAndId.get(key); + Long val = depositoryAllNameAndId.get(key); for (i = days.size() - 1; i > 0; i--) { // 遍历 Map并计算各仓库的入库数 // 获取一段时间内的库存额度 @@ -1713,11 +1713,11 @@ public class DepositoryController { class getInventoryByDate implements Callable { String key; List days; - Map depositoryAllNameAndId; + Map depositoryAllNameAndId; List inventoryByDnameList; - getInventoryByDate(String key, List days, Map depositoryAllNameAndId, List inventoryByDnameList) { + getInventoryByDate(String key, List days, Map depositoryAllNameAndId, List inventoryByDnameList) { this.key = key; this.depositoryAllNameAndId = depositoryAllNameAndId; this.days = days; @@ -1726,7 +1726,7 @@ public class DepositoryController { @Override public Object call() throws Exception { - Map result = new HashMap<>(); + Map result = new HashMap<>(); Map map = new HashMap<>(); map.put("type", "line"); Map areaStyleItem = new HashMap<>(); @@ -1739,7 +1739,7 @@ public class DepositoryController { Double inventoryByDname = getInventoryByDname(dname, inventoryByDnameList); // 将当前仓库的库存添加到结果集中 drCountbyDrName.add(inventoryByDname); - Integer val = (Integer) depositoryAllNameAndId.get(key); + Long val = (Long) depositoryAllNameAndId.get(key); SimpleDateFormat formatter = new SimpleDateFormat("yyyy-MM-dd"); boolean flag = false; // 判断当天是否有出入口记录 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 645fd056..e12d56e1 100644 --- a/src/main/java/com/dreamchaser/depository_manage/controller/DepositoryRecordController.java +++ b/src/main/java/com/dreamchaser/depository_manage/controller/DepositoryRecordController.java @@ -190,7 +190,7 @@ public class DepositoryRecordController { continue; } // 获取数据库中子订单信息 - ApplicationOutRecordMinP applicationOutMinById = depositoryRecordService.findApplicationOutMinById(ObjectFormatUtil.toInteger(minRecordId.trim())); + ApplicationOutRecordMinP applicationOutMinById = depositoryRecordService.findApplicationOutMinById(ObjectFormatUtil.toLong(minRecordId.trim())); // 获取仓库信息 Depository depositoryRecordById = depositoryService.findDepositoryById(applicationOutMinById.getDepositoryId()); // 获取子订单对应主订单 @@ -220,7 +220,7 @@ public class DepositoryRecordController { } UserByPort userToken = AuthenticationTokenPool.getUserToken(token); map.put("applicantId", userToken.getId()); - Integer depositoryId = ObjectFormatUtil.toInteger(map.get("depositoryId")); + Long depositoryId = ObjectFormatUtil.toLong(map.get("depositoryId")); Depository depository = depositoryService.findDepositoryById(depositoryId); return CrudUtil.insertHandle(depositoryRecordService.apply(map), 1); @@ -245,11 +245,11 @@ public class DepositoryRecordController { map.put("applicantId", userToken.getId()); Map result = new HashMap<>(); // 定义列表用于储存入库单id - List recordIds = new ArrayList<>(); + List recordIds = new ArrayList<>(); // 定义列表用于存储入库物料类型id List mtIdList = new ArrayList<>(); // 定义列表用于存储入库仓库id - List depositoryIdList = new ArrayList<>(); + List depositoryIdList = new ArrayList<>(); List typeList = new ArrayList<>(); @@ -262,10 +262,10 @@ public class DepositoryRecordController { Integer addSplitInventory = splitUnitService.addSplitInventory(map); if (addSplitInventory != -1) { integer += addSplitInventory; - recordIds.add(ObjectFormatUtil.toInteger(map.get("applicationInId"))); + recordIds.add(ObjectFormatUtil.toLong(map.get("applicationInId"))); mtIdList.add(ObjectFormatUtil.toLong(map.get("mtId"))); typeList.add((String) map.get("inType")); - depositoryIdList.add(ObjectFormatUtil.toInteger(map.get("depositoryId"))); + depositoryIdList.add(ObjectFormatUtil.toLong(map.get("depositoryId"))); } } else { // 获取库位id @@ -273,18 +273,18 @@ public class DepositoryRecordController { if (placeId == 0) {// 如果插入到仓库 map.put("placeId", 0); // 到默认库位 integer += depositoryRecordService.applicationInPlace(map, false); - recordIds.add(ObjectFormatUtil.toInteger(map.get("applicationInId"))); + recordIds.add(ObjectFormatUtil.toLong(map.get("applicationInId"))); mtIdList.add(ObjectFormatUtil.toLong(map.get("mtId"))); typeList.add((String) map.get("inType")); - depositoryIdList.add(ObjectFormatUtil.toInteger(map.get("depositoryId"))); + depositoryIdList.add(ObjectFormatUtil.toLong(map.get("depositoryId"))); } else { // 如果具体到库位 Integer flag = depositoryRecordService.applicationInPlace(map, false); if (flag != -1) { integer += flag; - recordIds.add(ObjectFormatUtil.toInteger(map.get("applicationInId"))); + recordIds.add(ObjectFormatUtil.toLong(map.get("applicationInId"))); mtIdList.add(ObjectFormatUtil.toLong(map.get("mtId"))); typeList.add((String) map.get("inType")); - depositoryIdList.add(ObjectFormatUtil.toInteger(map.get("depositoryId"))); + depositoryIdList.add(ObjectFormatUtil.toLong(map.get("depositoryId"))); } } } @@ -312,10 +312,10 @@ public class DepositoryRecordController { Integer addSplitInventory = splitUnitService.addSplitInventory(insert); if (addSplitInventory != -1) { integer += addSplitInventory; - recordIds.add(ObjectFormatUtil.toInteger(insert.get("applicationInId"))); + recordIds.add(ObjectFormatUtil.toLong(insert.get("applicationInId"))); mtIdList.add(ObjectFormatUtil.toLong(map.get("mtId"))); typeList.add((String) map.get("inType")); - depositoryIdList.add(ObjectFormatUtil.toInteger(map.get("depositoryId"))); + depositoryIdList.add(ObjectFormatUtil.toLong(map.get("depositoryId"))); successMsg.add(insert); } else { errMsg.add(insert); @@ -329,10 +329,10 @@ public class DepositoryRecordController { } else { integer += add; successMsg.add(insert); - recordIds.add(ObjectFormatUtil.toInteger(insert.get("applicationInId"))); + recordIds.add(ObjectFormatUtil.toLong(insert.get("applicationInId"))); mtIdList.add(ObjectFormatUtil.toLong(map.get("mtId"))); typeList.add((String) map.get("inType")); - depositoryIdList.add(ObjectFormatUtil.toInteger(map.get("depositoryId"))); + depositoryIdList.add(ObjectFormatUtil.toLong(map.get("depositoryId"))); } } else {// 如果具体到库位 @@ -343,10 +343,10 @@ public class DepositoryRecordController { errMsg.add(insert); } else { integer += flag; - recordIds.add(ObjectFormatUtil.toInteger(insert.get("applicationInId"))); + recordIds.add(ObjectFormatUtil.toLong(insert.get("applicationInId"))); mtIdList.add(ObjectFormatUtil.toLong(map.get("mtId"))); typeList.add((String) map.get("inType")); - depositoryIdList.add(ObjectFormatUtil.toInteger(map.get("depositoryId"))); + depositoryIdList.add(ObjectFormatUtil.toLong(map.get("depositoryId"))); } } @@ -359,10 +359,10 @@ public class DepositoryRecordController { if (addSplitInventory != -1) { integer += addSplitInventory; successMsg.add(map); - recordIds.add(ObjectFormatUtil.toInteger(map.get("applicationInId"))); + recordIds.add(ObjectFormatUtil.toLong(map.get("applicationInId"))); mtIdList.add(ObjectFormatUtil.toLong(map.get("mtId"))); typeList.add((String) map.get("inType")); - depositoryIdList.add(ObjectFormatUtil.toInteger(map.get("depositoryId"))); + depositoryIdList.add(ObjectFormatUtil.toLong(map.get("depositoryId"))); } else { errMsg.add(map); } @@ -377,10 +377,10 @@ public class DepositoryRecordController { } else { integer += add; successMsg.add(map); - recordIds.add(ObjectFormatUtil.toInteger(map.get("applicationInId"))); + recordIds.add(ObjectFormatUtil.toLong(map.get("applicationInId"))); mtIdList.add(ObjectFormatUtil.toLong(map.get("mtId"))); typeList.add((String) map.get("inType")); - depositoryIdList.add(ObjectFormatUtil.toInteger(map.get("depositoryId"))); + depositoryIdList.add(ObjectFormatUtil.toLong(map.get("depositoryId"))); } } else { // 如果具体到库位 @@ -390,10 +390,10 @@ public class DepositoryRecordController { errMsg.add(map); } else { integer += flag; - recordIds.add(ObjectFormatUtil.toInteger(map.get("applicationInId"))); + recordIds.add(ObjectFormatUtil.toLong(map.get("applicationInId"))); mtIdList.add(ObjectFormatUtil.toLong(map.get("mtId"))); typeList.add((String) map.get("inType")); - depositoryIdList.add(ObjectFormatUtil.toInteger(map.get("depositoryId"))); + depositoryIdList.add(ObjectFormatUtil.toLong(map.get("depositoryId"))); } } } @@ -406,17 +406,17 @@ public class DepositoryRecordController { String finalUserKey = userKey; String finalToken = token; SendQyWxMessageThreadPool.execute(() -> { - Map> MtIdToRecordId = new HashMap<>(); - Map> depositoryIdToRecordId = new HashMap<>(); + Map> MtIdToRecordId = new HashMap<>(); + Map> depositoryIdToRecordId = new HashMap<>(); for (int i = 0; i < recordIds.size(); i++) { - Integer recordId = recordIds.get(i); + Long recordId = recordIds.get(i); if (recordId != null) { // 如果当前id不是空 获取对应的入库仓库id String type = typeList.get(i); if ("mt".equals(type)) { Long mtId = mtIdList.get(i); // 将对应仓库与订单id添加映射关系 - List integers = MtIdToRecordId.get(mtId); + List integers = MtIdToRecordId.get(mtId); if (integers != null) { // 如果有对应关系 integers.add(recordId); @@ -427,9 +427,9 @@ public class DepositoryRecordController { MtIdToRecordId.put(mtId, integers); } } else { - Integer did = depositoryIdList.get(i); + Long did = depositoryIdList.get(i); // 将对应仓库与订单id添加映射关系 - List integers = depositoryIdToRecordId.get(did); + List integers = depositoryIdToRecordId.get(did); if (integers != null) { // 如果有对应关系 integers.add(recordId); @@ -451,7 +451,7 @@ public class DepositoryRecordController { // 获取当前类别 Long next = iterator.next(); // 获取入库到当前仓库的订单id - List integerList = MtIdToRecordId.get(next); + List integerList = MtIdToRecordId.get(next); // 获取当前类型的管理员 List materialTypeIdForIn = roleService.findRoleAndMaterialTypeByMtId(next); // 用于存储当前仓库的管理员企业微信userId @@ -460,7 +460,7 @@ public class DepositoryRecordController { ) { int classes = mt.getClasses(); - Integer uid = mt.getUid(); + Long uid = mt.getUid(); if (classes == 1) { // 如果是个人 @@ -506,12 +506,12 @@ public class DepositoryRecordController { redisPool.getRedisTemplateByDb(14).expire("wms_QyWxMessage_" + sp_no, 7, TimeUnit.DAYS); } - Iterator iterator1 = depositoryIdToRecordId.keySet().iterator(); + Iterator iterator1 = depositoryIdToRecordId.keySet().iterator(); if (iterator1.hasNext()) { // 获取当前类别 - Integer next = iterator1.next(); + Long next = iterator1.next(); // 获取入库到当前仓库的订单id - List integerList = depositoryIdToRecordId.get(next); + List integerList = depositoryIdToRecordId.get(next); // 获取当前类型的管理员 List materialTypeIdForIn = roleService.findRoleAndDepositoryByDid(next); // 用于存储当前仓库的管理员企业微信userId @@ -521,7 +521,7 @@ public class DepositoryRecordController { int classes = mt.getClasses(); - Integer uid = mt.getUserId(); + Long uid = mt.getUserId(); if (classes == 1) { // 如果是个人 @@ -647,7 +647,7 @@ public class DepositoryRecordController { // 开启一个线程开启审批 SendQyWxMessageThreadPool.execute(() -> { - JSONObject jsonObject = qyWxOperationService.sendOutApprovalTemplate(crypt, userToken, ObjectFormatUtil.toInteger(id), finalUserkey, finalUsertoken); + JSONObject jsonObject = qyWxOperationService.sendOutApprovalTemplate(crypt, userToken, ObjectFormatUtil.toLong(id), finalUserkey, finalUsertoken); String sp_no = jsonObject.getString("sp_no"); Map QyWxApprovalMap = new HashMap<>(); QyWxApprovalMap.put("sp_no", sp_no); @@ -703,7 +703,7 @@ public class DepositoryRecordController { // 开启一个线程开启审批 SendQyWxMessageThreadPool.execute(() -> { - JSONObject jsonObject = qyWxOperationService.sendOutApprovalTemplate(crypt, userToken, ObjectFormatUtil.toInteger(id), finalUserkey, finalUsertoken); + JSONObject jsonObject = qyWxOperationService.sendOutApprovalTemplate(crypt, userToken, ObjectFormatUtil.toLong(id), finalUserkey, finalUsertoken); String sp_no = jsonObject.getString("sp_no"); Map QyWxApprovalMap = new HashMap<>(); QyWxApprovalMap.put("sp_no", sp_no); @@ -743,7 +743,7 @@ public class DepositoryRecordController { Object userId = map.get("userId"); if (userId != null) { - UserByPort userByPort = PublicConfig.FindUserById(ObjectFormatUtil.toInteger(userId), userkey, usertoken); + UserByPort userByPort = PublicConfig.FindUserById(ObjectFormatUtil.toLong(userId), userkey, usertoken); // 获取用户的用工关系 int emptype = userByPort.getEmptype(); if (emptype <= 10) { @@ -751,7 +751,7 @@ public class DepositoryRecordController { map.put("depositoryManager", userToken.getId()); } } else { - List departmentHeadByUsers = PublicConfig.findDepartmentHeadByUser(ObjectFormatUtil.toInteger(map.get("adminorgId")), userkey, usertoken); + List departmentHeadByUsers = PublicConfig.findDepartmentHeadByUser(ObjectFormatUtil.toLong(map.get("adminorgId")), userkey, usertoken); StringBuilder departmentHeadId = new StringBuilder(); for (UserByPort departmentHeadByUser : departmentHeadByUsers) { departmentHeadId.append(departmentHeadByUser.getId()).append(","); @@ -784,7 +784,7 @@ public class DepositoryRecordController { // 开启一个线程开启审批 SendQyWxMessageThreadPool.execute(() -> { - JSONObject jsonObject = qyWxOperationService.sendOutApprovalTemplateForImmediately(crypt, userToken, ObjectFormatUtil.toInteger(id), finalUserkey, finalUsertoken); + JSONObject jsonObject = qyWxOperationService.sendOutApprovalTemplateForImmediately(crypt, userToken, ObjectFormatUtil.toLong(id), finalUserkey, finalUsertoken); String sp_no = jsonObject.getString("sp_no"); Map QyWxApprovalMap = new HashMap<>(); QyWxApprovalMap.put("sp_no", sp_no); @@ -839,7 +839,7 @@ public class DepositoryRecordController { // 开启一个线程开启审批 SendQyWxMessageThreadPool.execute(() -> { - JSONObject jsonObject = qyWxOperationService.sendOutApprovalTemplateForImmediately(crypt, userToken, ObjectFormatUtil.toInteger(id), finalUserkey, finalUsertoken); + JSONObject jsonObject = qyWxOperationService.sendOutApprovalTemplateForImmediately(crypt, userToken, ObjectFormatUtil.toLong(id), finalUserkey, finalUsertoken); String sp_no = jsonObject.getString("sp_no"); Map QyWxApprovalMap = new HashMap<>(); QyWxApprovalMap.put("sp_no", sp_no); @@ -875,12 +875,12 @@ public class DepositoryRecordController { UserByPort userToken = AuthenticationTokenPool.getUserToken(token); List list = new ArrayList<>(); Integer recordPCount = 0; - Integer maindeparment = userToken.getMaindeparment(); + Long maindeparment = userToken.getMaindeparment(); if (map.containsKey("depositoryId")) { // 如果包含仓库id - Integer depositoryId = ObjectFormatUtil.toInteger(map.get("depositoryId")); + Long depositoryId = ObjectFormatUtil.toLong(map.get("depositoryId")); // 获取当前仓库下所有可见的仓库 - List allChildDepositoryById = depositoryService.findAllChildDepositoryById(depositoryId, userToken); + List allChildDepositoryById = depositoryService.findAllChildDepositoryById(depositoryId, userToken); if (allChildDepositoryById.size() > 0) { map.put("depositoryIdList", allChildDepositoryById); map.remove("depositoryId"); @@ -908,7 +908,7 @@ public class DepositoryRecordController { @GetMapping("/ApplicationOutMinByDid") public RestResponse ApplicationOutMinByDid(@RequestParam Map map, HttpServletRequest request) { List applicationOutRecordMinList = new ArrayList<>(); - Integer depositoryId = ObjectFormatUtil.toInteger(map.get("depositoryId")); + Long depositoryId = ObjectFormatUtil.toLong(map.get("depositoryId")); // 0未完成1已完成 Integer stateOnView = ObjectFormatUtil.toInteger(map.get("state")); String token = request.getHeader("user-token"); @@ -956,9 +956,9 @@ public class DepositoryRecordController { // 获取子订单编码 String minRecordId = s.split(":")[1]; // 获取数据库中子订单信息 - ApplicationOutRecordMinP applicationOutMinById = depositoryRecordService.findApplicationOutMinById(ObjectFormatUtil.toInteger(minRecordId)); + ApplicationOutRecordMinP applicationOutMinById = depositoryRecordService.findApplicationOutMinById(ObjectFormatUtil.toLong(minRecordId)); // 如果该子订单仓库是当前仓库 - if (Integer.compare(applicationOutMinById.getDepositoryId(), depositoryId) == 0) { + if (Long.compare(applicationOutMinById.getDepositoryId(), depositoryId) == 0) { // 获取子订单对应主订单 ApplicationOutRecordP applicationOutRecordPById = depositoryRecordService.findApplicationOutRecordPById(applicationOutMinById.getParentId()); @@ -990,7 +990,7 @@ public class DepositoryRecordController { // 获取当前出库库位 Place placeByDid = placeService.findPlaceById(applicationOutMinById.getPlaceId()); // 获取当前子订单处理人编号 - Integer checkId = applicationOutMinById.getCheckId(); + Long checkId = applicationOutMinById.getCheckId(); if (checkId != null) { // 如果该订单已经处理 // 获取处理人 @@ -1046,12 +1046,12 @@ public class DepositoryRecordController { // 获取对应主订单 List list = new ArrayList<>(); Integer countBy = 0; - Integer maindeparment = userByPort.getMaindeparment(); + Long maindeparment = userByPort.getMaindeparment(); if (map.containsKey("depositoryId")) { // 如果包含仓库id - Integer depositoryId = ObjectFormatUtil.toInteger(map.get("depositoryId")); + Long depositoryId = ObjectFormatUtil.toLong(map.get("depositoryId")); // 获取当前仓库下所有可见的仓库 - List allChildDepositoryById = depositoryService.findAllChildDepositoryById(depositoryId, userByPort); + List allChildDepositoryById = depositoryService.findAllChildDepositoryById(depositoryId, userByPort); if (allChildDepositoryById.size() > 0) { map.put("depositoryIdList", allChildDepositoryById); map.remove("depositoryId"); @@ -1074,7 +1074,7 @@ public class DepositoryRecordController { StringBuilder depositoryName = new StringBuilder(); double sumQuantity = 0; double sumPrice = 0.0; - List depositoryIdList = new ArrayList<>(); + List depositoryIdList = new ArrayList<>(); List mnameForMobiles = new ArrayList<>(); for (ApplicationOutRecordMinP applicationOutRecordMin : applicationOutMinByParentId) { // 获取子订单信息 @@ -1091,7 +1091,7 @@ public class DepositoryRecordController { version = ""; } // 获取出库物料仓库Id - Integer depositoryId = applicationOutRecordMin.getDepositoryId(); + Long depositoryId = applicationOutRecordMin.getDepositoryId(); if (!depositoryIdList.contains(depositoryId)) { depositoryIdList.add(depositoryId); } @@ -1113,7 +1113,7 @@ public class DepositoryRecordController { paramForSplitInfo.put("newUnit", unit); SplitInfo splitInfo = splitUnitService.findSplitInfoByMidAndUnit(paramForSplitInfo); // 获取当前拆单记录与基础单位进制 - int splitInfoScaleQuantity = splitUnitService.findSplitInfoScaleQuantity(splitInfo, -1); + int splitInfoScaleQuantity = splitUnitService.findSplitInfoScaleQuantity(splitInfo, -1L); BigDecimal bg = new BigDecimal(inventory.getPrice() / splitInfoScaleQuantity * applicationOutRecordMin.getQuantity()); double newprice = bg.setScale(2, BigDecimal.ROUND_HALF_UP).doubleValue(); sumPrice = ObjectFormatUtil.sum(sumPrice, newprice); @@ -1139,7 +1139,7 @@ public class DepositoryRecordController { if ("".equals(value)) { continue; } - UserByPort departmenthead = PublicConfig.FindUserById(ObjectFormatUtil.toInteger(value), userKey, token); + UserByPort departmenthead = PublicConfig.FindUserById(ObjectFormatUtil.toLong(value), userKey, token); // 获取用户的用工关系 int emptype = departmenthead.getEmptype(); if (emptype > 10) { @@ -1173,10 +1173,10 @@ public class DepositoryRecordController { @DeleteMapping("/depositoryRecord") public RestResponse deleteDepositoryRecord(@RequestBody Map map) { if (map.containsKey("id")) { - Integer id = ObjectFormatUtil.toInteger(map.get("id")); + Long id = ObjectFormatUtil.toLong(map.get("id")); return CrudUtil.deleteHandle(depositoryRecordService.deleteDepositoryRecordById(id), 1); } else if (map.containsKey("ids")) { - List ids = (List) map.get("ids"); + List ids = ObjectFormatUtil.objToList(map.get("ids"), Long.class); return CrudUtil.deleteHandle(depositoryRecordService.deleteDepositoryRecordByIds(ids), ids.size()); } else { throw new MyException("所需请求参数缺失！"); @@ -1331,7 +1331,7 @@ public class DepositoryRecordController { // 开启一个线程开启审批 SendQyWxMessageThreadPool.execute(() -> { - JSONObject jsonObject = qyWxOperationService.sendOutApprovalTemplate(crypt, userToken, ObjectFormatUtil.toInteger(id), finalUserkey, finalUsertoken); + JSONObject jsonObject = qyWxOperationService.sendOutApprovalTemplate(crypt, userToken, ObjectFormatUtil.toLong(id), finalUserkey, finalUsertoken); String sp_no = jsonObject.getString("sp_no"); Map QyWxApprovalMap = new HashMap<>(); QyWxApprovalMap.put("sp_no", sp_no); @@ -1367,7 +1367,7 @@ public class DepositoryRecordController { Object id = map.get("parentId"); // 开启一个线程开启审批 SendQyWxMessageThreadPool.execute(() -> { - JSONObject jsonObject = qyWxOperationService.sendOutApprovalTemplate(crypt, userToken, ObjectFormatUtil.toInteger(id), finalUserkey, finalUsertoken); + JSONObject jsonObject = qyWxOperationService.sendOutApprovalTemplate(crypt, userToken, ObjectFormatUtil.toLong(id), finalUserkey, finalUsertoken); String sp_no = jsonObject.getString("sp_no"); Map QyWxApprovalMap = new HashMap<>(); QyWxApprovalMap.put("sp_no", sp_no); @@ -1399,10 +1399,10 @@ public class DepositoryRecordController { String header = request.getHeader("user-agent"); String crypt = Md5.crypt(header); if (map.containsKey("id")) { - Integer id = ObjectFormatUtil.toInteger(map.get("id")); + Long id = ObjectFormatUtil.toLong(map.get("id")); return CrudUtil.deleteHandle(depositoryRecordService.deleteApplicationInRecordById(id, userByPort, crypt), 1); } else if (map.containsKey("ids")) { - List ids = (List) map.get("ids"); + List ids = ObjectFormatUtil.objToList(map.get("ids"), Long.class); return CrudUtil.deleteHandle(depositoryRecordService.deleteApplicationInRecordByIds(ids, userByPort, crypt), ids.size()); } else { throw new MyException("所需请求参数缺失！"); @@ -1418,10 +1418,10 @@ public class DepositoryRecordController { } UserByPort userByPort = AuthenticationTokenPool.getUserToken(token); if (map.containsKey("id")) { - Integer id = ObjectFormatUtil.toInteger(map.get("id")); + Long id = ObjectFormatUtil.toLong(map.get("id")); return CrudUtil.deleteHandle(depositoryRecordService.deleteApplicationOutRecordById(id, userByPort), 1); } else if (map.containsKey("ids")) { - List ids = (List) map.get("ids"); + List ids = ObjectFormatUtil.objToList(map.get("ids"), Long.class); return CrudUtil.deleteHandle(depositoryRecordService.deleteApplicationOutRecordByIds(ids, userByPort), ids.size()); } else { throw new MyException("所需请求参数缺失！"); @@ -1432,14 +1432,14 @@ public class DepositoryRecordController { @PostMapping("/judgeApplicationOutRecordStatus") public RestResponse judgeApplicationOutRecordStatus(@RequestBody Map map) { if (map.containsKey("id")) { - Integer id = ObjectFormatUtil.toInteger(map.get("id")); + Long id = ObjectFormatUtil.toLong(map.get("id")); // 获取当前记录是否能删除 boolean b = depositoryRecordService.judgeApplicationOutRecordStatus(id); return new RestResponse(b, 0, 1); } else if (map.containsKey("ids")) { - List ids = (List) map.get("ids"); + List ids = ObjectFormatUtil.objToList(map.get("ids"), Long.class); List resultCodes = new ArrayList<>(); - for (Integer id : ids + for (Long id : ids ) { boolean b1 = depositoryRecordService.judgeApplicationOutRecordStatus(id); if (!b1) { @@ -1469,7 +1469,7 @@ public class DepositoryRecordController { } if (map.containsKey("id")) { // 如果请求参数存在id将其转为Integer类型 - Integer id = ObjectFormatUtil.toInteger(map.get("id")); + Long id = ObjectFormatUtil.toLong(map.get("id")); // 获取当前出库单 ApplicationOutRecordP recordPById = depositoryRecordService.findApplicationOutRecordPById(id); if (recordPById != null) { @@ -1480,7 +1480,7 @@ public class DepositoryRecordController { // 声明出库处理人 List managerList = new ArrayList<>(); for (ApplicationOutRecordMinP recordMinP : applicationOutMinByParentId) { - Integer checkId = recordMinP.getCheckId(); + Long checkId = recordMinP.getCheckId(); if (checkId == null) { // 如果当前未完成出库 @@ -1492,7 +1492,7 @@ public class DepositoryRecordController { String[] managersSplit = managers.toString().split(","); for (String manager : managersSplit) { if (!"".equals(manager)) { - UserByPort userByPort = PublicConfig.FindUserById(Integer.parseInt(manager), userKey, token); + UserByPort userByPort = PublicConfig.FindUserById(Long.parseLong(manager), userKey, token); // 获取用户的用工关系 int emptype = userByPort.getEmptype(); if (emptype > 10) { @@ -1538,7 +1538,7 @@ public class DepositoryRecordController { String[] split = balancePoster.split(","); for (String s : split) { if (!"".equals(s)) { - UserByPort userByPort = PublicConfig.FindUserById(ObjectFormatUtil.toInteger(s), userKey, token); + UserByPort userByPort = PublicConfig.FindUserById(ObjectFormatUtil.toLong(s), userKey, token); String name = userByPort.getMaindeparmentname() + "-" + userByPort.getName(); balancePosterIconPhoto.put(name, userByPort.getIconphoto()); balancePosterName.append(name).append(","); @@ -1566,7 +1566,7 @@ public class DepositoryRecordController { if ("".equals(s)) { continue; } - Integer managerid = ObjectFormatUtil.toInteger(s); + Long managerid = ObjectFormatUtil.toLong(s); UserByPort user = PublicConfig.FindUserById(managerid, userKey, token); String name = user.getMaindeparmentname() + "-" + user.getName(); depositoryManagerIconPhoto.put(name, user.getIconphoto()); @@ -1612,9 +1612,9 @@ public class DepositoryRecordController { List list = new ArrayList<>(); for (int i = start; i < end; i++) { // 获取物料编号 - Integer mid = ObjectFormatUtil.toInteger(redisPool.getRedisTemplateByDb(15).opsForList().index("mids" + userToken.getId(), i)); + Long mid = ObjectFormatUtil.toLong(redisPool.getRedisTemplateByDb(15).opsForList().index("mids" + userToken.getId(), i)); // 获取仓库编号 - Integer depositoryId = ObjectFormatUtil.toInteger(redisPool.getRedisTemplateByDb(15).opsForList().index("depositoryIds" + userToken.getId(), i)); + Long depositoryId = ObjectFormatUtil.toLong(redisPool.getRedisTemplateByDb(15).opsForList().index("depositoryIds" + userToken.getId(), i)); // 获取库位编码 String placeCode = (String) (redisPool.getRedisTemplateByDb(15).opsForList().index("placeCodes" + userToken.getId(), i)); // 获取物料信息 @@ -1684,41 +1684,41 @@ public class DepositoryRecordController { if ("in".equals(type)) { List typeList = new ArrayList<>(); List mtIdList = new ArrayList<>(); - List depositoryIdList = new ArrayList<>(); - List recordIds = new ArrayList<>(); + List depositoryIdList = new ArrayList<>(); + List recordIds = new ArrayList<>(); String unit = (String) (map.get("unit")); if (!"-1".equals(unit)) { map.put("type", "in"); Integer addSplitInventory = splitUnitService.addSplitInventory(map); if (addSplitInventory != -1) { success += addSplitInventory; - recordIds.add(ObjectFormatUtil.toInteger(map.get("applicationInId"))); + recordIds.add(ObjectFormatUtil.toLong(map.get("applicationInId"))); mtIdList.add(ObjectFormatUtil.toLong(map.get("mtId"))); typeList.add((String) map.get("inType")); - depositoryIdList.add(ObjectFormatUtil.toInteger(map.get("depositoryId"))); + depositoryIdList.add(ObjectFormatUtil.toLong(map.get("depositoryId"))); } } else { success += depositoryRecordService.applicationInPlace(map, false); - recordIds.add(ObjectFormatUtil.toInteger(map.get("applicationInId"))); + recordIds.add(ObjectFormatUtil.toLong(map.get("applicationInId"))); mtIdList.add(ObjectFormatUtil.toLong(map.get("mtId"))); typeList.add((String) map.get("inType")); - depositoryIdList.add(ObjectFormatUtil.toInteger(map.get("depositoryId"))); + depositoryIdList.add(ObjectFormatUtil.toLong(map.get("depositoryId"))); } // 开启一个线程用于发送入库申请 SendQyWxMessageThreadPool.execute(() -> { - Map> MtIdToRecordId = new HashMap<>(); - Map> depositoryIdToRecordId = new HashMap<>(); + Map> MtIdToRecordId = new HashMap<>(); + Map> depositoryIdToRecordId = new HashMap<>(); for (int i = 0; i < recordIds.size(); i++) { - Integer recordId = recordIds.get(i); + Long recordId = recordIds.get(i); if (recordId != null) { // 如果当前id不是空 获取对应的入库仓库id String type1 = typeList.get(i); if ("mt".equals(type1)) { Long mtId = mtIdList.get(i); // 将对应仓库与订单id添加映射关系 - List integers = MtIdToRecordId.get(mtId); + List integers = MtIdToRecordId.get(mtId); if (integers != null) { // 如果有对应关系 integers.add(recordId); @@ -1729,9 +1729,9 @@ public class DepositoryRecordController { MtIdToRecordId.put(mtId, integers); } } else { - Integer did = depositoryIdList.get(i); + Long did = depositoryIdList.get(i); // 将对应仓库与订单id添加映射关系 - List integers = depositoryIdToRecordId.get(did); + List integers = depositoryIdToRecordId.get(did); if (integers != null) { // 如果有对应关系 integers.add(recordId); @@ -1752,7 +1752,7 @@ public class DepositoryRecordController { // 获取当前类别 Long next = iterator.next(); // 获取入库到当前仓库的订单id - List integerList = MtIdToRecordId.get(next); + List integerList = MtIdToRecordId.get(next); // 获取当前类型的管理员 List materialTypeIdForIn = roleService.findRoleAndMaterialTypeByMtId(next); // 用于存储当前仓库的管理员企业微信userId @@ -1762,7 +1762,7 @@ public class DepositoryRecordController { // 获取权限类型 int classes = mt.getClasses(); // 获取权限赋值的uid - Integer uid = mt.getUid(); + Long uid = mt.getUid(); if (classes == 1) { // 如果是针对人 @@ -1812,12 +1812,12 @@ public class DepositoryRecordController { } - Iterator iterator1 = depositoryIdToRecordId.keySet().iterator(); + Iterator iterator1 = depositoryIdToRecordId.keySet().iterator(); if (iterator1.hasNext()) { // 获取当前类别 - Integer next = iterator1.next(); + Long next = iterator1.next(); // 获取入库到当前仓库的订单id - List integerList = depositoryIdToRecordId.get(next); + List integerList = depositoryIdToRecordId.get(next); // 获取当前类型的管理员 List materialTypeIdForIn = roleService.findRoleAndDepositoryByDid(next); // 用于存储当前仓库的管理员企业微信userId @@ -1827,7 +1827,7 @@ public class DepositoryRecordController { // 获取权限类型 int classes = mt.getClasses(); - Integer uid = mt.getUserId(); + Long uid = mt.getUserId(); if (classes == 1) { // 如果是对人 @@ -1889,7 +1889,7 @@ public class DepositoryRecordController { map.put("createUid", userToken.getId()); map.put("flagForAgency", 2); // 待出库物料id - Integer mid = ObjectFormatUtil.toInteger(map.get("iid")); + Long mid = ObjectFormatUtil.toLong(map.get("iid")); // 获取库存信息 Inventory inventoryByMid = materialService.findInventoryById(mid); if (inventoryByMid.getQuantity() < quantity) { @@ -1909,7 +1909,7 @@ public class DepositoryRecordController { // 开启一个线程开启审批 SendQyWxMessageThreadPool.execute(() -> { - JSONObject jsonObject = qyWxOperationService.sendOutApprovalTemplate(crypt, userToken, ObjectFormatUtil.toInteger(id), finalUserkey, finalUsertoken); + JSONObject jsonObject = qyWxOperationService.sendOutApprovalTemplate(crypt, userToken, ObjectFormatUtil.toLong(id), finalUserkey, finalUsertoken); String sp_no = jsonObject.getString("sp_no"); Map QyWxApprovalMap = new HashMap<>(); QyWxApprovalMap.put("sp_no", sp_no); @@ -1951,36 +1951,36 @@ public class DepositoryRecordController { // 获取要处理的类型 String type = (String) map.get("type"); Integer success = 0; - List mids = (List) map.get("mids"); - List iids = (List) map.get("iids"); - List depositoryIds = (List) map.get("depositoryIds"); - List quantitys = (List) map.get("quantitys"); - List placeCodes = (List) map.get("placeCodes"); - List applyRemarks = (List) map.get("applyRemarks"); - List units = (List) map.get("units"); + List mids = ObjectFormatUtil.objToList(map.get("mids"), Long.class); + List iids = ObjectFormatUtil.objToList(map.get("iids"), Long.class); + List depositoryIds = ObjectFormatUtil.objToList(map.get("depositoryIds"), Long.class); + List quantitys = ObjectFormatUtil.objToList(map.get("quantitys"), Object.class); + List placeCodes = ObjectFormatUtil.objToList(map.get("placeCodes"), String.class); + List applyRemarks = ObjectFormatUtil.objToList(map.get("applyRemarks"), String.class); + List units = ObjectFormatUtil.objToList(map.get("units"), String.class); StringBuilder errMsg = new StringBuilder(); - Integer id = 0; + Long id = 0L; if ("in".equals(type)) { List typeList = new ArrayList<>(); List mtIdList = new ArrayList<>(); - List depositoryIdList = new ArrayList<>(); - List recordIds = new ArrayList<>(); + List depositoryIdList = new ArrayList<>(); + List recordIds = new ArrayList<>(); for (int i = 0; i < mids.size(); i++) { // 获取库位 String placeCode = placeCodes.get(i); // 获取当前仓库编号 - Integer depositoryId = depositoryIds.get(i); + Long depositoryId = depositoryIds.get(i); // 获取当前申请数量 Double integer = ObjectFormatUtil.toDouble(quantitys.get(i)); String quantity = integer.toString(); // 先定义最终要使用的库位，默认是默认库位 - Integer placeId = 0; + Long placeId = 0L; if (!"0000".equals(placeCode)) { // 如果当前选择的不是默认库位 Place place = placeService.findPlaceByDidAndCode(depositoryId, placeCode); placeId = place.getId(); } - Integer mid = mids.get(i); + Long mid = mids.get(i); String applyRemark = applyRemarks.get(i); String unit = units.get(i); Map inRecord = new HashMap<>(); @@ -1996,34 +1996,34 @@ public class DepositoryRecordController { Integer addSplitInventory = splitUnitService.addSplitInventory(inRecord); if (addSplitInventory != -1) { success += addSplitInventory; - recordIds.add(ObjectFormatUtil.toInteger(inRecord.get("applicationInId"))); + recordIds.add(ObjectFormatUtil.toLong(inRecord.get("applicationInId"))); mtIdList.add(ObjectFormatUtil.toLong(inRecord.get("mtId"))); typeList.add((String) inRecord.get("inType")); - depositoryIdList.add(ObjectFormatUtil.toInteger(inRecord.get("depositoryId"))); + depositoryIdList.add(ObjectFormatUtil.toLong(inRecord.get("depositoryId"))); } } else { success += depositoryRecordService.applicationInPlace(inRecord, false); - recordIds.add(ObjectFormatUtil.toInteger(inRecord.get("applicationInId"))); + recordIds.add(ObjectFormatUtil.toLong(inRecord.get("applicationInId"))); mtIdList.add(ObjectFormatUtil.toLong(inRecord.get("mtId"))); typeList.add((String) inRecord.get("inType")); - depositoryIdList.add(ObjectFormatUtil.toInteger(inRecord.get("depositoryId"))); + depositoryIdList.add(ObjectFormatUtil.toLong(inRecord.get("depositoryId"))); } } // 开启一个线程用于发送入库申请 SendQyWxMessageThreadPool.execute(() -> { - Map> MtIdToRecordId = new HashMap<>(); - Map> depositoryIdToRecordId = new HashMap<>(); + Map> MtIdToRecordId = new HashMap<>(); + Map> depositoryIdToRecordId = new HashMap<>(); for (int i = 0; i < recordIds.size(); i++) { - Integer recordId = recordIds.get(i); + Long recordId = recordIds.get(i); if (recordId != null) { // 如果当前id不是空 获取对应的入库仓库id String type1 = typeList.get(i); if ("mt".equals(type1)) { Long mtId = mtIdList.get(i); // 将对应仓库与订单id添加映射关系 - List integers = MtIdToRecordId.get(mtId); + List integers = MtIdToRecordId.get(mtId); if (integers != null) { // 如果有对应关系 integers.add(recordId); @@ -2034,9 +2034,9 @@ public class DepositoryRecordController { MtIdToRecordId.put(mtId, integers); } } else { - Integer did = depositoryIdList.get(i); + Long did = depositoryIdList.get(i); // 将对应仓库与订单id添加映射关系 - List integers = depositoryIdToRecordId.get(did); + List integers = depositoryIdToRecordId.get(did); if (integers != null) { // 如果有对应关系 integers.add(recordId); @@ -2057,7 +2057,7 @@ public class DepositoryRecordController { // 获取当前类别 Long next = iterator.next(); // 获取入库到当前仓库的订单id - List integerList = MtIdToRecordId.get(next); + List integerList = MtIdToRecordId.get(next); // 获取当前类型的管理员 List materialTypeIdForIn = roleService.findRoleAndMaterialTypeByMtId(next); // 用于存储当前仓库的管理员企业微信userId @@ -2066,7 +2066,7 @@ public class DepositoryRecordController { ) { int classes = mt.getClasses(); - Integer uid = mt.getUid(); + Long uid = mt.getUid(); if (classes == 1) { // 获取管理员数据 UserByPort userByPort = PublicConfig.FindUserById(uid, finalUserkey, finalUsertoken); @@ -2111,12 +2111,12 @@ public class DepositoryRecordController { } - Iterator iterator1 = depositoryIdToRecordId.keySet().iterator(); + Iterator iterator1 = depositoryIdToRecordId.keySet().iterator(); if (iterator1.hasNext()) { // 获取当前类别 - Integer next = iterator1.next(); + Long next = iterator1.next(); // 获取入库到当前仓库的订单id - List integerList = depositoryIdToRecordId.get(next); + List integerList = depositoryIdToRecordId.get(next); // 获取当前类型的管理员 List materialTypeIdForIn = roleService.findRoleAndDepositoryByDid(next); // 用于存储当前仓库的管理员企业微信userId @@ -2125,7 +2125,7 @@ public class DepositoryRecordController { ) { int classes = mt.getClasses(); - Integer uid = mt.getUserId(); + Long uid = mt.getUserId(); if (classes == 1) { // 获取管理员数据 UserByPort userByPort = PublicConfig.FindUserById(uid, finalUserkey, finalUsertoken); @@ -2196,14 +2196,14 @@ public class DepositoryRecordController { // 插入主表 depositoryRecordService.insertApplicationOutRecord(mainRecord, userToken, userkey, usertoken); - id = ObjectFormatUtil.toInteger(mainRecord.get("id")); + id = ObjectFormatUtil.toLong(mainRecord.get("id")); for (int i = 0; i < iids.size(); i++) { // 出库物料 - Integer mid = iids.get(i); + Long mid = iids.get(i); // 出库数量 Double integer = ObjectFormatUtil.toDouble(quantitys.get(i)); // 获取当前仓库编号 - Integer depositoryId = depositoryIds.get(i); + Long depositoryId = depositoryIds.get(i); String quantity = String.valueOf((int) (integer * 100)); // 获取库位 String placeCode = placeCodes.get(i); @@ -2211,7 +2211,7 @@ public class DepositoryRecordController { String unit = units.get(i); // 获取每个库位编码 String[] s = placeCode.split(" "); - Integer place = 0; + Long place = 0L; // 用于标志该库位是否可以出库 boolean flag = false; if (s.length >= 1) { @@ -2236,9 +2236,9 @@ public class DepositoryRecordController { } } - if (Integer.compare(0, place) == 0) { + if (Long.compare(0, place) == 0) { // 如果当前库位是默认库位 - Integer quantityByMidAndPid = placeService.findQuantityByMidAndPid(mid, 0); + Integer quantityByMidAndPid = placeService.findQuantityByMidAndPid(mid, 0L); if (quantityByMidAndPid > integer) { // 如果默认库位中该物料数量可以出库 flag = true; @@ -2263,10 +2263,10 @@ public class DepositoryRecordController { errMsg.append(materialById.getMname()).append("在").append(depositoryRecordById.getDname()).append("出库数量为").append(quantity).append("失败，数量不足；"); } } - Integer finalId = id; + Long finalId = id; // 开启一个线程开启审批 SendQyWxMessageThreadPool.execute(() -> { - JSONObject jsonObject = qyWxOperationService.sendOutApprovalTemplate(crypt, userToken, ObjectFormatUtil.toInteger(finalId), finalUserkey, finalUsertoken); + JSONObject jsonObject = qyWxOperationService.sendOutApprovalTemplate(crypt, userToken, finalId, finalUserkey, finalUsertoken); String sp_no = jsonObject.getString("sp_no"); Map QyWxApprovalMap = new HashMap<>(); QyWxApprovalMap.put("sp_no", sp_no); @@ -2279,7 +2279,7 @@ public class DepositoryRecordController { } if (success == 0) { - depositoryRecordService.deleteApplicationOutRecordById(1, userToken); + depositoryRecordService.deleteApplicationOutRecordById(id, userToken); return new RestResponse("", 666, new StatusInfo("申请失败", "超出最大存储容量")); } if (success < mids.size()) { @@ -2329,7 +2329,7 @@ public class DepositoryRecordController { } UserByPort userToken = AuthenticationTokenPool.getUserToken(token); if (map.containsKey("id")) { - Integer id = ObjectFormatUtil.toInteger(map.get("id")); + Long id = ObjectFormatUtil.toLong(map.get("id")); List strings = excelService.writeExcelForPrint(id, 4, userToken, userKey, token); List files = new ArrayList<>(); for (String string : strings) { @@ -2349,7 +2349,7 @@ public class DepositoryRecordController { Inventory inventory = null; if (params.containsKey("id")) { // 获取子单详情 - ApplicationOutRecordMinP outRecordMinP = depositoryRecordService.findApplicationOutMinById(ObjectFormatUtil.toInteger(params.get("id"))); + ApplicationOutRecordMinP outRecordMinP = depositoryRecordService.findApplicationOutMinById(ObjectFormatUtil.toLong(params.get("id"))); inventory = materialService.findInventoryById(outRecordMinP.getMid()); List splitInfoByMid = splitUnitService.findSplitInfoByMid(inventory.getMid()); inventory.setSplitInfoList(splitInfoByMid); @@ -2390,7 +2390,7 @@ public class DepositoryRecordController { */ @PostMapping("/getApplicationForMaterial") public RestResponse getInventoryApplication(@RequestBody JSONObject jsonObject, HttpServletRequest request) { - Integer id = jsonObject.getInteger("id"); + Long id = jsonObject.getLong("id"); // 获取当前物料的库存数据 Inventory inventoryById = materialService.findInventoryById(id); @@ -2413,8 +2413,8 @@ public class DepositoryRecordController { // 设置id mp.setId(materialAndPlaceForViewP.getId()); // 设置数量 - mp.setQuantity(materialAndPlaceForViewP.getInventory().intValue()); - double allInventory = splitUnitService.findAllInventoryForSplitInfo(-1, mp, splitInfo.getId(), 0, true); + mp.setQuantity(materialAndPlaceForViewP.getInventory().longValue()); + double allInventory = splitUnitService.findAllInventoryForSplitInfo(-1L, mp, splitInfo.getId(), 0, true); inventory = ObjectFormatUtil.sum(allInventory, inventory); } @@ -2456,7 +2456,7 @@ public class DepositoryRecordController { // 获取当前物料单价 Double price = inventoryById.getPrice(); if (flagForSplitInfo) { - scale = splitUnitService.findSplitInfoScaleQuantity(splitInfo, -1); + scale = splitUnitService.findSplitInfoScaleQuantity(splitInfo, -1L); price = ObjectFormatUtil.divide(price, scale, 2); } // 获取当前物料总额 @@ -2529,10 +2529,10 @@ public class DepositoryRecordController { if (map.containsKey("dateType")) { dateType = map.get("dateType"); } - Integer depositoryId = -1; + Long depositoryId = -1L; if (map.containsKey("depositoryId")) { // 如果选择了仓库，则使用选中的仓库 - depositoryId = ObjectFormatUtil.toInteger(map.get("depositoryId")); + depositoryId = ObjectFormatUtil.toLong(map.get("depositoryId")); } else { // 如果没选中仓库 String token = request.getHeader("user-token"); @@ -2541,7 +2541,7 @@ public class DepositoryRecordController { } UserByPort userToken = AuthenticationTokenPool.getUserToken(token); // 获取当前用户可见的仓库id - List depositoryIdForUser = roleService.findDepositoryIdForUser(userToken); + List depositoryIdForUser = roleService.findDepositoryIdForUser(userToken); // 如果存在仓库 if (depositoryIdForUser != null && depositoryIdForUser.size() > 0) { // 默认为第一个 @@ -2586,10 +2586,10 @@ public class DepositoryRecordController { month = instance.get(Calendar.MONTH) + 1; dateName = month + "月"; } - Integer depositoryId = -1; + Long depositoryId = -1L; if (map.containsKey("depositoryId")) { // 如果选择了仓库，则使用选中的仓库 - depositoryId = ObjectFormatUtil.toInteger(map.get("depositoryId")); + depositoryId = ObjectFormatUtil.toLong(map.get("depositoryId")); } else { // 如果没选中仓库 String token = request.getHeader("user-token"); @@ -2598,7 +2598,7 @@ public class DepositoryRecordController { } UserByPort userToken = AuthenticationTokenPool.getUserToken(token); // 获取当前用户可见的仓库id - List depositoryIdForUser = roleService.findDepositoryIdForUser(userToken); + List depositoryIdForUser = roleService.findDepositoryIdForUser(userToken); // 如果存在仓库 if (depositoryIdForUser != null && depositoryIdForUser.size() > 0) { // 默认为第一个 @@ -2642,7 +2642,7 @@ public class DepositoryRecordController { if (!map.containsKey("depositoryId")) { throw new MyException("错误，未选择查看的仓库"); } - Integer depositoryId = ObjectFormatUtil.toInteger(map.get("depositoryId")); + Long depositoryId = ObjectFormatUtil.toLong(map.get("depositoryId")); // 获取图表类型 String type = map.get("type"); // 获取要查看的日期 @@ -2665,14 +2665,14 @@ public class DepositoryRecordController { if (map.containsKey("mtName")) { // 如果包含名称 String mtName = map.get("mtName"); - if("3".equals(type)){ + if ("3".equals(type)) { data = depositoryRecordService.getSunBurstDataForInventoryByMonth(dateName, mtName, depositoryId); - }else{ + } else { data = depositoryRecordService.getSunBurstDataByMtName(mtName, type, start, end, mtName, depositoryId); } } else { // 如果不包含名称 - if("3".equals(type)){ + if ("3".equals(type)) { data = depositoryRecordService.getSunBurstDataForInventoryByMonth(dateName, "", depositoryId); } else { List materialTypeNoParent = materialTypeService.findMaterialTypeNoParent(); diff --git a/src/main/java/com/dreamchaser/depository_manage/controller/DownLoadFileController.java b/src/main/java/com/dreamchaser/depository_manage/controller/DownLoadFileController.java index bf136ce3..9d5a8f94 100644 --- a/src/main/java/com/dreamchaser/depository_manage/controller/DownLoadFileController.java +++ b/src/main/java/com/dreamchaser/depository_manage/controller/DownLoadFileController.java @@ -168,7 +168,7 @@ public class DownLoadFileController { token = (String) request.getSession().getAttribute("userToken"); } UserByPort userToken = AuthenticationTokenPool.getUserToken(token); - Integer maindeparment = userToken.getMaindeparment(); + Long maindeparment = userToken.getMaindeparment(); if (b) { // 如果是移动端 if (PublicConfig.roleAdminorgList.contains(maindeparment)) { diff --git a/src/main/java/com/dreamchaser/depository_manage/controller/GroupController.java b/src/main/java/com/dreamchaser/depository_manage/controller/GroupController.java index 1b0d93e9..716c8a94 100644 --- a/src/main/java/com/dreamchaser/depository_manage/controller/GroupController.java +++ b/src/main/java/com/dreamchaser/depository_manage/controller/GroupController.java @@ -96,7 +96,7 @@ public class GroupController { } UserByPort userToken = AuthenticationTokenPool.getUserToken(token); - List depositoryIdList = roleService.findDepositoryIdForUserHas(userToken); + List depositoryIdList = roleService.findDepositoryIdForUserHas(userToken); String code = map.get("code").toString(); @@ -113,18 +113,18 @@ public class GroupController { // 用于标识当前组合是否可以正常出库 boolean flag = true; // 定义符合要求的仓库id - List satisfyDepositoryIdList = new ArrayList<>(); + List satisfyDepositoryIdList = new ArrayList<>(); for (GroupInfo groupInfo : groupByGid) { // 获取详细信息 Integer infoQuantity = groupInfo.getQuantity(); // 获取该物料的库存 - Map inventoryByGroupInfoAndDepository = materialService.findInventoryByGroupInfoAndDepository(groupInfo, depositoryIdList); + Map inventoryByGroupInfoAndDepository = materialService.findInventoryByGroupInfoAndDepository(groupInfo, depositoryIdList); // 用于标志当前物料库存是否符合要求 boolean flagForQuantity = false; // 获取key 的迭代 - for (Integer depositoryId : inventoryByGroupInfoAndDepository.keySet()) { + for (Long depositoryId : inventoryByGroupInfoAndDepository.keySet()) { Double quantity = inventoryByGroupInfoAndDepository.get(depositoryId); // 如果库存符合要求 if (quantity >= infoQuantity) { @@ -221,11 +221,11 @@ public class GroupController { // 如果刚好只有一个 // 获取当前组合的所有物料数据 List groupByGid = groupService.findGroupByCondition(map); - List depositoryIdForUserHas = roleService.findDepositoryIdForUserHas(userToken); + List depositoryIdForUserHas = roleService.findDepositoryIdForUserHas(userToken); List depositoryByIds = depositoryService.findDepositoryByIds(depositoryIdForUserHas); if (groupByGid != null && groupByGid.size() > 0) { groupByGid.get(0).setSatisfyDepositoryList(depositoryByIds); - }else{ + } else { groupByGid = new ArrayList<>(); } return new RestResponse(groupByGid, groupByGid.size(), 200); @@ -280,12 +280,12 @@ public class GroupController { @PostMapping("/delMaterialForGroup") public RestResponse delMaterialForGroup(@RequestBody Map map) { if (map.containsKey("id")) { - Integer id = ObjectFormatUtil.toInteger(map.get("id")); + Long id = ObjectFormatUtil.toLong(map.get("id")); Integer integer = groupService.delMaterialForGroupById(id); return CrudUtil.deleteHandle(1, integer); } else if (map.containsKey("ids")) { - List ids = (List) map.get("ids"); + List ids = ObjectFormatUtil.objToList(map.get("ids"), Long.class); Integer integer = groupService.delMaterialForGroupByIds(ids); return CrudUtil.deleteHandle(ids.size(), integer); } else { @@ -341,10 +341,10 @@ public class GroupController { Integer integer = groupService.updateGroupState(map); return CrudUtil.updateHandle(1, integer); } else if (map.containsKey("ids")) { - List ids = (List) map.get("ids"); + List ids = ObjectFormatUtil.objToList(map.get("ids"), Long.class); Integer integer = 0; - for (int i = 0; i < ids.size(); i++) { - map.put("id", ids.get(i)); + for (Long id : ids) { + map.put("id", id); map.put("state", 3); integer += groupService.updateGroupState(map); } @@ -364,7 +364,7 @@ public class GroupController { @PostMapping("/realDelGroup") public RestResponse realDelGroup(@RequestBody Map map) { if (map.containsKey("id")) { - Integer id = ObjectFormatUtil.toInteger(map.get("id")); + Long id = ObjectFormatUtil.toLong(map.get("id")); Integer integer = groupService.delGroupById(id); return CrudUtil.deleteHandle(1, integer); } else { @@ -382,7 +382,7 @@ public class GroupController { } UserByPort userToken = AuthenticationTokenPool.getUserToken(token); - List depositoryIdList = new ArrayList<>(); + List depositoryIdList = new ArrayList<>(); depositoryIdList = roleService.findDepositoryIdForUserHas(userToken); @@ -398,7 +398,7 @@ public class GroupController { if (!"in".equals(type)) { // 定义符合要求的仓库id - List satisfyDepositoryIdList = new ArrayList<>(); + List satisfyDepositoryIdList = new ArrayList<>(); for (GroupInfo groupInfo : groupByGid) { // 获取详细信息 @@ -408,9 +408,9 @@ public class GroupController { // 用于标志当前物料库存是否符合要求 boolean flagForQuantity = false; // 获取该物料在各仓库的库存 - Map inventoryByMidAndDepository = materialService.findInventoryByGroupInfoAndDepository(groupInfo, depositoryIdList); + Map inventoryByMidAndDepository = materialService.findInventoryByGroupInfoAndDepository(groupInfo, depositoryIdList); // 获取key的迭代器 - for (Integer depositoryId : inventoryByMidAndDepository.keySet()) { + for (Long depositoryId : inventoryByMidAndDepository.keySet()) { Double value = inventoryByMidAndDepository.get(depositoryId); if (value >= infoQuantity) { flagForQuantity = true; @@ -466,12 +466,14 @@ public class GroupController { } UserByPort userToken = AuthenticationTokenPool.getUserToken(token); // 获取暂存的数据 - List gids = (List) map.get("gids"); + List gids = ObjectFormatUtil.objToList(map.get("gids"), Long.class); // 获取当前已经存在的数据 List range = redisPool.getRedisTemplateByDb(15).opsForList().range("wms_gids" + userToken.getId(), 0, -1); - for (Integer gid : gids) { - if (range.contains(gid.toString())) { - continue; + for (Long gid : gids) { + if (range != null) { + if (range.contains(gid.toString())) { + continue; + } } redisPool.getRedisTemplateByDb(15).opsForList().leftPush("wms_gids" + userToken.getId(), gid.toString()); @@ -492,7 +494,7 @@ public class GroupController { public RestResponse applicant_multi_create(@RequestParam Map map, HttpServletRequest request) { Integer page = ObjectFormatUtil.toInteger(map.get("page")); Integer pagesize = ObjectFormatUtil.toInteger(map.get("size")); - Integer start = (page - 1) * pagesize; + int start = (page - 1) * pagesize; Integer end = page * 10; String token = request.getHeader("user-token"); if (token == null) { @@ -500,8 +502,12 @@ public class GroupController { } UserByPort userToken = AuthenticationTokenPool.getUserToken(token); Long size = redisPool.getRedisTemplateByDb(15).boundListOps("wms_gids" + userToken.getId()).size(); - if (end > size) { - end = ObjectFormatUtil.toInteger(size); + if (size != null) { + if (end > size) { + end = ObjectFormatUtil.toInteger(size); + } + }else{ + size = 0L; } List list = new ArrayList<>(); Map paramForGroupOnly = new HashMap<>(); @@ -510,9 +516,9 @@ public class GroupController { Integer gid = ObjectFormatUtil.toInteger(redisPool.getRedisTemplateByDb(15).opsForList().index("wms_gids" + userToken.getId(), i)); paramForGroupOnly.put("gid", gid); List groupPByCondition = groupService.findOnlyGroupByCondition(paramForGroupOnly); - for (int j = 0; j < groupPByCondition.size(); j++) { - groupPByCondition.get(j).setQuantity(1); - list.add(groupPByCondition.get(j)); + for (GroupInfoP groupInfoP : groupPByCondition) { + groupInfoP.setQuantity(1); + list.add(groupInfoP); } } @@ -533,9 +539,9 @@ public class GroupController { token = (String) request.getSession().getAttribute("userToken"); } UserByPort userToken = AuthenticationTokenPool.getUserToken(token); - List gids = (List) map.get("gids"); - for (int i = 0; i < gids.size(); i++) { - redisPool.getRedisTemplateByDb(15).opsForList().remove("wms_gids" + userToken.getId(), 1, gids.get(i).toString()); + List gids = ObjectFormatUtil.objToList(map.get("gids"),Long.class); + for (Long gid : gids) { + redisPool.getRedisTemplateByDb(15).opsForList().remove("wms_gids" + userToken.getId(), 1, gid.toString()); } return CrudUtil.insertHandle(1, 1); } @@ -560,18 +566,18 @@ public class GroupController { String header = request.getHeader("user-agent"); String crypt = Md5.crypt(header); // 获取当前提交数 - List params = (List) map.get("params"); + List params = ObjectFormatUtil.objToList(map.get("params"),String.class); // 执行结果 Integer integer = 0; // 实际结果 int result = 0; - Integer gid = ObjectFormatUtil.toInteger(map.get("gid")); + Long gid = ObjectFormatUtil.toLong(map.get("gid")); List groupInfoByGid = groupService.findGroupInfoByGid(gid); if (groupInfoByGid != null) { result += groupInfoByGid.size(); } for (String param : params) { - gid = ObjectFormatUtil.toInteger(map.get("gid" + param)); + gid = ObjectFormatUtil.toLong(map.get("gid" + param)); groupInfoByGid = groupService.findGroupInfoByGid(gid); if (groupInfoByGid != null) { result += groupInfoByGid.size(); @@ -612,7 +618,7 @@ public class GroupController { @PostMapping("/findGroupById") public RestResponse findGroupById(@RequestBody Map map) { if (map.containsKey("id")) { - return new RestResponse(groupService.findGroupOnlyById(ObjectFormatUtil.toInteger(map.get("id")))); + return new RestResponse(groupService.findGroupOnlyById(ObjectFormatUtil.toLong(map.get("id")))); } else { throw new MyException("缺少必要参数"); } @@ -628,8 +634,8 @@ public class GroupController { @PostMapping("/materialInfoForGroup") public RestResponse materialInfoForGroup(@RequestBody Map map) { if (map.containsKey("mid") && map.containsKey("gid")) { - Integer mid = ObjectFormatUtil.toInteger(map.get("mid")); - Integer gid = ObjectFormatUtil.toInteger(map.get("gid")); + Long mid = ObjectFormatUtil.toLong(map.get("mid")); + Long gid = ObjectFormatUtil.toLong(map.get("gid")); GroupInfo groupInfoByMidAndGid = groupService.findGroupInfoByMidAndGid(mid, gid); Map result = new HashMap<>(); if (groupInfoByMidAndGid != null) { @@ -668,24 +674,24 @@ public class GroupController { // 部门负责人id StringBuilder departmentHeadId = new StringBuilder(); // 部门负责人企业微信user - for (int i = 0; i < departmentHeadByUsers.size(); i++) { - departmentHeadId.append(departmentHeadByUsers.get(i).getId()).append(","); - } + for (UserByPort departmentHeadByUser : departmentHeadByUsers) { + departmentHeadId.append(departmentHeadByUser.getId()).append(","); + } // departmentHeadId = new StringBuilder("78").append(","); map.put("departmenthead", departmentHeadId.toString()); // 获取当前提交数 - List params = (List) map.get("params"); + List params = ObjectFormatUtil.objToList(map.get("params"),String.class); // 执行结果 Integer integer = 0; // 实际结果 - Integer result = 0; - Integer gid = ObjectFormatUtil.toInteger(map.get("gid")); + int result = 0; + Long gid = ObjectFormatUtil.toLong(map.get("gid")); List groupInfoByGid = groupService.findGroupInfoByGid(gid); if (groupInfoByGid != null) { result += groupInfoByGid.size(); } for (String param : params) { - gid = ObjectFormatUtil.toInteger(map.get("gid" + param)); + gid = ObjectFormatUtil.toLong(map.get("gid" + param)); groupInfoByGid = groupService.findGroupInfoByGid(gid); if (groupInfoByGid != null) { result += groupInfoByGid.size(); @@ -715,7 +721,7 @@ public class GroupController { String finalUserkey = userkey; String finalToken = token; SendQyWxMessageThreadPool.execute(() -> { - JSONObject jsonObject = qyWxOperationService.sendOutApprovalTemplate(crypt, userToken, ObjectFormatUtil.toInteger(id), finalUserkey, finalToken); + JSONObject jsonObject = qyWxOperationService.sendOutApprovalTemplate(crypt, userToken, ObjectFormatUtil.toLong(id), finalUserkey, finalToken); String sp_no = jsonObject.getString("sp_no"); Map QyWxApprovalMap = new HashMap<>(); QyWxApprovalMap.put("sp_no", sp_no); @@ -743,7 +749,7 @@ public class GroupController { Snowflake snowflake = new Snowflake(10, 10, true); String qrCode = snowflake.nextIdStr(); - Integer gid = ObjectFormatUtil.toInteger(map.get("gid")); + Long gid = ObjectFormatUtil.toLong(map.get("gid")); String qrCodeByMcode = groupService.findQrCodeByGid(gid); @@ -782,13 +788,13 @@ public class GroupController { // 获取组合id - Integer gid = ObjectFormatUtil.toInteger(map.get("gid")); + Long gid = ObjectFormatUtil.toLong(map.get("gid")); // 获取组合数量 Integer quantity = ObjectFormatUtil.toInteger(map.get("quantity")); - List depositoryIdList = new ArrayList<>(); + List depositoryIdList = new ArrayList<>(); if (map.containsKey("depositoryId")) { // 获取选择的仓库 - Integer depositoryId = ObjectFormatUtil.toInteger(map.get("depositoryId")); + Long depositoryId = ObjectFormatUtil.toLong(map.get("depositoryId")); depositoryIdList.add(depositoryId); } else { depositoryIdList = roleService.findDepositoryIdForUserHas(userToken); @@ -828,9 +834,9 @@ public class GroupController { // 部门负责人id StringBuilder departmentHeadId = new StringBuilder(); // 部门负责人企业微信user - for (int i = 0; i < departmentHeadByUsers.size(); i++) { - departmentHeadId.append(departmentHeadByUsers.get(i).getId()).append(","); - } + for (UserByPort departmentHeadByUser : departmentHeadByUsers) { + departmentHeadId.append(departmentHeadByUser.getId()).append(","); + } // departmentHeadId = new StringBuilder("78").append(","); map.put("departmenthead", departmentHeadId.toString()); @@ -840,7 +846,7 @@ public class GroupController { List depositoryAndRole = roleService.findDepositoryAndRole(userToken.getId()); depositoryAndRole.addAll(roleService.findDepositoryAndRole(userToken.getPosition())); - List depositoryIdList = new ArrayList<>(); + List depositoryIdList = new ArrayList<>(); for (Depository depository : depositoryByAdminorg ) { depositoryIdList.add(depository.getId()); @@ -861,7 +867,7 @@ public class GroupController { // 获取当前出库类型 String type = (String) map.get("type"); if ("one".equals(type)) { - Integer gid = ObjectFormatUtil.toInteger(map.get("id")); + Long gid = ObjectFormatUtil.toLong(map.get("id")); Integer quantity = ObjectFormatUtil.toInteger(map.get("quantity")); Map trueForGroup = isTrueForGroup(gid, quantity, depositoryIdList); boolean flag = Boolean.parseBoolean(trueForGroup.get("flag")); @@ -878,11 +884,11 @@ public class GroupController { int num = 0; List params = new ArrayList<>(); // 获取当前提交数 - List gids = (List) map.get("gids"); - List quantitys = (List) map.get("quantitys"); + List gids = ObjectFormatUtil.objToList(map.get("gids"),Long.class); + List quantitys = ObjectFormatUtil.objToList(map.get("quantitys"),Integer.class); for (int i = 0; i < gids.size(); i++) { - Integer temp = gids.get(i); + Long temp = gids.get(i); Integer quantity = quantitys.get(i); Map trueForGroup = isTrueForGroup(temp, quantity, depositoryIdList); @@ -930,7 +936,7 @@ public class GroupController { String finalUserkey = userkey; String finalToken = token; SendQyWxMessageThreadPool.execute(() -> { - JSONObject jsonObject = qyWxOperationService.sendOutApprovalTemplate(crypt, userToken, ObjectFormatUtil.toInteger(id), finalUserkey, finalToken); + JSONObject jsonObject = qyWxOperationService.sendOutApprovalTemplate(crypt, userToken, ObjectFormatUtil.toLong(id), finalUserkey, finalToken); String sp_no = jsonObject.getString("sp_no"); Map QyWxApprovalMap = new HashMap<>(); QyWxApprovalMap.put("sp_no", sp_no); @@ -945,7 +951,7 @@ public class GroupController { } - Map isTrueForGroup(Integer gid, Integer quantity, List depositoryIdList) { + Map isTrueForGroup(Long gid, Integer quantity, List depositoryIdList) { List groupInfoByGid = groupService.findGroupInfoByGid(gid); boolean flag = true; String mname = ""; @@ -958,9 +964,9 @@ public class GroupController { boolean flagForInventory = false; // 获取该物料在各仓库的库存 - Map inventoryByMidAndDepository = materialService.findInventoryByGroupInfoAndDepository(groupInfo, depositoryIdList); + Map inventoryByMidAndDepository = materialService.findInventoryByGroupInfoAndDepository(groupInfo, depositoryIdList); // 获取key的迭代器 - for (Integer depositoryId : inventoryByMidAndDepository.keySet()) { + for (Long depositoryId : inventoryByMidAndDepository.keySet()) { Double value = inventoryByMidAndDepository.get(depositoryId); if (value >= totalQuantity) { flagForInventory = true; diff --git a/src/main/java/com/dreamchaser/depository_manage/controller/MaterialController.java b/src/main/java/com/dreamchaser/depository_manage/controller/MaterialController.java index 7f2c2e15..a614c1ca 100644 --- a/src/main/java/com/dreamchaser/depository_manage/controller/MaterialController.java +++ b/src/main/java/com/dreamchaser/depository_manage/controller/MaterialController.java @@ -116,7 +116,7 @@ public class MaterialController { // 查询当前用户部门拥有的仓库 List depositoryByAdminorg = depositoryService.findDepositoryByAdminorg(userToken.getMaindeparment().toString()); // 定义仓库编号列表 - List didList = new ArrayList<>(); + List didList = new ArrayList<>(); List list = new ArrayList<>(); Integer total = 0; @@ -126,7 +126,7 @@ public class MaterialController { } if (!(map.containsKey("depositoryId") || map.containsKey("code") || map.containsKey("mname"))) { for (Depository depository : depositoryByAdminorg) { - Integer did = depository.getId(); + Long did = depository.getId(); didList.add(did); map.put("depositoryId", did); List inventory = materialService.findInventory(map); @@ -163,16 +163,16 @@ public class MaterialController { UserByPort userToken = AuthenticationTokenPool.getUserToken(token); List list = new ArrayList<>(); Integer total = 0; - Integer maindeparment = userToken.getMaindeparment(); + Long maindeparment = userToken.getMaindeparment(); if (!PublicConfig.roleAdminorgList.contains(maindeparment)) { - List didList = roleService.findDepositoryIdForUserHas(userToken); + List didList = roleService.findDepositoryIdForUserHas(userToken); map.put("depositoryIds", didList); } if (map.containsKey("depositoryId")) { // 如果包含仓库id - Integer depositoryId = ObjectFormatUtil.toInteger(map.get("depositoryId")); + Long depositoryId = ObjectFormatUtil.toLong(map.get("depositoryId")); // 获取当前仓库下所有可见的仓库 - List allChildDepositoryById = depositoryService.findAllChildDepositoryById(depositoryId, userToken); + List allChildDepositoryById = depositoryService.findAllChildDepositoryById(depositoryId, userToken); if (allChildDepositoryById.size() > 0) { map.put("depositoryIds", allChildDepositoryById); map.remove("depositoryId"); @@ -210,10 +210,10 @@ public class MaterialController { token = (String) request.getSession().getAttribute("userToken"); } UserByPort userToken = AuthenticationTokenPool.getUserToken(token); - Integer maindeparment = userToken.getMaindeparment(); + Long maindeparment = userToken.getMaindeparment(); if (!PublicConfig.roleAdminorgList.contains(maindeparment)) { // 如果不是管理部门 // 获取当前用户可见的仓库id列表 - List didList = roleService.findDepositoryIdForUserHas(userToken); + List didList = roleService.findDepositoryIdForUserHas(userToken); map.put("depositoryIdList", didList); } // 声明库存列表 @@ -224,7 +224,7 @@ public class MaterialController { Map paramForStringObjectMap = new HashMap<>(); if (inventoryByMidAndDidList != null && inventoryByMidAndDidList.size() > 0) { // 如果存在库存记录且记录数大于零 // 获取当前物料id - Integer mid = ObjectFormatUtil.toInteger(map.get("mid")); + Long mid = ObjectFormatUtil.toLong(map.get("mid")); // 获取当前物料的拆单记录 List splitInfoByMid = splitUnitService.findSplitInfoByMid(mid); for (Inventory inventory : inventoryByMidAndDidList) { @@ -294,10 +294,10 @@ public class MaterialController { @PostMapping("/material_del") public RestResponse deletematerial(@RequestBody Map map) { if (map.containsKey("id")) { - Integer id = ObjectFormatUtil.toInteger(map.get("id")); + Long id = ObjectFormatUtil.toLong(map.get("id")); return CrudUtil.deleteHandle(materialService.changeStateToDeletedById(id), 1); } else if (map.containsKey("ids")) { - List ids = (List) map.get("ids"); + List ids = ObjectFormatUtil.objToList(map.get("ids"),Long.class); return CrudUtil.deleteHandle(materialService.changeStateToDeletedByIds(ids), ids.size()); } else { throw new MyException("所需请求参数缺失！"); @@ -329,7 +329,7 @@ public class MaterialController { @PostMapping("realDeleteMaterial") public RestResponse RealDeleteMaterial(@RequestBody Map map) { if (map.containsKey("id")) { - Integer id = (Integer) map.get("id"); + Long id = ObjectFormatUtil.toLong(map.get("id")); return CrudUtil.deleteHandle(materialService.deleteMaterialById(id), 1); } else { throw new MyException("所需请求参数缺失！"); @@ -363,7 +363,7 @@ public class MaterialController { */ @PostMapping("/findOnlyMaterialById") public RestResponse findOnlyMaterialById(@RequestBody Map map) { - Material materialById = materialService.findMaterialById(ObjectFormatUtil.toInteger(map.get("id"))); + Material materialById = materialService.findMaterialById(ObjectFormatUtil.toLong(map.get("id"))); return new RestResponse(materialById); } @@ -385,17 +385,17 @@ public class MaterialController { } Map map = new HashMap<>(); - Material materialById = materialService.findMaterialById(ObjectFormatUtil.toInteger(mid)); + Material materialById = materialService.findMaterialById(ObjectFormatUtil.toLong(mid)); String mcode = materialById.getCode(); Inventory inventoryById = null; if ("out".equals(type)) { - inventoryById = materialService.findInventoryById(ObjectFormatUtil.toInteger(mid)); + inventoryById = materialService.findInventoryById(ObjectFormatUtil.toLong(mid)); mcode = inventoryById.getCode(); } List placePList = new ArrayList<>(); List depositoryByAdminorg = depositoryService.findDepositoryByAdminorg(userToken.getMaindeparment().toString()); for (Depository depository : depositoryByAdminorg) { - List placeByMidAndDid = placeService.findPlaceByMidAndDid(ObjectFormatUtil.toInteger(mid), depository.getId()); + List placeByMidAndDid = placeService.findPlaceByMidAndDid(ObjectFormatUtil.toLong(mid), depository.getId()); placePList.addAll(placeByMidAndDid); } Map param = new HashMap<>(); @@ -406,13 +406,13 @@ public class MaterialController { paramByBarcode.put("codeFlag", 1); List materialByBarCodeByCondition = materialService.findMaterialByBarCodeByCondition(paramByBarcode); if (inventoryPS.size() > 0) { - List depositoryIdList = roleService.findDepositoryIdForWareHouseVisiblePermissionByUser(userToken); - List tempDepositoryID = new ArrayList<>(); + List depositoryIdList = roleService.findDepositoryIdForWareHouseVisiblePermissionByUser(userToken); + List tempDepositoryID = new ArrayList<>(); for (InventoryP inventory : inventoryPS ) { tempDepositoryID.add(inventory.getDepositoryId()); } - tempDepositoryID = (List) CollectionUtils.union(depositoryIdList, tempDepositoryID); + tempDepositoryID = (List) CollectionUtils.union(depositoryIdList, tempDepositoryID); List depositoryByIds = depositoryService.findDepositoryByIds(tempDepositoryID); InventoryP materialP = null; if (inventoryById != null) { @@ -449,14 +449,14 @@ public class MaterialController { if ("".equals(mid)) { return new RestResponse("", 0, 200); } - Inventory inventoryById = materialService.findInventoryById(ObjectFormatUtil.toInteger(mid)); + Inventory inventoryById = materialService.findInventoryById(ObjectFormatUtil.toLong(mid)); String mcode = inventoryById.getCode(); Map paramByBarcode = new HashMap<>(); paramByBarcode.put("mcode", mcode); paramByBarcode.put("codeFlag", 1); List materialByBarCodeByCondition = materialService.findMaterialByBarCodeByCondition(paramByBarcode); List depositoryByAdminorg = depositoryService.findDepositoryByAdminorg(userToken.getMaindeparment().toString()); - List depositoryIdList = new ArrayList<>(); + List depositoryIdList = new ArrayList<>(); for (Depository depository : depositoryByAdminorg ) { depositoryIdList.add(depository.getId()); @@ -502,11 +502,11 @@ public class MaterialController { return new RestResponse("", 0, 200); } Map map = new HashMap<>(); - Inventory inventory = materialService.findInventoryById(ObjectFormatUtil.toInteger(mid)); + Inventory inventory = materialService.findInventoryById(ObjectFormatUtil.toLong(mid)); List placePList = new ArrayList<>(); List depositoryByAdminorg = depositoryService.findDepositoryByAdminorg(userToken.getMaindeparment().toString()); for (Depository depository : depositoryByAdminorg) { - List placeByMidAndDid = placeService.findPlaceByMidAndDid(ObjectFormatUtil.toInteger(mid), depository.getId()); + List placeByMidAndDid = placeService.findPlaceByMidAndDid(ObjectFormatUtil.toLong(mid), depository.getId()); placePList.addAll(placeByMidAndDid); } Map param = new HashMap<>(); @@ -516,7 +516,7 @@ public class MaterialController { paramByBarcode.put("codeFlag", 1); List materialByBarCodeByCondition = materialService.findMaterialByBarCodeByCondition(paramByBarcode); inventory.setMaterialAndBarCodeList(materialByBarCodeByCondition); - MaterialAndPlace placeAndMaterialByMidAndPid = placeService.findPlaceAndMaterialByMidAndPid(ObjectFormatUtil.toInteger(pid), inventory.getId()); + MaterialAndPlace placeAndMaterialByMidAndPid = placeService.findPlaceAndMaterialByMidAndPid(ObjectFormatUtil.toLong(pid), inventory.getId()); inventory.setQuantity(placeAndMaterialByMidAndPid.getQuantity()); List materialAndProducedDateByMid = materialService.findMaterialAndProducedDateByMid(inventory.getId()); @@ -568,10 +568,10 @@ public class MaterialController { param.put("mcode", code); - List depositoryIdList = roleService.findDepositoryIdForUserHas(userToken); + List depositoryIdList = roleService.findDepositoryIdForUserHas(userToken); // 用于存储存在库存的仓库id - List showDepository = new ArrayList<>(); - for (Integer depositoryId : depositoryIdList + List showDepository = new ArrayList<>(); + for (Long depositoryId : depositoryIdList ) { param.put("depositoryId", depositoryId); List inventoryPS = materialService.findInventory(param); @@ -654,7 +654,7 @@ public class MaterialController { return new RestResponse(null, 1, 200); } // 获取当前用户部门所拥有及当前用户管理的仓库 - List depositoryIdForUser = new ArrayList<>(); + List depositoryIdForUser = new ArrayList<>(); List depositoryByAdminorgAndUser = depositoryService.findDepositoryByAdminorg(userToken.getMaindeparment().toString()); for (Depository depository : depositoryByAdminorgAndUser ) { @@ -663,7 +663,7 @@ public class MaterialController { map.put("depositoryIds", depositoryIdForUser); map.remove("depositoryId"); List inventoryList = materialService.findInventory(map); - List depositoryIdList = new ArrayList<>(); + List depositoryIdList = new ArrayList<>(); InventoryP inventoryP = null; for (InventoryP inventory : inventoryList ) { @@ -710,7 +710,7 @@ public class MaterialController { List depositoryByAdminorg = depositoryService.findDepositoryByAdminorg(userToken.getMaindeparment().toString()); List inventoryPList = new ArrayList<>(); - List depositoryIdList = roleService.findDepositoryIdForUserHas(userToken); + List depositoryIdList = roleService.findDepositoryIdForUserHas(userToken); map.remove("depositoryId"); map.put("depositoryIds", depositoryIdList); @@ -758,7 +758,7 @@ public class MaterialController { } UserByPort userToken = AuthenticationTokenPool.getUserToken(token); // 获取当前用户部门所有拥有的仓库及其管理的仓库 - List depositoryIdForUser = new ArrayList<>(); + List depositoryIdForUser = new ArrayList<>(); List depositoryByAdminorg = depositoryService.findDepositoryByAdminorg(userToken.getMaindeparment().toString()); for (Depository depository : depositoryByAdminorg) { depositoryIdForUser.add(depository.getId()); @@ -777,7 +777,7 @@ public class MaterialController { Snowflake snowflake = new Snowflake(10, 10, true); String qrCode = snowflake.nextIdStr(); - Integer mid = ObjectFormatUtil.toInteger(map.get("mid")); + Long mid = ObjectFormatUtil.toLong(map.get("mid")); Material material = materialService.findMaterialById(mid); String qrCodeByMcode = materialService.findQrCodeByMcode(material.getCode()); @@ -845,7 +845,7 @@ public class MaterialController { } // 获取当前用户可见的仓库 List depositoryList = new ArrayList<>(); - Inventory inventoryById = materialService.findInventoryById(ObjectFormatUtil.toInteger(value)); + Inventory inventoryById = materialService.findInventoryById(ObjectFormatUtil.toLong(value)); Depository depository = new Depository(); depository.setId(inventoryById.getDepositoryId()); depository.setDname(inventoryById.getDepositoryName()); @@ -887,7 +887,7 @@ public class MaterialController { } // 获取当前用户可见的仓库 List depositoryList = new ArrayList<>(); - Material materialById = materialService.findMaterialById(ObjectFormatUtil.toInteger(value)); + Material materialById = materialService.findMaterialById(ObjectFormatUtil.toLong(value)); Depository depository = new Depository(); depositoryList.add(depository); List splitInfoByMid = splitUnitService.findSplitInfoByMid(materialById.getId()); @@ -980,13 +980,13 @@ public class MaterialController { boolean flag = false; map.remove("quantity"); // 获取当前用户所在部门关闭的仓库及公共仓库 - Integer placeId = ObjectFormatUtil.toInteger(map.get("placeId")); + Long placeId = ObjectFormatUtil.toLong(map.get("placeId")); map.remove("placeId"); - if (Integer.compare(placeId, -1) == 0) { + if (Long.compare(placeId, -1) == 0) { // 如果是查询所有库存 List depositoryByAdminorg = depositoryService.findDepositoryByAdminorg(userByPort.getMaindeparment().toString()); if (map.containsKey("depositoryId")) { - Depository depositoryById = depositoryService.findDepositoryById(ObjectFormatUtil.toInteger(map.get("depositoryId"))); + Depository depositoryById = depositoryService.findDepositoryById(ObjectFormatUtil.toLong(map.get("depositoryId"))); depositoryByAdminorg = new ArrayList<>(); depositoryByAdminorg.add(depositoryById); } @@ -1023,7 +1023,7 @@ public class MaterialController { // 获取对应关系 MaterialAndPlace placeAndMaterialByMidAndPid = placeService.findPlaceAndMaterialByMidAndPid(p.getId(), inventoryP.getId()); - double allInventoryForSplitInfo = splitUnitService.findAllInventoryForSplitInfo(-1, placeAndMaterialByMidAndPid, splitInfo.getId(), 0, true); + double allInventoryForSplitInfo = splitUnitService.findAllInventoryForSplitInfo(-1L, placeAndMaterialByMidAndPid, splitInfo.getId(), 0, true); saveQuantity += allInventoryForSplitInfo; } @@ -1038,7 +1038,7 @@ public class MaterialController { } else { // 获取当前要转移的库位 Place place = placeService.findPlaceById(placeId); - if (Integer.compare(place.getId(), 0) != 0) { + if (Long.compare(place.getId(), 0) != 0) { map.put("depositoryId", place.getDid()); } // 根据条件查询库存 @@ -1060,7 +1060,7 @@ public class MaterialController { // 查询当前拆单记录 SplitInfo splitInfo = splitUnitService.findSplitInfoByMidAndUnit(paramForSplitInfo); // 查询以当前拆单记录为基础单位的库存 - double allInventoryForSplitInfo = splitUnitService.findAllInventoryForSplitInfo(-1, placeAndMaterialByMidAndPid, splitInfo.getId(), 0, true); + double allInventoryForSplitInfo = splitUnitService.findAllInventoryForSplitInfo(-1L, placeAndMaterialByMidAndPid, splitInfo.getId(), 0, true); if (quantity <= allInventoryForSplitInfo) { flag = true; break; @@ -1177,7 +1177,7 @@ public class MaterialController { // 获取物料与条形码的对应关系 List materialByBarCodeByCondition = materialService.findMaterialByBarCodeByCondition(param); boolean flag = false; - List depositoryIdList = new ArrayList<>(); + List depositoryIdList = new ArrayList<>(); if (map.containsKey("outType")) { List depositoryByAdminorg = depositoryService.findDepositoryByAdminorg(userByPort.getMaindeparment().toString()); for (Depository depository : depositoryByAdminorg @@ -1188,7 +1188,7 @@ public class MaterialController { depositoryIdList = roleService.findDepositoryIdForUserHas(userByPort); } - for (Integer depositoryId : depositoryIdList) { + for (Long depositoryId : depositoryIdList) { param.put("mcode", mcode); param.put("depositoryId", depositoryId); // 获取当前仓库下是否有当前物料的库存 @@ -1253,7 +1253,7 @@ public class MaterialController { InventoryP materialP = inventory.get(0); if (!"0".equals(placeId)) { // 如果不是默认库位 - MaterialAndPlace placeAndMaterialByMidAndPid = placeService.findPlaceAndMaterialByMidAndPid(ObjectFormatUtil.toInteger(placeId), materialP.getId()); + MaterialAndPlace placeAndMaterialByMidAndPid = placeService.findPlaceAndMaterialByMidAndPid(ObjectFormatUtil.toLong(placeId), materialP.getId()); if (placeAndMaterialByMidAndPid == null) { // 如果当前物料不在该库位 flag = false; @@ -1261,7 +1261,7 @@ public class MaterialController { materialP.setQuantity((double) placeAndMaterialByMidAndPid.getQuantity() / 100); } } else { - MaterialAndPlace placeAndMaterialByMidAndPid = placeService.findPlaceAndMaterialByMidAndPid(0, materialP.getId()); + MaterialAndPlace placeAndMaterialByMidAndPid = placeService.findPlaceAndMaterialByMidAndPid(0L, materialP.getId()); if (placeAndMaterialByMidAndPid == null) { // 如果当前物料不在该库位 flag = false; @@ -1345,7 +1345,7 @@ public class MaterialController { // 获取条形码与物料的映射 MaterialAndBarCode materialByBarCode = materialService.findMaterialByBarCode(barCode); if (materialByBarCode != null) { - List depositoryIdList = new ArrayList<>(); + List depositoryIdList = new ArrayList<>(); if (map.containsKey("outType")) { List depositoryByAdminorg = depositoryService.findDepositoryByAdminorg(userByPort.getMaindeparment().toString()); for (Depository depository : depositoryByAdminorg @@ -1356,7 +1356,7 @@ public class MaterialController { depositoryIdList = roleService.findDepositoryIdForUserHas(userByPort); } List placePList = new ArrayList<>(); - for (Integer depositoryId : depositoryIdList) { + for (Long depositoryId : depositoryIdList) { boolean isExist = false; Map param = new HashMap<>(); param.put("depositoryId", depositoryId); @@ -1409,7 +1409,7 @@ public class MaterialController { MaterialAndBarCode materialByBarCode = materialService.findMaterialByBarCode(barCode); if (materialByBarCode != null) { // 如果存在对应关系 - Boolean isExist = false; + boolean isExist = false; Map param = new HashMap<>(); // 判断所在仓库 param.put("depositoryId", map.get("depositoryId")); @@ -1424,7 +1424,7 @@ public class MaterialController { if (!"0".equals(placeId)) { // 如果不是默认库位 // 获取物料与库位的对应关系 - MaterialAndPlace placeAndMaterialByMidAndPid = placeService.findPlaceAndMaterialByMidAndPid(ObjectFormatUtil.toInteger(placeId), materialP.getId()); + MaterialAndPlace placeAndMaterialByMidAndPid = placeService.findPlaceAndMaterialByMidAndPid(ObjectFormatUtil.toLong(placeId), materialP.getId()); if (placeAndMaterialByMidAndPid == null) { isExist = false; } else { @@ -1432,7 +1432,7 @@ public class MaterialController { } } else { // 获取物料与库位的对应关系 - MaterialAndPlace placeAndMaterialByMidAndPid = placeService.findPlaceAndMaterialByMidAndPid(0, materialP.getId()); + MaterialAndPlace placeAndMaterialByMidAndPid = placeService.findPlaceAndMaterialByMidAndPid(0L, materialP.getId()); if (placeAndMaterialByMidAndPid == null) { isExist = false; } else { @@ -1490,7 +1490,7 @@ public class MaterialController { // 用于查看当前物料下的条形码 @GetMapping("/findMaterialBarCode") public RestResponse findMaterialBarCode(@RequestParam Map map, HttpServletRequest request) { - Integer mid = ObjectFormatUtil.toInteger(map.get("mid")); + Long mid = ObjectFormatUtil.toLong(map.get("mid")); Material materialById = materialService.findMaterialById(mid); map.put("mcode", materialById.getCode()); map.put("codeFlag", 1); @@ -1511,9 +1511,9 @@ public class MaterialController { public RestResponse delBarCodeByMaterial(@RequestBody Map map, HttpServletRequest request) { Integer res = 0; if (map.containsKey("ids")) { - List ids = (List) map.get("ids"); - for (int i = 0; i < ids.size(); i++) { - map.put("id", ids.get(i)); + List ids = ObjectFormatUtil.objToList(map.get("ids"),Long.class); + for (Object id : ids) { + map.put("id", id); res += materialService.delBarCodeByMaterial(map); } return CrudUtil.deleteHandle(res, ids.size()); @@ -1541,7 +1541,7 @@ public class MaterialController { } else { // 获取当前物料 InventoryP materialP = inventory.get(0); - MaterialAndPlace pm = placeService.findPlaceAndMaterialByMidAndPid(0, materialP.getId()); + MaterialAndPlace pm = placeService.findPlaceAndMaterialByMidAndPid(0L, materialP.getId()); if (pm != null) { Map paramForCode = new HashMap<>(); paramForCode.put("mcode", materialP.getCode()); @@ -1559,7 +1559,7 @@ public class MaterialController { } else { // 如果不是默认库位 // 获取当前库位 - Place placeById = placeService.findPlaceById(ObjectFormatUtil.toInteger(placeId)); + Place placeById = placeService.findPlaceById(ObjectFormatUtil.toLong(placeId)); if (inventory.size() > 0) { // 如果当前名称下的物料不唯一 if (inventory.size() > 1) { @@ -1567,7 +1567,7 @@ public class MaterialController { } else { // 获取当前物料 InventoryP materialP = inventory.get(0); - MaterialAndPlace pm = placeService.findPlaceAndMaterialByMidAndPid(ObjectFormatUtil.toInteger(placeById.getId()), materialP.getId()); + MaterialAndPlace pm = placeService.findPlaceAndMaterialByMidAndPid(ObjectFormatUtil.toLong(placeById.getId()), materialP.getId()); if (pm != null) { // 如果成功获取 Map paramForCode = new HashMap<>(); @@ -1629,7 +1629,7 @@ public class MaterialController { if (!"0".equals(placeId)) { // 如果不是获取默认库位 - MaterialAndPlace placeAndMaterialByMidAndPid = placeService.findPlaceAndMaterialByMidAndPid(ObjectFormatUtil.toInteger(placeId), mp.getId()); + MaterialAndPlace placeAndMaterialByMidAndPid = placeService.findPlaceAndMaterialByMidAndPid(ObjectFormatUtil.toLong(placeId), mp.getId()); if (placeAndMaterialByMidAndPid == null) { // 如果当前库位没有该物料 @@ -1639,7 +1639,7 @@ public class MaterialController { } } else { - MaterialAndPlace placeAndMaterialByMidAndPid = placeService.findPlaceAndMaterialByMidAndPid(0, mp.getId()); + MaterialAndPlace placeAndMaterialByMidAndPid = placeService.findPlaceAndMaterialByMidAndPid(0L, mp.getId()); if (placeAndMaterialByMidAndPid == null) { // 如果当前库位没有该物料 @@ -1731,7 +1731,7 @@ public class MaterialController { Integer locationFlag = locationByQrCode.getFlag(); if (Integer.compare(locationFlag, 1) == 0) { // 如果是库位 - Place placeById = placeService.findPlaceById(ObjectFormatUtil.toInteger(locationByQrCode.getPid())); + Place placeById = placeService.findPlaceById(ObjectFormatUtil.toLong(locationByQrCode.getPid())); List placeAndMaterialByPid = placeService.findPlaceAndMaterialByPid(placeById.getId()); PlaceP pp = new PlaceP(placeById); @@ -1746,7 +1746,7 @@ public class MaterialController { flag = 2; } else { // 如果是仓库 - Depository depository = depositoryService.findDepositoryById(ObjectFormatUtil.toInteger(locationByQrCode.getDepositoryId())); + Depository depository = depositoryService.findDepositoryById(ObjectFormatUtil.toLong(locationByQrCode.getDepositoryId())); result.put("depository", depository); flag = 3; } @@ -1772,7 +1772,7 @@ public class MaterialController { token = (String) request.getSession().getAttribute("userToken"); } UserByPort userToken = AuthenticationTokenPool.getUserToken(token); - Integer maindeparment = userToken.getMaindeparment(); + Long maindeparment = userToken.getMaindeparment(); Object mtId = map.get("mtId"); List list = new ArrayList<>(); if (mtId != null) { @@ -1840,9 +1840,9 @@ public class MaterialController { // 获取当前的计量单位 String unit = (String) map.get("unit"); // 获取当前库存id - Integer id = ObjectFormatUtil.toInteger(map.get("mid")); + Long id = ObjectFormatUtil.toLong(map.get("mid")); // 获取当前判断库位 - Integer placeId = ObjectFormatUtil.toInteger(map.get("placeId")); + Long placeId = ObjectFormatUtil.toLong(map.get("placeId")); // 获取当前库存所在库位的对应信息 MaterialAndPlace placeAndMaterialByMidAndPid = placeService.findPlaceAndMaterialByMidAndPid(placeId, id); @@ -1862,7 +1862,7 @@ public class MaterialController { paramForSplitInfo.put("mid", inventory.getMid()); // 获取拆单记录 SplitInfo splitInfo = splitUnitService.findSplitInfoByMidAndUnit(paramForSplitInfo); - quantity = splitUnitService.findAllInventoryForSplitInfo(-1, placeAndMaterialByMidAndPid, splitInfo.getId(), 0, true); + quantity = splitUnitService.findAllInventoryForSplitInfo(-1L, placeAndMaterialByMidAndPid, splitInfo.getId(), 0, true); } return new RestResponse(quantity); @@ -1884,7 +1884,7 @@ public class MaterialController { // 获取当前的计量单位 String unit = (String) map.get("unit"); // 获取当前库存id - Integer id = ObjectFormatUtil.toInteger(map.get("id")); + Long id = ObjectFormatUtil.toLong(map.get("id")); // 获取库存记录 Inventory inventory = materialService.findInventoryById(id); if ("-1".equals(unit)) { @@ -1899,7 +1899,7 @@ public class MaterialController { for (PlaceP placeP : placeByMidAndDid ) { MaterialAndPlace placeAndMaterialByMidAndPid = placeService.findPlaceAndMaterialByMidAndPid(placeP.getId(), inventory.getId()); - allInventory += splitUnitService.findAllInventoryForSplitInfo(-1, placeAndMaterialByMidAndPid, splitInfoByMidAndUnit.getId(), 0, true); + allInventory += splitUnitService.findAllInventoryForSplitInfo(-1L, placeAndMaterialByMidAndPid, splitInfoByMidAndUnit.getId(), 0, true); } return new RestResponse(allInventory); } @@ -1929,7 +1929,7 @@ public class MaterialController { } UserByPort userToken = AuthenticationTokenPool.getUserToken(token); - List depositoryIdList = roleService.findDepositoryIdForUserHas(userToken); + List depositoryIdList = roleService.findDepositoryIdForUserHas(userToken); map.put("userTokenId", userToken.getId()); List materialAndPlaceForViews = materialService.findInventoryByMidAndDepository(map, depositoryIdList); Integer count = placeService.findPlaceAndMaterialCountByDidsAndMid(depositoryIdList, map); @@ -1979,7 +1979,7 @@ public class MaterialController { String unit = map.get("unit"); // 当前库位编码 String id = map.get("id"); - MaterialAndPlace placeAndMaterialByMidAndPid = placeService.findPlaceAndMaterialById(ObjectFormatUtil.toInteger(id)); + MaterialAndPlace placeAndMaterialByMidAndPid = placeService.findPlaceAndMaterialById(ObjectFormatUtil.toLong(id)); double quantity = 0.0; double amount = 0.0; Inventory inventoryById = materialService.findInventoryById(placeAndMaterialByMidAndPid.getMid()); @@ -1995,10 +1995,10 @@ public class MaterialController { paramForSplitInfo.put("newUnit", unit); SplitInfo splitInfo = splitUnitService.findSplitInfoByMidAndUnit(paramForSplitInfo); SplitInventory splitInventory = splitUnitService.findSplitInventoryByIidAndSid(placeAndMaterialByMidAndPid.getId(), splitInfo.getId()); - int Scale = splitUnitService.findSplitInfoScaleQuantity(splitInfo, -1); + int Scale = splitUnitService.findSplitInfoScaleQuantity(splitInfo, -1L); double price = ObjectFormatUtil.divide(inventoryById.getPrice(), Scale, 2); if (splitInventory != null) { - quantity = splitUnitService.findAllInventoryForSplitInfo(-1, placeAndMaterialByMidAndPid, splitInfo.getId(), 0, true); + quantity = splitUnitService.findAllInventoryForSplitInfo(-1L, placeAndMaterialByMidAndPid, splitInfo.getId(), 0, true); } else { quantity = (placeAndMaterialByMidAndPid.getQuantity() * Scale / 100.0); } @@ -2020,7 +2020,7 @@ public class MaterialController { @PostMapping("/findInventoryById") public RestResponse findInventoryById(@RequestBody Map map) { if (map.containsKey("id")) { - Integer id = ObjectFormatUtil.toInteger(map.get("id")); + Long id = ObjectFormatUtil.toLong(map.get("id")); Inventory inventoryById = materialService.findInventoryById(id); InventoryP inventory = new InventoryP(inventoryById); List placeByMidAndDid = placeService.findPlaceByMidAndDid(inventoryById.getId(), inventory.getDepositoryId()); @@ -2041,7 +2041,7 @@ public class MaterialController { } UserByPort userToken = AuthenticationTokenPool.getUserToken(token); String code = map.get("code"); - Integer depositoryId = ObjectFormatUtil.toInteger(map.get("depositoryId")); + Long depositoryId = ObjectFormatUtil.toLong(map.get("depositoryId")); InventoryP inventoryP = new InventoryP(); if (code != null) { Map param = new HashMap<>(); @@ -2069,7 +2069,7 @@ public class MaterialController { */ @PostMapping("/findInventoryForCompleteOutTask") public RestResponse findInventoryForCompleteOutTask(@RequestBody Map map) { - List midList = materialService.findInventoryForCompleteOutTask(map); + List midList = materialService.findInventoryForCompleteOutTask(map); List materialByIds = new ArrayList<>(); if (midList.size() > 0) { materialByIds = materialService.findMaterialByIds(midList); diff --git a/src/main/java/com/dreamchaser/depository_manage/controller/MaterialTypeController.java b/src/main/java/com/dreamchaser/depository_manage/controller/MaterialTypeController.java index 07ac9598..5f4f9b36 100644 --- a/src/main/java/com/dreamchaser/depository_manage/controller/MaterialTypeController.java +++ b/src/main/java/com/dreamchaser/depository_manage/controller/MaterialTypeController.java @@ -335,7 +335,7 @@ public class MaterialTypeController { // 获取当前类型所有子类型 List materialTypeByCondition = materialTypeService.findMaterialTypeByCondition(param); for (MaterialType materialType : materialTypeByCondition) { - int materialTypeId = materialType.getId(); + Long materialTypeId = materialType.getId(); Long oldId = materialType.getOldId(); UpdateSonState(String.valueOf(oldId), state); Map map = new HashMap<>(); diff --git a/src/main/java/com/dreamchaser/depository_manage/controller/NoticeController.java b/src/main/java/com/dreamchaser/depository_manage/controller/NoticeController.java index 5a5ccf9f..62bcd143 100644 --- a/src/main/java/com/dreamchaser/depository_manage/controller/NoticeController.java +++ b/src/main/java/com/dreamchaser/depository_manage/controller/NoticeController.java @@ -73,11 +73,11 @@ public class NoticeController { @PostMapping("/notice_del") public RestResponse DelNotice(@RequestBody Map map, HttpServletRequest request) { if(map.containsKey("id")){ - Integer id = ObjectFormatUtil.toInteger(map.get("id")); + Long id = ObjectFormatUtil.toLong(map.get("id")); Integer integer = noticeService.delNoticeForSoftById(id); return CrudUtil.deleteHandle(integer,1); }else if(map.containsKey("ids")){ - List ids = (List) map.get("ids"); + List ids = ObjectFormatUtil.objToList(map.get("ids"),Long.class); Integer integer = noticeService.delNoticeForSoftByIds(ids); return CrudUtil.deleteHandle(integer,ids.size()); }else{ @@ -109,7 +109,7 @@ public class NoticeController { @PostMapping("/realDeleteNotice") public RestResponse realDeleteNotice(@RequestBody Map map){ if(map.containsKey("id")){ - Integer id = ObjectFormatUtil.toInteger(map.get("id")); + Long id = ObjectFormatUtil.toLong(map.get("id")); Integer integer = noticeService.delNoticeById(id); return CrudUtil.deleteHandle(integer,1); }else{ @@ -136,7 +136,7 @@ public class NoticeController { userKey = (String) request.getSession().getAttribute("userKey"); } if(map.containsKey("id")){ - NoticeP notice = noticeService.findNoticeById(ObjectFormatUtil.toInteger(map.get("id")),userKey,token); + NoticeP notice = noticeService.findNoticeById(ObjectFormatUtil.toLong(map.get("id")),userKey,token); return new RestResponse(notice); }else{ throw new MyException("缺少必要参数"); 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 3b5be42a..c2a72909 100644 --- a/src/main/java/com/dreamchaser/depository_manage/controller/PageController.java +++ b/src/main/java/com/dreamchaser/depository_manage/controller/PageController.java @@ -233,9 +233,9 @@ public class PageController { mv.addObject("notices", noticeService.findNoticeByCondition(map, userToken, userKey, token)); } // 查询当前用户所在部门 - Integer maindeparment = userToken.getMaindeparment(); + Long maindeparment = userToken.getMaindeparment(); // 查询当前用户管理的仓库 - List depositoryIdList = roleService.findDepositoryIdForUserHas(userToken); + List depositoryIdList = roleService.findDepositoryIdForUserHas(userToken); mv.addObject("depositoryCount", depositoryIdList.size()); Integer inventoryCountByDepository = materialService.findInventoryCountByDepository(depositoryIdList); if (inventoryCountByDepository == null) { @@ -321,7 +321,7 @@ public class PageController { ModelAndView mv = new ModelAndView(); mv.setViewName("pages/warehouse/depository_add"); Map administration = PublicConfig.findAdministration(userKey, token); - List administrationPList = (List) administration.get("administrationPList"); + List administrationPList = ObjectFormatUtil.objToList(administration.get("administrationPList"),AdministrationP.class); mv.addObject("administrationPList", administrationPList); return mv; } @@ -368,7 +368,7 @@ public class PageController { * @return */ @GetMapping("/split_edit") - public ModelAndView split_edit(Integer id, HttpServletRequest request) { + public ModelAndView split_edit(Long id, HttpServletRequest request) { if (id == null) { throw new MyException("缺少必要参数"); } @@ -383,7 +383,7 @@ public class PageController { SplitInfoP splitInfoPById = splitUnitService.findSplitInfoPById(id); mv.addObject("record", splitInfoPById); mv.setViewName("pages/split/split_edit"); - Integer maindeparment = userToken.getMaindeparment(); + Long maindeparment = userToken.getMaindeparment(); if (PublicConfig.roleAdminorgList.contains(maindeparment)) { mv.addObject("display", "block"); } else { @@ -408,7 +408,7 @@ public class PageController { ModelAndView mv = new ModelAndView(); mv.setViewName("pages/split/split-out"); Map map = new HashMap<>(); - Integer maindeparment = userToken.getMaindeparment(); + Long maindeparment = userToken.getMaindeparment(); if (PublicConfig.roleAdminorgList.contains(maindeparment)) { mv.addObject("display", "inline-block"); } else { @@ -438,7 +438,7 @@ public class PageController { token = (String) request.getSession().getAttribute("userToken"); } UserByPort userToken = AuthenticationTokenPool.getUserToken(token); - Integer maindeparment = userToken.getMaindeparment(); + Long maindeparment = userToken.getMaindeparment(); if (PublicConfig.roleAdminorgList.contains(maindeparment)) { mv.addObject("display", "inline-block"); } else { @@ -482,7 +482,7 @@ public class PageController { token = (String) request.getSession().getAttribute("userToken"); } UserByPort userToken = AuthenticationTokenPool.getUserToken(token); - Integer maindeparment = userToken.getMaindeparment(); + Long maindeparment = userToken.getMaindeparment(); if (type == 1) { mv.addObject("adminorg", maindeparment); } else if (type == 2) { @@ -498,14 +498,14 @@ public class PageController { // 库位树形菜单 @GetMapping("/selectPlaceByDepository") - public ModelAndView selectPlaceByDepository(Integer depositoryId, Integer mid, String placeCode, String unit) { + public ModelAndView selectPlaceByDepository(Long depositoryId, Long mid, String placeCode, String unit) { ModelAndView mv = new ModelAndView(); MaterialAndPlace placeAndMaterialByMidAndPid = null; if ("0000".equals(placeCode)) { // 如果要改变默认库位 // 获取当前物料的对应关系 - placeAndMaterialByMidAndPid = placeService.findPlaceAndMaterialByMidAndPid(0, mid); + placeAndMaterialByMidAndPid = placeService.findPlaceAndMaterialByMidAndPid(0L, mid); mv.addObject("placeId", 0); } else { // 获取当前库位id @@ -532,10 +532,10 @@ public class PageController { SplitInfo splitInfo = splitUnitService.findSplitInfoByMidAndUnit(paramForSplitInfo); SplitInventory splitInventory = splitUnitService.findSplitInventoryByIidAndSid(placeAndMaterialByMidAndPid.getId(), splitInfo.getId()); if (splitInventory != null) { - double quantity = splitUnitService.findAllInventoryForSplitInfo(-1, placeAndMaterialByMidAndPid, splitInfo.getId(), 0, true); + double quantity = splitUnitService.findAllInventoryForSplitInfo(-1L, placeAndMaterialByMidAndPid, splitInfo.getId(), 0, true); mv.addObject("quantity", quantity); } else { - int Scale = splitUnitService.findSplitInfoScaleQuantity(splitInfo, -1); + int Scale = splitUnitService.findSplitInfoScaleQuantity(splitInfo, -1L); mv.addObject("quantity", (placeAndMaterialByMidAndPid.getQuantity() * Scale / 100)); } } @@ -548,11 +548,11 @@ public class PageController { // 同一仓库下的库位树形菜单 @GetMapping("/selectPlaceByDepositoryForInventory") - public ModelAndView selectPlaceByDepositoryForInventory(Integer id, String unit) { + public ModelAndView selectPlaceByDepositoryForInventory(Long id, String unit) { if (id != null) { ModelAndView mv = new ModelAndView(); MaterialAndPlace placeAndMaterialById = placeService.findPlaceAndMaterialById(id); - Integer mid = placeAndMaterialById.getMid(); + Long mid = placeAndMaterialById.getMid(); Inventory inventoryById = materialService.findInventoryById(mid); if (inventoryById.getUnit().equals(unit)) { // 如果转移的基础单位 @@ -566,11 +566,11 @@ public class PageController { SplitInfo splitInfo = splitUnitService.findSplitInfoByMidAndUnit(paramForSplitInfo); SplitInventory splitInventory = splitUnitService.findSplitInventoryByIidAndSid(placeAndMaterialById.getId(), splitInfo.getId()); if (splitInventory != null) { - double quantity = splitUnitService.findAllInventoryForSplitInfo(-1, placeAndMaterialById, splitInfo.getId(), 0, true); + double quantity = splitUnitService.findAllInventoryForSplitInfo(-1L, placeAndMaterialById, splitInfo.getId(), 0, true); mv.addObject("quantity", quantity); } else { - int Scale = splitUnitService.findSplitInfoScaleQuantity(splitInfo, -1); + int Scale = splitUnitService.findSplitInfoScaleQuantity(splitInfo, -1L); mv.addObject("quantity", (placeAndMaterialById.getQuantity() * Scale / 100)); } } @@ -604,7 +604,7 @@ public class PageController { } UserByPort userToken = AuthenticationTokenPool.getUserToken(token); if (type == 1) { - Integer maindeparment = userToken.getMaindeparment(); + Long maindeparment = userToken.getMaindeparment(); mv.addObject("adminorg", maindeparment); mv.addObject("clickObj", clickObj); mv.addObject("flagForGroup", flagForGroup); @@ -699,7 +699,7 @@ public class PageController { @GetMapping("material_view") - public ModelAndView material_view(Integer id, HttpServletRequest request) { + public ModelAndView material_view(Long id, HttpServletRequest request) { ModelAndView mv = new ModelAndView(); mv.setViewName("pages/material/material-view"); String token = request.getHeader("user-token"); @@ -713,7 +713,7 @@ public class PageController { map.put("mcode", material.getCode()); map.put("codeFlag", 1); // 获取物料与条形码的对应关系 - Integer maindeparment = userToken.getMaindeparment(); + Long maindeparment = userToken.getMaindeparment(); if (PublicConfig.roleAdminorgList.contains(maindeparment)) { mv.addObject("display", "block"); } else { @@ -729,7 +729,7 @@ public class PageController { } @GetMapping("materialEditForInventory") - public ModelAndView materialEditForInvetory(Integer id, HttpServletRequest request) { + public ModelAndView materialEditForInvetory(Long id, HttpServletRequest request) { ModelAndView mv = new ModelAndView(); mv.setViewName("pages/material/material-viewForInventoryEdit"); String token = request.getHeader("user-token"); @@ -739,11 +739,7 @@ public class PageController { UserByPort userToken = AuthenticationTokenPool.getUserToken(token); if (id != null) { Material material = materialService.findMaterialById(id); - Map map = new HashMap<>(); - map.put("mcode", material.getCode()); - map.put("codeFlag", 1); - // 获取物料与条形码的对应关系 - Integer maindeparment = userToken.getMaindeparment(); + Long maindeparment = userToken.getMaindeparment(); if (PublicConfig.roleAdminorgList.contains(maindeparment)) { mv.addObject("display", "block"); } else { @@ -788,7 +784,7 @@ public class PageController { UserByPort userToken = AuthenticationTokenPool.getUserToken(token); List materialTypeAll = materialTypeService.findMaterialTypeByCondition(map); mv.addObject("materialTypes", materialTypeAll); - Integer maindeparment = userToken.getMaindeparment(); + Long maindeparment = userToken.getMaindeparment(); if (PublicConfig.roleAdminorgList.contains(maindeparment)) { mv.addObject("display", "inline-block"); } else { @@ -843,7 +839,7 @@ public class PageController { * @return */ @GetMapping("/application_in_back") - public ModelAndView applicationIn(Integer mid, Integer depositoryId, Integer placeId) { + public ModelAndView applicationIn(Long mid, Long depositoryId, Long placeId) { ModelAndView mv = new ModelAndView(); InventoryP materialById = new InventoryP(); Depository depositoryById = new Depository(); @@ -860,7 +856,7 @@ public class PageController { materialById.setSplitInfoList(splitInfoByMid); mv.addObject("materialById", materialById); if (placeId == null) { - placeId = 0; + placeId = 0L; } else { Place placeById = placeService.findPlaceById(placeId); if (placeById != null) { @@ -901,7 +897,7 @@ public class PageController { } UserByPort userToken = AuthenticationTokenPool.getUserToken(token); // 获取当前用户是否存在可见仓库 - List union = roleService.findDepositoryIdForWareHouseVisiblePermissionByUser(userToken); + List union = roleService.findDepositoryIdForWareHouseVisiblePermissionByUser(userToken); if (union.size() > 0) { mv.addObject("display", "block"); } else { @@ -910,7 +906,7 @@ public class PageController { List businessTypeAll = businessTypeService.findBusinessTypeAll(); mv.addObject("btList", businessTypeAll); mv.setViewName("pages/application/application-out"); - Integer maindeparment = userToken.getMaindeparment(); + Long maindeparment = userToken.getMaindeparment(); if (PublicConfig.roleAdminorgList.contains(maindeparment)) { mv.setViewName("pages/applicationForStorageCenter/application-out"); } @@ -953,20 +949,20 @@ public class PageController { } UserByPort userToken = AuthenticationTokenPool.getUserToken(token); // 获取当前用户是否存在可见仓库 - List union = roleService.findDepositoryIdForWareHouseVisiblePermissionByUser(userToken); + List union = roleService.findDepositoryIdForWareHouseVisiblePermissionByUser(userToken); if (union.size() > 0) { mv.addObject("display", "block"); } else { mv.addObject("display", "none"); } - Integer maindeparment = userToken.getMaindeparment(); + Long maindeparment = userToken.getMaindeparment(); if (PublicConfig.roleAdminorgList.contains(maindeparment)) { mv.setViewName("pages/applicationForStorageCenter/application-out_back"); } InventoryP inventoryP = new InventoryP(); if (code != null) { Map map = new HashMap<>(); - Depository depositoryByCode = depositoryService.findDepositoryById(ObjectFormatUtil.toInteger(depositoryId.trim())); + Depository depositoryByCode = depositoryService.findDepositoryById(ObjectFormatUtil.toLong(depositoryId.trim())); map.put("depositoryId", depositoryByCode.getId()); map.put("mcode", code); List inventory = materialService.findInventory(map); @@ -1012,7 +1008,7 @@ public class PageController { token = (String) request.getSession().getAttribute("userToken"); } UserByPort userToken = AuthenticationTokenPool.getUserToken(token); - Integer maindeparment = userToken.getMaindeparment(); + Long maindeparment = userToken.getMaindeparment(); if (PublicConfig.roleAdminorgList.contains(maindeparment)) { mv.addObject("display", "inline-block"); mv.addObject("type", "2"); @@ -1044,7 +1040,7 @@ public class PageController { token = (String) request.getSession().getAttribute("userToken"); } UserByPort userToken = AuthenticationTokenPool.getUserToken(token); - Integer maindeparment = userToken.getMaindeparment(); + Long maindeparment = userToken.getMaindeparment(); if (PublicConfig.roleAdminorgList.contains(maindeparment)) { mv.addObject("display", "inline-block"); mv.addObject("type", "2"); @@ -1112,7 +1108,7 @@ public class PageController { UserByPort userToken = AuthenticationTokenPool.getUserToken(token); ModelAndView mv = new ModelAndView(); mv.setViewName("pages/depository/table-stock"); - Integer maindeparment = userToken.getMaindeparment(); + Long maindeparment = userToken.getMaindeparment(); mv.addObject("type", "2"); if (PublicConfig.roleAdminorgList.contains(maindeparment)) { mv.addObject("display", "table-cell"); @@ -1188,7 +1184,7 @@ public class PageController { * @return */ @GetMapping("/InventoryView") - public ModelAndView InventoryView(Integer id, HttpServletRequest request) { + public ModelAndView InventoryView(Long id, HttpServletRequest request) { if (id != null) { ModelAndView mv = new ModelAndView(); mv.setViewName("pages/depository/Inventory-view"); @@ -1212,7 +1208,7 @@ public class PageController { token = (String) request.getSession().getAttribute("userToken"); } UserByPort userToken = AuthenticationTokenPool.getUserToken(token); - Integer maindeparment = userToken.getMaindeparment(); + Long maindeparment = userToken.getMaindeparment(); if (PublicConfig.roleAdminorgList.contains(maindeparment)) { mv.addObject("display", "block"); } else { @@ -1241,7 +1237,7 @@ public class PageController { * @return */ @GetMapping("/InventoryViewBack") - public ModelAndView InventoryViewBack(Integer id, HttpServletRequest request) { + public ModelAndView InventoryViewBack(Long id, HttpServletRequest request) { if (id != null) { ModelAndView mv = new ModelAndView(); mv.setViewName("pages/material/material-view_back"); @@ -1267,7 +1263,7 @@ public class PageController { token = (String) request.getSession().getAttribute("userToken"); } UserByPort userToken = AuthenticationTokenPool.getUserToken(token); - Integer maindeparment = userToken.getMaindeparment(); + Long maindeparment = userToken.getMaindeparment(); if (PublicConfig.roleAdminorgList.contains(maindeparment)) { mv.addObject("display", "block"); } else { @@ -1294,7 +1290,7 @@ public class PageController { * @return */ @GetMapping("/group_add") - public ModelAndView group_add(@RequestParam(required = false) Integer gid) { + public ModelAndView group_add(@RequestParam(required = false) Long gid) { ModelAndView mv = new ModelAndView(); if (gid != null) { mv.addObject("gid", gid); @@ -1321,7 +1317,7 @@ public class PageController { token = (String) request.getSession().getAttribute("userToken"); } UserByPort userToken = AuthenticationTokenPool.getUserToken(token); - Integer maindeparment = userToken.getMaindeparment(); + Long maindeparment = userToken.getMaindeparment(); if (PublicConfig.roleAdminorgList.contains(maindeparment)) { mv.addObject("display", "inline-block"); } else { @@ -1345,7 +1341,7 @@ public class PageController { * @return */ @GetMapping("/materialForGroup") - public ModelAndView materialForGroup(Integer mid, Integer gid, HttpServletRequest request) { + public ModelAndView materialForGroup(Long mid, Long gid, HttpServletRequest request) { ModelAndView mv = new ModelAndView(); // 根据物料id与组合id查询对应明细 GroupInfo groupInfoByMidAndGid = groupService.findGroupInfoByMidAndGid(mid, gid); @@ -1357,7 +1353,7 @@ public class PageController { token = (String) request.getSession().getAttribute("userToken"); } UserByPort userToken = AuthenticationTokenPool.getUserToken(token); - Integer maindeparment = userToken.getMaindeparment(); + Long maindeparment = userToken.getMaindeparment(); if (PublicConfig.roleAdminorgList.contains(maindeparment)) { mv.addObject("display", "inline-block"); } else { @@ -1380,7 +1376,7 @@ public class PageController { * @return */ @GetMapping("/group_edit") - public ModelAndView groupEdit(Integer id, HttpServletRequest request) { + public ModelAndView groupEdit(Long id, HttpServletRequest request) { ModelAndView mv = new ModelAndView(); mv.setViewName("pages/group/group_edit"); Group group = groupService.findGroupOnlyById(id); @@ -1389,7 +1385,7 @@ public class PageController { token = (String) request.getSession().getAttribute("userToken"); } UserByPort userToken = AuthenticationTokenPool.getUserToken(token); - Integer maindeparment = userToken.getMaindeparment(); + Long maindeparment = userToken.getMaindeparment(); if (PublicConfig.roleAdminorgList.contains(maindeparment)) { mv.addObject("display", "inline-block"); } else { @@ -1424,7 +1420,7 @@ public class PageController { } UserByPort userToken = AuthenticationTokenPool.getUserToken(token); - Integer maindeparment = userToken.getMaindeparment(); + Long maindeparment = userToken.getMaindeparment(); if (PublicConfig.roleAdminorgList.contains(maindeparment)) { mv.addObject("display", "block"); } else { @@ -1437,7 +1433,7 @@ public class PageController { // 获取当前用户管理的仓库 List depositoryAndRole = roleService.findDepositoryAndRole(userToken.getId()); depositoryAndRole.addAll(roleService.findDepositoryAndRole(userToken.getPosition())); - List depositoryIdList = new ArrayList<>(); + List depositoryIdList = new ArrayList<>(); for (Depository depository : depositoryByAdminorg ) { depositoryIdList.add(depository.getId()); @@ -1495,7 +1491,7 @@ public class PageController { UserByPort userToken = AuthenticationTokenPool.getUserToken(token); - Integer maindeparment = userToken.getMaindeparment(); + Long maindeparment = userToken.getMaindeparment(); if (PublicConfig.roleAdminorgList.contains(maindeparment)) { mv.addObject("display", "block"); } else { @@ -1509,7 +1505,7 @@ public class PageController { List depositoryAndRole = roleService.findDepositoryAndRole(userToken.getId()); depositoryAndRole.addAll(roleService.findDepositoryAndRole(userToken.getPosition())); - List depositoryIdList = new ArrayList<>(); + List depositoryIdList = new ArrayList<>(); for (Depository depository : depositoryByAdminorg ) { depositoryIdList.add(depository.getId()); @@ -1580,7 +1576,7 @@ public class PageController { * @return */ @GetMapping("/user_add") - public ModelAndView user_add(Integer userId, Integer classes, HttpServletRequest request) { + public ModelAndView user_add(Long userId, Integer classes, HttpServletRequest request) { String token = request.getHeader("user-token"); String userKey = request.getHeader("user-key"); if (token == null) { @@ -1606,7 +1602,7 @@ public class PageController { * @return */ @GetMapping("/user_addForIn") - public ModelAndView user_addForIn(Integer userId, Integer classes, HttpServletRequest request) { + public ModelAndView user_addForIn(Long userId, Integer classes, HttpServletRequest request) { String token = request.getHeader("user-token"); String userKey = request.getHeader("user-key"); if (token == null) { @@ -1632,7 +1628,7 @@ public class PageController { * @return */ @GetMapping("/user_role_edit") - public ModelAndView user_role_edit(Integer id, HttpServletRequest request) { + public ModelAndView user_role_edit(Long id, HttpServletRequest request) { String token = request.getHeader("user-token"); String userKey = request.getHeader("user-key"); if (token == null) { @@ -1663,7 +1659,7 @@ public class PageController { * @return */ @GetMapping("/user_role_editForIn") - public ModelAndView user_role_editForIn(Integer id, HttpServletRequest request) { + public ModelAndView user_role_editForIn(Long id, HttpServletRequest request) { String token = request.getHeader("user-token"); String userKey = request.getHeader("user-key"); if (token == null) { @@ -1696,7 +1692,7 @@ public class PageController { * @return */ @GetMapping("/post_role_edit") - public ModelAndView post_role_edit(Integer id, Integer depositoryId, HttpServletRequest request) { + public ModelAndView post_role_edit(Long id, Long depositoryId, HttpServletRequest request) { String token = request.getHeader("user-token"); String userKey = request.getHeader("user-key"); if (token == null) { @@ -1758,7 +1754,7 @@ public class PageController { * @return */ @GetMapping("/warehouse_view") - public ModelAndView warehouse_view(Integer id, HttpServletRequest request) { + public ModelAndView warehouse_view(Long id, HttpServletRequest request) { String token = request.getHeader("user-token"); String userKey = request.getHeader("user-key"); if (token == null) { @@ -1773,7 +1769,7 @@ public class PageController { // 用于二维码存放数据 mv.addObject("record", depositoryRecordById); - Integer cid = depositoryRecordById.getCid(); + Long cid = depositoryRecordById.getCid(); List postList = PublicConfig.findCompanyBySuperior(cid.toString(), userKey, token); List administrationPList = PublicConfig.findAllCompany(userKey, token); // 部门列表 @@ -1823,7 +1819,7 @@ public class PageController { * @return */ @GetMapping("/placeView") - public ModelAndView placeView(Integer id) { + public ModelAndView placeView(Long id) { ModelAndView mv = new ModelAndView(); mv.setViewName("pages/place/place_edit"); if (id != null) { @@ -1847,7 +1843,7 @@ public class PageController { * @return */ @GetMapping("/insertPlace") - public ModelAndView insertPlace(Integer depositoryId) { + public ModelAndView insertPlace(Long depositoryId) { ModelAndView mv = new ModelAndView(); mv.setViewName("pages/place/place_add"); if (depositoryId != null) { @@ -1865,7 +1861,7 @@ public class PageController { * @return */ @GetMapping("/insertListPlace") - public ModelAndView insertListPlace(Integer depositoryId) { + public ModelAndView insertListPlace(Long depositoryId) { ModelAndView mv = new ModelAndView(); mv.setViewName("pages/place/place_list_add"); if (depositoryId != null) { @@ -1884,7 +1880,7 @@ public class PageController { * @return */ @GetMapping("/findWareHouseByParentId") - public ModelAndView findWareHouseByParentId(Integer parentId, HttpServletRequest request) { + public ModelAndView findWareHouseByParentId(Long parentId, HttpServletRequest request) { String token = request.getHeader("user-token"); String userKey = request.getHeader("user-key"); if (token == null) { @@ -1990,7 +1986,7 @@ public class PageController { * @return */ @GetMapping("/ManagerViewByMid") - public ModelAndView findManagerViewByMid(Integer id) { + public ModelAndView findManagerViewByMid(Long id) { ModelAndView mv = new ModelAndView(); Inventory materialById = materialService.findInventoryById(id); mv.addObject("did", materialById.getDepositoryId()); @@ -2006,7 +2002,7 @@ public class PageController { * @return */ @GetMapping("/findMaterialTypeByParentId") - public ModelAndView findMaterialTypeByParentId(Integer parentId, HttpServletRequest request) { + public ModelAndView findMaterialTypeByParentId(Long parentId, HttpServletRequest request) { String token = request.getHeader("user-token"); if (token == null) { token = (String) request.getSession().getAttribute("userToken"); @@ -2047,7 +2043,7 @@ public class PageController { * @return */ @GetMapping("/materialType_detail") - public ModelAndView materialType_detail(Integer id) { + public ModelAndView materialType_detail(Long id) { ModelAndView mv = new ModelAndView(); mv.setViewName("pages/materialtype/materialType_edit"); if (id != null) { @@ -2069,7 +2065,7 @@ public class PageController { * @return */ @GetMapping("/application_review") - public ModelAndView application_review(Integer id, HttpServletRequest request) { + public ModelAndView application_review(Long id, HttpServletRequest request) { String token = request.getHeader("user-token"); String userKey = request.getHeader("user-key"); if (token == null) { @@ -2099,18 +2095,18 @@ public class PageController { double sumPrice = 0.0; // 计量单位 StringBuilder sumUnit = new StringBuilder(); - List depositoryIdList = new ArrayList<>(); - List placeIdList = new ArrayList<>(); + List depositoryIdList = new ArrayList<>(); + List placeIdList = new ArrayList<>(); for (ApplicationOutRecordMinP applicationOutRecordMin : applicationOutRecordMinByParent) { // 获取子订单信息 // 获取出库物料信息 Inventory inventoryById = materialService.findInventoryById(applicationOutRecordMin.getMid()); // 获取出库物料仓库信息 - Integer depositoryId = applicationOutRecordMin.getDepositoryId(); + Long depositoryId = applicationOutRecordMin.getDepositoryId(); if (!depositoryIdList.contains(depositoryId)) { depositoryIdList.add(depositoryId); } - Integer placeId = applicationOutRecordMin.getPlaceId(); + Long placeId = applicationOutRecordMin.getPlaceId(); if (!placeIdList.contains(placeId)) { placeIdList.add(placeId); } @@ -2133,7 +2129,7 @@ public class PageController { // 获取拆单记录 SplitInfo splitInfo = splitUnitService.findSplitInfoByMidAndUnit(paramForSplitInfo); // 获取当前拆单与基础单位的进制 - int scale = splitUnitService.findSplitInfoScaleQuantity(splitInfo, -1); + int scale = splitUnitService.findSplitInfoScaleQuantity(splitInfo, -1L); sumUnit.append(unit).append(","); if (inventoryById.getPrice() != null) { BigDecimal bd = BigDecimal.valueOf((inventoryById.getPrice() / scale * applicationOutRecordMin.getQuantity())); @@ -2154,7 +2150,7 @@ public class PageController { String[] split = departmenthead.split(","); for (String s : split) { if (!"".equals(s)) { - UserByPort departmentUser = PublicConfig.FindUserById(ObjectFormatUtil.toInteger(s), userKey, token); + UserByPort departmentUser = PublicConfig.FindUserById(ObjectFormatUtil.toLong(s), userKey, token); String name = departmentUser.getMaindeparmentname() + "-" + departmentUser.getName(); departmentHeadIconPhoto.put(name, departmentUser.getIconphoto()); departmentHeadName.append("name").append(","); @@ -2195,7 +2191,7 @@ public class PageController { recordP.setUnit(sumUnit.toString()); mv.addObject("record", recordP); mv.addObject("recordMinList", applicationOutRecordMinByParent); - Integer maindeparment = userToken.getMaindeparment(); + Long maindeparment = userToken.getMaindeparment(); if (PublicConfig.roleAdminorgList.contains(maindeparment)) { mv.addObject("display", "table-row"); } else { @@ -2212,7 +2208,7 @@ public class PageController { * @return */ @GetMapping("/form_step_look") - public ModelAndView form_step_look(Integer id, HttpServletRequest request) { + public ModelAndView form_step_look(Long id, HttpServletRequest request) { String token = request.getHeader("user-token"); String userKey = request.getHeader("user-key"); if (token == null) { @@ -2232,9 +2228,9 @@ public class PageController { } // 获取入库库位id - Integer placeId = applicationInRecordPById.getPlaceId(); + Long placeId = applicationInRecordPById.getPlaceId(); String placeCode = "默认库位"; - if (Integer.compare(placeId, 0) != 0) { + if (Long.compare(placeId, 0) != 0) { Place placeById = placeService.findPlaceById(placeId); placeCode = placeById.getCode(); } @@ -2245,7 +2241,7 @@ public class PageController { for (String approverId : airapproverId ) { if (!"".equals(approverId)) { - UserByPort userByPort = PublicConfig.FindUserById(ObjectFormatUtil.toInteger(approverId), userKey, token); + UserByPort userByPort = PublicConfig.FindUserById(ObjectFormatUtil.toLong(approverId), userKey, token); airapproverName.append(userByPort.getName()).append(","); } } @@ -2291,7 +2287,7 @@ public class PageController { * @return */ @GetMapping("/application_in_review") - public ModelAndView application_in_review(Integer id, HttpServletRequest request) { + public ModelAndView application_in_review(Long id, HttpServletRequest request) { String token = request.getHeader("user-token"); String userKey = request.getHeader("user-key"); if (token == null) { @@ -2311,9 +2307,9 @@ public class PageController { } // 获取入库库位id - Integer placeId = applicationInRecordPById.getPlaceId(); + Long placeId = applicationInRecordPById.getPlaceId(); String placeCode = "默认库位"; - if (Integer.compare(placeId, 0) != 0) { + if (Long.compare(placeId, 0) != 0) { Place placeById = placeService.findPlaceById(placeId); placeCode = placeById.getCode(); } @@ -2324,7 +2320,7 @@ public class PageController { for (String approverId : airapproverId ) { if (!"".equals(approverId)) { - UserByPort userByPort = PublicConfig.FindUserById(ObjectFormatUtil.toInteger(approverId), userKey, token); + UserByPort userByPort = PublicConfig.FindUserById(ObjectFormatUtil.toLong(approverId), userKey, token); airapproverName.append(userByPort.getName()).append(","); } } @@ -2369,7 +2365,7 @@ public class PageController { * @return */ @GetMapping("/form_step_lookByminRecordOut") - public ModelAndView form_step_lookByminRecordOut(Integer id, HttpServletRequest request) { + public ModelAndView form_step_lookByminRecordOut(Long id, HttpServletRequest request) { String token = request.getHeader("user-token"); String userKey = request.getHeader("user-key"); if (token == null) { @@ -2390,7 +2386,7 @@ public class PageController { // 获取处理人 - Integer checkId = recordMinP.getCheckId(); + Long checkId = recordMinP.getCheckId(); if (checkId != null) { UserByPort userByPort = PublicConfig.FindUserById(checkId, userKey, token); @@ -2424,7 +2420,7 @@ public class PageController { // 获取拆单记录 SplitInfo splitInfo = splitUnitService.findSplitInfoByMidAndUnit(paramForSplitInfo); // 获取当前拆单与基础单位的进制 - int scale = splitUnitService.findSplitInfoScaleQuantity(splitInfo, -1); + int scale = splitUnitService.findSplitInfoScaleQuantity(splitInfo, -1L); double price = 0.0; if (inventoryById.getPrice() != null) { price = (inventoryById.getPrice()) / scale * recordMinP.getQuantity(); @@ -2448,7 +2444,7 @@ public class PageController { // 获取当前主单 ApplicationOutRecordP recordP = depositoryRecordService.findApplicationOutRecordPById(recordMinP.getParentId()); boolean b = DateUtil.IsMonthStartAndEnd(recordP.getApplicantTime()); - Integer maindeparment = userToken.getMaindeparment(); + Long maindeparment = userToken.getMaindeparment(); if (PublicConfig.roleAdminorgList.contains(maindeparment) && b) { mv.addObject("edisplay", "inline-block"); } else { @@ -2473,7 +2469,7 @@ public class PageController { // 跳转到出库详情 @GetMapping("/ApplicationOutView") - public ModelAndView ApplicationOutView(Integer id, HttpServletRequest request) { + public ModelAndView ApplicationOutView(Long id, HttpServletRequest request) { String token = request.getHeader("user-token"); String userKey = request.getHeader("user-key"); if (token == null) { @@ -2500,9 +2496,9 @@ public class PageController { StringBuilder depositoryName = new StringBuilder(); // 展示出库的库位编码 StringBuilder placeCode = new StringBuilder(); - List placeIdList = new ArrayList<>(); + List placeIdList = new ArrayList<>(); // 展示当前子订单的处理人 - List outDisPoserIdList = new ArrayList<>(); + List outDisPoserIdList = new ArrayList<>(); StringBuilder outDisposer = new StringBuilder(); // 当前订单总数 Double sumQuantity = 0.0; @@ -2511,26 +2507,26 @@ public class PageController { // 当前总额 double sumPrice = 0.0; // 出库仓库id列表 - List depositoryIdList = new ArrayList<>(); + List depositoryIdList = new ArrayList<>(); for (ApplicationOutRecordMinP recordMinP : applicationOutRecordMinByParent) { // 获取子订单信息 // 获取出库物料信息 Inventory inventoryById = materialService.findInventoryById(recordMinP.getMid()); // 获取出库物料仓库Id - Integer depositoryId = recordMinP.getDepositoryId(); + Long depositoryId = recordMinP.getDepositoryId(); if (!depositoryIdList.contains(depositoryId)) { depositoryIdList.add(depositoryId); } recordMinP.setMname(inventoryById.getMname()); - Integer checkId = recordMinP.getCheckId(); + Long checkId = recordMinP.getCheckId(); if (checkId != null) { // 如果当前子订单已经处理 // 获取当前处理人 if (!outDisPoserIdList.contains(checkId)) { outDisPoserIdList.add(checkId); } - Integer placeId = recordMinP.getPlaceId(); + Long placeId = recordMinP.getPlaceId(); if (!placeIdList.contains(placeId)) { placeIdList.add(placeId); } @@ -2561,7 +2557,7 @@ public class PageController { // 查询拆单记录 SplitInfo splitInfo = splitUnitService.findSplitInfoByMidAndUnit(paramForSplitInfo); // 获取当前拆单记录与基础单位的进制 - int scale = splitUnitService.findSplitInfoScaleQuantity(splitInfo, -1); + int scale = splitUnitService.findSplitInfoScaleQuantity(splitInfo, -1L); if (inventoryById.getPrice() != null) { BigDecimal bd = BigDecimal.valueOf((inventoryById.getPrice() / scale * recordMinP.getQuantity())); double v = bd.setScale(2, BigDecimal.ROUND_HALF_UP).doubleValue(); @@ -2579,7 +2575,7 @@ public class PageController { } // 如果处理过 if (outDisPoserIdList.size() > 0) { - for (Integer outDispositorId : outDisPoserIdList + for (Long outDispositorId : outDisPoserIdList ) { UserByPort disposer = PublicConfig.FindUserById(outDispositorId, userKey, token); outDisposer.append(disposer.getName()).append(","); @@ -2588,7 +2584,7 @@ public class PageController { if (placeIdList.size() > 0) { List placeByIdS = placeService.findPlaceByIdS(placeIdList); for (Place place : placeByIdS) { - int placeId = place.getId(); + Long placeId = place.getId(); if (placeId == 0) { placeCode.append("默认库位").append(","); } else { @@ -2597,7 +2593,7 @@ public class PageController { } } // 申请人Id - Integer applicantId = applicationOutRecordPById.getApplicantId(); + Long applicantId = applicationOutRecordPById.getApplicantId(); // 获取申请人信息 UserByPort userByPort = PublicConfig.FindUserById(applicantId, userKey, token); @@ -2615,7 +2611,7 @@ public class PageController { if ("".equals(value)) { continue; } - UserByPort departmenthead = PublicConfig.FindUserById(ObjectFormatUtil.toInteger(value), userKey, token); + UserByPort departmenthead = PublicConfig.FindUserById(ObjectFormatUtil.toLong(value), userKey, token); String name = departmenthead.getMaindeparmentname() + "-" + departmenthead.getName(); departmentHeadUserIcon.put(name, departmenthead.getIconphoto()); departmentHeadName.append(name).append(","); @@ -2626,8 +2622,8 @@ public class PageController { applicationOutRecordPById.setUseAdminorgName(useAdminorgName); - Integer adminorgId = applicationOutRecordPById.getAdminorgId(); - Integer constructionUnitId = applicationOutRecordPById.getConstructionUnitId(); + Long adminorgId = applicationOutRecordPById.getAdminorgId(); + Long constructionUnitId = applicationOutRecordPById.getConstructionUnitId(); if (adminorgId != null) { Administration company = PublicConfig.getCompany(adminorgId, userKey, token); applicationOutRecordPById.setAdminorgName(company.getName()); @@ -2643,7 +2639,7 @@ public class PageController { mv.addObject("cdisplay", "none"); } - Integer maindeparment = userToken.getMaindeparment(); + Long maindeparment = userToken.getMaindeparment(); if (PublicConfig.roleAdminorgList.contains(maindeparment)) { mv.addObject("display", "table-row"); } else { @@ -2697,7 +2693,7 @@ public class PageController { } // 获取当前用户是否存在可见仓库 - List union = roleService.findDepositoryIdForWareHouseVisiblePermissionByUser(userToken); + List union = roleService.findDepositoryIdForWareHouseVisiblePermissionByUser(userToken); if (union.size() > 0) { mv.addObject("display", "block"); } else { @@ -2705,7 +2701,7 @@ public class PageController { } mv.addObject("gidList", gidList); mv.setViewName("pages/group/applicationOutForGroup"); - Integer maindeparment = userToken.getMaindeparment(); + Long maindeparment = userToken.getMaindeparment(); if (PublicConfig.roleAdminorgList.contains(maindeparment)) { mv.setViewName("pages/applicationForStorageCenter/applicationOutForGroup"); } @@ -2741,7 +2737,7 @@ public class PageController { * @return */ @GetMapping("/StockTakingReview") - public ModelAndView StockTakingReview(Integer id, HttpServletRequest request) { + public ModelAndView StockTakingReview(Long id, HttpServletRequest request) { ModelAndView mv = new ModelAndView(); String token = request.getHeader("user-token"); String userKey = request.getHeader("user-key"); @@ -2804,7 +2800,7 @@ public class PageController { // 跳转到盘点详情 @GetMapping("/StockTakingView") - public ModelAndView StockTakingView(Integer id, HttpServletRequest request) { + public ModelAndView StockTakingView(Long id, HttpServletRequest request) { ModelAndView mv = new ModelAndView(); String token = request.getHeader("user-token"); String userKey = request.getHeader("user-key"); @@ -2979,14 +2975,13 @@ public class PageController { * @return */ @GetMapping("/company_detail") - public ModelAndView company_detail(Integer id, HttpServletRequest request) { + public ModelAndView company_detail(Long id, HttpServletRequest request) { String token = request.getHeader("user-token"); String userKey = request.getHeader("user-key"); if (token == null) { token = (String) request.getSession().getAttribute("userToken"); userKey = (String) request.getSession().getAttribute("userKey"); } - UserByPort userByPort = AuthenticationTokenPool.getUserToken(token); String url = PublicConfig.external_url + "/org/getgovcont"; Map map = new HashMap<>(); ModelAndView mv = new ModelAndView(); @@ -3024,7 +3019,7 @@ public class PageController { * @return */ @GetMapping("/findCompanyByParentId") - public ModelAndView findCompanyByParentId(Integer parentId, Integer level, HttpServletRequest request) { + public ModelAndView findCompanyByParentId(Long parentId, Integer level, HttpServletRequest request) { String token = request.getHeader("user-token"); String userKey = request.getHeader("user-key"); if (token == null) { @@ -3107,7 +3102,7 @@ public class PageController { * @return */ @GetMapping("/post_detail") - public ModelAndView post_detail(Integer id, HttpServletRequest request) { + public ModelAndView post_detail(Long id, HttpServletRequest request) { String token = request.getHeader("user-token"); String userKey = request.getHeader("user-key"); if (token == null) { @@ -3128,7 +3123,7 @@ public class PageController { @GetMapping("/findPostByParentId") - public ModelAndView findPostByParentId(Integer parentId, HttpServletRequest request) { + public ModelAndView findPostByParentId(Long parentId, HttpServletRequest request) { String token = request.getHeader("user-token"); String userKey = request.getHeader("user-key"); if (token == null) { @@ -3177,7 +3172,7 @@ public class PageController { // 跳转到添加权限界面 @GetMapping("/postRoleAdd") - public ModelAndView PostRoleAdd(Integer id, Integer classes, HttpServletRequest request) { + public ModelAndView PostRoleAdd(Long id, Integer classes, HttpServletRequest request) { String token = request.getHeader("user-token"); String userKey = request.getHeader("user-key"); if (token == null) { @@ -3230,7 +3225,7 @@ public class PageController { // 跳转到扫码出库界面 @GetMapping("/scanQrCodeByOut") - public ModelAndView scanQrCodeByOut(Integer id, HttpServletRequest request) { + public ModelAndView scanQrCodeByOut(Long id, HttpServletRequest request) { ModelAndView mv = new ModelAndView(); // 获取当前要处理的子订单 ApplicationOutRecordMinP applicationOutMinById = depositoryRecordService.findApplicationOutMinById(id); @@ -3243,7 +3238,7 @@ public class PageController { // 跳转到新扫码出库界面 @GetMapping("/scanBarOrQrCodeOut") - public ModelAndView scanBarOrQrCodeOut(Integer id, HttpServletRequest request) { + public ModelAndView scanBarOrQrCodeOut(Long id, HttpServletRequest request) { ModelAndView mv = new ModelAndView(); // 获取当前要处理的子订单 ApplicationOutRecordMinP applicationOutMinById = depositoryRecordService.findApplicationOutMinById(id); @@ -3256,7 +3251,7 @@ public class PageController { // 用于展示当前库位所存在的物料 @GetMapping("/ScanBarOrQrCodeOut_selectMaterial") - public ModelAndView ScanBarOrQrCodeOut_selectMaterial(Integer pid, String mcode, Integer depositoryId) { + public ModelAndView ScanBarOrQrCodeOut_selectMaterial(Long pid, String mcode, Long depositoryId) { ModelAndView mv = new ModelAndView(); mv.addObject("mcode", mcode); mv.addObject("depositoryId", depositoryId); @@ -3331,13 +3326,13 @@ public class PageController { UserByPort userToken = AuthenticationTokenPool.getUserToken(token); List range = redisPool.getRedisTemplateByDb(15).boundListOps("WMS_temporaryValue_Out" + userToken.getNumber()).range(0, -1); // 获取当前用户是否存在可见仓库 - List union = roleService.findDepositoryIdForWareHouseVisiblePermissionByUser(userToken); + List union = roleService.findDepositoryIdForWareHouseVisiblePermissionByUser(userToken); if (union.size() > 0) { mv.addObject("display", "block"); } else { mv.addObject("display", "none"); } - Integer maindeparment = userToken.getMaindeparment(); + Long maindeparment = userToken.getMaindeparment(); if (range != null && range.size() > 0) { mv.setViewName("pages/application/application-out_temporaryValue"); if (PublicConfig.roleAdminorgList.contains(maindeparment)) { @@ -3365,7 +3360,7 @@ public class PageController { mv.addObject("btList", businessTypeAll); UserByPort userToken = AuthenticationTokenPool.getUserToken(token); List range = redisPool.getRedisTemplateByDb(15).boundListOps("WMS_temporaryValue_Out" + userToken.getNumber()).range(0, -1); - Integer maindeparment = userToken.getMaindeparment(); + Long maindeparment = userToken.getMaindeparment(); if (range != null && range.size() > 0) { if (PublicConfig.roleAdminorgList.contains(maindeparment)) { mv.setViewName("pages/applicationForStorageCenter/application-out_admin_temporaryValue"); @@ -3391,7 +3386,7 @@ public class PageController { // 当前仓库中该用户的子订单详情,用于移动端 @GetMapping("/ApplicationOutMinByDidForMobile") - public ModelAndView ApplicationOutMinByDidForMobile(Integer depositoryId, Integer state, HttpServletRequest request) { + public ModelAndView ApplicationOutMinByDidForMobile(Long depositoryId, Integer state, HttpServletRequest request) { ModelAndView mv = new ModelAndView(); Depository depository = depositoryService.findDepositoryById(depositoryId); mv.addObject("depositoryId", depositoryId); @@ -3454,26 +3449,22 @@ public class PageController { List takingChildPS = new ArrayList<>(); StockTaking stockTaking = null; String[] split = minIds.split(","); - for (int i = 0; i < split.length; i++) { - String minRecordId = split[i]; + for (String minRecordId : split) { if ("".equals(minRecordId)) { continue; } // 获取当前子订单 - StockTakingChildP stcp = stockTakingService.findStockTakingChildPById(ObjectFormatUtil.toInteger(minRecordId)); + StockTakingChildP stcp = stockTakingService.findStockTakingChildPById(ObjectFormatUtil.toLong(minRecordId)); // 获取主订单 stockTaking = stockTakingService.findStockTakingById(stcp.getMainId()); - Integer placeId = stcp.getMid(); + Long placeId = stcp.getMid(); // 获取库位详情 Place placeById = placeService.findPlaceById(placeId); - // 获取当前物料在其库位中的数量 - MaterialAndPlace placeAndMaterialByMidAndPid = placeService.findPlaceAndMaterialByMidAndPid(placeId, stcp.getMid()); - // 获取盈亏数量 Double newInventory = stcp.getInventory(); @@ -3510,7 +3501,7 @@ public class PageController { * @return */ @GetMapping("/printCode") - public ModelAndView printCode(int mid, int flag) { + public ModelAndView printCode(Long mid, int flag) { ModelAndView mv = new ModelAndView(); mv.addObject("mcode", "noMaterial"); mv.addObject("version", "noMaterial"); @@ -3543,7 +3534,7 @@ public class PageController { // 获取对应库位 Place placeById = placeService.findPlaceById(mid); - if (Integer.compare(0, placeById.getDid()) == 0) { + if (Long.compare(0, placeById.getDid()) == 0) { mv.addObject("name", "默认库位"); } else { Depository depositoryById = depositoryService.findDepositoryById(placeById.getDid()); @@ -3564,7 +3555,7 @@ public class PageController { * @return */ @GetMapping("/materialForPlace") - public ModelAndView materialForPlace(Integer id) { + public ModelAndView materialForPlace(Long id) { ModelAndView mv = new ModelAndView(); mv.setViewName("pages/place/materialForPlace"); // 获取当前的映射 @@ -3596,7 +3587,7 @@ public class PageController { * @return */ @GetMapping("/noticeView") - public ModelAndView noticeView(Integer id, HttpServletRequest request) { + public ModelAndView noticeView(Long id, HttpServletRequest request) { ModelAndView mv = new ModelAndView(); mv.setViewName("pages/notice/notice-view"); String token = request.getHeader("user-token"); @@ -3607,7 +3598,7 @@ public class PageController { } UserByPort userToken = AuthenticationTokenPool.getUserToken(token); NoticeP noticeById = noticeService.findNoticeById(id, userKey, token); - if (Integer.compare(noticeById.getUserId(), userToken.getId()) == 0) { + if (Long.compare(noticeById.getUserId(), userToken.getId()) == 0) { String header = request.getHeader("user-agent"); String crypt = Md5.crypt(header); StringBuilder sb = new StringBuilder(); @@ -3701,7 +3692,7 @@ public class PageController { * @return */ @GetMapping("/constructionUnitEdit") - public ModelAndView constructionUnitEdit(Integer id) { + public ModelAndView constructionUnitEdit(Long id) { ModelAndView mv = new ModelAndView(); mv.setViewName("pages/constructionunit/constructionunit_edit"); ConstructionUnit constructionUnitById = constructionUnitService.findConstructionUnitById(id); @@ -3738,7 +3729,7 @@ public class PageController { * @return */ @GetMapping("/businessTypeEdit") - public ModelAndView businessTypeEdit(Integer id) { + public ModelAndView businessTypeEdit(Long id) { ModelAndView mv = new ModelAndView(); mv.setViewName("pages/BusinessType/businesstype_edit"); BusinessType businessTypeById = businessTypeService.findBusinessTypeById(id); @@ -3759,7 +3750,7 @@ public class PageController { } UserByPort userToken = AuthenticationTokenPool.getUserToken(token); if (param.containsKey("id")) { - Integer maindeparment = userToken.getMaindeparment(); + Long maindeparment = userToken.getMaindeparment(); if (PublicConfig.roleAdminorgList.contains(maindeparment)) { mv.addObject("display", "inline-block"); } @@ -3787,8 +3778,8 @@ public class PageController { public ModelAndView stockTakingInfoForInventory(@RequestParam Map param, HttpServletRequest request) { ModelAndView mv = new ModelAndView(); mv.setViewName("pages/stockTaking/stockTakingInfoForInventory"); - Integer id = ObjectFormatUtil.toInteger(param.get("id")); - Integer pid = ObjectFormatUtil.toInteger(param.get("pid")); + Long id = ObjectFormatUtil.toLong(param.get("id")); + Long pid = ObjectFormatUtil.toLong(param.get("pid")); // 获取库存记录 InventoryP inventoryById = new InventoryP(materialService.findInventoryById(id)); // 获取当前物料与库位的对应关系 @@ -3797,7 +3788,7 @@ public class PageController { // 获取库位信息 Place placeById = placeService.findPlaceById(pid); inventoryById.setPid(pid); - if (Integer.compare(0, pid) != 0) { + if (Long.compare(0, pid) != 0) { inventoryById.setDepositoryCode(inventoryById.getDepositoryName() + "-" + placeById.getKingdeecode()); } else { inventoryById.setDepositoryCode(inventoryById.getDepositoryName()); @@ -3868,7 +3859,7 @@ public class PageController { if ("".equals(s)) { continue; } - Integer minRecordId = ObjectFormatUtil.toInteger(s.split(":")[1].trim()); + Long minRecordId = ObjectFormatUtil.toLong(s.split(":")[1].trim()); ApplicationOutRecordMinP applicationOutMinById = depositoryRecordService.findApplicationOutMinById(minRecordId); ApplicationOutRecordP applicationOutRecordPById = depositoryRecordService.findApplicationOutRecordPById(applicationOutMinById.getParentId()); UserByPort userByPort = PublicConfig.FindUserById(applicationOutRecordPById.getApplicantId(), userKey, token); diff --git a/src/main/java/com/dreamchaser/depository_manage/controller/PlaceController.java b/src/main/java/com/dreamchaser/depository_manage/controller/PlaceController.java index 29078504..34ead68a 100644 --- a/src/main/java/com/dreamchaser/depository_manage/controller/PlaceController.java +++ b/src/main/java/com/dreamchaser/depository_manage/controller/PlaceController.java @@ -45,7 +45,7 @@ public class PlaceController { List placePList = new ArrayList<>(); for (Place place : placeByCondition) { PlaceP placeP = new PlaceP(place); - Integer depositoryId = place.getDid(); + Long depositoryId = place.getDid(); Depository depositoryById = depositoryService.findDepositoryById(depositoryId); // 获取当前库位所有的物料信息 List placeAndMaterialByPid = placeService.findPlaceAndMaterialByPid(place.getId()); @@ -54,7 +54,7 @@ public class PlaceController { } StringBuilder mname = new StringBuilder(); for (MaterialAndPlace materialAndPlace : placeAndMaterialByPid) { - Integer mid = materialAndPlace.getMid(); + Long mid = materialAndPlace.getMid(); Inventory materialById = materialService.findInventoryById(mid); mname.append(materialById.getMname()).append(","); } @@ -80,7 +80,7 @@ public class PlaceController { String type = (String) map.get("type"); Map insert = new HashMap<>(); Integer success = 0; - Integer total = 0; + int total = 0; if ("one".equals(type)) { Integer place_x = ObjectFormatUtil.toInteger(map.get("place_x")); // Integer place_y = ObjectFormatUtil.toInteger(map.get("place_y")); @@ -93,7 +93,7 @@ public class PlaceController { // insert.put("y", place_y); insert.put("z", place_z); insert.put("code", code); - Depository depository = depositoryService.findDepositoryById(ObjectFormatUtil.toInteger(map.get("depositoryId"))); + Depository depository = depositoryService.findDepositoryById(ObjectFormatUtil.toLong(map.get("depositoryId"))); String depositoryCode = depository.getCode(); String kingdeeCode = depositoryCode.substring(depositoryCode.length() - 2) + code; insert.put("did", map.get("depositoryId")); @@ -133,7 +133,7 @@ public class PlaceController { total = (place_end_x - place_start_x + 1) * (place_end_z - place_start_z + 1); String min = (String) map.get("min"); String max = (String) map.get("max"); - Depository depository = depositoryService.findDepositoryById(ObjectFormatUtil.toInteger(map.get("depositoryId"))); + Depository depository = depositoryService.findDepositoryById(ObjectFormatUtil.toLong(map.get("depositoryId"))); String depositoryCode = depository.getCode(); for (int i = place_start_x; i <= place_end_x; i++) { // for (int j = place_start_y; j < place_end_y; j++) { @@ -203,7 +203,7 @@ public class PlaceController { Object depositoryId = map.get("depositoryId"); insert.put("did", depositoryId); // 获取当前仓库的托盘数量 - Integer countForTray = placeService.findPlaceCountByTypeForFlag(2, ObjectFormatUtil.toInteger(depositoryId)); + Integer countForTray = placeService.findPlaceCountByTypeForFlag(2, ObjectFormatUtil.toLong(depositoryId)); if ("one".equals(type)) { String code = "F" + String.format("%02d", countForTray + 1); insert.put("code", code); @@ -241,10 +241,10 @@ public class PlaceController { @PostMapping("/deletePlace") public RestResponse deletePlace(@RequestBody Map map) { if (map.containsKey("id")) { - Integer id = ObjectFormatUtil.toInteger(map.get("id")); + Long id = ObjectFormatUtil.toLong(map.get("id")); return CrudUtil.deleteHandle(placeService.changeStateToDeletedById(id), 1); } else if (map.containsKey("ids")) { - List ids = (List) map.get("ids"); + List ids = ObjectFormatUtil.objToList(map.get("ids"),Long.class); return CrudUtil.deleteHandle(placeService.changeStateToDeletedByIds(ids), ids.size()); } else { throw new MyException("所需请求参数缺失！"); @@ -263,7 +263,7 @@ public class PlaceController { } Object id = map.get("id"); // 获取当前修改的库位 - Place placeById = placeService.findPlaceById(ObjectFormatUtil.toInteger(id)); + Place placeById = placeService.findPlaceById(ObjectFormatUtil.toLong(id)); Map update = new HashMap<>(); Integer place_x = ObjectFormatUtil.toInteger(map.get("place_x")); // Integer place_y = ObjectFormatUtil.toInteger(map.get("place_y")); @@ -320,7 +320,7 @@ public class PlaceController { if (!map.containsKey("id")) { throw new MyException("缺少必要参数"); } - Integer id = ObjectFormatUtil.toInteger(map.get("id")); + Long id = ObjectFormatUtil.toLong(map.get("id")); if (map.containsKey("state")) { map.put("state", 1); } else { @@ -330,7 +330,7 @@ public class PlaceController { Place placeById = placeService.findPlaceById(id); Map update = new HashMap<>(); if (!code.equals(placeById.getCode())) { - Integer depositoryId = ObjectFormatUtil.toInteger(map.get("did")); + Long depositoryId = ObjectFormatUtil.toLong(map.get("did")); Place placeByDidAndCode = placeService.findPlaceByDidAndCode(depositoryId, code); if (placeByDidAndCode == null) { update.put("code", code); @@ -385,12 +385,12 @@ public class PlaceController { // 查询当前用户管理的仓库 List depositoryAndRole = roleService.findDepositoryAndRole(userToken.getId()); depositoryAndRole.addAll(roleService.findDepositoryAndRole(userToken.getPosition())); - Integer mid = ObjectFormatUtil.toInteger(map.get("mid")); + Long mid = ObjectFormatUtil.toLong(map.get("mid")); Inventory inventoryById = materialService.findInventoryById(mid); List placeList = new ArrayList<>(); Map param = new HashMap<>(); param.put("mcode", inventoryById.getCode()); - List depositoryIdList = new ArrayList<>(); + List depositoryIdList = new ArrayList<>(); for (Depository depository : depositoryByAdminorg) { depositoryIdList.add(depository.getId()); } @@ -400,13 +400,13 @@ public class PlaceController { } } List inventoryPList = new ArrayList<>(); - for (Integer depositoryId : depositoryIdList + for (Long depositoryId : depositoryIdList ) { param.put("depositoryId", depositoryId); // 查找当前用户部门仓库中是否存在该物料 inventoryPList.addAll(materialService.findInventory(param)); } - for (Integer depositoryId : depositoryIdList) { + for (Long depositoryId : depositoryIdList) { for (InventoryP inventory : inventoryPList) { List placeByMidAndDid = placeService.findPlaceByMidAndDid(inventory.getId(), depositoryId); for (PlaceP placeP : placeByMidAndDid) { @@ -429,7 +429,7 @@ public class PlaceController { if (inventory.size() > 0) { // 如果有当前物料 for (int i = 0; i < inventory.size(); i++) { InventoryP materialP = inventory.get(i); - List placeByMidAndDid = placeService.findPlaceByMidAndDid(materialP.getId(), ObjectFormatUtil.toInteger(map.get("depositoryId"))); + List placeByMidAndDid = placeService.findPlaceByMidAndDid(materialP.getId(), ObjectFormatUtil.toLong(map.get("depositoryId"))); for (int j = 0; j < placeByMidAndDid.size(); j++) { int index = placeList.indexOf(placeByMidAndDid.get(j)); if (index == -1) { @@ -446,7 +446,7 @@ public class PlaceController { public RestResponse createQrCode(@RequestBody Map map) { - Integer pid = ObjectFormatUtil.toInteger(map.get("pid")); + Long pid = ObjectFormatUtil.toLong(map.get("pid")); String qrCode = placeService.findQrCodeByPlace(pid); try { // 二维码保存信息 @@ -475,10 +475,10 @@ public class PlaceController { // 如果当前位置为库位 // 获取当前库位 - Place place = placeService.findPlaceById(ObjectFormatUtil.toInteger(locationByQrCode.getPid().toString())); + Place place = placeService.findPlaceById(ObjectFormatUtil.toLong(locationByQrCode.getPid().toString())); PlaceP placeP = new PlaceP(place); - if (Integer.compare(0, placeP.getId()) == 0) { + if (Long.compare(0, placeP.getId()) == 0) { // 如果是默认库位 placeP.setDepositoryName("默认库位-0000"); } else { @@ -491,7 +491,7 @@ public class PlaceController { // 如果当前位置为仓库 // 获取当前仓库 - Depository depository = depositoryService.findDepositoryById(ObjectFormatUtil.toInteger(locationByQrCode.getDepositoryId().toString())); + Depository depository = depositoryService.findDepositoryById(ObjectFormatUtil.toLong(locationByQrCode.getDepositoryId().toString())); result.put("flag", 2); result.put("depository", depository); } @@ -513,11 +513,11 @@ public class PlaceController { String id = map.get("id"); if ("d".equals(type)) { // 如果是仓库 - Depository depositoryById = depositoryService.findDepositoryById(ObjectFormatUtil.toInteger(id)); + Depository depositoryById = depositoryService.findDepositoryById(ObjectFormatUtil.toLong(id)); return new RestResponse(depositoryById); } else if ("p".equals(type)) { // 如果是库位 - Place placeById = placeService.findPlaceById(ObjectFormatUtil.toInteger(id)); + Place placeById = placeService.findPlaceById(ObjectFormatUtil.toLong(id)); if (placeById != null) { PlaceP placeP = new PlaceP(placeById); Depository depositoryById = depositoryService.findDepositoryById(placeById.getDid()); diff --git a/src/main/java/com/dreamchaser/depository_manage/controller/QyWxOperationController.java b/src/main/java/com/dreamchaser/depository_manage/controller/QyWxOperationController.java index ed7e08b2..c7b5c3f2 100644 --- a/src/main/java/com/dreamchaser/depository_manage/controller/QyWxOperationController.java +++ b/src/main/java/com/dreamchaser/depository_manage/controller/QyWxOperationController.java @@ -272,7 +272,7 @@ public class QyWxOperationController { if (userByPort != null) { // 如果数据库中存在该用户 // 获取当前用户所在主部门 - int maindeparment = userByPort.getMaindeparment(); + Long maindeparment = userByPort.getMaindeparment(); if (maindeparment == 309) { userByPort.setMaindeparment(userByPort.getAdminorg()); } @@ -625,7 +625,7 @@ public class QyWxOperationController { boolean flagForLabel = true; // 默认为标签 // 获取当前的主订单 - ApplicationOutRecordP applicationOutRecordPById = depositoryRecordService.findApplicationOutRecordPById(ObjectFormatUtil.toInteger(mainId)); + ApplicationOutRecordP applicationOutRecordPById = depositoryRecordService.findApplicationOutRecordPById(ObjectFormatUtil.toLong(mainId)); if (Integer.compare(applicationOutRecordPById.getFlagForOpenDepository(), 2) == 0) { // 如果是申请的开放仓库 diff --git a/src/main/java/com/dreamchaser/depository_manage/controller/SplitController.java b/src/main/java/com/dreamchaser/depository_manage/controller/SplitController.java index 05305077..198c6352 100644 --- a/src/main/java/com/dreamchaser/depository_manage/controller/SplitController.java +++ b/src/main/java/com/dreamchaser/depository_manage/controller/SplitController.java @@ -57,7 +57,7 @@ public class SplitController { @PostMapping("/findSplitInventoryByIid") public RestResponse findSplitInventoryByIid(@RequestBody Map map){ if (map.containsKey("iid") ) { - Integer iid = ObjectFormatUtil.toInteger(map.get("iid")); + Long iid = ObjectFormatUtil.toLong(map.get("iid")); List splitInventoryByIid = splitUnitService.findSplitInventoryByIid(iid); return new RestResponse(splitInventoryByIid); } else { @@ -88,7 +88,7 @@ public class SplitController { @PostMapping("/split_del") public RestResponse splitDel(@RequestBody Map map) { if (map.containsKey("id")) { - Integer id = ObjectFormatUtil.toInteger(map.get("id")); + Long id = ObjectFormatUtil.toLong(map.get("id")); Integer integer = splitUnitService.delSplitInfoById(id); if (Integer.compare(integer, -1) == 0) { // 如果没有删除 @@ -97,10 +97,10 @@ public class SplitController { return CrudUtil.deleteHandle(1, integer); } } else if (map.containsKey("ids")) { - List ids = (List) map.get("ids"); + List ids = ObjectFormatUtil.objToList(map.get("ids"),Long.class); List errInfo = new ArrayList<>(); int result = 0; - for (Integer id : ids) { + for (Long id : ids) { Integer integer = splitUnitService.delSplitInfoById(id); if (Integer.compare(integer, -1) == 0) { // 如果没有删除 @@ -148,7 +148,7 @@ public class SplitController { public RestResponse findAllSplitInfoForbidden(@RequestBody Map map) { if (map.containsKey("id")) { // 获取当前要禁用的拆单 - Integer sid = ObjectFormatUtil.toInteger(map.get("id")); + Long sid = ObjectFormatUtil.toLong(map.get("id")); // 判断当前拆单是否可以禁用 boolean sonSplitInfoByParentId = findSonSplitInfoByParentId(sid, true); return new RestResponse(sonSplitInfoByParentId); @@ -164,7 +164,7 @@ public class SplitController { * @param flag 标志位 * @return */ - boolean findSonSplitInfoByParentId(Integer parentId,boolean flag){ + boolean findSonSplitInfoByParentId(Long parentId,boolean flag){ // 获取当前的子拆单 SplitInfo splitInfoByParentId = splitUnitService.findSplitInfoByParentId(parentId); boolean allSplitInfoForbidden = splitUnitService.findAllSplitInfoForbidden(parentId); diff --git a/src/main/java/com/dreamchaser/depository_manage/controller/StockTakingController.java b/src/main/java/com/dreamchaser/depository_manage/controller/StockTakingController.java index a415c9dd..6dd73ece 100644 --- a/src/main/java/com/dreamchaser/depository_manage/controller/StockTakingController.java +++ b/src/main/java/com/dreamchaser/depository_manage/controller/StockTakingController.java @@ -135,7 +135,7 @@ public class StockTakingController { // 用于发送审批 SendQyWxMessageThreadPool.execute(() -> { - JSONObject jsonObject = qyWxOperationService.sendApprovalTemplateStockTaking(crypt, userToken, ObjectFormatUtil.toInteger(mainId), QyWxDepartmentManager.toString()); + JSONObject jsonObject = qyWxOperationService.sendApprovalTemplateStockTaking(crypt, userToken, ObjectFormatUtil.toLong(mainId), QyWxDepartmentManager.toString()); String sp_no = jsonObject.getString("sp_no"); Map QyWxApprovalMap = new HashMap<>(); QyWxApprovalMap.put("sp_no", sp_no); @@ -153,7 +153,7 @@ public class StockTakingController { // 用于发送审批 SendQyWxMessageThreadPool.execute(() -> { - JSONObject jsonObject = qyWxOperationService.sendApprovalTemplateStockTaking(crypt, userToken, ObjectFormatUtil.toInteger(mainId), QyWxDepartmentManager.toString()); + JSONObject jsonObject = qyWxOperationService.sendApprovalTemplateStockTaking(crypt, userToken, ObjectFormatUtil.toLong(mainId), QyWxDepartmentManager.toString()); String sp_no = jsonObject.getString("sp_no"); Map QyWxApprovalMap = new HashMap<>(); QyWxApprovalMap.put("sp_no", sp_no); @@ -257,9 +257,9 @@ public class StockTakingController { } String placeId = (String) map.get("placeId"); // 获取当前库位 - Place placeById = placeService.findPlaceById(ObjectFormatUtil.toInteger(placeId)); + Place placeById = placeService.findPlaceById(ObjectFormatUtil.toLong(placeId)); // 获取当前库位的容量 - Integer inventory = placeById.getMax() - placeById.getQuantity(); + Long inventory = placeById.getMax() - placeById.getQuantity(); return new RestResponse(inventory); } @@ -351,7 +351,7 @@ public class StockTakingController { token = (String) request.getSession().getAttribute("userToken"); } UserByPort userToken = AuthenticationTokenPool.getUserToken(token); - MaterialAndPlace mpv = placeService.findPlaceAndMaterialById(ObjectFormatUtil.toInteger(map.get("mpId"))); + MaterialAndPlace mpv = placeService.findPlaceAndMaterialById(ObjectFormatUtil.toLong(map.get("mpId"))); String key = "wms_stockTaking_" + userToken.getId() + "_" + DateUtil.getNowTime() + "_" + mpv.getId(); // 设置结果集 // 获取存储在redis中盘点记录的key @@ -401,7 +401,7 @@ public class StockTakingController { // 如果是第一次提交 // 获取盘点时的物料与库位的对应关系id - Integer id = ObjectFormatUtil.toInteger(redisPool.getRedisTemplateByDb(15).opsForHash().get(key, "id")); + Long id = ObjectFormatUtil.toLong(redisPool.getRedisTemplateByDb(15).opsForHash().get(key, "id")); // 获取物料与库位的对应关系 MaterialAndPlace placeAndMaterial = placeService.findPlaceAndMaterialById(id); @@ -466,11 +466,11 @@ public class StockTakingController { } QyWxDepartmentManager.append("PangFuZhen"); if (map.containsKey("mainIdList")) { - List mainIdList = (List) map.get("mainIdList"); + List mainIdList = ObjectFormatUtil.objToList(map.get("mainIdList"),Object.class); for (Object main : mainIdList ) { SendQyWxMessageThreadPool.execute(() -> { - JSONObject jsonObject = qyWxOperationService.sendApprovalTemplateStockTaking(crypt, userToken, ObjectFormatUtil.toInteger(main), QyWxDepartmentManager.toString()); + JSONObject jsonObject = qyWxOperationService.sendApprovalTemplateStockTaking(crypt, userToken, ObjectFormatUtil.toLong(main), QyWxDepartmentManager.toString()); String sp_no = jsonObject.getString("sp_no"); Map QyWxApprovalMap = new HashMap<>(); QyWxApprovalMap.put("sp_no", sp_no); @@ -484,7 +484,7 @@ public class StockTakingController { // 用于发送审批 Object finalMainId = mainId; SendQyWxMessageThreadPool.execute(() -> { - JSONObject jsonObject = qyWxOperationService.sendApprovalTemplateStockTaking(crypt, userToken, ObjectFormatUtil.toInteger(finalMainId), QyWxDepartmentManager.toString()); + JSONObject jsonObject = qyWxOperationService.sendApprovalTemplateStockTaking(crypt, userToken, ObjectFormatUtil.toLong(finalMainId), QyWxDepartmentManager.toString()); String sp_no = jsonObject.getString("sp_no"); Map QyWxApprovalMap = new HashMap<>(); QyWxApprovalMap.put("sp_no", sp_no); diff --git a/src/main/java/com/dreamchaser/depository_manage/controller/UserController.java b/src/main/java/com/dreamchaser/depository_manage/controller/UserController.java index b41939bc..46cbe16e 100644 --- a/src/main/java/com/dreamchaser/depository_manage/controller/UserController.java +++ b/src/main/java/com/dreamchaser/depository_manage/controller/UserController.java @@ -287,12 +287,12 @@ public class UserController { @PostMapping("/sys/userRole_del") public RestResponse deleteRoleAndDepository(@RequestBody Map map) { if (map.containsKey("id")) { - Integer id = ObjectFormatUtil.toInteger(map.get("id")); + Long id = ObjectFormatUtil.toLong(map.get("id")); return CrudUtil.deleteHandle(roleService.deleteRoleAndDepositoryById(id), 1); } else if (map.containsKey("ids")) { Integer num = 0; - List ids = (List) map.get("ids"); - for (Integer id : ids) { + List ids = ObjectFormatUtil.objToList(map.get("ids"),Long.class); + for (Long id : ids) { num += roleService.deleteRoleAndDepositoryById(id); } return CrudUtil.deleteHandle(num, ids.size()); @@ -311,12 +311,12 @@ public class UserController { @PostMapping("/sys/userRole_delForIn") public RestResponse deleteRoleAndMaterialType(@RequestBody Map map) { if (map.containsKey("id")) { - Integer id = ObjectFormatUtil.toInteger(map.get("id")); + Long id = ObjectFormatUtil.toLong(map.get("id")); return CrudUtil.deleteHandle(roleService.deleteRoleAndMaterialTypeById(id), 1); } else if (map.containsKey("ids")) { Integer num = 0; - List ids = (List) map.get("ids"); - for (Integer id : ids) { + List ids = ObjectFormatUtil.objToList(map.get("ids"),Long.class); + for (Long id : ids) { num += roleService.deleteRoleAndMaterialTypeById(id); } return CrudUtil.deleteHandle(num, ids.size()); @@ -478,7 +478,7 @@ public class UserController { public List childAddress(List accessToAddressByList, AccesstoAddress address) { List accessstoAddressByParent = new ArrayList<>(); for (AccesstoAddress accesstoAddress : accessToAddressByList) { - if (Integer.compare(accesstoAddress.getMenuparent(), address.getId()) == 0) { + if (Long.compare(accesstoAddress.getMenuparent(), address.getId()) == 0) { accessstoAddressByParent.add(accesstoAddress); } } diff --git a/src/main/java/com/dreamchaser/depository_manage/converter/ExcelDepositoryInfoConverter.java b/src/main/java/com/dreamchaser/depository_manage/converter/ExcelDepositoryInfoConverter.java index 62b0d7db..11858f32 100644 --- a/src/main/java/com/dreamchaser/depository_manage/converter/ExcelDepositoryInfoConverter.java +++ b/src/main/java/com/dreamchaser/depository_manage/converter/ExcelDepositoryInfoConverter.java @@ -21,7 +21,7 @@ import java.util.List; * 用于将仓库编码转为仓库id */ @Component -public class ExcelDepositoryInfoConverter implements Converter { +public class ExcelDepositoryInfoConverter implements Converter { private static ExcelDepositoryInfoConverter excelDepositoryInfoConverter; @Autowired @@ -29,7 +29,7 @@ public class ExcelDepositoryInfoConverter implements Converter { @Override public Class supportJavaTypeKey() { - return Integer.class; + return Long.class; } @Override @@ -38,8 +38,8 @@ public class ExcelDepositoryInfoConverter implements Converter { } @Override - public Integer convertToJavaData(ReadCellData cellData, ExcelContentProperty contentProperty, GlobalConfiguration globalConfiguration) throws Exception { - Integer data = 0; + public Long convertToJavaData(ReadCellData cellData, ExcelContentProperty contentProperty, GlobalConfiguration globalConfiguration) throws Exception { + Long data = 0L; Depository depository = excelDepositoryInfoConverter.depositoryService.findDepositoryByCode(cellData.getStringValue()); if (depository != null) { data = depository.getId(); @@ -51,7 +51,7 @@ public class ExcelDepositoryInfoConverter implements Converter { } @Override - public WriteCellData convertToExcelData(Integer value, ExcelContentProperty contentProperty, GlobalConfiguration globalConfiguration) throws Exception { + public WriteCellData convertToExcelData(Long value, ExcelContentProperty contentProperty, GlobalConfiguration globalConfiguration) throws Exception { Depository depository = excelDepositoryInfoConverter.depositoryService.findDepositoryById(value); String data = ""; if(depository != null) { diff --git a/src/main/java/com/dreamchaser/depository_manage/converter/ExcelMaterialTypeInfoConverter.java b/src/main/java/com/dreamchaser/depository_manage/converter/ExcelMaterialTypeInfoConverter.java index f4dbda33..9c05d233 100644 --- a/src/main/java/com/dreamchaser/depository_manage/converter/ExcelMaterialTypeInfoConverter.java +++ b/src/main/java/com/dreamchaser/depository_manage/converter/ExcelMaterialTypeInfoConverter.java @@ -19,7 +19,7 @@ import java.util.List; // 用于表格数据导入时物料类型部分数据的转换 @Component -public class ExcelMaterialTypeInfoConverter implements Converter { +public class ExcelMaterialTypeInfoConverter implements Converter { @Autowired private MaterialTypeService materialTypeService; @@ -28,7 +28,7 @@ public class ExcelMaterialTypeInfoConverter implements Converter { @Override public Class supportJavaTypeKey() { - return Integer.class; + return Long.class; } @Override @@ -38,18 +38,18 @@ public class ExcelMaterialTypeInfoConverter implements Converter { @Override - public Integer convertToJavaData(ReadCellData cellData, ExcelContentProperty contentProperty, GlobalConfiguration globalConfiguration) throws Exception { - Integer data = 0; + public Long convertToJavaData(ReadCellData cellData, ExcelContentProperty contentProperty, GlobalConfiguration globalConfiguration) throws Exception { + Long data = 0L; return data; } @Override - public WriteCellData convertToExcelData(Integer value, ExcelContentProperty contentProperty, GlobalConfiguration globalConfiguration) throws Exception { + public WriteCellData convertToExcelData(Long value, ExcelContentProperty contentProperty, GlobalConfiguration globalConfiguration) throws Exception { List materialTypeAll = excelMaterialTypeInfoConverter.materialTypeService.findMaterialTypeAll(); String data = null; - for (int i = 0; i < materialTypeAll.size(); i++) { - if(value == materialTypeAll.get(i).getId()){ - data = materialTypeAll.get(i).getTname(); + for (MaterialType materialType : materialTypeAll) { + if (Long.compare(value,materialType.getId()) == 0) { + data = materialType.getTname(); } } return new WriteCellData<>(data); diff --git a/src/main/java/com/dreamchaser/depository_manage/depository_mapper/AccesstoAddressMapper.java b/src/main/java/com/dreamchaser/depository_manage/depository_mapper/AccesstoAddressMapper.java index 9ae3c222..4cd9a6be 100644 --- a/src/main/java/com/dreamchaser/depository_manage/depository_mapper/AccesstoAddressMapper.java +++ b/src/main/java/com/dreamchaser/depository_manage/depository_mapper/AccesstoAddressMapper.java @@ -35,7 +35,7 @@ public interface AccesstoAddressMapper { * @param id * @return */ - List findAccessstoAddressByParent(Integer id); + List findAccessstoAddressByParent(Long id); List findAccessstoAddressByParentAndRole(Map map); diff --git a/src/main/java/com/dreamchaser/depository_manage/depository_mapper/AccesstoAddressMapper.xml b/src/main/java/com/dreamchaser/depository_manage/depository_mapper/AccesstoAddressMapper.xml index 97612ef9..5c3d436f 100644 --- a/src/main/java/com/dreamchaser/depository_manage/depository_mapper/AccesstoAddressMapper.xml +++ b/src/main/java/com/dreamchaser/depository_manage/depository_mapper/AccesstoAddressMapper.xml @@ -6,12 +6,12 @@ - + - - + + @@ -73,7 +73,7 @@ - select from accesstoaddress a diff --git a/src/main/java/com/dreamchaser/depository_manage/depository_mapper/BusinessTypeMapper.java b/src/main/java/com/dreamchaser/depository_manage/depository_mapper/BusinessTypeMapper.java index 2ea8c09c..0fa22f5b 100644 --- a/src/main/java/com/dreamchaser/depository_manage/depository_mapper/BusinessTypeMapper.java +++ b/src/main/java/com/dreamchaser/depository_manage/depository_mapper/BusinessTypeMapper.java @@ -56,14 +56,14 @@ public interface BusinessTypeMapper { * @param id 待删除id * @return */ - Integer deleteBusinessTypeById(Integer id); + Integer deleteBusinessTypeById(Long id); /** * 根据id批量删除一条业务类型数据（硬删除） * @param ids 待删除id列表 * @return */ - Integer deleteBusinessTypeByIds(List ids); + Integer deleteBusinessTypeByIds(List ids); /** * 根据条件获取业务类型数据 @@ -90,12 +90,12 @@ public interface BusinessTypeMapper { * @param id 待查询id * @return */ - BusinessType findBusinessTypeById(Integer id); + BusinessType findBusinessTypeById(Long id); /** * 根据id批量获取业务类型数据 * @param ids 待查询id列表 * @return */ - List findBusinessTypeByIds(List ids); + List findBusinessTypeByIds(List ids); } diff --git a/src/main/java/com/dreamchaser/depository_manage/depository_mapper/BusinessTypeMapper.xml b/src/main/java/com/dreamchaser/depository_manage/depository_mapper/BusinessTypeMapper.xml index eb035a04..b5405a09 100644 --- a/src/main/java/com/dreamchaser/depository_manage/depository_mapper/BusinessTypeMapper.xml +++ b/src/main/java/com/dreamchaser/depository_manage/depository_mapper/BusinessTypeMapper.xml @@ -8,10 +8,10 @@ - + - - + + @@ -89,7 +89,7 @@ - + delete from businesstype where id = #{id} @@ -157,7 +157,7 @@ - select from businesstype diff --git a/src/main/java/com/dreamchaser/depository_manage/depository_mapper/CompanyMapper.java b/src/main/java/com/dreamchaser/depository_manage/depository_mapper/CompanyMapper.java index 4c3186f0..3d338657 100644 --- a/src/main/java/com/dreamchaser/depository_manage/depository_mapper/CompanyMapper.java +++ b/src/main/java/com/dreamchaser/depository_manage/depository_mapper/CompanyMapper.java @@ -20,14 +20,14 @@ public interface CompanyMapper { * 根据父级查询公司信息 * @return */ - List findCompanyByParentId(Integer parentId); + List findCompanyByParentId(Long parentId); /** * 根据id编号删除公司信息 * @param id * @return */ - Integer deleteCompanyById(Integer id); + Integer deleteCompanyById(Long id); /** * 修改公司信息 @@ -61,21 +61,21 @@ public interface CompanyMapper { * @param id * @return */ - Company findcompanyById(Integer id); + Company findcompanyById(Long id); /** * 根据主键将公司状态改为删除 * @param id * @return */ - Integer changeStateToDeletedById(Integer id); + Integer changeStateToDeletedById(Long id); /** * 根据主键批量将公司状态改为删除 * @param ids * @return */ - Integer changeStateToDeletedByIds(List ids); + Integer changeStateToDeletedByIds(List ids); /** * 根据条件修改公司状态 @@ -89,5 +89,5 @@ public interface CompanyMapper { * @param ids * @return */ - Integer deleteCompanyByIds(List ids); + Integer deleteCompanyByIds(List ids); } diff --git a/src/main/java/com/dreamchaser/depository_manage/depository_mapper/CompanyMapper.xml b/src/main/java/com/dreamchaser/depository_manage/depository_mapper/CompanyMapper.xml index 5ec1201a..90f4069c 100644 --- a/src/main/java/com/dreamchaser/depository_manage/depository_mapper/CompanyMapper.xml +++ b/src/main/java/com/dreamchaser/depository_manage/depository_mapper/CompanyMapper.xml @@ -6,10 +6,10 @@ - + - + @@ -28,7 +28,7 @@ Where c.state != 3 - select from company c where c.cid = #{id} @@ -79,7 +79,7 @@ - select from company c @@ -87,7 +87,7 @@ - + DELETE FROM company WHERE cid = #{id} @@ -132,7 +132,7 @@ - + update company state = 3 diff --git a/src/main/java/com/dreamchaser/depository_manage/depository_mapper/ConstructionUnitMapper.java b/src/main/java/com/dreamchaser/depository_manage/depository_mapper/ConstructionUnitMapper.java index 20d6d131..85cd3d86 100644 --- a/src/main/java/com/dreamchaser/depository_manage/depository_mapper/ConstructionUnitMapper.java +++ b/src/main/java/com/dreamchaser/depository_manage/depository_mapper/ConstructionUnitMapper.java @@ -50,7 +50,7 @@ public interface ConstructionUnitMapper { * @param id 待查询主键 * @return */ - ConstructionUnit findConstructionUnitById(Integer id); + ConstructionUnit findConstructionUnitById(Long id); /** * 修改施工单位状态 @@ -76,7 +76,7 @@ public interface ConstructionUnitMapper { * @param id 待删除id * @return */ - Integer deleteConstructionUnitById(Integer id); + Integer deleteConstructionUnitById(Long id); /** * 根据主键id批量删除施工单位 @@ -84,7 +84,7 @@ public interface ConstructionUnitMapper { * @param list 待删除id列表 * @return */ - Integer deleteConstructionUnitByIds(List list); + Integer deleteConstructionUnitByIds(List list); } diff --git a/src/main/java/com/dreamchaser/depository_manage/depository_mapper/ConstructionUnitMapper.xml b/src/main/java/com/dreamchaser/depository_manage/depository_mapper/ConstructionUnitMapper.xml index eb5df644..e8f0b602 100644 --- a/src/main/java/com/dreamchaser/depository_manage/depository_mapper/ConstructionUnitMapper.xml +++ b/src/main/java/com/dreamchaser/depository_manage/depository_mapper/ConstructionUnitMapper.xml @@ -3,12 +3,12 @@ - + - + id,`name`,state,introduce,address,createTime @@ -76,7 +76,7 @@ - select from constructionunit @@ -113,7 +113,7 @@ where id = #{id} - + delete from constructionunit where id = #{id} diff --git a/src/main/java/com/dreamchaser/depository_manage/depository_mapper/DepositoryMapper.java b/src/main/java/com/dreamchaser/depository_manage/depository_mapper/DepositoryMapper.java index c0102919..b04ef11f 100644 --- a/src/main/java/com/dreamchaser/depository_manage/depository_mapper/DepositoryMapper.java +++ b/src/main/java/com/dreamchaser/depository_manage/depository_mapper/DepositoryMapper.java @@ -33,14 +33,14 @@ public interface DepositoryMapper { * @param ids * @return */ - List selectDepositoryByIds(List ids); + List selectDepositoryByIds(List ids); /** * 根据仓库id查询仓库名称 * @param id 仓库id * @return 仓库名称 */ - String findDepositoryNameById(int id); + String findDepositoryNameById(Long id); /** @@ -57,14 +57,14 @@ public interface DepositoryMapper { * @param id 参数id * @return 受影响条数 */ - Integer deleteDepositoryRecordById(Integer id); + Integer deleteDepositoryRecordById(Long id); /** * 根据仓库id批量删除仓库信息 * @param list 参数list * @return 受影响条数 */ - Integer deleteDepositoryRecordByIds(List list); + Integer deleteDepositoryRecordByIds(List list); /** @@ -72,14 +72,14 @@ public interface DepositoryMapper { * @param id 参数id * @return 对应仓库信息 */ - Depository findDepositoryById(Integer id); + Depository findDepositoryById(Long id); /** * 根据主键id批量获取数据 * @param list * @return 查询数据 */ - List findDepositoryByIds(List list); + List findDepositoryByIds(List list); @@ -108,7 +108,7 @@ public interface DepositoryMapper { * @param did * @return */ - List findDepositoryByParent(Integer did); + List findDepositoryByParent(Long did); /** @@ -116,7 +116,7 @@ public interface DepositoryMapper { * @param list * @return */ - List findDepositoryByParents(List list); + List findDepositoryByParents(List list); @@ -125,14 +125,14 @@ public interface DepositoryMapper { * @param id * @return 搜索结果 */ - Integer changeStateToDeletedById(Integer id); + Integer changeStateToDeletedById(Long id); /** * 根据多个主键id将对应仓库状态改为删除 * @param ids * @return 受影响数目 */ - Integer changeStateToDeletedByIds(List ids); + Integer changeStateToDeletedByIds(List ids); /** @@ -183,13 +183,13 @@ public interface DepositoryMapper { * @param depositoryId * @return */ - String findUserNameByDepositoryId(Integer depositoryId); + String findUserNameByDepositoryId(Long depositoryId); /** * 根据父级获取子类 * @param parentId * @return */ - List getParentByDepository(Integer parentId); + List getParentByDepository(Long parentId); /** * 获取当前部门以及公共仓库 * @param adminorg diff --git a/src/main/java/com/dreamchaser/depository_manage/depository_mapper/DepositoryMapper.xml b/src/main/java/com/dreamchaser/depository_manage/depository_mapper/DepositoryMapper.xml index af50c9f9..2cd796ee 100644 --- a/src/main/java/com/dreamchaser/depository_manage/depository_mapper/DepositoryMapper.xml +++ b/src/main/java/com/dreamchaser/depository_manage/depository_mapper/DepositoryMapper.xml @@ -6,16 +6,16 @@ - + - - + + - - + + @@ -24,9 +24,9 @@ - - - + + + @@ -42,7 +42,7 @@ - SELECT d.dname FROM depository d where d.id=#{id} @@ -72,7 +72,7 @@ - SELECT FROM depositoryandcompany dc @@ -199,7 +199,7 @@ - SELECT FROM depository d WHERE d.parentId = #{parentId} @@ -207,7 +207,7 @@ - SELECT FROM depository d WHERE d.id = #{id} @@ -318,7 +318,7 @@ - + DELETE FROM depository WHERE id = #{id} @@ -332,7 +332,7 @@ - + UPDATE depository state = 3 @@ -424,7 +424,7 @@ - select uname from depositoryanduser where did = #{depositoryId} diff --git a/src/main/java/com/dreamchaser/depository_manage/depository_mapper/DepositoryRecordMapper.java b/src/main/java/com/dreamchaser/depository_manage/depository_mapper/DepositoryRecordMapper.java index 03357558..0e9fa398 100644 --- a/src/main/java/com/dreamchaser/depository_manage/depository_mapper/DepositoryRecordMapper.java +++ b/src/main/java/com/dreamchaser/depository_manage/depository_mapper/DepositoryRecordMapper.java @@ -39,7 +39,7 @@ public interface DepositoryRecordMapper { * @param id 记录id * @return 受影响的行数 */ - Integer deleteDepositoryRecordById(Integer id); + Integer deleteDepositoryRecordById(Long id); /** * 根据id修改仓库调度记录 @@ -63,7 +63,7 @@ public interface DepositoryRecordMapper { * @param id id * @return 该id的数据记录 */ - DepositoryRecord findDepositoryRecordById(Integer id); + DepositoryRecord findDepositoryRecordById(Long id); /** * 查找所有仓库调度记录 @@ -85,14 +85,14 @@ public interface DepositoryRecordMapper { * @param ids * @return */ - List findApplicationInRecordsByIds(List ids); + List findApplicationInRecordsByIds(List ids); /** * 查找所有入库记录 * * @return */ - List findApplicationInRecordPByDepositoryList(List list); + List findApplicationInRecordPByDepositoryList(List list); /** * 查询一段时间内的入库记录 @@ -163,7 +163,7 @@ public interface DepositoryRecordMapper { * @param list id集合 * @return 受影响的行数 */ - Integer deleteDepositoryRecordByIds(List list); + Integer deleteDepositoryRecordByIds(List list); /** * 返回该表的总条数 @@ -379,7 +379,7 @@ public interface DepositoryRecordMapper { * @param id * @return */ - ApplicationInRecord findApplicationInRecordPById(Integer id); + ApplicationInRecord findApplicationInRecordPById(Long id); /** @@ -388,7 +388,7 @@ public interface DepositoryRecordMapper { * @param id * @return */ - List findApplicationInRecordPByToGroupId(Integer id); + List findApplicationInRecordPByToGroupId(Long id); /** @@ -397,7 +397,7 @@ public interface DepositoryRecordMapper { * @param id * @return */ - ApplicationOutRecord findApplicationOutRecordPById(Integer id); + ApplicationOutRecord findApplicationOutRecordPById(Long id); /** @@ -406,7 +406,7 @@ public interface DepositoryRecordMapper { * @param list * @return */ - List findApplicationOutRecordPByIds(List list); + List findApplicationOutRecordPByIds(List list); /** * 根据id删除入库记录 @@ -414,7 +414,7 @@ public interface DepositoryRecordMapper { * @param id * @return 受影响的行数 */ - Integer deleteApplicationInRecordById(Integer id); + Integer deleteApplicationInRecordById(Long id); /** * 根据id集合删除多条入库记录 @@ -422,7 +422,7 @@ public interface DepositoryRecordMapper { * @param list id集合 * @return 受影响的行数 */ - Integer deleteApplicationInRecordByIds(List list); + Integer deleteApplicationInRecordByIds(List list); /** * 插入一条出库记录 @@ -438,7 +438,7 @@ public interface DepositoryRecordMapper { * @param id * @return 受影响的行数 */ - Integer deleteApplicationOutRecordById(Integer id); + Integer deleteApplicationOutRecordById(Long id); /** @@ -447,7 +447,7 @@ public interface DepositoryRecordMapper { * @param id * @return 受影响的行数 */ - Integer deleteApplicationOutRecordMinById(Integer id); + Integer deleteApplicationOutRecordMinById(Long id); /** @@ -456,7 +456,7 @@ public interface DepositoryRecordMapper { * @param list id集合 * @return 受影响的行数 */ - Integer deleteApplicationOutRecordByIds(List list); + Integer deleteApplicationOutRecordByIds(List list); /** @@ -465,7 +465,7 @@ public interface DepositoryRecordMapper { * @param list id集合 * @return 受影响的行数 */ - Integer deleteApplicationOutRecordMinByIds(List list); + Integer deleteApplicationOutRecordMinByIds(List list); /** * 根据申请单号获取入库申请 @@ -498,7 +498,7 @@ public interface DepositoryRecordMapper { * @param id * @return */ - ApplicationOutRecordMin findApplicationOutMinById(Integer id); + ApplicationOutRecordMin findApplicationOutMinById(Long id); /** * 根据id批量获取出库子订单 @@ -506,7 +506,7 @@ public interface DepositoryRecordMapper { * @param list * @return */ - List findApplicationOutMinByIds(List list); + List findApplicationOutMinByIds(List list); /** * 根据主表获取所有子表 @@ -514,7 +514,7 @@ public interface DepositoryRecordMapper { * @param parentId * @return */ - List findApplicationOutRecordMinByParent(Integer parentId); + List findApplicationOutRecordMinByParent(Long parentId); /** * 根据主表获取所有子表 @@ -522,7 +522,7 @@ public interface DepositoryRecordMapper { * @param list * @return */ - List findApplicationOutRecordMinByParents(List list); + List findApplicationOutRecordMinByParents(List list); /** * 修改子表记录 diff --git a/src/main/java/com/dreamchaser/depository_manage/depository_mapper/DepositoryRecordMapper.xml b/src/main/java/com/dreamchaser/depository_manage/depository_mapper/DepositoryRecordMapper.xml index cfb22ee0..727f5881 100644 --- a/src/main/java/com/dreamchaser/depository_manage/depository_mapper/DepositoryRecordMapper.xml +++ b/src/main/java/com/dreamchaser/depository_manage/depository_mapper/DepositoryRecordMapper.xml @@ -6,68 +6,68 @@ - + - + - + - - - + + + - - - + + + - - + + - + - + - - + + - + - + - + - + - - + + - + - - + + @@ -77,9 +77,9 @@ - - - + + + @@ -90,61 +90,61 @@ - - + + - + - - + + - + - + - + - + - - + + - + - - - - + + + + - - + + @@ -294,7 +294,7 @@ FROM depository_record dr - SELECT FROM depository_record dr @@ -832,7 +832,7 @@ - select from applicationOutRecordInfo @@ -863,7 +863,7 @@ - select from applicationInRecordInfo @@ -871,7 +871,7 @@ - select from applicationInRecordInfo @@ -1201,7 +1201,7 @@ - select from application_out_record_min as aorm @@ -1224,7 +1224,7 @@ - select from application_out_record_min as aorm @@ -1262,7 +1262,7 @@ - select from application_out_record_min as aorm @@ -1660,7 +1660,7 @@ - + DELETE FROM depository_record WHERE id = #{id} @@ -1874,7 +1874,7 @@ - select count(*) from depository_record dr where dr.state like '%已%' @@ -1883,7 +1883,7 @@ - + DELETE FROM application_in_record WHERE id = #{id} @@ -1898,7 +1898,7 @@ - + DELETE FROM application_out_record WHERE id = #{id} diff --git a/src/main/java/com/dreamchaser/depository_manage/depository_mapper/GroupMapper.java b/src/main/java/com/dreamchaser/depository_manage/depository_mapper/GroupMapper.java index 9f068878..cfd2ce4a 100644 --- a/src/main/java/com/dreamchaser/depository_manage/depository_mapper/GroupMapper.java +++ b/src/main/java/com/dreamchaser/depository_manage/depository_mapper/GroupMapper.java @@ -25,7 +25,7 @@ public interface GroupMapper { * @param gid 组合id * @return */ - Group findGroupOnlyById(Integer gid); + Group findGroupOnlyById(Long gid); /** * 用于查找所有组合 @@ -38,7 +38,7 @@ public interface GroupMapper { * @param id 组合id * @return */ - GroupInfo findGroupById(Integer id); + GroupInfo findGroupById(Long id); @@ -47,7 +47,7 @@ public interface GroupMapper { * @param gid 组合id * @return */ - List findGroupInfoByGid(Integer gid); + List findGroupInfoByGid(Long gid); /** @@ -73,7 +73,7 @@ public interface GroupMapper { * @param list 组合id列表 * @return */ - List findGroupByGids(List list); + List findGroupByGids(List list); /** * 修改组合中物料的数据 @@ -156,14 +156,14 @@ public interface GroupMapper { * @param id 待删除主键 * @return */ - Integer delMaterialForGroupById(Integer id); + Integer delMaterialForGroupById(Long id); /** * 根据主键批量删除组合中的物料明细 * @param list 待删除主键 * @return */ - Integer delMaterialForGroupByIds(List list); + Integer delMaterialForGroupByIds(List list); /** @@ -171,7 +171,7 @@ public interface GroupMapper { * @param id 待删除组合主键 * @return */ - Integer delGroup(Integer id); + Integer delGroup(Long id); /** @@ -186,6 +186,6 @@ public interface GroupMapper { * @param gid 组合id * @return */ - String findQrCodeByGid(Integer gid); + String findQrCodeByGid(Long gid); } diff --git a/src/main/java/com/dreamchaser/depository_manage/depository_mapper/GroupMapper.xml b/src/main/java/com/dreamchaser/depository_manage/depository_mapper/GroupMapper.xml index 41f261b1..14250350 100644 --- a/src/main/java/com/dreamchaser/depository_manage/depository_mapper/GroupMapper.xml +++ b/src/main/java/com/dreamchaser/depository_manage/depository_mapper/GroupMapper.xml @@ -4,11 +4,11 @@ - - - + + + - + @@ -29,20 +29,20 @@ - + - + - - - - + + + + @@ -97,7 +97,7 @@ - select from `group` @@ -135,7 +135,7 @@ - select from materialforgroup @@ -236,7 +236,7 @@ - select from materialforgroup @@ -331,7 +331,7 @@ where id = #{id} - select code from gidandcode where gid = #{gid} @@ -369,7 +369,7 @@ where id = #{id} - + delete from groupformaterial where id = #{id} @@ -381,7 +381,7 @@ - + delete from `group` where id = #{id} diff --git a/src/main/java/com/dreamchaser/depository_manage/depository_mapper/MaterialMapper.java b/src/main/java/com/dreamchaser/depository_manage/depository_mapper/MaterialMapper.java index 61a6c341..9d0dd059 100644 --- a/src/main/java/com/dreamchaser/depository_manage/depository_mapper/MaterialMapper.java +++ b/src/main/java/com/dreamchaser/depository_manage/depository_mapper/MaterialMapper.java @@ -121,7 +121,7 @@ public interface MaterialMapper { * @param id 库存id * @return 受影响的行数 */ - Integer deleteMaterialById(int id); + Integer deleteMaterialById(Long id); /** * 根据条件查询符合条件的库存信息 @@ -162,7 +162,7 @@ public interface MaterialMapper { * @param depositoryId 带查询仓库id * @return */ - Integer findInventorySumForDepository(Integer depositoryId); + Integer findInventorySumForDepository(Long depositoryId); /** @@ -205,7 +205,7 @@ public interface MaterialMapper { * @param id 库存id * @return 库存信息 */ - Material findMaterialById(int id); + Material findMaterialById(Long id); /** * 根据库存id查询库存信息 @@ -213,7 +213,7 @@ public interface MaterialMapper { * @param id 库存id * @return 库存信息 */ - Inventory findInventoryById(int id); + Inventory findInventoryById(Long id); /** * 根据物料id与仓库id列表获取对应库存信息 @@ -238,7 +238,7 @@ public interface MaterialMapper { * @param id 库存id * @return 库存信息 */ - Material findMaterialAndTypeById(int id); + Material findMaterialAndTypeById(Long id); /** * 根据id批量查询库存信息 @@ -246,7 +246,7 @@ public interface MaterialMapper { * @param list 库存id集合 * @return 库存信息 */ - List findInventoryByIds(List list); + List findInventoryByIds(List list); /** * 查询所有库存条数 @@ -302,7 +302,7 @@ public interface MaterialMapper { * @param ids * @return */ - List findMaterialByDepositorys(List ids); + List findMaterialByDepositorys(List ids); /** * 根据仓库与类别查询物品 @@ -442,7 +442,7 @@ public interface MaterialMapper { * @param mid * @return */ - List findMaterialAndProducedDateByMid(Integer mid); + List findMaterialAndProducedDateByMid(Long mid); /** * 根据物料编码查询所有物料与二维码对应 @@ -502,5 +502,5 @@ public interface MaterialMapper { * @param depositoryIds 待查询仓库列表 * @return */ - Integer findInventoryCountByDepository(List depositoryIds); + Integer findInventoryCountByDepository(List depositoryIds); } diff --git a/src/main/java/com/dreamchaser/depository_manage/depository_mapper/MaterialMapper.xml b/src/main/java/com/dreamchaser/depository_manage/depository_mapper/MaterialMapper.xml index 150f8eff..ff04142c 100644 --- a/src/main/java/com/dreamchaser/depository_manage/depository_mapper/MaterialMapper.xml +++ b/src/main/java/com/dreamchaser/depository_manage/depository_mapper/MaterialMapper.xml @@ -7,19 +7,19 @@ - - + + - - - + + + - + @@ -31,14 +31,14 @@ - - - - + + + + - - - + + + @@ -52,22 +52,22 @@ - + - - + + - - - + + + - + @@ -78,13 +78,13 @@ - + - + @@ -93,12 +93,12 @@ - - - - - - + + + + + + @@ -106,8 +106,8 @@ - - + + @@ -115,10 +115,10 @@ - - - - + + + + @@ -282,7 +282,7 @@ - select from materialandproduceddate mp @@ -373,7 +373,7 @@ - select ifnull(sum(quantity),0) from inventory where depository_id = #{depositoryId} @@ -808,7 +808,7 @@ - SELECT FROM material m WHERE m.id =#{id} @@ -821,7 +821,7 @@ FROM material m WHERE m.code =#{code} - SELECT FROM findInventory WHERE id =#{mid} @@ -876,7 +876,7 @@ - select from materialAndType @@ -1292,7 +1292,7 @@ - + DELETE FROM material WHERE id = #{id} diff --git a/src/main/java/com/dreamchaser/depository_manage/depository_mapper/MaterialTypeMapper.xml b/src/main/java/com/dreamchaser/depository_manage/depository_mapper/MaterialTypeMapper.xml index 9634bcd6..71fa2ef2 100644 --- a/src/main/java/com/dreamchaser/depository_manage/depository_mapper/MaterialTypeMapper.xml +++ b/src/main/java/com/dreamchaser/depository_manage/depository_mapper/MaterialTypeMapper.xml @@ -6,12 +6,12 @@ - + - - + + diff --git a/src/main/java/com/dreamchaser/depository_manage/depository_mapper/NoticeMapper.java b/src/main/java/com/dreamchaser/depository_manage/depository_mapper/NoticeMapper.java index cdb13670..430527b6 100644 --- a/src/main/java/com/dreamchaser/depository_manage/depository_mapper/NoticeMapper.java +++ b/src/main/java/com/dreamchaser/depository_manage/depository_mapper/NoticeMapper.java @@ -79,7 +79,7 @@ public interface NoticeMapper { * @param id 待删除公告id * @return */ - Integer deleteNoticeById(Integer id); + Integer deleteNoticeById(Long id); /** @@ -87,7 +87,7 @@ public interface NoticeMapper { * @param list 带获取id列表 * @return */ - List findNoticeByIds(List list); + List findNoticeByIds(List list); /** @@ -95,13 +95,13 @@ public interface NoticeMapper { * @param list 待删除公告id列表 * @return */ - Integer deleteNoticeByIds(List list); + Integer deleteNoticeByIds(List list); /** * 根据主键查询对应公告 * @param id 待查询主键id * @return */ - Notice findNoticeById(Integer id); + Notice findNoticeById(Long id); } diff --git a/src/main/java/com/dreamchaser/depository_manage/depository_mapper/NoticeMapper.xml b/src/main/java/com/dreamchaser/depository_manage/depository_mapper/NoticeMapper.xml index 6310ceb6..c2f1390b 100644 --- a/src/main/java/com/dreamchaser/depository_manage/depository_mapper/NoticeMapper.xml +++ b/src/main/java/com/dreamchaser/depository_manage/depository_mapper/NoticeMapper.xml @@ -6,14 +6,14 @@ - + - + - - + + @@ -95,7 +95,7 @@ - SELECT FROM notice n WHERE n.id = #{id} @@ -237,7 +237,7 @@ - + DELETE FROM notice WHERE id = #{id} diff --git a/src/main/java/com/dreamchaser/depository_manage/depository_mapper/PlaceMapper.java b/src/main/java/com/dreamchaser/depository_manage/depository_mapper/PlaceMapper.java index 41922800..071f2f63 100644 --- a/src/main/java/com/dreamchaser/depository_manage/depository_mapper/PlaceMapper.java +++ b/src/main/java/com/dreamchaser/depository_manage/depository_mapper/PlaceMapper.java @@ -22,7 +22,7 @@ public interface PlaceMapper { * 根据id查询库位 * @return */ - Place findPlaceById(Integer id); + Place findPlaceById(Long id); /** @@ -30,7 +30,7 @@ public interface PlaceMapper { * @param ids 待查询id列表 * @return */ - List findPlaceByIdS(List ids); + List findPlaceByIdS(List ids); /** * 根据条件查找库位 @@ -66,7 +66,7 @@ public interface PlaceMapper { * @param id * @return */ - Integer DelPlace(Integer id); + Integer DelPlace(Long id); /** * 插入一条库位信息 @@ -80,28 +80,28 @@ public interface PlaceMapper { * @param did * @return */ - List findPlaceByDid(Integer did); + List findPlaceByDid(Long did); /** * 根据id将库位状态改为删除 * @param id * @return */ - Integer changeStateToDeletedById(Integer id); + Integer changeStateToDeletedById(Long id); /** * 根据批量id将库位状态改为删除 * @param ids * @return */ - Integer changeStateToDeletedByIds(List ids); + Integer changeStateToDeletedByIds(List ids); /** * 获取当前仓库下的所有行（倒序） * @param did * @return */ - List findPlaceXByDid(Integer did); + List findPlaceXByDid(Long did); /** * 获取当前仓库下该排的所有列（倒序） * @param map @@ -115,7 +115,7 @@ public interface PlaceMapper { */ List findPlaceZByDid(Map map); - List findPlaceByMid(Integer mid); + List findPlaceByMid(Long mid); /** * 将物料添加到库位 @@ -129,7 +129,7 @@ public interface PlaceMapper { * @param id * @return */ - Integer delMaterialOnPlace(Integer id); + Integer delMaterialOnPlace(Long id); /** @@ -142,7 +142,7 @@ public interface PlaceMapper { /** * 根据库位获取当前库位所存储的物料 */ - List findPlaceAndMaterialByPid(Integer id); + List findPlaceAndMaterialByPid(Long id); /** * 根据仓库id及物料id获取对应库位存储的物料 @@ -177,7 +177,7 @@ public interface PlaceMapper { * @param id 待查询id * @return */ - MaterialAndPlaceForViewP findPlaceAndMaterialForViewById(Integer id); + MaterialAndPlaceForViewP findPlaceAndMaterialForViewById(Long id); /** @@ -208,7 +208,7 @@ public interface PlaceMapper { /** * 根据id获取物料与库位的映射 */ - MaterialAndPlace findPlaceAndMaterialById(Integer id); + MaterialAndPlace findPlaceAndMaterialById(Long id); /** * 修改当前库位存放物料信息 @@ -247,5 +247,5 @@ public interface PlaceMapper { * @param did * @return */ - List findTrayByDepositoryId(Integer did); + List findTrayByDepositoryId(Long did); } diff --git a/src/main/java/com/dreamchaser/depository_manage/depository_mapper/PlaceMapper.xml b/src/main/java/com/dreamchaser/depository_manage/depository_mapper/PlaceMapper.xml index 92f2324a..caaed584 100644 --- a/src/main/java/com/dreamchaser/depository_manage/depository_mapper/PlaceMapper.xml +++ b/src/main/java/com/dreamchaser/depository_manage/depository_mapper/PlaceMapper.xml @@ -6,40 +6,40 @@ - + - - + + - - + + - + - - - - - - - + + + + + + + - - - - - - + + + + + + @@ -164,7 +164,7 @@ - select FROM materialandplaceinfo WHERE id = #{id} @@ -274,7 +274,7 @@ - SELECT FROM place p WHERE 1 = 1 @@ -324,14 +324,14 @@ and p.state != 3 - SELECT FROM place p WHERE 1 = 1 and p.did = #{did} and p.state != 3 - SELECT FROM materialandplace mp left join place p on p.id = mp.pid WHERE 1 = 1 and mp.mid = #{mid} and p.state != 3 @@ -344,7 +344,7 @@ - SELECT FROM place p WHERE p.id = #{id} @@ -362,7 +362,7 @@ - SELECT FROM materialandplace mp left join place p on p.id = mp.pid WHERE 1 = 1 and p.id = #{id} and p.state != 3 @@ -382,7 +382,7 @@ and p.state != 3 - SELECT FROM materialandplace mp left join place p on p.id = mp.pid @@ -421,7 +421,7 @@ ) - + DELETE FROM materialandplace WHERE id = #{id} @@ -484,7 +484,7 @@ - + DELETE FROM place WHERE id = #{id} @@ -502,7 +502,7 @@ - + UPDATE place state = 3 @@ -511,7 +511,7 @@ - select DISTINCT x from place where did = #{did} and state != 3 and x is not null ORDER BY x desc diff --git a/src/main/java/com/dreamchaser/depository_manage/depository_mapper/QrCodeMapper.xml b/src/main/java/com/dreamchaser/depository_manage/depository_mapper/QrCodeMapper.xml index 118538ab..006367d3 100644 --- a/src/main/java/com/dreamchaser/depository_manage/depository_mapper/QrCodeMapper.xml +++ b/src/main/java/com/dreamchaser/depository_manage/depository_mapper/QrCodeMapper.xml @@ -7,11 +7,11 @@ - + - + - + diff --git a/src/main/java/com/dreamchaser/depository_manage/depository_mapper/RoleMapper.java b/src/main/java/com/dreamchaser/depository_manage/depository_mapper/RoleMapper.java index 59392c2e..a2d7adf2 100644 --- a/src/main/java/com/dreamchaser/depository_manage/depository_mapper/RoleMapper.java +++ b/src/main/java/com/dreamchaser/depository_manage/depository_mapper/RoleMapper.java @@ -54,7 +54,7 @@ public interface RoleMapper { * @param userid * @return */ - List findDepositoryAndRole(Integer userid); + List findDepositoryAndRole(Long userid); /** * 修改用户或者岗位权限及管理的仓库 @@ -80,7 +80,7 @@ public interface RoleMapper { * @param uid * @return */ - Integer findRoleByUid(Integer uid); + Integer findRoleByUid(Long uid); /** @@ -89,7 +89,7 @@ public interface RoleMapper { * @param did * @return */ - List findUserIdByDid(Integer did); + List findUserIdByDid(Long did); /** @@ -139,7 +139,7 @@ public interface RoleMapper { * @param id * @return */ - RoleAndDepository findRoleAndDepositoryById(Integer id); + RoleAndDepository findRoleAndDepositoryById(Long id); /** @@ -148,7 +148,7 @@ public interface RoleMapper { * @param id * @return */ - RoleAndMaterialType findRoleAndMaterialTypeById(Integer id); + RoleAndMaterialType findRoleAndMaterialTypeById(Long id); /** * 修改权限列表 @@ -164,7 +164,7 @@ public interface RoleMapper { * @param id * @return */ - Integer deleteRoleAndDepositoryById(Integer id); + Integer deleteRoleAndDepositoryById(Long id); /** @@ -173,7 +173,7 @@ public interface RoleMapper { * @param id * @return */ - Integer deleteRoleAndMaterialTypeById(Integer id); + Integer deleteRoleAndMaterialTypeById(Long id); /** @@ -224,7 +224,7 @@ public interface RoleMapper { * @param map * @return */ - List findDepositoryIdForWarehouseVisiblePermissionByCondition(Map map); + List findDepositoryIdForWarehouseVisiblePermissionByCondition(Map map); /** diff --git a/src/main/java/com/dreamchaser/depository_manage/depository_mapper/RoleMapper.xml b/src/main/java/com/dreamchaser/depository_manage/depository_mapper/RoleMapper.xml index f5a18d7b..283a6387 100644 --- a/src/main/java/com/dreamchaser/depository_manage/depository_mapper/RoleMapper.xml +++ b/src/main/java/com/dreamchaser/depository_manage/depository_mapper/RoleMapper.xml @@ -7,16 +7,16 @@ - + - - + + - - + + @@ -27,14 +27,14 @@ - + - - + + - + @@ -140,14 +140,14 @@ - select from userroleanddepository where userid = #{userid} and state = 1 - select role from postoruserrole where userid = #{uid} @@ -155,7 +155,7 @@ - select userid from postoruserrole where 1 = 1 @@ -268,27 +268,27 @@ - select from userroleanddepository where prid = #{id} - select from materialtypeanduser where id = #{id} - + delete from postoruserrole WHERE id = #{id} - + delete from mtanduserrole WHERE id = #{id} @@ -400,7 +400,7 @@ - select did from depositoryopenrole diff --git a/src/main/java/com/dreamchaser/depository_manage/depository_mapper/SplitUnitMapper.java b/src/main/java/com/dreamchaser/depository_manage/depository_mapper/SplitUnitMapper.java index 0db22ef2..006eb808 100644 --- a/src/main/java/com/dreamchaser/depository_manage/depository_mapper/SplitUnitMapper.java +++ b/src/main/java/com/dreamchaser/depository_manage/depository_mapper/SplitUnitMapper.java @@ -39,14 +39,14 @@ public interface SplitUnitMapper { * @param id 待删除主键id * @return */ - Integer delSplitInfoById(Integer id); + Integer delSplitInfoById(Long id); /** * 通过主键id批量删除一条拆单记录 * @param ids 待删除主键id * @return */ - Integer delSplitInfoByIds(List ids); + Integer delSplitInfoByIds(List ids); /** * 用于添加一条拆单库存处理记录 @@ -74,14 +74,14 @@ public interface SplitUnitMapper { * @param id 待删除主键id * @return */ - Integer delSplitInventoryById(Integer id); + Integer delSplitInventoryById(Long id); /** * 通过主键id批量删除一条拆单库存处理记录 * @param ids 待删除主键id * @return */ - Integer delSplitInventoryByIds(List ids); + Integer delSplitInventoryByIds(List ids); /** * 通过物料id与拆单前的计量单位获取对应拆单记录 @@ -127,7 +127,7 @@ public interface SplitUnitMapper { * @param id 待查询id * @return */ - SplitInfo findSplitInfoById(Integer id); + SplitInfo findSplitInfoById(Long id); /** @@ -135,7 +135,7 @@ public interface SplitUnitMapper { * @param sid 拆单记录id * @return */ - List findSplitInventoryBySid(Integer sid); + List findSplitInventoryBySid(Long sid); /** @@ -143,7 +143,7 @@ public interface SplitUnitMapper { * @param id 待查询主键 * @return */ - SplitInfoP findSplitInfoPById(Integer id); + SplitInfoP findSplitInfoPById(Long id); /** @@ -151,7 +151,7 @@ public interface SplitUnitMapper { * @param mid 待查询物料id * @return */ - List findSplitInfoByMid(Integer mid); + List findSplitInfoByMid(Long mid); /** @@ -159,7 +159,7 @@ public interface SplitUnitMapper { * @param Iid 待查询库存id * @return */ - List findSplitInventoryByIid(Integer Iid); + List findSplitInventoryByIid(Long Iid); @@ -168,7 +168,7 @@ public interface SplitUnitMapper { * @param parentId 待查询父级 * @return */ - SplitInfo findSplitInfoByParentId(Integer parentId); + SplitInfo findSplitInfoByParentId(Long parentId); /** @@ -176,6 +176,6 @@ public interface SplitUnitMapper { * @param depositoryId 待查询仓库 * @return */ - List findSplitInventoryViewByDepository(Integer depositoryId); + List findSplitInventoryViewByDepository(Long depositoryId); } diff --git a/src/main/java/com/dreamchaser/depository_manage/depository_mapper/SplitUnitMapper.xml b/src/main/java/com/dreamchaser/depository_manage/depository_mapper/SplitUnitMapper.xml index 692f0f23..8aa31247 100644 --- a/src/main/java/com/dreamchaser/depository_manage/depository_mapper/SplitUnitMapper.xml +++ b/src/main/java/com/dreamchaser/depository_manage/depository_mapper/SplitUnitMapper.xml @@ -7,30 +7,30 @@ - - - - + + + + - - - - - - + + + + + + - - - - + + + + @@ -47,17 +47,17 @@ - - - - + + + + - - - - + + + + - + @@ -96,7 +96,7 @@ - select from `split` s @@ -104,7 +104,7 @@ - select from `split` s @@ -139,14 +139,14 @@ - select from `split_inventory` si where si.sid = #{sid} - select from `split_inventory` si @@ -227,11 +227,11 @@ ) - + delete from `split` WHERE id = #{id} - + delete from `split` where id in @@ -239,11 +239,11 @@ - + delete from `split_inventory` WHERE id = #{id} - + delete from `split_inventory` where id in @@ -252,7 +252,7 @@ - select from findsplitInfo @@ -342,7 +342,7 @@ - select from `split` s @@ -350,7 +350,7 @@ - select from splitinventoryinfo diff --git a/src/main/java/com/dreamchaser/depository_manage/depository_mapper/StockTakingMapper.java b/src/main/java/com/dreamchaser/depository_manage/depository_mapper/StockTakingMapper.java index 93b60e05..7c7aa5e3 100644 --- a/src/main/java/com/dreamchaser/depository_manage/depository_mapper/StockTakingMapper.java +++ b/src/main/java/com/dreamchaser/depository_manage/depository_mapper/StockTakingMapper.java @@ -47,28 +47,28 @@ public interface StockTakingMapper { * @param id * @return */ - Integer deleteStockTakingChild(Integer id); + Integer deleteStockTakingChild(Long id); /** * 根据主键id批量删除子表 * @param list * @return */ - Integer deleteStockTakingChilds(List list); + Integer deleteStockTakingChilds(List list); /** * 根据主键删除主表 * @param id * @return */ - Integer deleteStockTaking(Integer id); + Integer deleteStockTaking(Long id); /** * 根据主键批量删除主表 * @param list * @return */ - Integer deleteStockTakings(List list); + Integer deleteStockTakings(List list); /** * 修改主表记录 @@ -106,7 +106,7 @@ public interface StockTakingMapper { * @param mainId * @return */ - List selectStockTakingChildByMainId(Integer mainId); + List selectStockTakingChildByMainId(Long mainId); /** @@ -132,13 +132,6 @@ public interface StockTakingMapper { */ List selectStockTakingChildPByCondition(Map map); - /** - * 根据主键查找主表 - * @param id - * @return - */ - StockTaking selectStockTakingById(Integer id); - /** * 根据主键查找主表 * @param id @@ -147,13 +140,6 @@ public interface StockTakingMapper { StockTaking selectStockTakingById(Long id); - /** - * 根据主键查找盘点详情 - * @param id - * @return - */ - StockTakingChild selectStockTakingChildPById(Integer id); - /** * 根据主键查找盘点详情 * @param id @@ -162,6 +148,7 @@ public interface StockTakingMapper { StockTakingChild selectStockTakingChildPById(Long id); + /** * 查询用户的任务 * @param map diff --git a/src/main/java/com/dreamchaser/depository_manage/depository_mapper/StockTakingMapper.xml b/src/main/java/com/dreamchaser/depository_manage/depository_mapper/StockTakingMapper.xml index b70f5c4e..0c464946 100644 --- a/src/main/java/com/dreamchaser/depository_manage/depository_mapper/StockTakingMapper.xml +++ b/src/main/java/com/dreamchaser/depository_manage/depository_mapper/StockTakingMapper.xml @@ -6,26 +6,26 @@ - + - + - - - - + + + + - - - - - - + + + + + + @@ -34,9 +34,9 @@ - - - + + + @@ -75,7 +75,7 @@ - + delete from stocktakingchild where id = #{id} @@ -87,7 +87,7 @@ - + delete from stocktaking where id = #{id} @@ -173,7 +173,7 @@ where id = #{id} - select from stocktakingchildinfo diff --git a/src/main/java/com/dreamchaser/depository_manage/depository_mapper/TransferRecordMapper.java b/src/main/java/com/dreamchaser/depository_manage/depository_mapper/TransferRecordMapper.java index f7a48a9a..79dc20fe 100644 --- a/src/main/java/com/dreamchaser/depository_manage/depository_mapper/TransferRecordMapper.java +++ b/src/main/java/com/dreamchaser/depository_manage/depository_mapper/TransferRecordMapper.java @@ -32,5 +32,5 @@ public interface TransferRecordMapper { * @param id * @return */ - TransferRecord findTransferRecordById(Integer id); + TransferRecord findTransferRecordById(Long id); } diff --git a/src/main/java/com/dreamchaser/depository_manage/depository_mapper/TransferRecordMapper.xml b/src/main/java/com/dreamchaser/depository_manage/depository_mapper/TransferRecordMapper.xml index 44679132..ac30bff8 100644 --- a/src/main/java/com/dreamchaser/depository_manage/depository_mapper/TransferRecordMapper.xml +++ b/src/main/java/com/dreamchaser/depository_manage/depository_mapper/TransferRecordMapper.xml @@ -6,14 +6,14 @@ - - - - - - - - + + + + + + + + @@ -67,7 +67,7 @@ --> - SELECT FROM transfer_record tr WHERE tr.id = #{id} diff --git a/src/main/java/com/dreamchaser/depository_manage/depository_mapper/UserMapper.java b/src/main/java/com/dreamchaser/depository_manage/depository_mapper/UserMapper.java deleted file mode 100644 index 6d2c5831..00000000 --- a/src/main/java/com/dreamchaser/depository_manage/depository_mapper/UserMapper.java +++ /dev/null @@ -1,130 +0,0 @@ -package com.dreamchaser.depository_manage.depository_mapper; - -import com.dreamchaser.depository_manage.entity.User; -import org.apache.ibatis.annotations.Mapper; -import org.springframework.stereotype.Repository; - -import java.util.List; -import java.util.Map; - -/** - * 关于用户的mapper接口 - * @author Dreamchaser - */ -@Repository -@Mapper -public interface UserMapper { - - /** - * 查询user表的所有数据的行数 - * @return 行数 - */ - Integer findCount(); - - /** - * 查询user表的符合条件数据的行数 - * @param map 参数map - * @return 符合条件数据的行数 - */ - Integer findCountByCondition(Map map); - - /** - * 根据条件查询用户(此方法只能在确认结果只有一条记录时调用) - * @param map - * @return - */ - User findUserByCondition(Map map); - - /** - * 根据主键查询用户 - * @param id 用户id - * @return 用户信息 - */ - User findUserById(Integer id); - - /** - * 根据条件查询符合条件的用户 - * @param map - * @return - */ - List findUsersByCondition(Map map); - - /** - * 根据email查询用户信息 - * @param email - * @return - */ - User findUserByEmail(String email); - - /** - * 根据用户id查询用户名 - * @param id 用户id - * @return 用户名称 - */ - String findUserNameById(int id); - - - /** - * 根据参数插入一条用户信息 - * @param map 参数map - * @return 受影响的行数，0表示插入失败，1表示成功 - */ - Integer insertUser(Map map); - - /** - * 更新用户信息 - * @param map 参数map - * @return 受影响的行数 - */ - Integer updateUser(Map map); - - /** - * 更新用户非敏感信息（一般用户自己的修改） - * @param map 参数map - * @return 受影响的行数 - */ - Integer updateUserNoSensitive(Map map); - - /** - * 根据id删除用户 - * @param id 用户id - * @return 受影响的行数 - */ - Integer deleteUserById(Integer id); - /** - * 根据id批量删除数据 - * @param list 用户id的集合 - * @return 受影响的行数 - */ - Integer deleteUserByIds(List list); - - /** - * 根据id将用户状态改为删除 - * @param id - * @return 受影响的行数 - */ - Integer changeUserStateToDeleteById(Integer id); - - /** - * 根据id批量将用户状态改为删除 - * @param ids - * @return 受影响的行数 - */ - Integer changeUserStateToDeleteByIds(List ids); - - /** - * 根据id进行密码修改 - * @param map - * @return 受影响行数 - */ - Integer updateUserPasswordById(Map map); - - - /** - * 根据用户id查询具体仓库名称 - * @param id - * @return - */ - String FindDepositoryByUserId(Integer id); - -} diff --git a/src/main/java/com/dreamchaser/depository_manage/depository_mapper/UserMapper.xml b/src/main/java/com/dreamchaser/depository_manage/depository_mapper/UserMapper.xml deleted file mode 100644 index 2b59b856..00000000 --- a/src/main/java/com/dreamchaser/depository_manage/depository_mapper/UserMapper.xml +++ /dev/null @@ -1,381 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - u.id, u.uname, u.sex, u.entry_date - - - - u.id, u.uname, u.authority, u.pwd, u.sex, u.depository_id, u.entry_date, u.email, - u.phone,u.state - - - - u.id, u.uname,u.authority, u.pwd, u.sex, u.depository_id, u.entry_date, u.email, - u.phone,u.state - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - INSERT INTO user ( - id, uname, authority, pwd, sex, depository_id, entry_date, email, - phone - ) VALUES ( - #{id}, - #{uname}, - #{authority}, - #{pwd}, - #{sex}, - #{depositoryId}, - #{entryDate}, - #{email}, - #{phone} - ) - - - - - - - UPDATE user - - - uname = #{uname}, - - - sex = #{sex}, - - - entry_date = #{entryDate}, - - - phone = #{phone} - - - WHERE id = #{id} - - - - UPDATE user - - - uname = #{uname}, - - - authority = #{authority}, - - - pwd = #{pwd}, - - - sex = #{sex}, - - - depository_id = #{depositoryId}, - - - entry_date = #{entryDate}, - - - email = #{email}, - - - phone = #{phone}, - - - state = #{state} - - - WHERE id = #{id} - - - - - - - - DELETE FROM user WHERE id = #{id} - - - - - DELETE FROM user WHERE id IN - - - #{id} - - - - - - update user - - state = 3 - - where id = #{id} - - - - update user - - state = 3 - - where id in - - #{id} - - - - - - update user - - pwd = #{new_password} - - where id = #{id} - - - - - \ No newline at end of file diff --git a/src/main/java/com/dreamchaser/depository_manage/entity/AccesstoAddress.java b/src/main/java/com/dreamchaser/depository_manage/entity/AccesstoAddress.java index cfa2555c..8f9ffb23 100644 --- a/src/main/java/com/dreamchaser/depository_manage/entity/AccesstoAddress.java +++ b/src/main/java/com/dreamchaser/depository_manage/entity/AccesstoAddress.java @@ -12,7 +12,7 @@ public class AccesstoAddress { /** * 菜单地址编号 */ - private Integer id; + private Long id; /** * 菜单名 */ @@ -37,7 +37,7 @@ public class AccesstoAddress { /** * 父菜单编号 */ - private Integer menuparent; + private Long menuparent; /** * 菜单状态 */ diff --git a/src/main/java/com/dreamchaser/depository_manage/entity/Administration.java b/src/main/java/com/dreamchaser/depository_manage/entity/Administration.java index 84ba5177..2d2d381d 100644 --- a/src/main/java/com/dreamchaser/depository_manage/entity/Administration.java +++ b/src/main/java/com/dreamchaser/depository_manage/entity/Administration.java @@ -7,7 +7,7 @@ public class Administration { /** * id */ - private Integer id; + private Long id; /** * 编号（非必填；为空时由系统自动生成） @@ -22,7 +22,7 @@ public class Administration { /** * 上级 */ - private Integer superior; + private Long superior; /** * 部门类别ID diff --git a/src/main/java/com/dreamchaser/depository_manage/entity/ApplicationInRecord.java b/src/main/java/com/dreamchaser/depository_manage/entity/ApplicationInRecord.java index 4675af11..28ffc566 100644 --- a/src/main/java/com/dreamchaser/depository_manage/entity/ApplicationInRecord.java +++ b/src/main/java/com/dreamchaser/depository_manage/entity/ApplicationInRecord.java @@ -8,7 +8,7 @@ public class ApplicationInRecord { /** * id */ - private Integer id; + private Long id; /** * 入库物品名称 */ @@ -34,7 +34,7 @@ public class ApplicationInRecord { /** * 提交人id */ - private Integer applicantId; + private Long applicantId; /** * 提交时间 @@ -54,7 +54,7 @@ public class ApplicationInRecord { /** * 仓库id */ - private Integer depositoryId; + private Long depositoryId; /** @@ -105,13 +105,13 @@ public class ApplicationInRecord { /** * 入库物料 */ - private Integer mid; + private Long mid; /** * 入库库位 */ - private Integer placeId; + private Long placeId; /** * 用于标志该物料入库记录是那个组合下的入库记录 diff --git a/src/main/java/com/dreamchaser/depository_manage/entity/ApplicationOutRecord.java b/src/main/java/com/dreamchaser/depository_manage/entity/ApplicationOutRecord.java index ecac59df..c4505014 100644 --- a/src/main/java/com/dreamchaser/depository_manage/entity/ApplicationOutRecord.java +++ b/src/main/java/com/dreamchaser/depository_manage/entity/ApplicationOutRecord.java @@ -7,12 +7,12 @@ public class ApplicationOutRecord { /** * id */ - private Integer id; + private Long id; /** * 物料id */ - private Integer mid; + private Long mid; /** * 物料名称 @@ -22,7 +22,7 @@ public class ApplicationOutRecord { /** * 仓库id */ - private Integer depositoryId; + private Long depositoryId; /** * 仓库名称 @@ -32,7 +32,7 @@ public class ApplicationOutRecord { /** * 申请人id */ - private Integer applicantId; + private Long applicantId; /** * 申请人名称 @@ -157,7 +157,7 @@ public class ApplicationOutRecord { /** * 对应库位id */ - private Integer placeId; + private Long placeId; /** * 对应库位编码 @@ -188,7 +188,7 @@ public class ApplicationOutRecord { /** * 施工单位id */ - private Integer constructionUnitId; + private Long constructionUnitId; /** * 施工单位名称 */ @@ -196,7 +196,7 @@ public class ApplicationOutRecord { /** * 部门id */ - private Integer adminorgId; + private Long adminorgId; /** @@ -235,7 +235,7 @@ public class ApplicationOutRecord { /** * 创建人id */ - private Integer createUid; + private Long createUid; /** diff --git a/src/main/java/com/dreamchaser/depository_manage/entity/ApplicationOutRecordMin.java b/src/main/java/com/dreamchaser/depository_manage/entity/ApplicationOutRecordMin.java index b2ffdd6a..ee68be79 100644 --- a/src/main/java/com/dreamchaser/depository_manage/entity/ApplicationOutRecordMin.java +++ b/src/main/java/com/dreamchaser/depository_manage/entity/ApplicationOutRecordMin.java @@ -10,21 +10,21 @@ public class ApplicationOutRecordMin { /** * id */ - private Integer id; + private Long id; /** * 物料id */ - private Integer mid; + private Long mid; /** * 仓库id */ - private Integer depositoryId; + private Long depositoryId; /** * 对应库位id */ - private Integer placeId; + private Long placeId; /** * 数量 */ @@ -37,12 +37,12 @@ public class ApplicationOutRecordMin { /** * 审核人编号 */ - private Integer checkId; + private Long checkId; /** * 主订单编号 */ - private Integer parentId; + private Long parentId; /** * 子订单状态（1未完成，2完成） @@ -52,7 +52,7 @@ public class ApplicationOutRecordMin { /** * 转移申请编号 */ - private Integer transferId; + private Long transferId; /** * 已经出库的数量 diff --git a/src/main/java/com/dreamchaser/depository_manage/entity/BusinessType.java b/src/main/java/com/dreamchaser/depository_manage/entity/BusinessType.java index 753868d5..b908244b 100644 --- a/src/main/java/com/dreamchaser/depository_manage/entity/BusinessType.java +++ b/src/main/java/com/dreamchaser/depository_manage/entity/BusinessType.java @@ -10,7 +10,7 @@ public class BusinessType { /** * 自增id主键 */ - private Integer id; + private Long id; /** * 业务类型名称 */ @@ -42,7 +42,7 @@ public class BusinessType { /** * 修改人id */ - private Integer updateUid; + private Long updateUid; /** * 修改人时间 */ diff --git a/src/main/java/com/dreamchaser/depository_manage/entity/Company.java b/src/main/java/com/dreamchaser/depository_manage/entity/Company.java index ef257267..0ec929af 100644 --- a/src/main/java/com/dreamchaser/depository_manage/entity/Company.java +++ b/src/main/java/com/dreamchaser/depository_manage/entity/Company.java @@ -7,7 +7,7 @@ public class Company { /** * 公司编号 */ - private Integer cid; + private Long cid; /** * 公司名称 */ @@ -21,7 +21,7 @@ public class Company { /** * 父级 */ - private Integer parentId; + private Long parentId; /** * 公司介绍 diff --git a/src/main/java/com/dreamchaser/depository_manage/entity/ConstructionUnit.java b/src/main/java/com/dreamchaser/depository_manage/entity/ConstructionUnit.java index 73eee7d4..0da3d319 100644 --- a/src/main/java/com/dreamchaser/depository_manage/entity/ConstructionUnit.java +++ b/src/main/java/com/dreamchaser/depository_manage/entity/ConstructionUnit.java @@ -10,7 +10,7 @@ public class ConstructionUnit { /** * id */ - private Integer id; + private Long id; /** * 状态 1启用2禁用3删除 */ diff --git a/src/main/java/com/dreamchaser/depository_manage/entity/CsvInfo.java b/src/main/java/com/dreamchaser/depository_manage/entity/CsvInfo.java deleted file mode 100644 index 80fe988e..00000000 --- a/src/main/java/com/dreamchaser/depository_manage/entity/CsvInfo.java +++ /dev/null @@ -1,12 +0,0 @@ -package com.dreamchaser.depository_manage.entity; - -import lombok.Data; - - -/** - * 用于csv文件导入 - */ -@Data -public class CsvInfo { - -} diff --git a/src/main/java/com/dreamchaser/depository_manage/entity/Depository.java b/src/main/java/com/dreamchaser/depository_manage/entity/Depository.java index c0c9dcb6..61b43c69 100644 --- a/src/main/java/com/dreamchaser/depository_manage/entity/Depository.java +++ b/src/main/java/com/dreamchaser/depository_manage/entity/Depository.java @@ -14,7 +14,7 @@ public class Depository { private static final long serialVersionUID = -2259445638130429647L; /** id */ - private Integer id; + private Long id; @@ -32,12 +32,12 @@ public class Depository { /** 父级 */ - private Integer parentId; + private Long parentId; /** * 公司编号 */ - private Integer cid; + private Long cid; /** * 公司名称 @@ -62,10 +62,10 @@ public class Depository { /** * 当前仓库最大存储量 */ - private Integer maxNumber; + private Long maxNumber; /** * 当前仓库最小存储量 */ - private Integer minNumber; + private Long minNumber; } \ No newline at end of file diff --git a/src/main/java/com/dreamchaser/depository_manage/entity/DepositoryRecord.java b/src/main/java/com/dreamchaser/depository_manage/entity/DepositoryRecord.java index 6076c3e2..894a1e4a 100644 --- a/src/main/java/com/dreamchaser/depository_manage/entity/DepositoryRecord.java +++ b/src/main/java/com/dreamchaser/depository_manage/entity/DepositoryRecord.java @@ -16,16 +16,16 @@ public class DepositoryRecord { /** 版本号 */ private static final long serialVersionUID = 8546566842955977610L; /** 记录id */ - private Integer id; + private Long id; /** 申请编号 */ - private Integer applicationId; + private Long applicationId; /** 产品名称 */ private String mname; /** 调度的仓库id */ - private Integer depositoryId; + private Long depositoryId; /** 调度记录类型（购入/退料/转入,退还/领料/转出) */ private Integer type; @@ -40,7 +40,7 @@ public class DepositoryRecord { private String state; /** 申请人id */ - private Integer applicantId; + private Long applicantId; /** 申请备注 */ private String applyRemark; @@ -49,7 +49,7 @@ public class DepositoryRecord { private Long applyTime; /** 审核人id */ - private Integer reviewerId; + private Long reviewerId; /** 审核结果备注 */ private String reviewRemark; @@ -63,7 +63,7 @@ public class DepositoryRecord { private Integer reviewPass; /** 验货人id */ - private Integer checkerId; + private Long checkerId; /** 验收备注 */ private String checkRemark; diff --git a/src/main/java/com/dreamchaser/depository_manage/entity/Govthreeing.java b/src/main/java/com/dreamchaser/depository_manage/entity/Govthreeing.java index 25c2eb0d..db697841 100644 --- a/src/main/java/com/dreamchaser/depository_manage/entity/Govthreeing.java +++ b/src/main/java/com/dreamchaser/depository_manage/entity/Govthreeing.java @@ -9,15 +9,15 @@ import java.util.List; */ @Data public class Govthreeing { - private Integer id; + private Long id; private String number; private String name; - private Integer superior; + private Long superior; private Integer organizationtype; private String abbreviation; private Long time; private String state; - private Integer wechatorganizationid; + private Long wechatorganizationid; private String superiorsun; private Integer schoole; private String kingdeeidrIAAAAENsrM567U; diff --git a/src/main/java/com/dreamchaser/depository_manage/entity/Group.java b/src/main/java/com/dreamchaser/depository_manage/entity/Group.java index 5126d152..7e13f9f5 100644 --- a/src/main/java/com/dreamchaser/depository_manage/entity/Group.java +++ b/src/main/java/com/dreamchaser/depository_manage/entity/Group.java @@ -7,7 +7,7 @@ public class Group { /** * id */ - private Integer id; + private Long id; /** * 组合编码 */ diff --git a/src/main/java/com/dreamchaser/depository_manage/entity/GroupInfo.java b/src/main/java/com/dreamchaser/depository_manage/entity/GroupInfo.java index a26b286d..1b97918d 100644 --- a/src/main/java/com/dreamchaser/depository_manage/entity/GroupInfo.java +++ b/src/main/java/com/dreamchaser/depository_manage/entity/GroupInfo.java @@ -12,15 +12,15 @@ public class GroupInfo { /** * id */ - private Integer id; + private Long id; /** * 物料id */ - private Integer mid; + private Long mid; /** * 组合id */ - private Integer gid; + private Long gid; /** * 数量 */ @@ -36,7 +36,7 @@ public class GroupInfo { /** * 物料类型id */ - private Integer mtid; + private Long mtid; /** * 类型名称 */ diff --git a/src/main/java/com/dreamchaser/depository_manage/entity/Inventory.java b/src/main/java/com/dreamchaser/depository_manage/entity/Inventory.java index 22486907..025249e8 100644 --- a/src/main/java/com/dreamchaser/depository_manage/entity/Inventory.java +++ b/src/main/java/com/dreamchaser/depository_manage/entity/Inventory.java @@ -14,17 +14,17 @@ public class Inventory { /** * 存储id */ - private Integer id; + private Long id; /** * 物料id */ - private Integer mid; + private Long mid; /** * 仓库id */ - private Integer depositoryId; + private Long depositoryId; /** * 物料名称 @@ -34,7 +34,7 @@ public class Inventory { /** * 数量 */ - private Integer quantity; + private Long quantity; /** * 总金额 @@ -119,7 +119,7 @@ public class Inventory { /** * 暂存额度 */ - private Integer numberOfTemporary; + private Long numberOfTemporary; /** * 生产日期 @@ -185,7 +185,7 @@ public class Inventory { this.materialTypeId = ObjectFormatUtil.toLong(mpv.getType_id()); this.typeName = mpv.getTname(); this.version = mpv.getVersion(); - this.quantity = mpv.getInventory().intValue(); + this.quantity = mpv.getInventory().longValue(); } public Inventory(MaterialAndPlace mp) { diff --git a/src/main/java/com/dreamchaser/depository_manage/entity/Material.java b/src/main/java/com/dreamchaser/depository_manage/entity/Material.java index cd4eaf08..971f826d 100644 --- a/src/main/java/com/dreamchaser/depository_manage/entity/Material.java +++ b/src/main/java/com/dreamchaser/depository_manage/entity/Material.java @@ -2,6 +2,7 @@ package com.dreamchaser.depository_manage.entity; import lombok.Data; +import java.io.Serializable; import java.math.BigInteger; import java.util.List; @@ -12,7 +13,7 @@ import java.util.List; * @version 1.0.0 2021-05-20 */ @Data -public class Material { +public class Material implements Serializable { /** * 版本号 */ @@ -21,12 +22,12 @@ public class Material { /** * 存储id */ - private Integer id; + private Long id; /** * 仓库id */ - private Integer depositoryId; + private Long depositoryId; /** * 物料名称 @@ -36,7 +37,7 @@ public class Material { /** * 数量 */ - private Integer quantity; + private Long quantity; /** * 总金额 diff --git a/src/main/java/com/dreamchaser/depository_manage/entity/MaterialAndBarCode.java b/src/main/java/com/dreamchaser/depository_manage/entity/MaterialAndBarCode.java index 78786acb..85589c24 100644 --- a/src/main/java/com/dreamchaser/depository_manage/entity/MaterialAndBarCode.java +++ b/src/main/java/com/dreamchaser/depository_manage/entity/MaterialAndBarCode.java @@ -14,7 +14,7 @@ public class MaterialAndBarCode { /** * id */ - private Integer id; + private Long id; /** * 条形码 */ @@ -26,16 +26,16 @@ public class MaterialAndBarCode { /** * 物料id */ - private Integer mid; + private Long mid; /** * 库存id */ - private Integer iid; + private Long iid; /** * 仓库id */ - private Integer depositoryId; + private Long depositoryId; /** * 物料名称 */ @@ -43,7 +43,7 @@ public class MaterialAndBarCode { /** * 物料类别id */ - private Integer mtid; + private Long mtid; /** * 物料规格型号 */ diff --git a/src/main/java/com/dreamchaser/depository_manage/entity/MaterialAndPlace.java b/src/main/java/com/dreamchaser/depository_manage/entity/MaterialAndPlace.java index e15feec3..9101f70d 100644 --- a/src/main/java/com/dreamchaser/depository_manage/entity/MaterialAndPlace.java +++ b/src/main/java/com/dreamchaser/depository_manage/entity/MaterialAndPlace.java @@ -7,19 +7,19 @@ public class MaterialAndPlace { /** * id */ - private Integer id; + private Long id; /** * 物料id */ - private Integer mid; + private Long mid; /** * 库位id */ - private Integer pid; + private Long pid; /** * 当前库位所处仓库 */ - private Integer did; + private Long did; /** * 库位编码 */ @@ -32,15 +32,15 @@ public class MaterialAndPlace { /** * 库位最大存储量 */ - private Integer max; + private Long max; /** * 库位最小存储量 */ - private Integer min; + private Long min; /** * 当前存放额度 */ - private Integer quantity; + private Long quantity; diff --git a/src/main/java/com/dreamchaser/depository_manage/entity/MaterialAndProducedDate.java b/src/main/java/com/dreamchaser/depository_manage/entity/MaterialAndProducedDate.java index dcb50c0f..8964fd27 100644 --- a/src/main/java/com/dreamchaser/depository_manage/entity/MaterialAndProducedDate.java +++ b/src/main/java/com/dreamchaser/depository_manage/entity/MaterialAndProducedDate.java @@ -10,27 +10,27 @@ public class MaterialAndProducedDate { /** * id */ - private Integer id; + private Long id; /** * 入库编号 */ - private Integer inid; + private Long inid; /** * 入库物料 */ - private Integer mid; + private Long mid; /** * 入库数量 */ - private Integer quantity; + private Long quantity; /** * 使用数量 */ - private Integer expendnum; + private Long expendnum; /** * 剩余库存 */ - private Integer inventory; + private Long inventory; /** * 生产日期 */ diff --git a/src/main/java/com/dreamchaser/depository_manage/entity/MaterialForGroup.java b/src/main/java/com/dreamchaser/depository_manage/entity/MaterialForGroup.java index 988fd5a8..21b3e164 100644 --- a/src/main/java/com/dreamchaser/depository_manage/entity/MaterialForGroup.java +++ b/src/main/java/com/dreamchaser/depository_manage/entity/MaterialForGroup.java @@ -7,19 +7,19 @@ public class MaterialForGroup { /** * id */ - private Integer id; + private Long id; /** * 物料id */ - private Integer mid; + private Long mid; /** * 组合id */ - private Integer gid; + private Long gid; /** * 数量 */ - private Integer quantity; + private Long quantity; /* 计量单位 diff --git a/src/main/java/com/dreamchaser/depository_manage/entity/MaterialType.java b/src/main/java/com/dreamchaser/depository_manage/entity/MaterialType.java index 47f88e41..e7a52597 100644 --- a/src/main/java/com/dreamchaser/depository_manage/entity/MaterialType.java +++ b/src/main/java/com/dreamchaser/depository_manage/entity/MaterialType.java @@ -16,7 +16,7 @@ public class MaterialType { /* This code was generated by TableGo tools, mark 1 begin. */ /** 类型id */ - private Integer id; + private Long id; /** 类型名称 */ private String tname; diff --git a/src/main/java/com/dreamchaser/depository_manage/entity/Notice.java b/src/main/java/com/dreamchaser/depository_manage/entity/Notice.java index b1289fe1..93d0a2b7 100644 --- a/src/main/java/com/dreamchaser/depository_manage/entity/Notice.java +++ b/src/main/java/com/dreamchaser/depository_manage/entity/Notice.java @@ -17,7 +17,7 @@ public class Notice implements java.io.Serializable { /** 公告主键 */ - private Integer id; + private Long id; /** 公告标题 */ private String title; @@ -31,12 +31,12 @@ public class Notice implements java.io.Serializable { /** * 发布人员 */ - private Integer userId; + private Long userId; /** * 读取公告id */ - private Integer readId; + private Long readId; /** * 公告状态 diff --git a/src/main/java/com/dreamchaser/depository_manage/entity/Place.java b/src/main/java/com/dreamchaser/depository_manage/entity/Place.java index af924fa4..3204c012 100644 --- a/src/main/java/com/dreamchaser/depository_manage/entity/Place.java +++ b/src/main/java/com/dreamchaser/depository_manage/entity/Place.java @@ -10,7 +10,7 @@ public class Place { /** * id */ - private Integer id; + private Long id; /** * 行 @@ -28,12 +28,12 @@ public class Place { /** * 存放物料id */ - private Integer mid; + private Long mid; /** * 该库位所处仓库 */ - private Integer did; + private Long did; /** * 库位编码 @@ -43,12 +43,12 @@ public class Place { /** * 当前库位最少数目 */ - private Integer min; + private Long min; /** * 当前库位最多数目 */ - private Integer max; + private Long max; /** * 当前库位状态 @@ -58,7 +58,7 @@ public class Place { /** * 当前库位数目 */ - private Integer quantity; + private Long quantity; /** * 当前库位类型（1库位2托盘） diff --git a/src/main/java/com/dreamchaser/depository_manage/entity/Post.java b/src/main/java/com/dreamchaser/depository_manage/entity/Post.java index c2d774cc..2f633793 100644 --- a/src/main/java/com/dreamchaser/depository_manage/entity/Post.java +++ b/src/main/java/com/dreamchaser/depository_manage/entity/Post.java @@ -10,7 +10,7 @@ public class Post { /** * id */ - private Integer id; + private Long id; /** * 编号 */ @@ -24,7 +24,7 @@ public class Post { /** * 职务编号 */ - private Integer duties; + private Long duties; /** * 时间 @@ -39,13 +39,13 @@ public class Post { /** * 归属行政组织 */ - private Integer administrativeorganization; + private Long administrativeorganization; /** * 上级 */ - private Integer superior; + private Long superior; /** * 是否为本部门负责人（1：是；2：否） @@ -55,7 +55,7 @@ public class Post { /** * 部门 */ - private Integer department; + private Long department; /** * 名称 diff --git a/src/main/java/com/dreamchaser/depository_manage/entity/PostOrUserRole.java b/src/main/java/com/dreamchaser/depository_manage/entity/PostOrUserRole.java index 91785e56..0e0b63e7 100644 --- a/src/main/java/com/dreamchaser/depository_manage/entity/PostOrUserRole.java +++ b/src/main/java/com/dreamchaser/depository_manage/entity/PostOrUserRole.java @@ -7,7 +7,7 @@ public class PostOrUserRole { /** * 编号 */ - private Integer id; + private Long id; /** * 1个人2岗位 @@ -22,10 +22,10 @@ public class PostOrUserRole { /** * 如果是个人则绑定到人,如果是岗位则绑定岗位 */ - private Integer userid; + private Long userid; /** * 负责仓库编号 */ - private Integer did; + private Long did; } diff --git a/src/main/java/com/dreamchaser/depository_manage/entity/Role.java b/src/main/java/com/dreamchaser/depository_manage/entity/Role.java deleted file mode 100644 index 6a6e95ba..00000000 --- a/src/main/java/com/dreamchaser/depository_manage/entity/Role.java +++ /dev/null @@ -1,49 +0,0 @@ -package com.dreamchaser.depository_manage.entity; - -import lombok.Data; - -@Data -public class Role { - - /** - * 角色id - */ - private int id; - - /** - * 角色名称 - */ - private String name; - - /** - * 获取角色id - * @return - */ - public int getId() { - return id; - } - - /** - * 设置角色id - * @param id - */ - public void setId(int id) { - this.id = id; - } - - /** - * 获取角色名称 - * @return - */ - public String getName() { - return name; - } - - /** - * 设置角色名称 - * @param name - */ - public void setName(String name) { - this.name = name; - } -} diff --git a/src/main/java/com/dreamchaser/depository_manage/entity/SimpleApplicationInRecord.java b/src/main/java/com/dreamchaser/depository_manage/entity/SimpleApplicationInRecord.java index c4c3c93a..16f6dda8 100644 --- a/src/main/java/com/dreamchaser/depository_manage/entity/SimpleApplicationInRecord.java +++ b/src/main/java/com/dreamchaser/depository_manage/entity/SimpleApplicationInRecord.java @@ -9,10 +9,10 @@ import lombok.Data; @Data public class SimpleApplicationInRecord { /** 记录id */ - private Integer id; + private Long id; /** 申请人id */ - private Integer applicantId; + private Long applicantId; /** 申请备注 */ private String applyRemark; diff --git a/src/main/java/com/dreamchaser/depository_manage/entity/SimpleApplicationOutRecord.java b/src/main/java/com/dreamchaser/depository_manage/entity/SimpleApplicationOutRecord.java index 7d40c0f5..68e5bd4e 100644 --- a/src/main/java/com/dreamchaser/depository_manage/entity/SimpleApplicationOutRecord.java +++ b/src/main/java/com/dreamchaser/depository_manage/entity/SimpleApplicationOutRecord.java @@ -9,10 +9,10 @@ import lombok.Data; @Data public class SimpleApplicationOutRecord { /** 记录id */ - private Integer id; + private Long id; /** 申请人id */ - private Integer applicantId; + private Long applicantId; /** 申请备注 */ private String applyRemark; diff --git a/src/main/java/com/dreamchaser/depository_manage/entity/SimpleDepositoryRecord.java b/src/main/java/com/dreamchaser/depository_manage/entity/SimpleDepositoryRecord.java index 67703522..a6d1b842 100644 --- a/src/main/java/com/dreamchaser/depository_manage/entity/SimpleDepositoryRecord.java +++ b/src/main/java/com/dreamchaser/depository_manage/entity/SimpleDepositoryRecord.java @@ -11,13 +11,13 @@ import java.util.Date; @Data public class SimpleDepositoryRecord { /** 记录id */ - private Integer id; + private Long id; /** 调度记录类型（购入/退料/转入,退还/领料/转出) */ private Integer type; /** 申请人id */ - private Integer applicantId; + private Long applicantId; /** 申请备注 */ private String applyRemark; diff --git a/src/main/java/com/dreamchaser/depository_manage/entity/SplitInfo.java b/src/main/java/com/dreamchaser/depository_manage/entity/SplitInfo.java index 2e5a5cbf..75767f56 100644 --- a/src/main/java/com/dreamchaser/depository_manage/entity/SplitInfo.java +++ b/src/main/java/com/dreamchaser/depository_manage/entity/SplitInfo.java @@ -10,11 +10,11 @@ public class SplitInfo { /** * 拆单id */ - private Integer id; + private Long id; /** * 物料id */ - private Integer mid; + private Long mid; /** * 旧计量单位 */ @@ -26,11 +26,11 @@ public class SplitInfo { /** * 新旧单位映射数 */ - private Integer quantity; + private Long quantity; /** * 父级id */ - private Integer parentId; + private Long parentId; /** * 状态：1启用2禁用3删除 diff --git a/src/main/java/com/dreamchaser/depository_manage/entity/SplitInventory.java b/src/main/java/com/dreamchaser/depository_manage/entity/SplitInventory.java index efd7fe03..9920ef71 100644 --- a/src/main/java/com/dreamchaser/depository_manage/entity/SplitInventory.java +++ b/src/main/java/com/dreamchaser/depository_manage/entity/SplitInventory.java @@ -10,27 +10,27 @@ public class SplitInventory { /** * 记录id */ - private Integer id; + private Long id; /** * 对应库存id */ - private Integer iid; + private Long iid; /** * 对应拆单id */ - private Integer sid; + private Long sid; /** * 出库数量 */ - private Integer outQuantity; + private Long outQuantity; /** * 入库数量 */ - private Integer inQuantity; + private Long inQuantity; /** * 入库后剩余的数量 */ - private Integer saveQuantity; + private Long saveQuantity; /** * 当前拆单的单位 diff --git a/src/main/java/com/dreamchaser/depository_manage/entity/SplitInventoryView.java b/src/main/java/com/dreamchaser/depository_manage/entity/SplitInventoryView.java index 644400e1..75d987c0 100644 --- a/src/main/java/com/dreamchaser/depository_manage/entity/SplitInventoryView.java +++ b/src/main/java/com/dreamchaser/depository_manage/entity/SplitInventoryView.java @@ -10,35 +10,35 @@ public class SplitInventoryView { /** * 拆单库存id */ - private Integer id; + private Long id; /** * 拆单记录 */ - private Integer sid; + private Long sid; /** * 库存库位映射id */ - private Integer mpId; + private Long mpId; /** * 拆单库存数 */ - private Integer siQuantity; + private Long siQuantity; /** * 拆单物料id */ - private Integer mid; + private Long mid; /** * 所处仓库id */ - private Integer depositoryId; + private Long depositoryId; /** * 库存id */ - private Integer iid; + private Long iid; /** * 库位id */ - private Integer pid; + private Long pid; /** * 拆单记录状态 */ diff --git a/src/main/java/com/dreamchaser/depository_manage/entity/StandingBook.java b/src/main/java/com/dreamchaser/depository_manage/entity/StandingBook.java deleted file mode 100644 index 15e6b8ed..00000000 --- a/src/main/java/com/dreamchaser/depository_manage/entity/StandingBook.java +++ /dev/null @@ -1,130 +0,0 @@ -package com.dreamchaser.depository_manage.entity; - -/** - * standing_book - * - * @author bianj - * @version 1.0.0 2021-05-20 - */ -public class StandingBook { - /** 版本号 */ - private static final long serialVersionUID = 7203535351933957406L; - - /* This code was generated by TableGo tools, mark 1 begin. */ - - /** 台账记录id */ - private Integer id; - - /** 0表示调入，1表示调出（外部）;2表示调入（退料），3表示调出（领料）（内部调用） */ - private Integer type; - - /** 数量 */ - private Integer quantity; - - /** 总价 */ - private Integer price; - - /** 物料名称 */ - private String materialName; - - /* This code was generated by TableGo tools, mark 1 end. */ - - /* This code was generated by TableGo tools, mark 2 begin. */ - - /** - * 获取台账记录id - * - * @return 台账记录id - */ - public Integer getId() { - return this.id; - } - - /** - * 设置台账记录id - * - * @param id - * 台账记录id - */ - public void setId(Integer id) { - this.id = id; - } - - /** - * 获取0表示调入，1表示调出（外部）;2表示调入（退料），3表示调出（领料）（内部调用） - * - * @return 0表示调入 - */ - public Integer getType() { - return this.type; - } - - /** - * 设置0表示调入，1表示调出（外部）;2表示调入（退料），3表示调出（领料）（内部调用） - * - * @param type - * 0表示调入 - */ - public void setType(Integer type) { - this.type = type; - } - - /** - * 获取数量 - * - * @return 数量 - */ - public Integer getQuantity() { - return this.quantity; - } - - /** - * 设置数量 - * - * @param quantity - * 数量 - */ - public void setQuantity(Integer quantity) { - this.quantity = quantity; - } - - /** - * 获取总价 - * - * @return 总价 - */ - public Integer getPrice() { - return this.price; - } - - /** - * 设置总价 - * - * @param price - * 总价 - */ - public void setPrice(Integer price) { - this.price = price; - } - - /** - * 获取物料名称 - * - * @return 物料名称 - */ - public String getMaterialName() { - return this.materialName; - } - - /** - * 设置物料名称 - * - * @param materialName - * 物料名称 - */ - public void setMaterialName(String materialName) { - this.materialName = materialName; - } - - /* This code was generated by TableGo tools, mark 2 end. */ -} \ No newline at end of file diff --git a/src/main/java/com/dreamchaser/depository_manage/entity/StockTaking.java b/src/main/java/com/dreamchaser/depository_manage/entity/StockTaking.java index 431f9381..5e7b383b 100644 --- a/src/main/java/com/dreamchaser/depository_manage/entity/StockTaking.java +++ b/src/main/java/com/dreamchaser/depository_manage/entity/StockTaking.java @@ -26,7 +26,7 @@ public class StockTaking { /** * 盘点仓库 */ - private Integer depositoryId; + private Long depositoryId; /** * 1通过2驳回3待处理 @@ -41,7 +41,7 @@ public class StockTaking { /** * 盘点发起人 */ - private Integer originator; + private Long originator; /** * 申请时间 diff --git a/src/main/java/com/dreamchaser/depository_manage/entity/StockTakingChild.java b/src/main/java/com/dreamchaser/depository_manage/entity/StockTakingChild.java index 00090dc7..05d12c26 100644 --- a/src/main/java/com/dreamchaser/depository_manage/entity/StockTakingChild.java +++ b/src/main/java/com/dreamchaser/depository_manage/entity/StockTakingChild.java @@ -16,21 +16,21 @@ public class StockTakingChild { /** * 物料id */ - private Integer mid; + private Long mid; /** * 盘点库位id */ - private Integer pid; + private Long pid; /** * 库存容量 */ - private Integer oldInventory; + private Long oldInventory; /** * 盘点数量 */ - private Integer newInventory; + private Long newInventory; /** * 盘点结果 */ @@ -43,7 +43,7 @@ public class StockTakingChild { /** * 盈亏数量 */ - private Integer inventory; + private Long inventory; /** * 盘点单号 diff --git a/src/main/java/com/dreamchaser/depository_manage/entity/TransferRecord.java b/src/main/java/com/dreamchaser/depository_manage/entity/TransferRecord.java index 3035f64c..356db37c 100644 --- a/src/main/java/com/dreamchaser/depository_manage/entity/TransferRecord.java +++ b/src/main/java/com/dreamchaser/depository_manage/entity/TransferRecord.java @@ -1,11 +1,14 @@ package com.dreamchaser.depository_manage.entity; +import lombok.Data; + /** * transfer_record * * @author bianj * @version 1.0.0 2021-06-05 */ +@Data public class TransferRecord implements java.io.Serializable { /** 版本号 */ private static final long serialVersionUID = 1696077392188910210L; @@ -13,18 +16,18 @@ public class TransferRecord implements java.io.Serializable { /* This code was generated by TableGo tools, mark 1 begin. */ /** 转移记录id */ - private Integer id; + private Long id; /** 转出仓库id */ - private Integer fromId; + private Long fromId; /** 转入仓库id */ - private Integer toId; + private Long toId; /** * 转移物品编号 */ - private Integer mid; + private Long mid; /** * 申请时间 @@ -34,115 +37,14 @@ public class TransferRecord implements java.io.Serializable { /** * 申请人 */ - private Integer applicantId; + private Long applicantId; /** * 转出库位 */ - private Integer fromPlaceId; + private Long fromPlaceId; /** * 转入库位 */ - private Integer toPlaceId; - - /* This code was generated by TableGo tools, mark 1 end. */ - - /* This code was generated by TableGo tools, mark 2 begin. */ - - /** - * 获取转移记录id - * - * @return 转移记录id - */ - public Integer getId() { - return this.id; - } - - /** - * 设置转移记录id - * - * @param id - * 转移记录id - */ - public void setId(Integer id) { - this.id = id; - } - - /** - * 获取转出仓库id - * - * @return 转出仓库id - */ - public Integer getFromId() { - return this.fromId; - } - - /** - * 设置转出仓库id - * - * @param fromId - * 转出仓库id - */ - public void setFromId(Integer fromId) { - this.fromId = fromId; - } - - /** - * 获取转入仓库id - * - * @return 转入仓库id - */ - public Integer getToId() { - return this.toId; - } - - /** - * 设置转入仓库id - * - * @param toId - * 转入仓库id - */ - public void setToId(Integer toId) { - this.toId = toId; - } - - public Integer getMid() { - return mid; - } - - public void setMid(Integer mid) { - this.mid = mid; - } - - public Long getApplicantTime() { - return applicantTime; - } - - public void setApplicantTime(Long applicantTime) { - this.applicantTime = applicantTime; - } - - public Integer getApplicantId() { - return applicantId; - } - - public void setApplicantId(Integer applicantId) { - this.applicantId = applicantId; - } - - public Integer getFromPlaceId() { - return fromPlaceId; - } - - public void setFromPlaceId(Integer fromPlaceId) { - this.fromPlaceId = fromPlaceId; - } - - public Integer getToPlaceId() { - return toPlaceId; - } + private Long toPlaceId; - public void setToPlaceId(Integer toPlaceId) { - this.toPlaceId = toPlaceId; - } - /* This code was generated by TableGo tools, mark 2 end. */ } \ No newline at end of file diff --git a/src/main/java/com/dreamchaser/depository_manage/entity/User.java b/src/main/java/com/dreamchaser/depository_manage/entity/User.java index 71c323bb..8bf16556 100644 --- a/src/main/java/com/dreamchaser/depository_manage/entity/User.java +++ b/src/main/java/com/dreamchaser/depository_manage/entity/User.java @@ -1,7 +1,7 @@ package com.dreamchaser.depository_manage.entity; import java.util.Date; -import com.dreamchaser.depository_manage.entity.Role; + /** * user * diff --git a/src/main/java/com/dreamchaser/depository_manage/entity/UserByPort.java b/src/main/java/com/dreamchaser/depository_manage/entity/UserByPort.java index 301eac9c..fe589ef1 100644 --- a/src/main/java/com/dreamchaser/depository_manage/entity/UserByPort.java +++ b/src/main/java/com/dreamchaser/depository_manage/entity/UserByPort.java @@ -13,7 +13,7 @@ public class UserByPort { /** * id */ - private Integer id; + private Long id; /** * 工号 @@ -48,17 +48,17 @@ public class UserByPort { /** * 入职公司 */ - private Integer company; + private Long company; /** * 主部门 */ - private Integer maindeparment; + private Long maindeparment; /** * 子部门 */ - private Integer sunmaindeparment; + private Long sunmaindeparment; /** * 部门 @@ -68,12 +68,12 @@ public class UserByPort { /** * 所属行政组织 */ - private Integer adminorg; + private Long adminorg; /** * 职位 */ - private Integer position; + private Long position; /** * 职务分类 @@ -83,7 +83,7 @@ public class UserByPort { /** * 职务 */ - private Integer jobid; + private Long jobid; /** * 职务等级 diff --git a/src/main/java/com/dreamchaser/depository_manage/entity/materialOnly.java b/src/main/java/com/dreamchaser/depository_manage/entity/materialOnly.java index f1effd05..522508be 100644 --- a/src/main/java/com/dreamchaser/depository_manage/entity/materialOnly.java +++ b/src/main/java/com/dreamchaser/depository_manage/entity/materialOnly.java @@ -7,14 +7,14 @@ import java.math.BigInteger; @Data public class materialOnly { /** 存储id */ - private Integer id; + private Long id; /** 物料名称 */ private String mname; /** 物料种类id */ - private Integer typeId; + private Long typeId; /** 物料状态 */ private Integer state; diff --git a/src/main/java/com/dreamchaser/depository_manage/entity/qywxDepartment.java b/src/main/java/com/dreamchaser/depository_manage/entity/qywxDepartment.java index dad640d8..db7eb813 100644 --- a/src/main/java/com/dreamchaser/depository_manage/entity/qywxDepartment.java +++ b/src/main/java/com/dreamchaser/depository_manage/entity/qywxDepartment.java @@ -9,9 +9,9 @@ import java.util.List; */ @Data public class qywxDepartment { - private Integer id; - private Integer parentid; - private Integer order; + private Long id; + private Long parentid; + private Long order; private String name; private String name_en; private List department_leader; diff --git a/src/main/java/com/dreamchaser/depository_manage/entity/qywxLabel.java b/src/main/java/com/dreamchaser/depository_manage/entity/qywxLabel.java index aa090178..d879f287 100644 --- a/src/main/java/com/dreamchaser/depository_manage/entity/qywxLabel.java +++ b/src/main/java/com/dreamchaser/depository_manage/entity/qywxLabel.java @@ -7,6 +7,6 @@ import lombok.Data; */ @Data public class qywxLabel { - private Integer tagid; + private Long tagid; private String tagname; } diff --git a/src/main/java/com/dreamchaser/depository_manage/hrNew_mapper/AdministrativeMapper.java b/src/main/java/com/dreamchaser/depository_manage/hrNew_mapper/AdministrativeMapper.java new file mode 100644 index 00000000..647d4983 --- /dev/null +++ b/src/main/java/com/dreamchaser/depository_manage/hrNew_mapper/AdministrativeMapper.java @@ -0,0 +1,18 @@ +package com.dreamchaser.depository_manage.hrNew_mapper; + +import com.baomidou.dynamic.datasource.annotation.DS; +import com.dreamchaser.depository_manage.entity.Administration; +import org.apache.ibatis.annotations.Mapper; +import org.springframework.stereotype.Repository; + +@Mapper +@Repository +@DS("hr_new") +public interface AdministrativeMapper { + /** + * 根据id获取行政组织 + * @param id 待获取行政组织id + * @return + */ + Administration findAdministrationById(Long id); +} diff --git a/src/main/java/com/dreamchaser/depository_manage/hrNew_mapper/AdministrativeMapper.xml b/src/main/java/com/dreamchaser/depository_manage/hrNew_mapper/AdministrativeMapper.xml new file mode 100644 index 00000000..0393424c --- /dev/null +++ b/src/main/java/com/dreamchaser/depository_manage/hrNew_mapper/AdministrativeMapper.xml @@ -0,0 +1,26 @@ + + + + + + + + + + + + + + + + + id,number,name,superior,organization_type,abbreviation,state,time,wechat_organization_id + + + + \ No newline at end of file diff --git a/src/main/java/com/dreamchaser/depository_manage/hrNew_mapper/UserMapper.java b/src/main/java/com/dreamchaser/depository_manage/hrNew_mapper/UserMapper.java new file mode 100644 index 00000000..a7bb5bd6 --- /dev/null +++ b/src/main/java/com/dreamchaser/depository_manage/hrNew_mapper/UserMapper.java @@ -0,0 +1,33 @@ +package com.dreamchaser.depository_manage.hrNew_mapper; + +import com.baomidou.dynamic.datasource.annotation.DS; +import com.dreamchaser.depository_manage.entity.User; +import com.dreamchaser.depository_manage.entity.UserByPort; +import org.apache.ibatis.annotations.Mapper; +import org.springframework.stereotype.Repository; + +import java.util.List; +import java.util.Map; + +/** + * 关于用户的mapper接口 + * @author Dreamchaser + */ +@Repository +@Mapper +@DS("hr_new") +public interface UserMapper { + /** + * 通过id获取用户信息 + * @param id 待获取用户id + * @return + */ + UserByPort findUserById(Long id); + + /** + * 通过工号获取用户信息 + * @param number 待获取用户工号 + * @return + */ + UserByPort findUserByNumber(String number); +} diff --git a/src/main/java/com/dreamchaser/depository_manage/hrNew_mapper/UserMapper.xml b/src/main/java/com/dreamchaser/depository_manage/hrNew_mapper/UserMapper.xml new file mode 100644 index 00000000..555c253c --- /dev/null +++ b/src/main/java/com/dreamchaser/depository_manage/hrNew_mapper/UserMapper.xml @@ -0,0 +1,81 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + id,number,name,icon,hire_class,emp_type,company,maindeparment,deparment,admin_org,position,job_class,job_id,job_leve,eite_time, + time,wechat,work_wechat,state,`key`,is_admin,`password`,role,idcardno,passportno,globalroaming,mobilephone,email,gender,birthday,myfolk,nativeplace, + idcardstartdate,idcardenddate,idcardaddress,idcardIssued,health,maritalstatus,internaltelephone,currentresidence,constellationing,isdoubleworker, + isveterans,veteransnumber,jobstartdate,entrydate,probationperiod,planformaldate,political_outlook,sun_main_department,icon_photo,person_in_charge + + + + + + + \ No newline at end of file diff --git a/src/main/java/com/dreamchaser/depository_manage/pojo/AdministrationP.java b/src/main/java/com/dreamchaser/depository_manage/pojo/AdministrationP.java index 6d0c7c09..14492fea 100644 --- a/src/main/java/com/dreamchaser/depository_manage/pojo/AdministrationP.java +++ b/src/main/java/com/dreamchaser/depository_manage/pojo/AdministrationP.java @@ -12,7 +12,7 @@ public class AdministrationP implements Serializable { /** * id */ - private Integer id; + private Long id; /** * 编号 diff --git a/src/main/java/com/dreamchaser/depository_manage/pojo/ApplicationInRecordP.java b/src/main/java/com/dreamchaser/depository_manage/pojo/ApplicationInRecordP.java index dd89fe97..1c0c0cad 100644 --- a/src/main/java/com/dreamchaser/depository_manage/pojo/ApplicationInRecordP.java +++ b/src/main/java/com/dreamchaser/depository_manage/pojo/ApplicationInRecordP.java @@ -8,7 +8,7 @@ public class ApplicationInRecordP { /** * id */ - private Integer id; + private Long id; /** * 入库物品名称 */ @@ -39,7 +39,7 @@ public class ApplicationInRecordP { /** * 提交人id */ - private Integer applicantId; + private Long applicantId; /** * 提交时间 @@ -59,7 +59,7 @@ public class ApplicationInRecordP { /** * 仓库id */ - private Integer depositoryId; + private Long depositoryId; /** @@ -110,13 +110,13 @@ public class ApplicationInRecordP { /** * 入库物料 */ - private Integer mid; + private Long mid; /** * 入库库位 */ - private Integer placeId; + private Long placeId; /** * 用于标志该物料入库记录是那个组合下的入库记录 diff --git a/src/main/java/com/dreamchaser/depository_manage/pojo/ApplicationModel.java b/src/main/java/com/dreamchaser/depository_manage/pojo/ApplicationModel.java index 0e29dddf..33a02efb 100644 --- a/src/main/java/com/dreamchaser/depository_manage/pojo/ApplicationModel.java +++ b/src/main/java/com/dreamchaser/depository_manage/pojo/ApplicationModel.java @@ -25,7 +25,7 @@ public class ApplicationModel { /** * 仓库编号 */ - private Integer depositoryId; + private Long depositoryId; /** * 物料名称 */ @@ -33,16 +33,16 @@ public class ApplicationModel { /** * 物料编号 */ - private Integer mid; + private Long mid; /** * 库存编号 */ - private Integer iid; + private Long iid; /** * 申请人编号 */ - private Integer applicant; + private Long applicant; /** * 物料编码 diff --git a/src/main/java/com/dreamchaser/depository_manage/pojo/ApplicationOutRecordMinP.java b/src/main/java/com/dreamchaser/depository_manage/pojo/ApplicationOutRecordMinP.java index cea13ac0..efe9ada3 100644 --- a/src/main/java/com/dreamchaser/depository_manage/pojo/ApplicationOutRecordMinP.java +++ b/src/main/java/com/dreamchaser/depository_manage/pojo/ApplicationOutRecordMinP.java @@ -10,12 +10,12 @@ public class ApplicationOutRecordMinP { /** * id */ - private Integer id; + private Long id; /** * 物料id */ - private Integer mid; + private Long mid; /** * 物料名称 @@ -29,7 +29,7 @@ public class ApplicationOutRecordMinP { /** * 仓库id */ - private Integer depositoryId; + private Long depositoryId; /** @@ -40,7 +40,7 @@ public class ApplicationOutRecordMinP { /** * 对应库位id */ - private Integer placeId; + private Long placeId; /** @@ -59,7 +59,7 @@ public class ApplicationOutRecordMinP { /** * 审核人编号 */ - private Integer checkId; + private Long checkId; /** @@ -74,7 +74,7 @@ public class ApplicationOutRecordMinP { /** * 主订单编号 */ - private Integer parentId; + private Long parentId; /** @@ -105,7 +105,7 @@ public class ApplicationOutRecordMinP { /** * 转移申请编号 */ - private Integer transferId; + private Long transferId; /** diff --git a/src/main/java/com/dreamchaser/depository_manage/pojo/ApplicationOutRecordP.java b/src/main/java/com/dreamchaser/depository_manage/pojo/ApplicationOutRecordP.java index 4bfa501e..36ca56f0 100644 --- a/src/main/java/com/dreamchaser/depository_manage/pojo/ApplicationOutRecordP.java +++ b/src/main/java/com/dreamchaser/depository_manage/pojo/ApplicationOutRecordP.java @@ -13,12 +13,12 @@ public class ApplicationOutRecordP { /** * id */ - private Integer id; + private Long id; /** * 物料id */ - private Integer mid; + private Long mid; /** * 物料名称 @@ -33,7 +33,7 @@ public class ApplicationOutRecordP { /** * 仓库id */ - private Integer depositoryId; + private Long depositoryId; /** * 仓库名称 @@ -43,7 +43,7 @@ public class ApplicationOutRecordP { /** * 申请人id */ - private Integer applicantId; + private Long applicantId; /** * 申请人名称 @@ -189,7 +189,7 @@ public class ApplicationOutRecordP { /** * 对应库位id */ - private Integer placeId; + private Long placeId; /** * 对应库位编码 @@ -209,7 +209,7 @@ public class ApplicationOutRecordP { /** * 施工单位id */ - private Integer constructionUnitId; + private Long constructionUnitId; /** * 施工单位名称 */ @@ -217,7 +217,7 @@ public class ApplicationOutRecordP { /** * 部门id */ - private Integer adminorgId; + private Long adminorgId; /** @@ -275,7 +275,7 @@ public class ApplicationOutRecordP { /** * 创建人id */ - private Integer createUid; + private Long createUid; /** diff --git a/src/main/java/com/dreamchaser/depository_manage/pojo/DepositoryRecordP.java b/src/main/java/com/dreamchaser/depository_manage/pojo/DepositoryRecordP.java index b6393ad7..fa944179 100644 --- a/src/main/java/com/dreamchaser/depository_manage/pojo/DepositoryRecordP.java +++ b/src/main/java/com/dreamchaser/depository_manage/pojo/DepositoryRecordP.java @@ -11,12 +11,12 @@ public class DepositoryRecordP { /** * 记录id */ - private Integer id; + private Long id; /** * 申请编号 */ - private Integer applicationId; + private Long applicationId; /** * 产品名称 @@ -26,7 +26,7 @@ public class DepositoryRecordP { /** * 调度的仓库id */ - private Integer depositoryId; + private Long depositoryId; /** * 仓库名称 @@ -56,7 +56,7 @@ public class DepositoryRecordP { /** * 申请人id */ - private Integer applicantId; + private Long applicantId; /** * 申请人姓名 @@ -76,7 +76,7 @@ public class DepositoryRecordP { /** * 审核人id */ - private Integer reviewerId; + private Long reviewerId; /** * 审核人姓名 @@ -101,7 +101,7 @@ public class DepositoryRecordP { /** * 验货人id */ - private Integer checkerId; + private Long checkerId; /** * 验货人姓名 diff --git a/src/main/java/com/dreamchaser/depository_manage/pojo/GroupInfoP.java b/src/main/java/com/dreamchaser/depository_manage/pojo/GroupInfoP.java index 0beb9ce3..be5e9758 100644 --- a/src/main/java/com/dreamchaser/depository_manage/pojo/GroupInfoP.java +++ b/src/main/java/com/dreamchaser/depository_manage/pojo/GroupInfoP.java @@ -16,7 +16,7 @@ public class GroupInfoP { /** * id */ - private Integer id; + private Long id; /** * 组合创建时间 @@ -31,7 +31,7 @@ public class GroupInfoP { /** * 物料名称 */ - private Map materialSimple; + private Map materialSimple; /** diff --git a/src/main/java/com/dreamchaser/depository_manage/pojo/InventoryByMTAndDepository.java b/src/main/java/com/dreamchaser/depository_manage/pojo/InventoryByMTAndDepository.java index 7a7034df..d557f7be 100644 --- a/src/main/java/com/dreamchaser/depository_manage/pojo/InventoryByMTAndDepository.java +++ b/src/main/java/com/dreamchaser/depository_manage/pojo/InventoryByMTAndDepository.java @@ -10,7 +10,7 @@ public class InventoryByMTAndDepository implements Serializable { // 类型id private Long mtId; // 仓库id - private Integer depositoryId; + private Long depositoryId; // 库存数 private Double inventory; } diff --git a/src/main/java/com/dreamchaser/depository_manage/pojo/InventoryP.java b/src/main/java/com/dreamchaser/depository_manage/pojo/InventoryP.java index e8be3015..2a6f25ce 100644 --- a/src/main/java/com/dreamchaser/depository_manage/pojo/InventoryP.java +++ b/src/main/java/com/dreamchaser/depository_manage/pojo/InventoryP.java @@ -12,12 +12,12 @@ public class InventoryP { /** * 存储id */ - private Integer id; + private Long id; /** * 物料id */ - private Integer mid; + private Long mid; /** * 仓库名称 @@ -27,12 +27,12 @@ public class InventoryP { /** * 仓库id */ - private Integer depositoryId; + private Long depositoryId; /** * 库位id */ - private Integer pid; + private Long pid; /** * 物料名称 @@ -169,7 +169,7 @@ public class InventoryP { /** * 预警数量 */ - private Integer warningCount; + private Long warningCount; /** * 该物料生产日期列表 @@ -229,7 +229,7 @@ public class InventoryP { private List materialAndPlaceList; - public InventoryP(Integer id, Integer depositoryId, String mname, Integer quantity, Double price, String typeName) { + public InventoryP(Long id, Integer depositoryId, String mname, Integer quantity, Double price, String typeName) { this.id = id; this.mname = mname; this.quantity = (double) quantity / 100; diff --git a/src/main/java/com/dreamchaser/depository_manage/pojo/MaterialAndPlaceForViewP.java b/src/main/java/com/dreamchaser/depository_manage/pojo/MaterialAndPlaceForViewP.java index f23b661c..31018b87 100644 --- a/src/main/java/com/dreamchaser/depository_manage/pojo/MaterialAndPlaceForViewP.java +++ b/src/main/java/com/dreamchaser/depository_manage/pojo/MaterialAndPlaceForViewP.java @@ -11,15 +11,15 @@ public class MaterialAndPlaceForViewP { /** * 物料与库位映射关系id */ - private Integer id; + private Long id; /** * 物料id */ - private Integer mid; + private Long mid; /** * 当前库存id */ - private Integer pid; + private Long pid; /** * 在当前库位的数量 */ @@ -27,7 +27,7 @@ public class MaterialAndPlaceForViewP { /** * 当前库存所处仓库 */ - private Integer depository_id; + private Long depository_id; /** * 当前物料类型id */ @@ -35,7 +35,7 @@ public class MaterialAndPlaceForViewP { /** * 库存id */ - private Integer iid; + private Long iid; /** * 所处仓库编码 */ diff --git a/src/main/java/com/dreamchaser/depository_manage/pojo/MaterialOnlyP.java b/src/main/java/com/dreamchaser/depository_manage/pojo/MaterialOnlyP.java index 9c3458ce..4154d49a 100644 --- a/src/main/java/com/dreamchaser/depository_manage/pojo/MaterialOnlyP.java +++ b/src/main/java/com/dreamchaser/depository_manage/pojo/MaterialOnlyP.java @@ -1,17 +1,20 @@ package com.dreamchaser.depository_manage.pojo; +import lombok.Data; + import java.math.BigInteger; +@Data public class MaterialOnlyP { /** 存储id */ - private Integer id; + private Long id; /** 物料名称 */ private String mname; /** 物料种类id */ - private Integer typeId; + private Long typeId; /** 物料状态 */ private Integer state; diff --git a/src/main/java/com/dreamchaser/depository_manage/pojo/MaterialP.java b/src/main/java/com/dreamchaser/depository_manage/pojo/MaterialP.java index 890b05b2..f7ca81e3 100644 --- a/src/main/java/com/dreamchaser/depository_manage/pojo/MaterialP.java +++ b/src/main/java/com/dreamchaser/depository_manage/pojo/MaterialP.java @@ -19,12 +19,12 @@ public class MaterialP { /** * 存储id */ - private Integer id; + private Long id; /** * 物料id */ - private Integer mid; + private Long mid; /** * 仓库名称 @@ -34,7 +34,7 @@ public class MaterialP { /** * 仓库id */ - private Integer depositoryId; + private Long depositoryId; /** * 物料名称 @@ -44,7 +44,7 @@ public class MaterialP { /** * 数量 */ - private Integer quantity; + private Long quantity; /** * 总金额 @@ -190,7 +190,7 @@ public class MaterialP { private String baseUnit; - public MaterialP(Integer id, Integer depositoryId, String mname, Integer quantity, Double price, String typeName) { + public MaterialP(Long id, Integer depositoryId, String mname, Long quantity, Double price, String typeName) { this.id = id; this.mname = mname; this.quantity = quantity; diff --git a/src/main/java/com/dreamchaser/depository_manage/pojo/NoticeP.java b/src/main/java/com/dreamchaser/depository_manage/pojo/NoticeP.java index a39db673..f93c6592 100644 --- a/src/main/java/com/dreamchaser/depository_manage/pojo/NoticeP.java +++ b/src/main/java/com/dreamchaser/depository_manage/pojo/NoticeP.java @@ -7,7 +7,7 @@ import lombok.Data; @Data public class NoticeP { /** 公告主键 */ - private Integer id; + private Long id; /** 公告标题 */ private String title; @@ -21,7 +21,7 @@ public class NoticeP { /** * 发布人员 */ - private Integer userId; + private Long userId; /** * 公告状态 @@ -46,7 +46,7 @@ public class NoticeP { /** * 读取公告id */ - private Integer readId; + private Long readId; public NoticeP(Notice notice) { diff --git a/src/main/java/com/dreamchaser/depository_manage/pojo/PlaceP.java b/src/main/java/com/dreamchaser/depository_manage/pojo/PlaceP.java index a198b017..503ad865 100644 --- a/src/main/java/com/dreamchaser/depository_manage/pojo/PlaceP.java +++ b/src/main/java/com/dreamchaser/depository_manage/pojo/PlaceP.java @@ -12,7 +12,7 @@ public class PlaceP { /** * id */ - private Integer id; + private Long id; /** * 行 @@ -30,12 +30,12 @@ public class PlaceP { /** * 存放物料id */ - private Integer mid; + private Long mid; /** * 该库位所处仓库 */ - private Integer did; + private Long did; /** * 库位编码 @@ -45,12 +45,12 @@ public class PlaceP { /** * 当前库位最少数目 */ - private Integer min; + private Long min; /** * 当前库位最多数目 */ - private Integer max; + private Long max; /** * 当前库位状态 @@ -86,7 +86,7 @@ public class PlaceP { */ private String kingdeecode; - public PlaceP(Integer id, Integer x, Integer y, Integer z, Integer mid, Integer did, String code, Integer min, Integer max, Integer state, String mname, String mcode, String depositoryCode, String depositoryName) { + public PlaceP(Long id, Integer x, Integer y, Integer z, Long mid, Long did, String code, Long min, Long max, Integer state, String mname, String mcode, String depositoryCode, String depositoryName) { this.id = id; this.x = x; this.y = y; diff --git a/src/main/java/com/dreamchaser/depository_manage/pojo/PostP.java b/src/main/java/com/dreamchaser/depository_manage/pojo/PostP.java index 483b3865..b763d27c 100644 --- a/src/main/java/com/dreamchaser/depository_manage/pojo/PostP.java +++ b/src/main/java/com/dreamchaser/depository_manage/pojo/PostP.java @@ -9,7 +9,7 @@ public class PostP { /** * 岗位id */ - private Integer id; + private Long id; /** * 编号 */ @@ -37,7 +37,7 @@ public class PostP { /** * 权限id */ - private Integer prid; + private Long prid; /** @@ -79,12 +79,12 @@ public class PostP { /** * 管理仓库编号 */ - private Integer depositoryId; + private Long depositoryId; /** * 归属行政组织 */ - private Integer administrativeorganization; + private Long administrativeorganization; public PostP(Post post){ this.id = post.getId(); @@ -102,7 +102,7 @@ public class PostP { } - public PostP(Integer id, String number, String name, Integer state, String dutiesname, String aoname, String aonumber, String jobname, String superiorname, String superiornumber, String departmentname, String rolename, String depositoryName) { + public PostP(Long id, String number, String name, Integer state, String dutiesname, String aoname, String aonumber, String jobname, String superiorname, String superiornumber, String departmentname, String rolename, String depositoryName) { this.id = id; this.number = number; this.name = name; diff --git a/src/main/java/com/dreamchaser/depository_manage/pojo/ResultForGroupReturn.java b/src/main/java/com/dreamchaser/depository_manage/pojo/ResultForGroupReturn.java index d2fada0f..3699f852 100644 --- a/src/main/java/com/dreamchaser/depository_manage/pojo/ResultForGroupReturn.java +++ b/src/main/java/com/dreamchaser/depository_manage/pojo/ResultForGroupReturn.java @@ -11,11 +11,11 @@ import java.util.List; @Data public class ResultForGroupReturn { // 定义列表用于储存入库单id - List recordIds; + List recordIds; // 定义列表用于存储入库仓库id List mtIdList; // 定义列表用于存储展示的入库单id - List showRecordIds; + List showRecordIds; // 用于存储申请数 Integer result; } diff --git a/src/main/java/com/dreamchaser/depository_manage/pojo/RoleAndDepository.java b/src/main/java/com/dreamchaser/depository_manage/pojo/RoleAndDepository.java index fd87fdf3..5a0904f8 100644 --- a/src/main/java/com/dreamchaser/depository_manage/pojo/RoleAndDepository.java +++ b/src/main/java/com/dreamchaser/depository_manage/pojo/RoleAndDepository.java @@ -8,19 +8,19 @@ public class RoleAndDepository { /** * 权限列表编号 */ - private Integer id; + private Long id; /** * 归属人/岗位编号 */ - private Integer userId; + private Long userId; /** * 仓库编号 */ - private Integer depositoryId; + private Long depositoryId; /** * 仓库名称 @@ -55,7 +55,7 @@ public class RoleAndDepository { /** * 仓库父级id */ - private Integer parentId; + private Long parentId; /** diff --git a/src/main/java/com/dreamchaser/depository_manage/pojo/RoleAndMaterialType.java b/src/main/java/com/dreamchaser/depository_manage/pojo/RoleAndMaterialType.java index 4314efc6..ddec76f6 100644 --- a/src/main/java/com/dreamchaser/depository_manage/pojo/RoleAndMaterialType.java +++ b/src/main/java/com/dreamchaser/depository_manage/pojo/RoleAndMaterialType.java @@ -10,7 +10,7 @@ public class RoleAndMaterialType { /** * id */ - private Integer id; + private Long id; /** * 类型id @@ -27,7 +27,7 @@ public class RoleAndMaterialType { /** * 类型父级 */ - private Integer mtparentId; + private Long mtparentId; /** * 用户名称 */ @@ -35,7 +35,7 @@ public class RoleAndMaterialType { /** * 用户id */ - private Integer uid; + private Long uid; /** * 1个人2岗位 */ diff --git a/src/main/java/com/dreamchaser/depository_manage/pojo/SimpleApplicationOutMinRecordP.java b/src/main/java/com/dreamchaser/depository_manage/pojo/SimpleApplicationOutMinRecordP.java index 5debb3d4..02f98c5a 100644 --- a/src/main/java/com/dreamchaser/depository_manage/pojo/SimpleApplicationOutMinRecordP.java +++ b/src/main/java/com/dreamchaser/depository_manage/pojo/SimpleApplicationOutMinRecordP.java @@ -9,7 +9,7 @@ import java.math.BigInteger; @Data public class SimpleApplicationOutMinRecordP { /** 记录id */ - private Integer id; + private Long id; /** 申请人姓名 */ private String applicantName; @@ -38,7 +38,7 @@ public class SimpleApplicationOutMinRecordP { /** * 主订单编号 */ - private Integer parentId; + private Long parentId; /** * 申请数目 @@ -47,7 +47,7 @@ public class SimpleApplicationOutMinRecordP { /** * 仓库编号 */ - private Integer depositoryId; + private Long depositoryId; /** * 仓库名 */ @@ -56,7 +56,7 @@ public class SimpleApplicationOutMinRecordP { /** * 库位编号 */ - private Integer pid; + private Long pid; /** * 库位编码 */ diff --git a/src/main/java/com/dreamchaser/depository_manage/pojo/SimpleApplicationOutOrInRecordP.java b/src/main/java/com/dreamchaser/depository_manage/pojo/SimpleApplicationOutOrInRecordP.java index 0ca49548..9b610e53 100644 --- a/src/main/java/com/dreamchaser/depository_manage/pojo/SimpleApplicationOutOrInRecordP.java +++ b/src/main/java/com/dreamchaser/depository_manage/pojo/SimpleApplicationOutOrInRecordP.java @@ -9,7 +9,7 @@ import lombok.Data; @Data public class SimpleApplicationOutOrInRecordP { /** 记录id */ - private Integer id; + private Long id; /** 申请人姓名 */ private String applicantName; diff --git a/src/main/java/com/dreamchaser/depository_manage/pojo/SimpleDepositoryRecordP.java b/src/main/java/com/dreamchaser/depository_manage/pojo/SimpleDepositoryRecordP.java index d49c28c2..7e845124 100644 --- a/src/main/java/com/dreamchaser/depository_manage/pojo/SimpleDepositoryRecordP.java +++ b/src/main/java/com/dreamchaser/depository_manage/pojo/SimpleDepositoryRecordP.java @@ -13,7 +13,7 @@ import java.util.Date; @Data public class SimpleDepositoryRecordP { /** 记录id */ - private Integer id; + private Long id; /** 调度记录类型（购入/退料/转入,退还/领料/转出) */ private Integer type; diff --git a/src/main/java/com/dreamchaser/depository_manage/pojo/SplitInfoP.java b/src/main/java/com/dreamchaser/depository_manage/pojo/SplitInfoP.java index dfe0791a..3970c419 100644 --- a/src/main/java/com/dreamchaser/depository_manage/pojo/SplitInfoP.java +++ b/src/main/java/com/dreamchaser/depository_manage/pojo/SplitInfoP.java @@ -11,11 +11,11 @@ public class SplitInfoP { /** * 拆单id */ - private Integer id; + private Long id; /** * 物料id */ - private Integer mid; + private Long mid; /** * 旧计量单位 */ @@ -27,11 +27,11 @@ public class SplitInfoP { /** * 新旧单位映射数 */ - private Integer quantity; + private Long quantity; /** * 父级id */ - private Integer sparentId; + private Long sparentId; /** * 状态：1启用2禁用3删除 diff --git a/src/main/java/com/dreamchaser/depository_manage/pojo/Statistic.java b/src/main/java/com/dreamchaser/depository_manage/pojo/Statistic.java deleted file mode 100644 index 729076a2..00000000 --- a/src/main/java/com/dreamchaser/depository_manage/pojo/Statistic.java +++ /dev/null @@ -1,14 +0,0 @@ -package com.dreamchaser.depository_manage.pojo; - - -/** - * 统计量 - * @author Dreamchaser - */ -public class Statistic { - - - class Material{ - - } -} diff --git a/src/main/java/com/dreamchaser/depository_manage/pojo/StockTakingChildP.java b/src/main/java/com/dreamchaser/depository_manage/pojo/StockTakingChildP.java index d167adbd..c5d6eac3 100644 --- a/src/main/java/com/dreamchaser/depository_manage/pojo/StockTakingChildP.java +++ b/src/main/java/com/dreamchaser/depository_manage/pojo/StockTakingChildP.java @@ -18,13 +18,13 @@ public class StockTakingChildP { /** * 物料id */ - private Integer mid; + private Long mid; /** * 盘点库位id */ - private Integer pid; + private Long pid; /** * 库存容量 */ @@ -138,7 +138,7 @@ public class StockTakingChildP { this.showUnit = record.getShowUnit(); } - public StockTakingChildP(Long id, Integer mid, Integer pid, Double oldInventory, Double newInventory, String takingResult, String takingResultShow, Double inventory, String code, String mname, String mcode, List materialAndBarCodeList, Long mtId, String tname, String mtexture, String mversion, String munit, Long mainId, Long producedDate, String unit, String showUnit) { + public StockTakingChildP(Long id, Long mid, Long pid, Double oldInventory, Double newInventory, String takingResult, String takingResultShow, Double inventory, String code, String mname, String mcode, List materialAndBarCodeList, Long mtId, String tname, String mtexture, String mversion, String munit, Long mainId, Long producedDate, String unit, String showUnit) { this.id = id; this.mid = mid; this.pid = pid; diff --git a/src/main/java/com/dreamchaser/depository_manage/pojo/StockTakingP.java b/src/main/java/com/dreamchaser/depository_manage/pojo/StockTakingP.java index fb0a49ce..38016c25 100644 --- a/src/main/java/com/dreamchaser/depository_manage/pojo/StockTakingP.java +++ b/src/main/java/com/dreamchaser/depository_manage/pojo/StockTakingP.java @@ -25,12 +25,12 @@ public class StockTakingP { /** * 盘点仓库 */ - private Integer placeId; + private Long placeId; /** * 盘点库位 */ - private Integer depositoryId; + private Long depositoryId; /** * 库位编码 @@ -76,7 +76,7 @@ public class StockTakingP { /** * 盘点发起人 */ - private Integer originator; + private Long originator; /** diff --git a/src/main/java/com/dreamchaser/depository_manage/pojo/UserByPortP.java b/src/main/java/com/dreamchaser/depository_manage/pojo/UserByPortP.java index ae1a37e9..2532c1a3 100644 --- a/src/main/java/com/dreamchaser/depository_manage/pojo/UserByPortP.java +++ b/src/main/java/com/dreamchaser/depository_manage/pojo/UserByPortP.java @@ -9,7 +9,7 @@ public class UserByPortP { /** * id */ - private Integer id; + private Long id; /** * 工号 @@ -81,7 +81,7 @@ public class UserByPortP { */ private Integer personincharge; - private Integer maindeparment; + private Long maindeparment; public UserByPortP(UserByPort userByPort) { diff --git a/src/main/java/com/dreamchaser/depository_manage/pojo/UserP.java b/src/main/java/com/dreamchaser/depository_manage/pojo/UserP.java index 827b8d0f..7b3f4860 100644 --- a/src/main/java/com/dreamchaser/depository_manage/pojo/UserP.java +++ b/src/main/java/com/dreamchaser/depository_manage/pojo/UserP.java @@ -1,8 +1,6 @@ package com.dreamchaser.depository_manage.pojo; -import com.dreamchaser.depository_manage.entity.Role; import com.dreamchaser.depository_manage.entity.User; -import com.dreamchaser.depository_manage.entity.Role; import com.dreamchaser.depository_manage.utils.DateUtil; import lombok.Data; diff --git a/src/main/java/com/dreamchaser/depository_manage/service/AccessAddressService.java b/src/main/java/com/dreamchaser/depository_manage/service/AccessAddressService.java index 8e385f6b..a4baf6a5 100644 --- a/src/main/java/com/dreamchaser/depository_manage/service/AccessAddressService.java +++ b/src/main/java/com/dreamchaser/depository_manage/service/AccessAddressService.java @@ -31,7 +31,7 @@ public interface AccessAddressService { * @param id * @return */ - List findAccessstoAddressByParent(Integer id); + List findAccessstoAddressByParent(Long id); /** diff --git a/src/main/java/com/dreamchaser/depository_manage/service/BusinessTypeService.java b/src/main/java/com/dreamchaser/depository_manage/service/BusinessTypeService.java index e7ebd395..fe0f2c72 100644 --- a/src/main/java/com/dreamchaser/depository_manage/service/BusinessTypeService.java +++ b/src/main/java/com/dreamchaser/depository_manage/service/BusinessTypeService.java @@ -52,14 +52,14 @@ public interface BusinessTypeService { * @param id 待删除id * @return */ - Integer deleteBusinessTypeById(Integer id); + Integer deleteBusinessTypeById(Long id); /** * 根据id批量删除一条业务类型数据（硬删除） * @param ids 待删除id列表 * @return */ - Integer deleteBusinessTypeByIds(List ids); + Integer deleteBusinessTypeByIds(List ids); /** * 根据条件获取业务类型数据 @@ -86,12 +86,12 @@ public interface BusinessTypeService { * @param id 待查询id * @return */ - BusinessType findBusinessTypeById(Integer id); + BusinessType findBusinessTypeById(Long id); /** * 根据id批量获取业务类型数据 * @param ids 待查询id列表 * @return */ - List findBusinessTypeByIds(List ids); + List findBusinessTypeByIds(List ids); } diff --git a/src/main/java/com/dreamchaser/depository_manage/service/CompanyService.java b/src/main/java/com/dreamchaser/depository_manage/service/CompanyService.java index 85350f35..5fe85c91 100644 --- a/src/main/java/com/dreamchaser/depository_manage/service/CompanyService.java +++ b/src/main/java/com/dreamchaser/depository_manage/service/CompanyService.java @@ -20,21 +20,21 @@ public interface CompanyService { * 根据父级查询公司信息 * @return */ - List findCompanyByParentId(Integer parentId); + List findCompanyByParentId(Long parentId); /** * 根据id编号删除公司信息 * @param id * @return */ - Integer deleteCompanyById(Integer id); + Integer deleteCompanyById(Long id); /** * 根据编号批量删除公司信息 * @param ids * @return */ - Integer deleteCompanyByIds(List ids); + Integer deleteCompanyByIds(List ids); /** * 修改公司信息 @@ -68,20 +68,20 @@ public interface CompanyService { * @param id * @return */ - Company findcompanyById(Integer id); + Company findcompanyById(Long id); /** * 根据主键将公司状态改为删除 * @param id * @return */ - Integer changeStateToDeletedById(Integer id); + Integer changeStateToDeletedById(Long id); /** * 根据主键批量将公司状s态改为删除 * @param ids * @return */ - Integer changeStateToDeletedByIds(List ids); + Integer changeStateToDeletedByIds(List ids); /** * 根据条件修改公司状态 diff --git a/src/main/java/com/dreamchaser/depository_manage/service/ConstructionUnitService.java b/src/main/java/com/dreamchaser/depository_manage/service/ConstructionUnitService.java index d8a68e31..bc25ca14 100644 --- a/src/main/java/com/dreamchaser/depository_manage/service/ConstructionUnitService.java +++ b/src/main/java/com/dreamchaser/depository_manage/service/ConstructionUnitService.java @@ -47,7 +47,7 @@ public interface ConstructionUnitService { * @param id 待查询主键 * @return */ - ConstructionUnit findConstructionUnitById(Integer id); + ConstructionUnit findConstructionUnitById(Long id); /** * 修改施工单位状态 @@ -73,7 +73,7 @@ public interface ConstructionUnitService { * @param id 待删除id * @return */ - Integer deleteConstructionUnitById(Integer id); + Integer deleteConstructionUnitById(Long id); /** * 根据主键id批量删除施工单位 @@ -81,5 +81,5 @@ public interface ConstructionUnitService { * @param list 待删除id列表 * @return */ - Integer deleteConstructionUnitByIds(List list); + Integer deleteConstructionUnitByIds(List list); } diff --git a/src/main/java/com/dreamchaser/depository_manage/service/DepositoryRecordService.java b/src/main/java/com/dreamchaser/depository_manage/service/DepositoryRecordService.java index cc44963c..40ffee4b 100644 --- a/src/main/java/com/dreamchaser/depository_manage/service/DepositoryRecordService.java +++ b/src/main/java/com/dreamchaser/depository_manage/service/DepositoryRecordService.java @@ -45,7 +45,7 @@ public interface DepositoryRecordService { * @param map 仓库调度信息 * @return 受影响的行数 */ - Integer review(Map map, Integer userId, UserByPort userToken, String userAgent,String userKey,String token); + Integer review(Map map, Long userId, UserByPort userToken, String userAgent,String userKey,String token); /** * 入库审核申请 @@ -53,7 +53,7 @@ public interface DepositoryRecordService { * @param map 仓库调度信息 * @return 受影响的行数 */ - Integer reviewIn(Map map, Integer userId, UserByPort userToken, String userAgent); + Integer reviewIn(Map map, Long userId, UserByPort userToken, String userAgent); /** @@ -152,7 +152,7 @@ public interface DepositoryRecordService { * @param id * @return */ - ApplicationOutRecordP findApplicationOutRecordPById(Integer id); + ApplicationOutRecordP findApplicationOutRecordPById(Long id); /** * 根据条件查询入库记录数目 @@ -185,7 +185,7 @@ public interface DepositoryRecordService { * @param id * @return 受影响的行数 */ - Integer deleteDepositoryRecordById(Integer id); + Integer deleteDepositoryRecordById(Long id); /** * 根据id集合删除多条仓库记录 @@ -193,7 +193,7 @@ public interface DepositoryRecordService { * @param list id集合 * @return 受影响的行数 */ - Integer deleteDepositoryRecordByIds(List list); + Integer deleteDepositoryRecordByIds(List list); /** * 返回该表的总条数 @@ -237,7 +237,7 @@ public interface DepositoryRecordService { * * @return */ - Map CalculateAllApplicationInAll(List list); + Map CalculateAllApplicationInAll(List list); /** @@ -249,7 +249,7 @@ public interface DepositoryRecordService { * @param depositoryId * @return */ - Double findApplicationRecordByDate(Long end, Long start, Integer type, Integer depositoryId); + Double findApplicationRecordByDate(Long end, Long start, Integer type, Long depositoryId); /** * 获取一段时间内的入库额度 @@ -259,7 +259,7 @@ public interface DepositoryRecordService { * @param depositoryId * @return */ - Integer findApplicationInRecordByDate(Long end, Long start, Integer depositoryId); + Integer findApplicationInRecordByDate(Long end, Long start, Long depositoryId); /** * 获取一段时间内的出库额度 @@ -269,7 +269,7 @@ public interface DepositoryRecordService { * @param depositoryId * @return */ - Integer findApplicationOutRecordByDate(Long end, Long start, Integer depositoryId); + Integer findApplicationOutRecordByDate(Long end, Long start, Long depositoryId); /** @@ -286,7 +286,7 @@ public interface DepositoryRecordService { * @param id * @return */ - ApplicationInRecordP findApplicationInRecordPById(Integer id); + ApplicationInRecordP findApplicationInRecordPById(Long id); /** * 根据id删除入库记录 @@ -294,7 +294,7 @@ public interface DepositoryRecordService { * @param id * @return 受影响的行数 */ - Integer deleteApplicationInRecordById(Integer id, UserByPort userToken, String userAgent); + Integer deleteApplicationInRecordById(Long id, UserByPort userToken, String userAgent); /** * 根据id集合删除多条入库记录 @@ -302,7 +302,7 @@ public interface DepositoryRecordService { * @param list id集合 * @return 受影响的行数 */ - Integer deleteApplicationInRecordByIds(List list, UserByPort userToken, String userAgent); + Integer deleteApplicationInRecordByIds(List list, UserByPort userToken, String userAgent); /** * 插入一条出库记录 @@ -319,7 +319,7 @@ public interface DepositoryRecordService { * @param id * @return 受影响的行数 */ - Integer deleteApplicationOutRecordById(Integer id, UserByPort userToken); + Integer deleteApplicationOutRecordById(Long id, UserByPort userToken); /** * 根据id集合删除多条出库记录 @@ -327,7 +327,7 @@ public interface DepositoryRecordService { * @param list id集合 * @return 受影响的行数 */ - Integer deleteApplicationOutRecordByIds(List list, UserByPort userByPort); + Integer deleteApplicationOutRecordByIds(List list, UserByPort userByPort); /** @@ -335,14 +335,14 @@ public interface DepositoryRecordService { * * @return */ - Map CalculateAllApplicationInCount(List list); + Map CalculateAllApplicationInCount(List list); /** * 计算出库物料总数 * * @return */ - Map CalculateAllApplicationOutCount(String state, List list); + Map CalculateAllApplicationOutCount(String state, List list); /** @@ -380,7 +380,7 @@ public interface DepositoryRecordService { * @param id * @return */ - List findApplicationOutRecordMinByParent(Integer id); + List findApplicationOutRecordMinByParent(Long id); /** * 根据主键获取子表信息 @@ -388,7 +388,7 @@ public interface DepositoryRecordService { * @param id * @return */ - ApplicationOutRecordMinP findApplicationOutMinById(Integer id); + ApplicationOutRecordMinP findApplicationOutMinById(Long id); /** * 根据条件获取子订单 @@ -404,7 +404,7 @@ public interface DepositoryRecordService { * @param parentId * @return */ - List findApplicationOutMinByParentId(Integer parentId); + List findApplicationOutMinByParentId(Long parentId); /** @@ -433,7 +433,7 @@ public interface DepositoryRecordService { * @param id * @return */ - boolean judgeApplicationOutRecordStatus(Integer id); + boolean judgeApplicationOutRecordStatus(Long id); /** * 根据主键查询转移记录 @@ -441,7 +441,7 @@ public interface DepositoryRecordService { * @param id * @return */ - TransferRecord findTransferRecordById(Integer id); + TransferRecord findTransferRecordById(Long id); /** @@ -489,7 +489,7 @@ public interface DepositoryRecordService { * @param splitInfo 拆单单位 * @return */ - Map getApplicationByMaterial(Integer id, List days,Integer type,boolean flagForSplit,SplitInfo splitInfo); + Map getApplicationByMaterial(Long id, List days,Integer type,boolean flagForSplit,SplitInfo splitInfo); /** * 用于构造堆叠面积图的series项目 @@ -507,7 +507,7 @@ public interface DepositoryRecordService { * @param dateType 日期类型（day按天month按月） * @return */ - Map getLineOrBarChartData(Integer depositoryId, String type, String dateType, String echartType); + Map getLineOrBarChartData(Long depositoryId, String type, String dateType, String echartType); /** @@ -517,7 +517,7 @@ public interface DepositoryRecordService { * @param echartType 图表类型 * @return */ - public Map getLineOrBarChartDataForInventory(Integer depositoryId, String dateType, String echartType); + public Map getLineOrBarChartDataForInventory(Long depositoryId, String dateType, String echartType); /** * 用于获取出入库的旭日图数据 @@ -528,7 +528,7 @@ public interface DepositoryRecordService { * @param materialTypeAll 当前查看物料类型 * @return */ - Map getSunBurstDataByForApplication(String name, String type, Long start, Long end, List materialTypeAll,Integer depositoryId); + Map getSunBurstDataByForApplication(String name, String type, Long start, Long end, List materialTypeAll,Long depositoryId); @@ -540,7 +540,7 @@ public interface DepositoryRecordService { * @param depositoryId 待查询仓库 * @return */ - Map getSunBurstDataForInventoryByMonth(String dayName, String mtName, Integer depositoryId); + Map getSunBurstDataForInventoryByMonth(String dayName, String mtName, Long depositoryId); /** * 用于获取当前类别名称下当前月份的出入库的旭日图数据 @@ -552,5 +552,5 @@ public interface DepositoryRecordService { * @param mtName 类别名称 * @return */ - Map getSunBurstDataByMtName(String name, String type, Long start, Long end, String mtName,Integer depositoryId); + Map getSunBurstDataByMtName(String name, String type, Long start, Long end, String mtName,Long depositoryId); } diff --git a/src/main/java/com/dreamchaser/depository_manage/service/DepositoryService.java b/src/main/java/com/dreamchaser/depository_manage/service/DepositoryService.java index 50411045..9de79f82 100644 --- a/src/main/java/com/dreamchaser/depository_manage/service/DepositoryService.java +++ b/src/main/java/com/dreamchaser/depository_manage/service/DepositoryService.java @@ -40,14 +40,14 @@ public interface DepositoryService { * @return 影响条数 */ - Integer deleteDepositoryRecordById(Integer id); + Integer deleteDepositoryRecordById(Long id); /** * 根据多个主键id删除数据 * @param list * @return 影响条数 */ - Integer deleteDepositoryRecordByIds(List list); + Integer deleteDepositoryRecordByIds(List list); /** @@ -55,7 +55,7 @@ public interface DepositoryService { * @param id * @return 查询数据 */ - Depository findDepositoryById(Integer id); + Depository findDepositoryById(Long id); /** @@ -63,7 +63,7 @@ public interface DepositoryService { * @param ids * @return 查询数据 */ - List findDepositoryByIds(List ids); + List findDepositoryByIds(List ids); /** @@ -71,7 +71,7 @@ public interface DepositoryService { * @param ids * @return 查询到的多个数据 */ - List selectDepositoryRecordByIds(List ids); + List selectDepositoryRecordByIds(List ids); /** * 根据条件修改数据 @@ -102,14 +102,14 @@ public interface DepositoryService { * @param id * @return 受影响数目 */ - Integer changeStateToDeletedById(Integer id); + Integer changeStateToDeletedById(Long id); /** * 根据多个主键id将对应仓库状态改为删除 * @param ids * @return 受影响数目 */ - Integer changeStateToDeletedByIds(List ids); + Integer changeStateToDeletedByIds(List ids); /** @@ -123,13 +123,13 @@ public interface DepositoryService { * 查询当前用户所拥有的所有仓库名称即对应编号 * @return */ - Map findDepositoryAllNameAndId(UserByPort user); + Map findDepositoryAllNameAndId(UserByPort user); /** * 查询所有仓库名称即对应编号 * @return */ - Map findAllDepositoryNameAndId(); + Map findAllDepositoryNameAndId(); /** @@ -144,7 +144,7 @@ public interface DepositoryService { * @param id 当前仓库id * @return */ - List findAllChildDepositoryById(Integer id,UserByPort userByPort); + List findAllChildDepositoryById(Long id,UserByPort userByPort); @@ -176,7 +176,7 @@ public interface DepositoryService { * @param depositoryId 仓库id * @return */ - List InitTreeMenus_Place(Integer depositoryId); + List InitTreeMenus_Place(Long depositoryId); /** * 根据仓库编码获取仓库 @@ -197,7 +197,7 @@ public interface DepositoryService { * @param did * @return */ - String findQrCodeByDepository(Integer did); + String findQrCodeByDepository(Long did); /** @@ -220,7 +220,7 @@ public interface DepositoryService { * @param mtId 待查询类型 * @return */ - InventoryByMTAndDepository getTodayInventoryByDidAndMt(Integer did,Long mtId); + InventoryByMTAndDepository getTodayInventoryByDidAndMt(Long did,Long mtId); /** @@ -228,7 +228,7 @@ public interface DepositoryService { * @param did 待查询仓库 * @return */ - List getTodayInventoryInfoByDidAndMt(Integer did); + List getTodayInventoryInfoByDidAndMt(Long did); diff --git a/src/main/java/com/dreamchaser/depository_manage/service/ExcelService.java b/src/main/java/com/dreamchaser/depository_manage/service/ExcelService.java index 76f0c2f7..87e5a234 100644 --- a/src/main/java/com/dreamchaser/depository_manage/service/ExcelService.java +++ b/src/main/java/com/dreamchaser/depository_manage/service/ExcelService.java @@ -39,7 +39,7 @@ public interface ExcelService { * @param userToken 调用接口人员 * @param pageSize 一张最多打印条数 */ - List writeExcelForPrint(Integer id, Integer pageSize, UserByPort userToken,String userKey,String token); + List writeExcelForPrint(Long id, Integer pageSize, UserByPort userToken,String userKey,String token); /** diff --git a/src/main/java/com/dreamchaser/depository_manage/service/GroupService.java b/src/main/java/com/dreamchaser/depository_manage/service/GroupService.java index 64f38e26..9fd52e78 100644 --- a/src/main/java/com/dreamchaser/depository_manage/service/GroupService.java +++ b/src/main/java/com/dreamchaser/depository_manage/service/GroupService.java @@ -25,14 +25,14 @@ public interface GroupService { * @param gid 组合id * @return */ - Group findGroupOnlyById(Integer gid); + Group findGroupOnlyById(Long gid); /** * 用于通过组合id查询对应的码值 * @param gid 组合id * @return */ - String findQrCodeByGid(Integer gid); + String findQrCodeByGid(Long gid); /** * 用于添加组合与二维码的对应关系 @@ -46,7 +46,7 @@ public interface GroupService { * @param id 组合id * @return */ - GroupInfo findGroupById(Integer id); + GroupInfo findGroupById(Long id); /** * 根据条件查询对应组合 @@ -111,14 +111,14 @@ public interface GroupService { * @param id 待删除组合主键 * @return */ - Integer delGroupById(Integer id); + Integer delGroupById(Long id); /** * 根据主键批量删除组合记录 * @param ids 主键列表 * @return */ - Integer delGroupByIds(List ids); + Integer delGroupByIds(List ids); /** @@ -135,21 +135,21 @@ public interface GroupService { * @param gid 组合id * @return 组合明细 */ - GroupInfo findGroupInfoByMidAndGid(Integer mid,Integer gid); + GroupInfo findGroupInfoByMidAndGid(Long mid,Long gid); /** * 根据主键删除一条组合中的物料明细 * @param id 待删除主键 * @return */ - Integer delMaterialForGroupById(Integer id); + Integer delMaterialForGroupById(Long id); /** * 根据主键批量删除组合中的物料明细 * @param ids 待删除主键 * @return */ - Integer delMaterialForGroupByIds(List ids); + Integer delMaterialForGroupByIds(List ids); /** @@ -205,7 +205,7 @@ public interface GroupService { * @param gid 待查讯组合编号 * @return */ - List findGroupInfoByGid(Integer gid); + List findGroupInfoByGid(Long gid); /** @@ -213,7 +213,7 @@ public interface GroupService { * @param map 仓库调度信息 * @return 受影响的行数 */ - Integer reviewIn(Map map,Integer userId,UserByPort userToken,String userAgent); + Integer reviewIn(Map map,Long userId,UserByPort userToken,String userAgent); diff --git a/src/main/java/com/dreamchaser/depository_manage/service/MaterialService.java b/src/main/java/com/dreamchaser/depository_manage/service/MaterialService.java index 2b1b0fae..b3d2aab0 100644 --- a/src/main/java/com/dreamchaser/depository_manage/service/MaterialService.java +++ b/src/main/java/com/dreamchaser/depository_manage/service/MaterialService.java @@ -42,7 +42,7 @@ public interface MaterialService { * @param id 库存id * @return 受影响的行数 */ - Integer deleteMaterialById(int id); + Integer deleteMaterialById(Long id); /** * 根据条件查询符合条件的物料信息 @@ -134,14 +134,14 @@ public interface MaterialService { * @param id 库存id * @return 库存信息 */ - Material findMaterialById(int id); + Material findMaterialById(Long id); /** * 根据库存id查询库存信息 * @param id 库存id * @return 库存信息 */ - Inventory findInventoryById(int id); + Inventory findInventoryById(Long id); /** * 根据物料id获取对应库存信息 @@ -165,7 +165,7 @@ public interface MaterialService { * @param depositoryList 待查询的仓库 * @return */ - Map findInventoryByGroupInfoAndDepository(GroupInfo groupInfo, List depositoryList); + Map findInventoryByGroupInfoAndDepository(GroupInfo groupInfo, List depositoryList); /** * 根据物料id获取其在对应仓库中的库存数 @@ -174,7 +174,7 @@ public interface MaterialService { * @param depositoryList 待查询的仓库 * @return */ - List findInventoryByMidAndDepository(Map map, List depositoryList); + List findInventoryByMidAndDepository(Map map, List depositoryList); @@ -184,13 +184,13 @@ public interface MaterialService { * @param id 库存id * @return 库存信息 */ - Material findMaterialAndTypeById(int id); + Material findMaterialAndTypeById(Long id); /** * 根据id批量查询库存信息 * @param ids 库存id集合 * @return 库存信息 */ - List findMaterialByIds(List ids); + List findMaterialByIds(List ids); /** * 查询所有库存条数 @@ -211,14 +211,14 @@ public interface MaterialService { * @param id * @return 受影响条数 */ - Integer changeStateToDeletedById(Integer id); + Integer changeStateToDeletedById(Long id); /** * 根据主键id批量将物料状态改为删除 * @param ids * @return 受影响条数 */ - Integer changeStateToDeletedByIds(List ids); + Integer changeStateToDeletedByIds(List ids); /** * 计算所有仓库未删除总额 @@ -257,7 +257,7 @@ public interface MaterialService { * @param dids * @return */ - List findMaterialByDepositorys(List dids); + List findMaterialByDepositorys(List dids); /** * 根据仓库查询物品 @@ -366,7 +366,7 @@ public interface MaterialService { * @param mid * @return */ - List findMaterialAndProducedDateByMid(Integer mid); + List findMaterialAndProducedDateByMid(Long mid); /** * 根据物料id与生产日期获取对应关系 @@ -421,7 +421,7 @@ public interface MaterialService { * @param depositoryIds 待查询仓库列表 * @return */ - Integer findInventoryCountByDepository(List depositoryIds); + Integer findInventoryCountByDepository(List depositoryIds); /** @@ -437,7 +437,7 @@ public interface MaterialService { * @param map * @return */ - List findInventoryForCompleteOutTask(Map map); + List findInventoryForCompleteOutTask(Map map); /** @@ -445,7 +445,7 @@ public interface MaterialService { * @param depositoryId 带查询仓库id * @return */ - Double findInventorySumForDepository(Integer depositoryId); + Double findInventorySumForDepository(Long depositoryId); /** * 根据条件获取月份仓库中的库存数 diff --git a/src/main/java/com/dreamchaser/depository_manage/service/NoticeService.java b/src/main/java/com/dreamchaser/depository_manage/service/NoticeService.java index d2d56f41..805f869c 100644 --- a/src/main/java/com/dreamchaser/depository_manage/service/NoticeService.java +++ b/src/main/java/com/dreamchaser/depository_manage/service/NoticeService.java @@ -47,7 +47,7 @@ public interface NoticeService { * @param id 待查询id * @return */ - NoticeP findNoticeById(Integer id,String userKey,String token); + NoticeP findNoticeById(Long id,String userKey,String token); /** @@ -62,28 +62,28 @@ public interface NoticeService { * @param id 待删除主键 * @return */ - Integer delNoticeForSoftById(Integer id); + Integer delNoticeForSoftById(Long id); /** * 用于根据主键批量删除公告信息（软删除） * @param ids 待删除主键列表 * @return */ - Integer delNoticeForSoftByIds(List ids); + Integer delNoticeForSoftByIds(List ids); /** * 用于根据主键删除公告信息 * @param id 待删除主键 * @return */ - Integer delNoticeById(Integer id); + Integer delNoticeById(Long id); /** * 用于根据主键批量删除公告信息 * @param ids 待删除主键id列表 * @return */ - Integer delNoticeByIds(List ids); + Integer delNoticeByIds(List ids); /** * 用于修改公告状态 diff --git a/src/main/java/com/dreamchaser/depository_manage/service/PlaceService.java b/src/main/java/com/dreamchaser/depository_manage/service/PlaceService.java index 052b6e7d..3e327cb6 100644 --- a/src/main/java/com/dreamchaser/depository_manage/service/PlaceService.java +++ b/src/main/java/com/dreamchaser/depository_manage/service/PlaceService.java @@ -58,7 +58,7 @@ public interface PlaceService { * @param pid * @return */ - Integer DelPlace(Integer pid); + Integer DelPlace(Long pid); /** * 插入一条库位信息 @@ -72,21 +72,21 @@ public interface PlaceService { * @param did * @return */ - List findPlaceByDid(Integer did); + List findPlaceByDid(Long did); /** * 根据id查询库位 * @return */ - Place findPlaceById(Integer id); + Place findPlaceById(Long id); /** * 根据id批量查询库位 * @param ids 待查询id列表 * @return */ - List findPlaceByIdS(List ids); + List findPlaceByIdS(List ids); /** @@ -95,28 +95,28 @@ public interface PlaceService { * @param code 库位编码 * @return */ - Place findPlaceByDidAndCode(Integer did,String code); + Place findPlaceByDidAndCode(Long did,String code); /** * 根据id将库位状态改为删除 * @param id * @return */ - Integer changeStateToDeletedById(Integer id); + Integer changeStateToDeletedById(Long id); /** * 根据批量id将库位状态改为删除 * @param ids * @return */ - Integer changeStateToDeletedByIds(List ids); + Integer changeStateToDeletedByIds(List ids); /** * 根据物料与仓库获取库位 * @param mid * @return */ - List findPlaceByMidAndDid(Integer mid, Integer depositoryId); + List findPlaceByMidAndDid(Long mid, Long depositoryId); @@ -124,7 +124,7 @@ public interface PlaceService { /** * 根据库位获取当前库位所存储的物料 */ - List findPlaceAndMaterialByPid(Integer id); + List findPlaceAndMaterialByPid(Long id); /** * 根据仓库id及物料id获取对应库位存储的物料 @@ -132,7 +132,7 @@ public interface PlaceService { * @param mid 物料id * @return */ - List findPlaceAndMaterialByDidAndMid(Integer did, Integer mid); + List findPlaceAndMaterialByDidAndMid(Long did, Long mid); /** * 根据仓库id及物料id获取对应库位存储的物料 @@ -140,7 +140,7 @@ public interface PlaceService { * @param map 待查询的其他数据 * @return */ - List findPlaceAndMaterialByDidsAndMid(List dids, Map map); + List findPlaceAndMaterialByDidsAndMid(List dids, Map map); /** * 根据仓库id及物料id获取对应库位存储的物料数量 @@ -148,7 +148,7 @@ public interface PlaceService { * @param map 待查询的其他数据 * @return */ - Integer findPlaceAndMaterialCountByDidsAndMid(List dids, Map map); + Integer findPlaceAndMaterialCountByDidsAndMid(List dids, Map map); /** * 根据条件获取对应库位存储的物料 @@ -169,11 +169,11 @@ public interface PlaceService { /** * 根据当前库位编号及物料编号获取具体库位 */ - MaterialAndPlace findPlaceAndMaterialByMidAndPid(Integer pid,Integer mid); + MaterialAndPlace findPlaceAndMaterialByMidAndPid(Long pid,Long mid); /** * 根据id获取物料与库位的映射 */ - MaterialAndPlace findPlaceAndMaterialById(Integer id); + MaterialAndPlace findPlaceAndMaterialById(Long id); /** @@ -181,7 +181,7 @@ public interface PlaceService { * @param id 待查询id * @return */ - MaterialAndPlaceForViewP findPlaceAndMaterialForViewById(Integer id); + MaterialAndPlaceForViewP findPlaceAndMaterialForViewById(Long id); /** @@ -198,7 +198,7 @@ public interface PlaceService { * @param pid * @return */ - Integer findQuantityByMidAndPid(Integer mid,Integer pid); + Integer findQuantityByMidAndPid(Long mid,Long pid); /** * 修改当前库位存放物料 @@ -212,14 +212,14 @@ public interface PlaceService { * @param id 主键id * @return */ - Integer deleteMaterialAndPlace(Integer id); + Integer deleteMaterialAndPlace(Long id); /** * 获取库位对应的二维码 * @param pid * @return */ - String findQrCodeByPlace(Integer pid); + String findQrCodeByPlace(Long pid); /** @@ -241,7 +241,7 @@ public interface PlaceService { * @param flag 类型 * @return */ - Integer findPlaceCountByTypeForFlag(Integer flag, Integer did); + Integer findPlaceCountByTypeForFlag(Integer flag, Long did); /** diff --git a/src/main/java/com/dreamchaser/depository_manage/service/RoleService.java b/src/main/java/com/dreamchaser/depository_manage/service/RoleService.java index e8cef7e7..971956dc 100644 --- a/src/main/java/com/dreamchaser/depository_manage/service/RoleService.java +++ b/src/main/java/com/dreamchaser/depository_manage/service/RoleService.java @@ -1,6 +1,5 @@ package com.dreamchaser.depository_manage.service; -import com.dreamchaser.depository_manage.entity.Role; import com.dreamchaser.depository_manage.entity.UserByPort; import com.dreamchaser.depository_manage.pojo.RoleAndDepository; import com.dreamchaser.depository_manage.pojo.RoleAndMaterialType; @@ -31,7 +30,7 @@ public interface RoleService { * @param userid * @return */ - List findDepositoryAndRole(Integer userid); + List findDepositoryAndRole(Long userid); /** * 修改用户或者岗位权限及管理的仓库 @@ -53,7 +52,7 @@ public interface RoleService { * @param did * @return */ - List findUserIdByDid(Integer did); + List findUserIdByDid(Long did); /** * 根据类型id获取userId @@ -100,7 +99,7 @@ public interface RoleService { * @param id * @return */ - RoleAndDepository findRoleAndDepositoryById(Integer id); + RoleAndDepository findRoleAndDepositoryById(Long id); /** @@ -116,7 +115,7 @@ public interface RoleService { * @param id * @return */ - RoleAndMaterialType findRoleAndMaterialTypeById(Integer id); + RoleAndMaterialType findRoleAndMaterialTypeById(Long id); /** * 修改管理仓库权限列表 @@ -138,21 +137,21 @@ public interface RoleService { * @param id * @return */ - Integer deleteRoleAndDepositoryById(Integer id); + Integer deleteRoleAndDepositoryById(Long id); /** * 根据id删除类型管理权限 * @param id * @return */ - Integer deleteRoleAndMaterialTypeById(Integer id); + Integer deleteRoleAndMaterialTypeById(Long id); /** * 根据仓库编号查询权限记录 * @param did * @return */ - List findRoleAndDepositoryByDid(Integer did); + List findRoleAndDepositoryByDid(Long did); /** @@ -190,7 +189,7 @@ public interface RoleService { * @param map 待查询条件 * @return */ - List findDepositoryIdForWarehouseVisiblePermissionByCondition(Map map); + List findDepositoryIdForWarehouseVisiblePermissionByCondition(Map map); /** @@ -205,20 +204,20 @@ public interface RoleService { * @param userToken 待查询用户 * @return */ - List findDepositoryIdForWareHouseVisiblePermissionByUser(UserByPort userToken); + List findDepositoryIdForWareHouseVisiblePermissionByUser(UserByPort userToken); /** * 用于查询当前用户所拥有及所管理的仓库 * @param userToken 待查询用户 * @return */ - List findDepositoryIdForUserHas(UserByPort userToken); + List findDepositoryIdForUserHas(UserByPort userToken); /** * 用于查询当前用户部门所拥有的仓库 * @param userToken 待查询用户 * @return */ - List findDepositoryIdForUser(UserByPort userToken); + List findDepositoryIdForUser(UserByPort userToken); } diff --git a/src/main/java/com/dreamchaser/depository_manage/service/SplitUnitService.java b/src/main/java/com/dreamchaser/depository_manage/service/SplitUnitService.java index 602a26cd..1075b19c 100644 --- a/src/main/java/com/dreamchaser/depository_manage/service/SplitUnitService.java +++ b/src/main/java/com/dreamchaser/depository_manage/service/SplitUnitService.java @@ -61,7 +61,7 @@ public interface SplitUnitService { * @param id 待删除id * @return */ - Integer delSplitInfoById(Integer id); + Integer delSplitInfoById(Long id); /** * 根据主键删除拆单信息（硬删除） @@ -69,7 +69,7 @@ public interface SplitUnitService { * @param id 待删除id * @return */ - Integer realDelSplitInById(Integer id); + Integer realDelSplitInById(Long id); /** * 根据条件修改拆单信息 @@ -86,7 +86,7 @@ public interface SplitUnitService { * @param id 待查询主键 * @return */ - SplitInfo findSplitInfoById(Integer id); + SplitInfo findSplitInfoById(Long id); /** * 根据主键id获取拆单详细信息 @@ -94,7 +94,7 @@ public interface SplitUnitService { * @param id 待查询主键 * @return */ - SplitInfoP findSplitInfoPById(Integer id); + SplitInfoP findSplitInfoPById(Long id); /** * 根据物料id查询对应的拆单记录 @@ -102,7 +102,7 @@ public interface SplitUnitService { * @param mid 待查询物料id * @return */ - List findSplitInfoByMid(Integer mid); + List findSplitInfoByMid(Long mid); /** @@ -120,7 +120,7 @@ public interface SplitUnitService { * @param Iid 待查询库存id * @return */ - List findSplitInventoryByIid(Integer Iid); + List findSplitInventoryByIid(Long Iid); /** * 用于计算当前拆单单位与目标拆单单位之间的进率 @@ -129,7 +129,7 @@ public interface SplitUnitService { * @param parentSplitInfoId 目标拆单单位 * @return */ - int findSplitInfoScaleQuantity(SplitInfo splitInfo, Integer parentSplitInfoId); + int findSplitInfoScaleQuantity(SplitInfo splitInfo, Long parentSplitInfoId); /** @@ -142,7 +142,7 @@ public interface SplitUnitService { * @param allQuantityFlag 用于标志是否获取全部库存 * @return */ - double findAllInventoryForSplitInfo(Integer splitInfoId, MaterialAndPlace materialAndPlace, Integer baseSplitInfoId, double saveQuantity, boolean allQuantityFlag); + double findAllInventoryForSplitInfo(Long splitInfoId, MaterialAndPlace materialAndPlace, Long baseSplitInfoId, double saveQuantity, boolean allQuantityFlag); /** * 根据库存id与拆单记录id获取对应拆单库存处理记录 @@ -151,7 +151,7 @@ public interface SplitUnitService { * @param sid 待查询拆单id * @return */ - SplitInventory findSplitInventoryByIidAndSid(Integer Iid, Integer sid); + SplitInventory findSplitInventoryByIidAndSid(Long Iid, Long sid); /** @@ -162,7 +162,7 @@ public interface SplitUnitService { * @param map 入库条件 * @param inQuantity 最终入库数量 */ - void updateSplitInfoSaveQuantity(SplitInfo splitInfo, double quantity, int iid, Map map, double inQuantity, SplitInfo baseSplitInfo); + void updateSplitInfoSaveQuantity(SplitInfo splitInfo, double quantity, long iid, Map map, double inQuantity, SplitInfo baseSplitInfo); /** * 根据父级查询拆单记录 @@ -170,7 +170,7 @@ public interface SplitUnitService { * @param parentId 待查询父级 * @return */ - SplitInfo findSplitInfoByParentId(Integer parentId); + SplitInfo findSplitInfoByParentId(Long parentId); /** @@ -179,7 +179,7 @@ public interface SplitUnitService { * @param sid 待查询id * @return */ - boolean findAllSplitInfoForbidden(Integer sid); + boolean findAllSplitInfoForbidden(Long sid); /** @@ -187,7 +187,7 @@ public interface SplitUnitService { * @param mid 待查询物料id * @return */ - SplitInfo findBaseSplitInfoForMid(Integer mid); + SplitInfo findBaseSplitInfoForMid(Long mid); /** * 用于审批通过或无需审批时修改库存 diff --git a/src/main/java/com/dreamchaser/depository_manage/service/StockTakingService.java b/src/main/java/com/dreamchaser/depository_manage/service/StockTakingService.java index d2369869..5238b9a8 100644 --- a/src/main/java/com/dreamchaser/depository_manage/service/StockTakingService.java +++ b/src/main/java/com/dreamchaser/depository_manage/service/StockTakingService.java @@ -63,12 +63,6 @@ public interface StockTakingService { */ Integer findMyApplyCount(Map map); - /** - * 根据主键查询主表 - * @param id - * @return - */ - StockTaking findStockTakingById(Integer id); /** * 根据主键查询主表 @@ -82,14 +76,14 @@ public interface StockTakingService { * @param mainId * @return */ - List findStockTakingChildPByMainId(Integer mainId); + List findStockTakingChildPByMainId(Long mainId); /** * 根据主键获取子表 * @param id * @return */ - StockTakingChildP findStockTakingChildPById(Integer id); + StockTakingChildP findStockTakingChildPById(Long id); /** * 根据条件查询盘点记录 diff --git a/src/main/java/com/dreamchaser/depository_manage/service/UserService.java b/src/main/java/com/dreamchaser/depository_manage/service/UserService.java index 2f93fae2..5767a31a 100644 --- a/src/main/java/com/dreamchaser/depository_manage/service/UserService.java +++ b/src/main/java/com/dreamchaser/depository_manage/service/UserService.java @@ -1,15 +1,24 @@ package com.dreamchaser.depository_manage.service; -import com.dreamchaser.depository_manage.entity.Role; -import com.dreamchaser.depository_manage.entity.User; -import com.dreamchaser.depository_manage.pojo.UserP; - -import java.util.List; -import java.util.Map; +import com.dreamchaser.depository_manage.entity.UserByPort; /** * user的service层 */ public interface UserService { + /** + * 通过id获取用户信息 + * @param id 待获取用户id + * @return + */ + UserByPort findUserById(Long id); + + /** + * 通过工号获取用户信息 + * @param number 待获取用户工号 + * @return + */ + UserByPort findUserByNumber(String number); + } diff --git a/src/main/java/com/dreamchaser/depository_manage/service/impl/AccessAddressServiceImpl.java b/src/main/java/com/dreamchaser/depository_manage/service/impl/AccessAddressServiceImpl.java index cab94975..b4bbe460 100644 --- a/src/main/java/com/dreamchaser/depository_manage/service/impl/AccessAddressServiceImpl.java +++ b/src/main/java/com/dreamchaser/depository_manage/service/impl/AccessAddressServiceImpl.java @@ -51,7 +51,7 @@ public class AccessAddressServiceImpl implements AccessAddressService { * @return */ @Override - public List findAccessstoAddressByParent(Integer id) { + public List findAccessstoAddressByParent(Long id) { return accesstoAddressMapper.findAccessstoAddressByParent(id); } diff --git a/src/main/java/com/dreamchaser/depository_manage/service/impl/BusinessTypeServiceImpl.java b/src/main/java/com/dreamchaser/depository_manage/service/impl/BusinessTypeServiceImpl.java index 43768682..dc39684e 100644 --- a/src/main/java/com/dreamchaser/depository_manage/service/impl/BusinessTypeServiceImpl.java +++ b/src/main/java/com/dreamchaser/depository_manage/service/impl/BusinessTypeServiceImpl.java @@ -90,7 +90,7 @@ public class BusinessTypeServiceImpl implements BusinessTypeService { * @return */ @Override - public Integer deleteBusinessTypeById(Integer id) { + public Integer deleteBusinessTypeById(Long id) { return businessTypeMapper.deleteBusinessTypeById(id); } @@ -101,7 +101,7 @@ public class BusinessTypeServiceImpl implements BusinessTypeService { * @return */ @Override - public Integer deleteBusinessTypeByIds(List ids) { + public Integer deleteBusinessTypeByIds(List ids) { return businessTypeMapper.deleteBusinessTypeByIds(ids); } @@ -159,7 +159,7 @@ public class BusinessTypeServiceImpl implements BusinessTypeService { * @return */ @Override - public BusinessType findBusinessTypeById(Integer id) { + public BusinessType findBusinessTypeById(Long id) { return businessTypeMapper.findBusinessTypeById(id); } @@ -169,7 +169,7 @@ public class BusinessTypeServiceImpl implements BusinessTypeService { * @return */ @Override - public List findBusinessTypeByIds(List ids) { + public List findBusinessTypeByIds(List ids) { return businessTypeMapper.findBusinessTypeByIds(ids); } } diff --git a/src/main/java/com/dreamchaser/depository_manage/service/impl/CompanyServiceImpl.java b/src/main/java/com/dreamchaser/depository_manage/service/impl/CompanyServiceImpl.java index ba977cc5..a53de8a3 100644 --- a/src/main/java/com/dreamchaser/depository_manage/service/impl/CompanyServiceImpl.java +++ b/src/main/java/com/dreamchaser/depository_manage/service/impl/CompanyServiceImpl.java @@ -41,7 +41,7 @@ public class CompanyServiceImpl implements CompanyService { * @return */ @Override - public List findCompanyByParentId(Integer parentId) { + public List findCompanyByParentId(Long parentId) { return companyMapper.findCompanyByParentId(parentId); } @@ -51,7 +51,7 @@ public class CompanyServiceImpl implements CompanyService { * @return */ @Override - public Integer deleteCompanyById(Integer id) { + public Integer deleteCompanyById(Long id) { return companyMapper.deleteCompanyById(id); } @@ -61,7 +61,7 @@ public class CompanyServiceImpl implements CompanyService { * @return */ @Override - public Integer deleteCompanyByIds(List ids) { + public Integer deleteCompanyByIds(List ids) { return companyMapper.deleteCompanyByIds(ids); } @@ -110,7 +110,7 @@ public class CompanyServiceImpl implements CompanyService { * @return */ @Override - public Company findcompanyById(Integer id) { + public Company findcompanyById(Long id) { return companyMapper.findcompanyById(id); } @@ -120,7 +120,7 @@ public class CompanyServiceImpl implements CompanyService { * @return */ @Override - public Integer changeStateToDeletedById(Integer id) { + public Integer changeStateToDeletedById(Long id) { return companyMapper.changeStateToDeletedById(id); } @@ -130,7 +130,7 @@ public class CompanyServiceImpl implements CompanyService { * @return */ @Override - public Integer changeStateToDeletedByIds(List ids) { + public Integer changeStateToDeletedByIds(List ids) { return companyMapper.changeStateToDeletedByIds(ids); } @@ -150,7 +150,7 @@ public class CompanyServiceImpl implements CompanyService { */ @Override public List InitTreeMenusForHearder(UserByPort userToken,String userKey,String token) { - Integer company = userToken.getCompany(); + Long company = userToken.getCompany(); List allUserByAdministration = findAllUserByAdministration(company.toString(), userKey,token); // 开启对应数量的线程 int threadSize = allUserByAdministration.size(); @@ -227,7 +227,7 @@ public class CompanyServiceImpl implements CompanyService { qyWxDepartmentList = new ArrayList<>(); // 情况列表 } else { // 添加id到列表中 - if (Integer.compare(qywxDepartment.getParentid(), 3) == 0) { + if (Long.compare(qywxDepartment.getParentid(), 3) == 0) { qyWxDepartmentList.add(qywxDepartment); } } @@ -506,7 +506,7 @@ public class CompanyServiceImpl implements CompanyService { List children = new ArrayList<>(); for (qywxDepartment department : qywxDepartmentList) { // 如果该部门是当前部门的子部门 - if (Integer.compare(qywxDepartment.getId(), department.getParentid()) == 0) { + if (Long.compare(qywxDepartment.getId(), department.getParentid()) == 0) { Map stringObjectMap = InitTreeForQyWxDepartment(department, null); children.add(stringObjectMap); } diff --git a/src/main/java/com/dreamchaser/depository_manage/service/impl/ConstructionUnitServiceImpl.java b/src/main/java/com/dreamchaser/depository_manage/service/impl/ConstructionUnitServiceImpl.java index af54c63f..206208d3 100644 --- a/src/main/java/com/dreamchaser/depository_manage/service/impl/ConstructionUnitServiceImpl.java +++ b/src/main/java/com/dreamchaser/depository_manage/service/impl/ConstructionUnitServiceImpl.java @@ -96,7 +96,7 @@ public class ConstructionUnitServiceImpl implements ConstructionUnitService { * @return */ @Override - public ConstructionUnit findConstructionUnitById(Integer id) { + public ConstructionUnit findConstructionUnitById(Long id) { ConstructionUnit constructionUnitById = constructionUnitMapper.findConstructionUnitById(id); constructionUnitById.setShowCreateTime(DateUtil.TimeStampToDateTime(constructionUnitById.getCreateTime())); return constructionUnitById; @@ -131,7 +131,7 @@ public class ConstructionUnitServiceImpl implements ConstructionUnitService { * @return */ @Override - public Integer deleteConstructionUnitById(Integer id) { + public Integer deleteConstructionUnitById(Long id) { return constructionUnitMapper.deleteConstructionUnitById(id); } @@ -142,7 +142,7 @@ public class ConstructionUnitServiceImpl implements ConstructionUnitService { * @return */ @Override - public Integer deleteConstructionUnitByIds(List list) { + public Integer deleteConstructionUnitByIds(List list) { return constructionUnitMapper.deleteConstructionUnitByIds(list); } } diff --git a/src/main/java/com/dreamchaser/depository_manage/service/impl/DepositoryRecordServiceImpl.java b/src/main/java/com/dreamchaser/depository_manage/service/impl/DepositoryRecordServiceImpl.java index a1fac04f..7006b36a 100644 --- a/src/main/java/com/dreamchaser/depository_manage/service/impl/DepositoryRecordServiceImpl.java +++ b/src/main/java/com/dreamchaser/depository_manage/service/impl/DepositoryRecordServiceImpl.java @@ -45,8 +45,6 @@ public class DepositoryRecordServiceImpl implements DepositoryRecordService { @Autowired private TransferRecordMapper transferRecordMapper; @Autowired - private UserMapper userMapper; - @Autowired private MaterialMapper materialMapper; @Autowired private RoleService roleService; @@ -113,7 +111,7 @@ public class DepositoryRecordServiceImpl implements DepositoryRecordService { public Integer applicationIn(Map map) { // 获取当前入库是否需要审批 Boolean flagForApproval = ObjectFormatUtil.toBoolean(map.get("flagForApproval")); - Integer depositoryId = ObjectFormatUtil.toInteger(map.get("depositoryId")); + Long depositoryId = ObjectFormatUtil.toLong(map.get("depositoryId")); Depository depositoryRecordById = depositoryMapper.findDepositoryById(depositoryId); Map temp = new HashMap<>(); temp.put("dname", depositoryRecordById.getDname()); @@ -123,7 +121,7 @@ public class DepositoryRecordServiceImpl implements DepositoryRecordService { //构造单号 String code = createCode(depositoryRecordById.getDname(), "InOrderNumber", "in", ""); double quantity = ObjectFormatUtil.toDouble((String) map.get("quantity")); - Integer mid = ObjectFormatUtil.toInteger(map.get("mid")); + Long mid = ObjectFormatUtil.toLong(map.get("mid")); // 根据物料id查询物料 Material material = materialMapper.findMaterialById(mid); // 判断剩余容量是否可以存入 @@ -157,7 +155,7 @@ public class DepositoryRecordServiceImpl implements DepositoryRecordService { // 获取当前物料 // 获取当前入库物料id - Integer newMid = 0; + Long newMid = 0L; if (!flagForApproval) { // 如果不需要审批 newMid = updateOrInsertInventory(map, materialByCondition, quantity, mid, depositoryId, producedDate); @@ -199,13 +197,13 @@ public class DepositoryRecordServiceImpl implements DepositoryRecordService { * @param producedDate 生产日期 * @return */ - Integer updateOrInsertInventory(Map map, List materialByCondition, Double quantity, Integer mid, Integer depositoryId, long producedDate) { + Long updateOrInsertInventory(Map map, List materialByCondition, Double quantity, Long mid, Long depositoryId, long producedDate) { // 获取当前入库物料id - Integer newMid = 0; + Long newMid = 0L; if (materialByCondition.size() > 0) { // 如果当前存在 Inventory mt = materialByCondition.get(0); map.put("mid", mt.getMid()); - mt.setQuantity((int) (mt.getQuantity() + (quantity * 100))); + mt.setQuantity((long)(mt.getQuantity() + (quantity * 100))); mt.setProducedDate(producedDate); materialMapper.updateInventory(mt); newMid = mt.getId(); @@ -218,7 +216,7 @@ public class DepositoryRecordServiceImpl implements DepositoryRecordService { insert.put("producedDate", producedDate); insert.put("mid", map.get("mid")); materialMapper.insertInventory(insert); - newMid = ObjectFormatUtil.toInteger(insert.get("id")); + newMid = ObjectFormatUtil.toLong(insert.get("id")); } return newMid; } @@ -239,7 +237,7 @@ public class DepositoryRecordServiceImpl implements DepositoryRecordService { map.put("flagForOpenDepository", 1); map.remove("depositoryId"); } else { - List depositoryIdForUserHas = roleService.findDepositoryIdForUser(userToken); + List depositoryIdForUserHas = roleService.findDepositoryIdForUser(userToken); map.put("flagForOpenDepository", 2); if (depositoryIdForUserHas.contains(ObjectFormatUtil.toInteger(depositoryId))) { map.put("flagForOpenDepository", 1); @@ -255,7 +253,7 @@ public class DepositoryRecordServiceImpl implements DepositoryRecordService { double quantity = ObjectFormatUtil.toDouble(map.get("quantity")) * 100; Long time = DateUtil.DateTimeToTimeStamp(DateUtil.getSimpleTime(new Date())); map.put("applicantTime", time); - Integer mid = ObjectFormatUtil.toInteger(map.get("mid")); + Long mid = ObjectFormatUtil.toLong(map.get("mid")); String dname = ""; map.put("istransfer", 2); map.put("state", "待负责人审核"); @@ -287,7 +285,7 @@ public class DepositoryRecordServiceImpl implements DepositoryRecordService { */ @Transactional(rollbackFor = Exception.class) @Override - public Integer deleteApplicationOutRecordById(Integer id, UserByPort userByPort) { + public Integer deleteApplicationOutRecordById(Long id, UserByPort userByPort) { // 获取主单 ApplicationOutRecord recordP = depositoryRecordMapper.findApplicationOutRecordPById(id); @@ -332,7 +330,7 @@ public class DepositoryRecordServiceImpl implements DepositoryRecordService { @Transactional(rollbackFor = Exception.class) @Override - public Integer deleteApplicationOutRecordByIds(List list, UserByPort userByPort) { + public Integer deleteApplicationOutRecordByIds(List list, UserByPort userByPort) { // 获取出库单列表 List recordPList = depositoryRecordMapper.findApplicationOutRecordPByIds(list); @@ -379,7 +377,7 @@ public class DepositoryRecordServiceImpl implements DepositoryRecordService { * @return */ @Override - public Map CalculateAllApplicationInCount(List list) { + public Map CalculateAllApplicationInCount(List list) { // 获取当前时间 long now = System.currentTimeMillis(); @@ -416,7 +414,7 @@ public class DepositoryRecordServiceImpl implements DepositoryRecordService { // 获取当前入库类型(1物料2组合) sumForToday = ObjectFormatUtil.sum(sumForToday, (double) applicationInRecordP.getQuantity() / 100); - Integer mid = applicationInRecordP.getMid(); + Long mid = applicationInRecordP.getMid(); Material materialById = materialMapper.findMaterialById(mid); if (materialById.getPrice() == null) { priceForToday += 0; @@ -428,7 +426,7 @@ public class DepositoryRecordServiceImpl implements DepositoryRecordService { paramForSplitInfo.put("newUnit", applicationInRecordP.getAirUnit()); paramForSplitInfo.put("mid", mid); SplitInfo splitInfoByMidAndUnit = splitUnitMapper.findSplitInfoByMidAndUnit(paramForSplitInfo); - int scale = splitUnitService.findSplitInfoScaleQuantity(splitInfoByMidAndUnit, -1); + int scale = splitUnitService.findSplitInfoScaleQuantity(splitInfoByMidAndUnit, -1L); priceForToday = ObjectFormatUtil.sum(priceForToday, materialById.getPrice() / scale * (double) applicationInRecordP.getQuantity() / 100); } } @@ -437,7 +435,7 @@ public class DepositoryRecordServiceImpl implements DepositoryRecordService { for (ApplicationInRecord applicationInRecordP : applicationInRecordPForYesterday) { sumForYesterDay = ObjectFormatUtil.sum(sumForYesterDay, (double) applicationInRecordP.getQuantity() / 100); - Integer mid = applicationInRecordP.getMid(); + Long mid = applicationInRecordP.getMid(); Material materialById = materialMapper.findMaterialById(mid); if (materialById.getPrice() == null) { priceForYesterDay += 0; @@ -449,7 +447,7 @@ public class DepositoryRecordServiceImpl implements DepositoryRecordService { paramForSplitInfo.put("newUnit", applicationInRecordP.getAirUnit()); paramForSplitInfo.put("mid", mid); SplitInfo splitInfoByMidAndUnit = splitUnitMapper.findSplitInfoByMidAndUnit(paramForSplitInfo); - int scale = splitUnitService.findSplitInfoScaleQuantity(splitInfoByMidAndUnit, -1); + int scale = splitUnitService.findSplitInfoScaleQuantity(splitInfoByMidAndUnit, -1L); priceForYesterDay = ObjectFormatUtil.sum(priceForYesterDay, materialById.getPrice() / scale * (double) applicationInRecordP.getQuantity() / 100); } } @@ -483,7 +481,7 @@ public class DepositoryRecordServiceImpl implements DepositoryRecordService { * @return */ @Override - public Map CalculateAllApplicationOutCount(String state, List list) { + public Map CalculateAllApplicationOutCount(String state, List list) { // 获取昨天出库订单 // 获取当前时间 @@ -631,7 +629,7 @@ public class DepositoryRecordServiceImpl implements DepositoryRecordService { paramForSplitInfo.put("newUnit", recordMin.getUnit()); paramForSplitInfo.put("mid", materialById.getMid()); SplitInfo splitInfo = splitUnitMapper.findSplitInfoByMidAndUnit(paramForSplitInfo); - int scale = splitUnitService.findSplitInfoScaleQuantity(splitInfo, -1); + int scale = splitUnitService.findSplitInfoScaleQuantity(splitInfo, -1L); if (materialById.getPrice() != null) { price_out = materialById.getPrice() / scale * quantity; } @@ -658,7 +656,7 @@ public class DepositoryRecordServiceImpl implements DepositoryRecordService { paramForSplitInfo.put("newUnit", recordMin.getUnit()); paramForSplitInfo.put("mid", materialById.getMid()); SplitInfo splitInfo = splitUnitMapper.findSplitInfoByMidAndUnit(paramForSplitInfo); - int scale = splitUnitService.findSplitInfoScaleQuantity(splitInfo, -1); + int scale = splitUnitService.findSplitInfoScaleQuantity(splitInfo, -1L); if (materialById.getPrice() != null) { price_out = materialById.getPrice() / scale * quantity; } @@ -702,17 +700,17 @@ public class DepositoryRecordServiceImpl implements DepositoryRecordService { @Override @Transactional(rollbackFor = Exception.class) public Integer applicationInPlace(Map map, boolean isApprovalPass) { - Integer placeId = ObjectFormatUtil.toInteger(map.get("placeId")); - Integer depositoryId = ObjectFormatUtil.toInteger(map.get("depositoryId")); + Long placeId = ObjectFormatUtil.toLong(map.get("placeId")); + Long depositoryId = ObjectFormatUtil.toLong(map.get("depositoryId")); if (placeId == null) { - placeId = 0; + placeId = 0L; } Double quantity = ObjectFormatUtil.toDouble(map.get("quantity")); Place placeById = placeMapper.findPlaceById(placeId); // 获取入库的仓库 Depository depositoryById = depositoryMapper.findDepositoryById(depositoryId); // 获取当前物料基本信息 - Integer mid = ObjectFormatUtil.toInteger(map.get("mid")); + Long mid = ObjectFormatUtil.toLong(map.get("mid")); Material materialById = materialMapper.findMaterialById(mid); map.put("mtId", materialById.getMaterialTypeId()); @@ -742,7 +740,7 @@ public class DepositoryRecordServiceImpl implements DepositoryRecordService { // 获取该权限类型 int classes = roleAndDepository.getClasses(); // 获取userid - Integer userId = roleAndDepository.getUserId(); + Long userId = roleAndDepository.getUserId(); if (classes == 1) { // 如果是对人设置权限 approverId.append(userId).append(","); @@ -784,7 +782,7 @@ public class DepositoryRecordServiceImpl implements DepositoryRecordService { StringBuilder approverId = new StringBuilder(); for (RoleAndMaterialType roleAndMaterialType : roleAndMaterials) { Integer classes = roleAndMaterialType.getClasses(); - Integer uid = roleAndMaterialType.getUid(); + Long uid = roleAndMaterialType.getUid(); if (classes == 1) { approverId.append(uid).append(","); } else { @@ -892,7 +890,7 @@ public class DepositoryRecordServiceImpl implements DepositoryRecordService { Map param = new HashMap<>(); param.put("mcode", materialById.getCode()); param.put("mname", materialById.getMname()); - if (Integer.compare(placeById.getId(), 0) == 0) { + if (Long.compare(placeById.getId(), 0L) == 0) { param.put("depositoryId", map.get("depositoryId")); } else { param.put("depositoryId", placeById.getDid()); @@ -932,7 +930,7 @@ public class DepositoryRecordServiceImpl implements DepositoryRecordService { @Transactional(rollbackFor = Exception.class) public Integer insertApplicationOutMin(Map map) { // 获取当前出库库存id - Integer mid = ObjectFormatUtil.toInteger(map.get("mid")); + Long mid = ObjectFormatUtil.toLong(map.get("mid")); Object depositoryId = map.get("depositoryId"); // 获取当前出库库存记录 Inventory inventoryById = materialMapper.findInventoryById(mid); @@ -969,7 +967,7 @@ public class DepositoryRecordServiceImpl implements DepositoryRecordService { * @return */ @Override - public List findApplicationOutRecordMinByParent(Integer id) { + public List findApplicationOutRecordMinByParent(Long id) { List outRecordMinByParent = depositoryRecordMapper.findApplicationOutRecordMinByParent(id); List recordMinPList = new ArrayList<>(); for (ApplicationOutRecordMin aorm : outRecordMinByParent @@ -987,7 +985,7 @@ public class DepositoryRecordServiceImpl implements DepositoryRecordService { * @return */ @Override - public ApplicationOutRecordMinP findApplicationOutMinById(Integer id) { + public ApplicationOutRecordMinP findApplicationOutMinById(Long id) { return new ApplicationOutRecordMinP(depositoryRecordMapper.findApplicationOutMinById(id)); } @@ -1015,7 +1013,7 @@ public class DepositoryRecordServiceImpl implements DepositoryRecordService { * @return */ @Override - public List findApplicationOutMinByParentId(Integer parentId) { + public List findApplicationOutMinByParentId(Long parentId) { Map map = new HashMap<>(); map.put("parentId", parentId); List applicationOutMinByCondition = depositoryRecordMapper.findApplicationOutMinByCondition(map); @@ -1041,13 +1039,13 @@ public class DepositoryRecordServiceImpl implements DepositoryRecordService { // 最终返回值 RestResponse restResponse = new RestResponse(); - Integer id = ObjectFormatUtil.toInteger(param.get("id")); + Long id = ObjectFormatUtil.toLong(param.get("id")); // 获取要完成的子订单 ApplicationOutRecordMin applicationOutMinById = depositoryRecordMapper.findApplicationOutMinById(id); // 获取子订单中对应的库存id - Integer mid = applicationOutMinById.getMid(); + Long mid = applicationOutMinById.getMid(); // 获取库存信息 Inventory inventory = materialMapper.findInventoryById(mid); // 获取子订单对应的主订单 @@ -1062,7 +1060,7 @@ public class DepositoryRecordServiceImpl implements DepositoryRecordService { // 获取要出库的数量 Double trueOut = ObjectFormatUtil.toDouble(param.get("trueOut")); // 获取出库库位 - Integer placeId = ObjectFormatUtil.toInteger(param.get("placeId")); + Long placeId = ObjectFormatUtil.toLong(param.get("placeId")); // 获取出库申请时的单位 String unit = applicationOutMinById.getUnit(); @@ -1155,7 +1153,7 @@ public class DepositoryRecordServiceImpl implements DepositoryRecordService { // 更新入库批次中的物料数量 HandlesOtherFunctionalThreadPool.execute(() -> { // 获取出库物料id - Integer mid1 = inventory.getId(); + Long mid1 = inventory.getId(); // 获取当前物料对应的生产日期 List materialAndProducedDateByMid = materialMapper.findMaterialAndProducedDateByMid(mid1); if (materialAndProducedDateByMid.size() > 0) { @@ -1218,7 +1216,7 @@ public class DepositoryRecordServiceImpl implements DepositoryRecordService { if (splitInventory.getOutQuantity() != null) { splitInventory.setOutQuantity(splitInventory.getOutQuantity() + (int) (trueOut * 100)); } else { - splitInventory.setOutQuantity((int) (trueOut * 100)); + splitInventory.setOutQuantity((long) (trueOut * 100)); } // 修改库存处理记录 @@ -1263,7 +1261,7 @@ public class DepositoryRecordServiceImpl implements DepositoryRecordService { splitInventory.setOutQuantity(splitInventory.getOutQuantity() + splitInventory.getSaveQuantity()); // 将当前库存设置为0 - splitInventory.setSaveQuantity(0); + splitInventory.setSaveQuantity(0L); // 修改库存数量 splitUnitMapper.updateSplitInventory(splitInventory); @@ -1287,7 +1285,7 @@ public class DepositoryRecordServiceImpl implements DepositoryRecordService { } } else { trueOut = 0.0; - splitInventory.setSaveQuantity((int) (oldSplitInventory * 100)); + splitInventory.setSaveQuantity((long) (oldSplitInventory * 100)); splitInventory.setOutQuantity(splitInventory.getOutQuantity() - (int) (oldSplitInventory * 100)); // 修改库存数量 splitUnitMapper.updateSplitInventory(splitInventory); @@ -1383,9 +1381,9 @@ public class DepositoryRecordServiceImpl implements DepositoryRecordService { // 如果大于 // 获取库存重要减少的数量 - int surplus_redundant = surplus / (splitInfoById.getQuantity() * 100); + long surplus_redundant = surplus / (splitInfoById.getQuantity() * 100); // 获取拆单库存处理中要处理数量 - int saveQuantity = surplus - surplus_redundant * splitInfoById.getQuantity(); + long saveQuantity = surplus - surplus_redundant * splitInfoById.getQuantity(); if (saveQuantity > splitInventory.getSaveQuantity()) { // 如果要处理的数量大于剩余数量 @@ -1470,7 +1468,7 @@ public class DepositoryRecordServiceImpl implements DepositoryRecordService { } else { // 如果拆单库存处理记录不存在 - int scale = splitUnitService.findSplitInfoScaleQuantity(splitInfo, -1); + int scale = splitUnitService.findSplitInfoScaleQuantity(splitInfo, -1L); if (inventory.getQuantity() * scale >= trueOut * 100) { // 如果当前库存数量满足要求 @@ -1515,7 +1513,7 @@ public class DepositoryRecordServiceImpl implements DepositoryRecordService { insertForSplitInventory.put("flagForApproval", false); splitUnitService.addSplitInventory(insertForSplitInventory); - Integer new_id = ObjectFormatUtil.toInteger(insertForSplitInventory.get("applicationInIdForOut")); + long new_id = ObjectFormatUtil.toLong(insertForSplitInventory.get("applicationInIdForOut")); depositoryRecordMapper.deleteApplicationInRecordById(new_id); @@ -1585,7 +1583,7 @@ public class DepositoryRecordServiceImpl implements DepositoryRecordService { paramForSplitInventory.put("sid", splitInfoByParentId.getId()); // 获取对应子类的库存 SplitInventory splitInventoryBySplitInfoByParentId = splitUnitMapper.findSplitInventoryByIidAndSid(paramForSplitInventory); - splitInventoryBySplitInfoByParentId.setSaveQuantity((int) (realSaveQuantity * parentScale - nowQuantity) * 100); + splitInventoryBySplitInfoByParentId.setSaveQuantity((long) (realSaveQuantity * parentScale - nowQuantity) * 100); splitUnitMapper.updateSplitInventory(splitInventoryBySplitInfoByParentId); } restResponse.setStatus(200); @@ -1597,7 +1595,7 @@ public class DepositoryRecordServiceImpl implements DepositoryRecordService { // 获取当前物料的库存 - double allInventoryForSplitInfo = splitUnitService.findAllInventoryForSplitInfo(-1, materialAndPlace, realSplitInfo.getId(), 0, true); + double allInventoryForSplitInfo = splitUnitService.findAllInventoryForSplitInfo(-1L, materialAndPlace, realSplitInfo.getId(), 0, true); // 判断当前所有库存是否可以满足需求 if (allInventoryForSplitInfo >= nowQuantity) { // 如果当前库存数可以满足需求 @@ -1616,7 +1614,7 @@ public class DepositoryRecordServiceImpl implements DepositoryRecordService { // 获取当前物料的进制 int scaleQuantity = splitUnitService.findSplitInfoScaleQuantity(parentSplitInfo, realSplitInfo.getId()); - int realQuantity = scaleQuantity * parentSplitInventoryForSplitInfo.getSaveQuantity(); + long realQuantity = scaleQuantity * parentSplitInventoryForSplitInfo.getSaveQuantity(); if (realQuantity >= nowQuantity) { // 如果当前库存容量可以满足需求 @@ -1640,7 +1638,7 @@ public class DepositoryRecordServiceImpl implements DepositoryRecordService { // 设置当前库存数量 splitInventoryForSplitInfo.setSaveQuantity(scale * splitInfo.getQuantity() - splitInventoryForSplitInfo.getSaveQuantity()); // 设置当前出库数量 - splitInventoryForSplitInfo.setOutQuantity((int) (splitInventoryForSplitInfo.getOutQuantity() + ((quantity * 100 - splitInventoryForSplitInfo.getSaveQuantity())))); + splitInventoryForSplitInfo.setOutQuantity((long) (splitInventoryForSplitInfo.getOutQuantity() + ((quantity * 100 - splitInventoryForSplitInfo.getSaveQuantity())))); // 修改当前拆单库存处理记录 } else { @@ -1673,7 +1671,7 @@ public class DepositoryRecordServiceImpl implements DepositoryRecordService { nowQuantity = nowQuantity - realQuantity; parentSplitInventoryForSplitInfo.setOutQuantity(parentSplitInventoryForSplitInfo.getOutQuantity() + parentSplitInventoryForSplitInfo.getSaveQuantity()); - parentSplitInventoryForSplitInfo.setSaveQuantity(0); + parentSplitInventoryForSplitInfo.setSaveQuantity(0L); splitUnitMapper.updateSplitInventory(parentSplitInventoryForSplitInfo); // 如果当前还有父级 @@ -1684,7 +1682,7 @@ public class DepositoryRecordServiceImpl implements DepositoryRecordService { Object data = restResponse1.getData(); // 计算当前与最底层的进制 double splitInfoScaleQuantity = 1; - if (Integer.compare(realSplitInfo.getId(), parentSplitInfo.getId()) != 0) { + if (Long.compare(realSplitInfo.getId(), parentSplitInfo.getId()) != 0) { // 如果当前不是最底层 splitInfoScaleQuantity *= splitUnitService.findSplitInfoScaleQuantity(realSplitInfo, parentSplitInfo.getId()); } @@ -1702,7 +1700,7 @@ public class DepositoryRecordServiceImpl implements DepositoryRecordService { surplus_redundant = surplus_redundant - nowQuantity; // 获取当前拆单单位要添加的库存 double floor = Math.floor(surplus_redundant / splitInfoScaleQuantity); - parentSplitInventoryForSplitInfo.setSaveQuantity((int) floor); + parentSplitInventoryForSplitInfo.setSaveQuantity((long) floor); if (surplus_redundant - floor == 0) { restResponse.setStatus(200); restResponse.setData(""); @@ -1718,7 +1716,7 @@ public class DepositoryRecordServiceImpl implements DepositoryRecordService { // 如果没有父级 // 获取当前拆单单位与顶级之间的进制 - int splitInfoQuantity = splitUnitService.findSplitInfoScaleQuantity(splitInfo, -1); + int splitInfoQuantity = splitUnitService.findSplitInfoScaleQuantity(splitInfo, -1L); // 获取所有当前单位的拆单库存 realQuantity = materialAndPlace.getQuantity() * splitInfoQuantity + realQuantity; if (realQuantity > nowQuantity) { @@ -1756,7 +1754,7 @@ public class DepositoryRecordServiceImpl implements DepositoryRecordService { // 如果已经没有父级 // 获取基础单位与当前实际出库单位单位之间的进制 - double splitInfoScaleQuantityForAll = splitUnitService.findSplitInfoScaleQuantity(realSplitInfo, -1); + double splitInfoScaleQuantityForAll = splitUnitService.findSplitInfoScaleQuantity(realSplitInfo, -1L); // 计算库存减少的数目 int surplus_redundant = (int) Math.ceil(nowQuantity / splitInfoScaleQuantityForAll); @@ -1786,7 +1784,7 @@ public class DepositoryRecordServiceImpl implements DepositoryRecordService { insertForOut.put("flagForApproval", false); splitUnitService.addSplitInventory(insertForOut); - Integer new_id = ObjectFormatUtil.toInteger(insertForOut.get("applicationInIdForOut")); + Long new_id = ObjectFormatUtil.toLong(insertForOut.get("applicationInIdForOut")); depositoryRecordMapper.deleteApplicationInRecordById(new_id); restResponse.setData(surplus_redundant); @@ -1813,7 +1811,7 @@ public class DepositoryRecordServiceImpl implements DepositoryRecordService { public Integer updateOutMinRecordInfo(Map map, UserByPort userToken, String userAgent, String userKey, String token) { Integer result = 0; - Integer id = ObjectFormatUtil.toInteger(map.get("id")); + Long id = ObjectFormatUtil.toLong(map.get("id")); // 获取更改的数量 Double quantity = ObjectFormatUtil.toDouble(map.get("quantity")); @@ -1909,9 +1907,9 @@ public class DepositoryRecordServiceImpl implements DepositoryRecordService { if (Integer.compare(trueOut, outQuantity) != 0) { //如果没有完成出库 - Integer numberOfTemporary = inventoryById.getNumberOfTemporary() + trueOut - outQuantity + (int) (quantity * 100); - if (numberOfTemporary < 0) { - numberOfTemporary = 0; + Long numberOfTemporary = inventoryById.getNumberOfTemporary() + trueOut - outQuantity + (long) (quantity * 100); + if (numberOfTemporary < 0L) { + numberOfTemporary = 0L; } inventoryById.setNumberOfTemporary(numberOfTemporary); materialMapper.updateInventory(inventoryById); @@ -1951,7 +1949,7 @@ public class DepositoryRecordServiceImpl implements DepositoryRecordService { sb.append(workwechat).append(","); } } else { - List materialTypeIdForIn = roleService.findRoleAndDepositoryByDid(ObjectFormatUtil.toInteger(depositoryId)); + List materialTypeIdForIn = roleService.findRoleAndDepositoryByDid(ObjectFormatUtil.toLong(depositoryId)); for (RoleAndDepository mt : materialTypeIdForIn ) { @@ -1970,8 +1968,8 @@ public class DepositoryRecordServiceImpl implements DepositoryRecordService { } } - List integerList = new ArrayList<>(); - integerList.add(ObjectFormatUtil.toInteger(applicationInId)); + List integerList = new ArrayList<>(); + integerList.add(ObjectFormatUtil.toLong(applicationInId)); JSONObject jsonObject = qyWxOperationService.sendApprovalTemplateIn(userAgent, userToken, integerList, sb.toString(), userKey, token); String sp_no = jsonObject.getString("sp_no"); Map QyWxApprovalMap = new HashMap<>(); @@ -1988,9 +1986,9 @@ public class DepositoryRecordServiceImpl implements DepositoryRecordService { if ("-1".equals(unit)) { if (inventoryById.getNumberOfTemporary() != null && inventoryById.getNumberOfTemporary() > 0) { - Integer numberOfTemporary = inventoryById.getNumberOfTemporary() + trueOut - outQuantity + (int) (quantity * 100); + Long numberOfTemporary = inventoryById.getNumberOfTemporary() + trueOut - outQuantity + (long) (quantity * 100); if (numberOfTemporary < 0) { - numberOfTemporary = 0; + numberOfTemporary = 0L; } inventoryById.setNumberOfTemporary(numberOfTemporary); materialMapper.updateInventory(inventoryById); @@ -2013,9 +2011,9 @@ public class DepositoryRecordServiceImpl implements DepositoryRecordService { if ("-1".equals(unit)) { if (inventoryById.getNumberOfTemporary() != null && inventoryById.getNumberOfTemporary() > 0) { - Integer numberOfTemporary = inventoryById.getNumberOfTemporary() - outQuantity + (int) (quantity * 100); + long numberOfTemporary = inventoryById.getNumberOfTemporary() - outQuantity + (int) (quantity * 100); if (numberOfTemporary < 0) { - numberOfTemporary = 0; + numberOfTemporary = 0L; } inventoryById.setNumberOfTemporary(numberOfTemporary); materialMapper.updateInventory(inventoryById); @@ -2043,7 +2041,7 @@ public class DepositoryRecordServiceImpl implements DepositoryRecordService { SplitInfo splitInfo = splitUnitMapper.findSplitInfoByMidAndUnit(paramForSplitInfo); // 获取当前拆单单位与基础单位的进制 - int splitInfoScaleQuantity = splitUnitService.findSplitInfoScaleQuantity(splitInfo, -1); + int splitInfoScaleQuantity = splitUnitService.findSplitInfoScaleQuantity(splitInfo, -1L); double newPrice = inventoryById.getPrice() / splitInfoScaleQuantity; BigDecimal bg = new BigDecimal(newPrice); @@ -2074,7 +2072,7 @@ public class DepositoryRecordServiceImpl implements DepositoryRecordService { public void clearOutBadData() { List applicationOutRecordPForBad = depositoryRecordMapper.findApplicationOutRecordPForBad(); for (ApplicationOutRecord record : applicationOutRecordPForBad) { - Integer id = record.getId(); + Long id = record.getId(); List applicationOutRecordMinByParent = depositoryRecordMapper.findApplicationOutRecordMinByParent(id); if (applicationOutRecordMinByParent != null) { for (ApplicationOutRecordMin outRecordMin : applicationOutRecordMinByParent) { @@ -2096,7 +2094,7 @@ public class DepositoryRecordServiceImpl implements DepositoryRecordService { * @return */ @Override - public Map getApplicationByMaterial(Integer id, List days, Integer type, boolean flagForSplit, SplitInfo splitInfo) { + public Map getApplicationByMaterial(Long id, List days, Integer type, boolean flagForSplit, SplitInfo splitInfo) { // 声明结果集 Map result = new HashMap<>(); // 声明总数列表 @@ -2116,7 +2114,7 @@ public class DepositoryRecordServiceImpl implements DepositoryRecordService { } int scale = 1; if (flagForSplit) { - scale = splitUnitService.findSplitInfoScaleQuantity(splitInfo, -1); + scale = splitUnitService.findSplitInfoScaleQuantity(splitInfo, -1L); } for (int i = 0; i < days.size() - 1; i++) { // 设置开始时间 @@ -2230,7 +2228,7 @@ public class DepositoryRecordServiceImpl implements DepositoryRecordService { * @param userAgent user-agent */ @Transactional(rollbackFor = Exception.class) - void updateApplicationMinOutInfo(Integer id, ApplicationOutRecordMin applicationOutMinById, ApplicationOutRecord record, Double trueOut, UserByPort userByPort, Integer placeId, String userAgent, String userKey, String token) { + void updateApplicationMinOutInfo(Long id, ApplicationOutRecordMin applicationOutMinById, ApplicationOutRecord record, Double trueOut, UserByPort userByPort, Long placeId, String userAgent, String userKey, String token) { log.info("要出库的子订单数据id：" + id + "，出库数量：" + trueOut + "出库人：" + userByPort.getName() + ":" + userByPort.getNumber()); String redisMinRecordKey = "minRecord:" + id; // 设置redis中子订单键值 // 修改当前已经出库的数量 @@ -2364,7 +2362,7 @@ public class DepositoryRecordServiceImpl implements DepositoryRecordService { if ("".equals(s)) { continue; } - Integer uid = ObjectFormatUtil.toInteger(s); + Long uid = ObjectFormatUtil.toLong(s); UserByPort depositoryManager = PublicConfig.FindUserById(uid, userKey, token); // 获取用户的用工关系 int emptype = depositoryManager.getEmptype(); @@ -2417,7 +2415,7 @@ public class DepositoryRecordServiceImpl implements DepositoryRecordService { // 用于标志是否更新当前申请明细 boolean flag = true; // 获取审核订单 - Integer outId = ObjectFormatUtil.toInteger(mainId); + Long outId = ObjectFormatUtil.toLong(mainId); // 获取对应的出库订单 ApplicationOutRecord recordP = depositoryRecordMapper.findApplicationOutRecordPById(outId); @@ -2465,14 +2463,14 @@ public class DepositoryRecordServiceImpl implements DepositoryRecordService { List materialTypeIdList = new ArrayList<>(); // 定义仓库列表 - List depositoryIdList = new ArrayList<>(); + List depositoryIdList = new ArrayList<>(); // 遍历子单给对应的出库人员发送出库通知 for (ApplicationOutRecordMin applicationOutRecordMin : applicationOutRecordMinByParent) { // 获取子单信息 // 获取对应的物料编号 - Integer mid = applicationOutRecordMin.getMid(); + Long mid = applicationOutRecordMin.getMid(); // 获取物料信息 Inventory inventory = materialMapper.findInventoryById(mid); @@ -2480,7 +2478,7 @@ public class DepositoryRecordServiceImpl implements DepositoryRecordService { boolean flagForMtOrDepository = true; // 获取出库仓库 - Integer depositoryId = applicationOutRecordMin.getDepositoryId(); + Long depositoryId = applicationOutRecordMin.getDepositoryId(); Depository depositoryById = depositoryMapper.findDepositoryById(depositoryId); // 获取当前仓库的顶级父仓库 Depository parentDepository = findParentDepository(depositoryById, depositoryAll); @@ -2513,12 +2511,12 @@ public class DepositoryRecordServiceImpl implements DepositoryRecordService { // 如果当前仓库id没有存入过 materialTypeIdList.add(materialTypeId); } - List minIdList = new ArrayList<>(); + List minIdList = new ArrayList<>(); // 将当前子订单添加到该仓库下的子订单列表中 minIdList.add(applicationOutRecordMin.getId()); // 获取该物料所处类型的管理员 - List userIdByMtId = new ArrayList<>(); + List userIdByMtId = new ArrayList<>(); // 用于查询对应的管理员权限 Map paramForUserManager = new HashMap<>(); @@ -2544,7 +2542,7 @@ public class DepositoryRecordServiceImpl implements DepositoryRecordService { if (emptype > 10) { continue; } - Integer userId1 = userByPort1.getId(); + Long userId1 = userByPort1.getId(); // 修改redis中用户的数据 updateRedisDataForUserManager(userId1, minRecordKey); minRecordManage.append(userId1).append(","); @@ -2559,7 +2557,7 @@ public class DepositoryRecordServiceImpl implements DepositoryRecordService { } // 将没有插入的用户进行插入 - for (Integer integer : userIdByMtId) { + for (Long integer : userIdByMtId) { // 获取仓库管理员信息 UserByPort manager = PublicConfig.FindUserById(integer, userKey, token); // 获取用户的用工关系 @@ -2597,12 +2595,12 @@ public class DepositoryRecordServiceImpl implements DepositoryRecordService { // 如果当前仓库id没有存入过 depositoryIdList.add(depositoryId); } - List minIdList = new ArrayList<>(); + List minIdList = new ArrayList<>(); // 将当前子订单添加到该仓库下的子订单列表中 minIdList.add(applicationOutRecordMin.getId()); // 获取该物料所处仓库的仓库管理员 - List userIdByDid = new ArrayList<>(); + List userIdByDid = new ArrayList<>(); // 用于查询对应的管理员权限 Map paramForUserManager = new HashMap<>(); @@ -2627,7 +2625,7 @@ public class DepositoryRecordServiceImpl implements DepositoryRecordService { if (emptype > 10) { continue; } - Integer userId1 = userByPort1.getId(); + Long userId1 = userByPort1.getId(); // 修改redis中用户的数据 updateRedisDataForUserManager(userId1, minRecordKey); minRecordManage.append(userId1).append(","); @@ -2642,7 +2640,7 @@ public class DepositoryRecordServiceImpl implements DepositoryRecordService { } - for (Integer integer : userIdByDid) { + for (Long integer : userIdByDid) { // 修改redis中用户的数据 updateRedisDataForUserManager(integer, minRecordKey); // 获取仓库管理员信息 @@ -2733,10 +2731,10 @@ public class DepositoryRecordServiceImpl implements DepositoryRecordService { boolean flagForZXCWorkWarehouse = false; // 定义仓库id列表 - List depositoryIdList = new ArrayList<>(); + List depositoryIdList = new ArrayList<>(); for (ApplicationOutRecordMin outRecordMin : applicationOutRecordMinByParent) { // 遍历子单详情 - Integer depositoryId = outRecordMin.getDepositoryId(); + Long depositoryId = outRecordMin.getDepositoryId(); // 添加当前仓库id if (!depositoryIdList.contains(depositoryId)) { depositoryIdList.add(depositoryId); @@ -2772,7 +2770,7 @@ public class DepositoryRecordServiceImpl implements DepositoryRecordService { Depository depositoryById = depositoryMapper.findDepositoryById(recordP.getDepositoryId()); // 获取当前仓库所属的部门 String adminorg = depositoryById.getAdminorg(); - List departmentHeadByUser = PublicConfig.findDepartmentHeadByUser(ObjectFormatUtil.toInteger(adminorg), null, null); + List departmentHeadByUser = PublicConfig.findDepartmentHeadByUser(ObjectFormatUtil.toLong(adminorg), null, null); for (UserByPort departmentHead : departmentHeadByUser ) { depositoryManager.append(departmentHead.getId()).append(","); @@ -2817,7 +2815,7 @@ public class DepositoryRecordServiceImpl implements DepositoryRecordService { map.put("balancePosterTime", DateUtil.DateTimeToTimeStamp(simpleTime)); map.put("balancePoster", userByPort.getId()); // 获取综合办负责人 - List departmentHeadByUser = PublicConfig.findDepartmentHeadByUser(268, userKey, token); + List departmentHeadByUser = PublicConfig.findDepartmentHeadByUser(268L, userKey, token); StringBuilder departmentId = new StringBuilder(); for (UserByPort byPort : departmentHeadByUser) { departmentId.append(byPort.getId()).append(","); @@ -2858,7 +2856,7 @@ public class DepositoryRecordServiceImpl implements DepositoryRecordService { * @return true:可以直接删除，false：流程暂未完成 */ @Override - public boolean judgeApplicationOutRecordStatus(Integer id) { + public boolean judgeApplicationOutRecordStatus(Long id) { // 获取当前出库记录 ApplicationOutRecord recordPById = depositoryRecordMapper.findApplicationOutRecordPById(id); Integer pass = recordPById.getPass(); @@ -2890,7 +2888,7 @@ public class DepositoryRecordServiceImpl implements DepositoryRecordService { * @return */ @Override - public TransferRecord findTransferRecordById(Integer id) { + public TransferRecord findTransferRecordById(Long id) { return transferRecordMapper.findTransferRecordById(id); } @@ -2936,7 +2934,7 @@ public class DepositoryRecordServiceImpl implements DepositoryRecordService { // 用于标志当前处理的入库申请是否为组合入库下的申请 boolean flagForGroupInfoInDepository = false; // 默认不是 if (!"".equals(sid) && flagForIn) { - Integer id = ObjectFormatUtil.toInteger(sid.trim()); + Long id = ObjectFormatUtil.toLong(sid.trim()); // 获取具体入库订单 ApplicationInRecord record = depositoryRecordMapper.findApplicationInRecordPById(id); @@ -2974,7 +2972,7 @@ public class DepositoryRecordServiceImpl implements DepositoryRecordService { mproducedDate = 0L; } // 获取当前库存id - Integer newMid = updateOrInsertInventory(paramForUpdateInventory, materialByCondition, (double) (record.getQuantity() / 100), materialById.getId(), record.getDepositoryId(), mproducedDate); + Long newMid = updateOrInsertInventory(paramForUpdateInventory, materialByCondition, (double) (record.getQuantity() / 100), materialById.getId(), record.getDepositoryId(), mproducedDate); // 修改库位库存 paramForUpdateInventory.put("newInMid", newMid); paramForUpdateInventory.put("id", record.getId()); @@ -3028,7 +3026,7 @@ public class DepositoryRecordServiceImpl implements DepositoryRecordService { } splitUnitService.realInInventoryToDepository((double) record.getQuantity() / 100, splitInventory, paramForUpdateInventory, splitInfoForUnit, placeAndMaterialByMidAndPid, true); if (paramForUpdateInventory.containsKey("applicationInId")) { - depositoryRecordMapper.deleteApplicationInRecordById(ObjectFormatUtil.toInteger(paramForUpdateInventory.get("applicationInId"))); + depositoryRecordMapper.deleteApplicationInRecordById(ObjectFormatUtil.toLong(paramForUpdateInventory.get("applicationInId"))); } } } @@ -3037,7 +3035,7 @@ public class DepositoryRecordServiceImpl implements DepositoryRecordService { map.put("id", sid); depositoryRecordMapper.updateApplicationInRecord(map); } else { - depositoryRecordMapper.deleteApplicationInRecordById(ObjectFormatUtil.toInteger(sid.trim())); + depositoryRecordMapper.deleteApplicationInRecordById(ObjectFormatUtil.toLong(sid.trim())); String mainGidId = (String) redisPool.getRedisTemplateByDb(15).opsForHash().get(spNo, "mainGidId"); String[] replace = mainGidId.replace("[", "").replace("]", "").split(","); for (String rid : replace @@ -3062,7 +3060,7 @@ public class DepositoryRecordServiceImpl implements DepositoryRecordService { @Override @Transactional(rollbackFor = Exception.class) public Integer transferApply(Map map, UserByPort userByPort, String userKey, String token) { - Integer mid = ObjectFormatUtil.toInteger(map.get("mid")); + Long mid = ObjectFormatUtil.toLong(map.get("mid")); double quantity = ObjectFormatUtil.toDouble((String) map.get("quantity")); Inventory material = materialMapper.findInventoryById(mid); map.put("depositoryId", material.getDepositoryId()); @@ -3131,7 +3129,7 @@ public class DepositoryRecordServiceImpl implements DepositoryRecordService { // 获取出库时的计量单位 String unit = recordMin.getUnit(); // 获取库存记录 - Integer mid = recordMin.getMid(); + Long mid = recordMin.getMid(); if ("-1".equals(unit)) { // 如果出库时选中的为基础单位 @@ -3154,7 +3152,7 @@ public class DepositoryRecordServiceImpl implements DepositoryRecordService { * @param integer 用户id * @param minRecordKey */ - private void updateRedisDataForUserManager(Integer integer, String minRecordKey) { + private void updateRedisDataForUserManager(Long integer, String minRecordKey) { // 仓库管理员订单信息 Map userRecord = new HashMap<>(); // 用户当前子订单 @@ -3178,9 +3176,9 @@ public class DepositoryRecordServiceImpl implements DepositoryRecordService { */ @Override @Transactional(rollbackFor = Exception.class) - public Integer review(Map map, Integer userid, UserByPort userToken, String userAgent, String userKey, String token) { + public Integer review(Map map, Long userid, UserByPort userToken, String userAgent, String userKey, String token) { Object id = map.get("id"); // 主订单编号 - ApplicationOutRecord record = depositoryRecordMapper.findApplicationOutRecordPById(ObjectFormatUtil.toInteger(id)); + ApplicationOutRecord record = depositoryRecordMapper.findApplicationOutRecordPById(ObjectFormatUtil.toLong(id)); map.remove("id"); List minByParent = depositoryRecordMapper.findApplicationOutRecordMinByParent(record.getId()); @@ -3203,7 +3201,7 @@ public class DepositoryRecordServiceImpl implements DepositoryRecordService { for (ApplicationOutRecordMin min : minByParent ) { Depository depositoryById = depositoryMapper.findDepositoryById(min.getDepositoryId()); - if (Integer.compare(depositoryById.getParentId(), 0) != 0) { + if (Long.compare(depositoryById.getParentId(), 0) != 0) { // 如果不是 List depositoryAll = depositoryMapper.findDepositoryAll(); depositoryById = findParentDepository(depositoryById, depositoryAll); @@ -3235,9 +3233,9 @@ public class DepositoryRecordServiceImpl implements DepositoryRecordService { StringBuilder QyWxUid = new StringBuilder(); // 定义获取当前申请出库的仓库id - List depositoryIdList = new ArrayList<>(); + List depositoryIdList = new ArrayList<>(); for (ApplicationOutRecordMin outRecordMin : minByParent) { - Integer depositoryId = outRecordMin.getDepositoryId(); + Long depositoryId = outRecordMin.getDepositoryId(); if (!depositoryIdList.contains(depositoryId)) { depositoryIdList.add(depositoryId); } @@ -3271,7 +3269,7 @@ public class DepositoryRecordServiceImpl implements DepositoryRecordService { // 获取当前仓库所属的部门 String adminorg = depositoryById.getAdminorg(); - List departmentHeadByUser = PublicConfig.findDepartmentHeadByUser(ObjectFormatUtil.toInteger(adminorg), null, null); + List departmentHeadByUser = PublicConfig.findDepartmentHeadByUser(ObjectFormatUtil.toLong(adminorg), null, null); for (UserByPort departmentHead : departmentHeadByUser ) { depositoryManager.append(departmentHead.getId()).append(","); @@ -3286,7 +3284,7 @@ public class DepositoryRecordServiceImpl implements DepositoryRecordService { // 获取仓储中心负责人 - List departmentHeadByUser = PublicConfig.findDepartmentHeadByUser(361, userKey, token); + List departmentHeadByUser = PublicConfig.findDepartmentHeadByUser(361L, userKey, token); for (UserByPort userByPort : departmentHeadByUser) { depositoryManager.append(userByPort.getId()).append(","); @@ -3336,7 +3334,7 @@ public class DepositoryRecordServiceImpl implements DepositoryRecordService { if ("".equals(depositorymanager)) { continue; } - UserByPort depositoryManage = PublicConfig.FindUserById(ObjectFormatUtil.toInteger(depositorymanager), userKey, token); + UserByPort depositoryManage = PublicConfig.FindUserById(ObjectFormatUtil.toLong(depositorymanager), userKey, token); // 获取用户的用工关系 int emptype = depositoryManage.getEmptype(); if (emptype > 10) { @@ -3353,7 +3351,7 @@ public class DepositoryRecordServiceImpl implements DepositoryRecordService { SendQyWxMessageThreadPool.execute(() -> { - JSONObject jsonObject = qyWxOperationService.sendQyWxToApplicationOutMessage(QyWxUid.toString(), ObjectFormatUtil.toInteger(id), false, userAgent, userKey, token); + JSONObject jsonObject = qyWxOperationService.sendQyWxToApplicationOutMessage(QyWxUid.toString(), ObjectFormatUtil.toLong(id), false, userAgent, userKey, token); // 将当前返回结果保存到redis中 Map QyWxMessageMap = new HashMap<>(); QyWxMessageMap.put("MsgId", jsonObject.getString("msgid")); @@ -3395,7 +3393,7 @@ public class DepositoryRecordServiceImpl implements DepositoryRecordService { if ("".equals(s)) { continue; } - UserByPort userByPort = PublicConfig.FindUserById(ObjectFormatUtil.toInteger(s), userKey, token); + UserByPort userByPort = PublicConfig.FindUserById(ObjectFormatUtil.toLong(s), userKey, token); // 获取用户的用工关系 int emptype = userByPort.getEmptype(); if (emptype > 10) { @@ -3409,7 +3407,7 @@ public class DepositoryRecordServiceImpl implements DepositoryRecordService { } String s = QyWxUid.toString(); s = "PangFuZhen,"; - qyWxOperationService.sendMessageForOtherUserByCard(ObjectFormatUtil.toInteger(id), s, userAgent, 1, userKey, token); + qyWxOperationService.sendMessageForOtherUserByCard(ObjectFormatUtil.toLong(id), s, userAgent, 1, userKey, token); }); } else if (map.containsKey("balancePosterPass") && !flagForHasOtherDepository) { // 如果是平衡岗人员审批且进入该流程 @@ -3431,7 +3429,7 @@ public class DepositoryRecordServiceImpl implements DepositoryRecordService { // 获取综合办负责人 - List departmentHeadByUser = PublicConfig.findDepartmentHeadByUser(268, userKey, token); + List departmentHeadByUser = PublicConfig.findDepartmentHeadByUser(268L, userKey, token); for (UserByPort userByPort : departmentHeadByUser) { depositoryManager.append(userByPort.getId()).append(","); @@ -3456,7 +3454,7 @@ public class DepositoryRecordServiceImpl implements DepositoryRecordService { if ("".equals(depositorymanager)) { continue; } - UserByPort depositoryManage = PublicConfig.FindUserById(ObjectFormatUtil.toInteger(depositorymanager), userKey, token); + UserByPort depositoryManage = PublicConfig.FindUserById(ObjectFormatUtil.toLong(depositorymanager), userKey, token); // 获取用户的用工关系 int emptype = depositoryManage.getEmptype(); if (emptype > 10) { @@ -3473,7 +3471,7 @@ public class DepositoryRecordServiceImpl implements DepositoryRecordService { SendQyWxMessageThreadPool.execute(() -> { - JSONObject jsonObject = qyWxOperationService.sendQyWxToApplicationOutMessage(QyWxUid.toString(), ObjectFormatUtil.toInteger(id), false, userAgent, userKey, token); + JSONObject jsonObject = qyWxOperationService.sendQyWxToApplicationOutMessage(QyWxUid.toString(), ObjectFormatUtil.toLong(id), false, userAgent, userKey, token); // 将当前返回结果保存到redis中 Map QyWxMessageMap = new HashMap<>(); QyWxMessageMap.put("MsgId", jsonObject.getString("msgid")); @@ -3515,7 +3513,7 @@ public class DepositoryRecordServiceImpl implements DepositoryRecordService { if ("".equals(s)) { continue; } - UserByPort userByPort = PublicConfig.FindUserById(ObjectFormatUtil.toInteger(s), userKey, token); + UserByPort userByPort = PublicConfig.FindUserById(ObjectFormatUtil.toLong(s), userKey, token); // 获取用户的用工关系 int emptype = userByPort.getEmptype(); if (emptype > 10) { @@ -3529,7 +3527,7 @@ public class DepositoryRecordServiceImpl implements DepositoryRecordService { } String s = QyWxUid.toString(); s = "PangFuZhen,"; - qyWxOperationService.sendMessageForOtherUserByCard(ObjectFormatUtil.toInteger(id), s, userAgent, 1, userKey, token); + qyWxOperationService.sendMessageForOtherUserByCard(ObjectFormatUtil.toLong(id), s, userAgent, 1, userKey, token); }); } else { String result = ""; @@ -3561,14 +3559,14 @@ public class DepositoryRecordServiceImpl implements DepositoryRecordService { List materialTypeIdList = new ArrayList<>(); // 定义类型列表 - List depositoryIdList = new ArrayList<>(); + List depositoryIdList = new ArrayList<>(); StringBuilder minRecordByMain = new StringBuilder("[]"); List applicationOutRecordMinByParent = depositoryRecordMapper.findApplicationOutRecordMinByParent(record.getId()); List depositoryAll = depositoryMapper.findDepositoryAll(); for (ApplicationOutRecordMin applicationOutRecordMin : applicationOutRecordMinByParent) { // 获取子单信息 // 获取对应的物料编号 - Integer mid = applicationOutRecordMin.getMid(); + Long mid = applicationOutRecordMin.getMid(); // 获取物料信息 Inventory inventory = materialMapper.findInventoryById(mid); @@ -3584,7 +3582,7 @@ public class DepositoryRecordServiceImpl implements DepositoryRecordService { // 获取出库仓库 - Integer depositoryId = applicationOutRecordMin.getDepositoryId(); + Long depositoryId = applicationOutRecordMin.getDepositoryId(); Depository depositoryById = depositoryMapper.findDepositoryById(depositoryId); // 用于标志出库人员通过物料类型还说仓库获取 // 默认是仓库 boolean flagForMtOrDepository = true; @@ -3606,17 +3604,17 @@ public class DepositoryRecordServiceImpl implements DepositoryRecordService { // 如果当前仓库id没有存入过 materialTypeIdList.add(materialTypeId); } - List minIdList = new ArrayList<>(); + List minIdList = new ArrayList<>(); Object o = minIdByMaterialType.get("materialType" + materialTypeId); if (o != null) { - minIdList = (List) o; + minIdList = (List) o; } // 将当前子订单添加到该仓库下的子订单列表中 minIdList.add(applicationOutRecordMin.getId()); minIdByMaterialType.put("materialType" + materialTypeId, minIdList); // 获取该物料所处类型的管理员 - List userIdByDid = new ArrayList<>(); + List userIdByDid = new ArrayList<>(); // 用于查询对应的管理员权限 Map paramForUserManager = new HashMap<>(); @@ -3640,7 +3638,7 @@ public class DepositoryRecordServiceImpl implements DepositoryRecordService { if (emptype > 10) { continue; } - Integer userId = userByPort.getId(); + Long userId = userByPort.getId(); // 修改redis中用户的数据 updateRedisDataForUserManager(userId, minRecordKey); minRecordManage.append(userId).append(","); @@ -3655,7 +3653,7 @@ public class DepositoryRecordServiceImpl implements DepositoryRecordService { } - for (Integer integer : userIdByDid) { + for (Long integer : userIdByDid) { // 获取仓库管理员信息 UserByPort manager = PublicConfig.FindUserById(integer, userKey, token); // 获取用户的用工关系 @@ -3693,17 +3691,17 @@ public class DepositoryRecordServiceImpl implements DepositoryRecordService { // 如果当前仓库id没有存入过 depositoryIdList.add(depositoryId); } - List minIdList = new ArrayList<>(); + List minIdList = new ArrayList<>(); Object o = minIdByMaterialType.get("depository" + depositoryId); if (o != null) { - minIdList = (List) o; + minIdList = ObjectFormatUtil.objToList(o,Long.class); } // 将当前子订单添加到该仓库下的子订单列表中 minIdList.add(applicationOutRecordMin.getId()); minIdByMaterialType.put("depository" + depositoryId, minIdList); // 获取该物料所处仓库的仓库管理员 - List userIdByDid = new ArrayList<>(); + List userIdByDid = new ArrayList<>(); // 用于查询对应的管理员权限 Map paramForUserManager = new HashMap<>(); @@ -3727,7 +3725,7 @@ public class DepositoryRecordServiceImpl implements DepositoryRecordService { if (emptype > 10) { continue; } - Integer userId = userByPort.getId(); + Long userId = userByPort.getId(); // 修改redis中用户的数据 updateRedisDataForUserManager(userId, minRecordKey); minRecordManage.append(userId).append(","); @@ -3742,7 +3740,7 @@ public class DepositoryRecordServiceImpl implements DepositoryRecordService { } - for (Integer integer : userIdByDid) { + for (Long integer : userIdByDid) { // 修改redis中用户的数据 updateRedisDataForUserManager(integer, minRecordKey); // 获取仓库管理员信息 @@ -3784,7 +3782,7 @@ public class DepositoryRecordServiceImpl implements DepositoryRecordService { if ("".equals(s)) { continue; } - UserByPort userByPort = PublicConfig.FindUserById(ObjectFormatUtil.toInteger(s), userKey, token); + UserByPort userByPort = PublicConfig.FindUserById(ObjectFormatUtil.toLong(s), userKey, token); // 获取用户的用工关系 int emptype = userByPort.getEmptype(); if (emptype > 10) { @@ -3798,7 +3796,7 @@ public class DepositoryRecordServiceImpl implements DepositoryRecordService { } String s = QyWxUid.toString(); s = "PangFuZhen,"; - qyWxOperationService.sendMessageForOtherUserByCard(ObjectFormatUtil.toInteger(id), s, userAgent, 1, userKey, token); + qyWxOperationService.sendMessageForOtherUserByCard(ObjectFormatUtil.toLong(id), s, userAgent, 1, userKey, token); }); // 将主订单插入到redis中 @@ -3831,7 +3829,7 @@ public class DepositoryRecordServiceImpl implements DepositoryRecordService { SendQyWxMessageThreadPool.execute(() -> { // 获取responseCode（key为申请人number） //获取部门负责人信息 - UserByPort departHead = PublicConfig.FindUserById(ObjectFormatUtil.toInteger(record.getDepartmenthead()), userKey, token); + UserByPort departHead = PublicConfig.FindUserById(ObjectFormatUtil.toLong(record.getDepartmenthead()), userKey, token); // 获取用户的用工关系 int emptype = departHead.getEmptype(); if (emptype <= 10) { @@ -3855,7 +3853,7 @@ public class DepositoryRecordServiceImpl implements DepositoryRecordService { */ @Override @Transactional - public Integer reviewIn(Map map, Integer userId, UserByPort userToken, String userAgent) { + public Integer reviewIn(Map map, Long userId, UserByPort userToken, String userAgent) { log.info("入库申请审批，系统端数据：" + JSONObject.toJSON(map) + ";" + userId); Object id = map.get("id"); // 主订单编号 // 获取当前审批结果 @@ -3867,7 +3865,7 @@ public class DepositoryRecordServiceImpl implements DepositoryRecordService { map.put("state", "已入库"); // 获取具体入库订单 - ApplicationInRecord recordP = depositoryRecordMapper.findApplicationInRecordPById(ObjectFormatUtil.toInteger(id)); + ApplicationInRecord recordP = depositoryRecordMapper.findApplicationInRecordPById(ObjectFormatUtil.toLong(id)); // 获取当前入库对应的物料 @@ -3895,7 +3893,7 @@ public class DepositoryRecordServiceImpl implements DepositoryRecordService { if (mproducedDate == null) { mproducedDate = 0L; } - Integer newMid = updateOrInsertInventory(paramForUpdateInventory, materialByCondition, (double) recordP.getQuantity() / 100, materialById.getId(), recordP.getDepositoryId(), mproducedDate); + Long newMid = updateOrInsertInventory(paramForUpdateInventory, materialByCondition, (double) recordP.getQuantity() / 100, materialById.getId(), recordP.getDepositoryId(), mproducedDate); // 修改库位库存 paramForUpdateInventory.put("newInMid", newMid); paramForUpdateInventory.put("id", recordP.getId()); @@ -3948,7 +3946,7 @@ public class DepositoryRecordServiceImpl implements DepositoryRecordService { } splitUnitService.realInInventoryToDepository((double) recordP.getQuantity() / 100, splitInventory, paramForUpdateInventory, splitInfoForUnit, placeAndMaterialByMidAndPid, true); if (paramForUpdateInventory.containsKey("applicationInId")) { - depositoryRecordMapper.deleteApplicationInRecordById(ObjectFormatUtil.toInteger(paramForUpdateInventory.get("applicationInId"))); + depositoryRecordMapper.deleteApplicationInRecordById(ObjectFormatUtil.toLong(paramForUpdateInventory.get("applicationInId"))); } } } @@ -3980,7 +3978,7 @@ public class DepositoryRecordServiceImpl implements DepositoryRecordService { // 将其进行分割 String[] clickKeys = eventKey.split("_"); // 获取审核订单 - Integer outId = ObjectFormatUtil.toInteger(clickKeys[2].split("outId")[1]); + Long outId = ObjectFormatUtil.toLong(clickKeys[2].split("outId")[1]); // 获取对应的出库订单 ApplicationOutRecord recordP = depositoryRecordMapper.findApplicationOutRecordPById(outId); // 获取当前用户的身份 @@ -4003,7 +4001,7 @@ public class DepositoryRecordServiceImpl implements DepositoryRecordService { String depositoryManagerString = recordP.getDepositoryManager(); if (depositoryManagerString == null) { // 获取仓储中心负责人 - List departmentHeadByUser = PublicConfig.findDepartmentHeadByUser(361, null, null); + List departmentHeadByUser = PublicConfig.findDepartmentHeadByUser(361L, null, null); StringBuilder depositoryManager = new StringBuilder(); // for (UserByPort byPort : departmentHeadByUser) { // int emptype = byPort.getEmptype(); @@ -4026,7 +4024,7 @@ public class DepositoryRecordServiceImpl implements DepositoryRecordService { if ("".equals(s)) { continue; } - UserByPort userById = PublicConfig.FindUserById(ObjectFormatUtil.toInteger(s), null, null); + UserByPort userById = PublicConfig.FindUserById(ObjectFormatUtil.toLong(s), null, null); // 获取用户的用工关系 int emptype = userById.getEmptype(); if (emptype > 10) { @@ -4042,7 +4040,7 @@ public class DepositoryRecordServiceImpl implements DepositoryRecordService { } // 向仓储中心负责人发送新的消息 - JSONObject jsonObject = qyWxOperationService.sendQyWxToApplicationOutMessage(QyWxUid.toString(), ObjectFormatUtil.toInteger(outId), false, userAgent, userKey, token); + JSONObject jsonObject = qyWxOperationService.sendQyWxToApplicationOutMessage(QyWxUid.toString(), ObjectFormatUtil.toLong(outId), false, userAgent, userKey, token); // 将当前返回结果保存到redis中 Map QyWxMessageMap = new HashMap<>(); QyWxMessageMap.put("MsgId", jsonObject.getString("msgid")); @@ -4077,14 +4075,14 @@ public class DepositoryRecordServiceImpl implements DepositoryRecordService { Map minIdByMaterialType = new HashMap<>(); // 定义仓库列表 List materialTypeIdList = new ArrayList<>(); - List depositoryIdList = new ArrayList<>(); + List depositoryIdList = new ArrayList<>(); StringBuilder minRecordByMain = new StringBuilder("[]"); List applicationOutRecordMinByParent = depositoryRecordMapper.findApplicationOutRecordMinByParent(recordP.getId()); List depositoryAll = depositoryMapper.findDepositoryAll(); for (ApplicationOutRecordMin applicationOutRecordMin : applicationOutRecordMinByParent) { // 获取子单信息 // 获取对应的物料编号 - Integer mid = applicationOutRecordMin.getMid(); + Long mid = applicationOutRecordMin.getMid(); // 获取物料信息 Inventory inventory = materialMapper.findInventoryById(mid); @@ -4100,7 +4098,7 @@ public class DepositoryRecordServiceImpl implements DepositoryRecordService { // 获取出库仓库 - Integer depositoryId = applicationOutRecordMin.getDepositoryId(); + Long depositoryId = applicationOutRecordMin.getDepositoryId(); Depository depositoryById = depositoryMapper.findDepositoryById(depositoryId); // 用于标志出库人员通过物料类型还说仓库获取 // 默认是仓库 boolean flagForMtOrDepository = true; @@ -4121,17 +4119,17 @@ public class DepositoryRecordServiceImpl implements DepositoryRecordService { // 如果当前仓库id没有存入过 materialTypeIdList.add(materialTypeId); } - List minIdList = new ArrayList<>(); + List minIdList = new ArrayList<>(); Object o = minIdByMaterialType.get("materialType" + materialTypeId); if (o != null) { - minIdList = (List) o; + minIdList =ObjectFormatUtil.objToList(o,Long.class); } // 将当前子订单添加到该仓库下的子订单列表中 minIdList.add(applicationOutRecordMin.getId()); minIdByMaterialType.put("materialType" + materialTypeId, minIdList); // 获取该物料所处类型的管理员 - List userIdByDid = new ArrayList<>(); + List userIdByDid = new ArrayList<>(); // 用于查询对应的管理员权限 Map paramForUserManager = new HashMap<>(); @@ -4155,7 +4153,7 @@ public class DepositoryRecordServiceImpl implements DepositoryRecordService { if (emptype > 10) { continue; } - Integer userId = userByPort1.getId(); + Long userId = userByPort1.getId(); // 修改redis中用户的数据 updateRedisDataForUserManager(userId, minRecordKey); minRecordManage.append(userId).append(","); @@ -4170,7 +4168,7 @@ public class DepositoryRecordServiceImpl implements DepositoryRecordService { } - for (Integer integer : userIdByDid) { + for (Long integer : userIdByDid) { // 获取仓库管理员信息 UserByPort manager = PublicConfig.FindUserById(integer, userKey, token); // 获取用户的用工关系 @@ -4207,17 +4205,17 @@ public class DepositoryRecordServiceImpl implements DepositoryRecordService { // 如果当前仓库id没有存入过 depositoryIdList.add(depositoryId); } - List minIdList = new ArrayList<>(); + List minIdList = new ArrayList<>(); Object o = minIdByMaterialType.get("depository" + depositoryId); if (o != null) { - minIdList = (List) o; + minIdList = ObjectFormatUtil.objToList(o,Long.class); } // 将当前子订单添加到该仓库下的子订单列表中 minIdList.add(applicationOutRecordMin.getId()); minIdByMaterialType.put("depository" + depositoryId, minIdList); // 获取该物料所处仓库的仓库管理员 - List userIdByDid = new ArrayList<>(); + List userIdByDid = new ArrayList<>(); // 用于查询对应的管理员权限 Map paramForUserManager = new HashMap<>(); @@ -4241,7 +4239,7 @@ public class DepositoryRecordServiceImpl implements DepositoryRecordService { if (emptype > 10) { continue; } - Integer userId = userByPort1.getId(); + Long userId = userByPort1.getId(); // 修改redis中用户的数据 updateRedisDataForUserManager(userId, minRecordKey); minRecordManage.append(userId).append(","); @@ -4256,7 +4254,7 @@ public class DepositoryRecordServiceImpl implements DepositoryRecordService { } - for (Integer integer : userIdByDid) { + for (Long integer : userIdByDid) { // 修改redis中用户的数据 updateRedisDataForUserManager(integer, minRecordKey); // 获取仓库管理员信息 @@ -4313,13 +4311,13 @@ public class DepositoryRecordServiceImpl implements DepositoryRecordService { Map param = new HashMap<>(); // 获取出库订单 - Integer minRecordId = ObjectFormatUtil.toInteger(map.get("minRecordId")); + Long minRecordId = ObjectFormatUtil.toLong(map.get("minRecordId")); // 获取子订单 ApplicationOutRecordMin recordMin = depositoryRecordMapper.findApplicationOutMinById(minRecordId); // 获取转移详情 TransferRecord transferRecord = transferRecordMapper.findTransferRecordById(recordMin.getTransferId()); - Integer mid = transferRecord.getMid(); + Long mid = transferRecord.getMid(); // 获取转出时库存信息 Inventory inventoryById = materialMapper.findInventoryById(mid); @@ -4368,7 +4366,7 @@ public class DepositoryRecordServiceImpl implements DepositoryRecordService { // 查询该记录 // 获取该库存记录 - Inventory inventory = materialMapper.findInventoryById(ObjectFormatUtil.toInteger(insert.get("id"))); + Inventory inventory = materialMapper.findInventoryById(ObjectFormatUtil.toLong(insert.get("id"))); // 转入库位所拥有的参数 Map toPlaceTemp = new HashMap<>(); @@ -4404,7 +4402,7 @@ public class DepositoryRecordServiceImpl implements DepositoryRecordService { SplitInfo splitInfo = splitUnitMapper.findSplitInfoByMidAndUnit(paramForSplitInfo); // 获取当前拆单与顶级之间的进制 - int scaleQuantity = splitUnitService.findSplitInfoScaleQuantity(splitInfo, -1); + int scaleQuantity = splitUnitService.findSplitInfoScaleQuantity(splitInfo, -1L); // 获取当前转移的数量 Double quantity = ObjectFormatUtil.toDouble(map.get("quantity")); @@ -4467,7 +4465,7 @@ public class DepositoryRecordServiceImpl implements DepositoryRecordService { realQuantity = realQuantity - quantity_in * splitInfo.getQuantity(); } // 设置当前计量单位的库存 - splitInventory.setSaveQuantity((int) (realQuantity * 100)); + splitInventory.setSaveQuantity((long) (realQuantity * 100)); // 更新当前数据 splitUnitMapper.updateSplitInventory(splitInventory); if (disposeQuantity != 0) { @@ -4496,7 +4494,7 @@ public class DepositoryRecordServiceImpl implements DepositoryRecordService { } else { applicationInPlace(map, true); // map.put("applicationInId", map.get("id")); - depositoryRecordMapper.deleteApplicationInRecordById(ObjectFormatUtil.toInteger(map.get("applicationInId"))); + depositoryRecordMapper.deleteApplicationInRecordById(ObjectFormatUtil.toLong(map.get("applicationInId"))); // map.remove("id"); } @@ -4820,7 +4818,7 @@ public class DepositoryRecordServiceImpl implements DepositoryRecordService { String endDate = (String) map.get("endDate"); map.put("endDate", DateUtil.DateTimeToTimeStamp(endDate)); } - List depositoryIdList = roleService.findDepositoryIdForUserHas(userByPort); + List depositoryIdList = roleService.findDepositoryIdForUserHas(userByPort); if (depositoryIdList.size() == 0) { depositoryIdList = null; } @@ -4857,7 +4855,7 @@ public class DepositoryRecordServiceImpl implements DepositoryRecordService { map.put("applicantTime", DateUtil.DateTimeByDayToTimeStamp(applyTime)); } - List depositoryIdList = roleService.findDepositoryIdForUserHas(userByPort); + List depositoryIdList = roleService.findDepositoryIdForUserHas(userByPort); map.put("depositoryIdList", depositoryIdList); map.put("applicantId", userByPort.getId()); return depositoryRecordMapper.findApplicationInRecordPCountByUser(map); @@ -4877,7 +4875,7 @@ public class DepositoryRecordServiceImpl implements DepositoryRecordService { String applyTime = (String) map.get("applyTime"); map.put("applicantTime", DateUtil.DateTimeByDayToTimeStamp(applyTime)); } - List depositoryIdList = new ArrayList<>(); + List depositoryIdList = new ArrayList<>(); map.put("applicantId", userByPort.getId()); if (map.containsKey("startDate")) { String startDate = (String) map.get("startDate"); @@ -4888,7 +4886,7 @@ public class DepositoryRecordServiceImpl implements DepositoryRecordService { map.put("endDate", DateUtil.DateTimeToTimeStamp(endDate)); } if (map.containsKey("depositoryId")) { - depositoryIdList.add(ObjectFormatUtil.toInteger(map.get("depositoryId"))); + depositoryIdList.add(ObjectFormatUtil.toLong(map.get("depositoryId"))); } else if (!map.containsKey("depositoryIdList")) { List depositoryAndRole = roleService.findDepositoryAndRole(userByPort.getId()); depositoryAndRole.addAll(roleService.findDepositoryAndRole(userByPort.getPosition())); @@ -4929,12 +4927,12 @@ public class DepositoryRecordServiceImpl implements DepositoryRecordService { String applyTime = (String) map.get("applyTime"); map.put("applicantTime", DateUtil.DateTimeByDayToTimeStamp(applyTime)); } - List depositoryIdList = new ArrayList<>(); + List depositoryIdList = new ArrayList<>(); if (map.size() <= 2) { map.put("applicantId", userByPort.getId()); } if (map.containsKey("depositoryId")) { - depositoryIdList.add(ObjectFormatUtil.toInteger(map.get("depositoryId"))); + depositoryIdList.add(ObjectFormatUtil.toLong(map.get("depositoryId"))); } else if (!map.containsKey("depositoryIdList")) { List depositoryAndRole = roleService.findDepositoryAndRole(userByPort.getId()); depositoryAndRole.addAll(roleService.findDepositoryAndRole(userByPort.getPosition())); @@ -5051,7 +5049,7 @@ public class DepositoryRecordServiceImpl implements DepositoryRecordService { * @return */ @Override - public ApplicationOutRecordP findApplicationOutRecordPById(Integer id) { + public ApplicationOutRecordP findApplicationOutRecordPById(Long id) { ApplicationOutRecord record = depositoryRecordMapper.findApplicationOutRecordPById(id); return new ApplicationOutRecordP(record); } @@ -5116,7 +5114,7 @@ public class DepositoryRecordServiceImpl implements DepositoryRecordService { * @return 受影响的行数 */ @Override - public Integer deleteDepositoryRecordById(Integer id) { + public Integer deleteDepositoryRecordById(Long id) { return depositoryRecordMapper.deleteDepositoryRecordById(id); } @@ -5127,7 +5125,7 @@ public class DepositoryRecordServiceImpl implements DepositoryRecordService { * @return 受影响的行数 */ @Override - public Integer deleteDepositoryRecordByIds(List list) { + public Integer deleteDepositoryRecordByIds(List list) { return depositoryRecordMapper.deleteDepositoryRecordByIds(list); } @@ -5189,7 +5187,7 @@ public class DepositoryRecordServiceImpl implements DepositoryRecordService { * @return */ @Override - public Map CalculateAllApplicationInAll(List list) { + public Map CalculateAllApplicationInAll(List list) { Map result = new HashMap<>(); List applicationInRecordPAll = depositoryRecordMapper.findApplicationInRecordPByDepositoryList(list); double sum = 0.0; @@ -5204,7 +5202,7 @@ public class DepositoryRecordServiceImpl implements DepositoryRecordService { paramForSplitInfo.put("newUnit", applicationInRecordP.getAirUnit()); paramForSplitInfo.put("mid", applicationInRecordP.getMid()); SplitInfo splitInfoByMidAndUnit = splitUnitMapper.findSplitInfoByMidAndUnit(paramForSplitInfo); - int scale = splitUnitService.findSplitInfoScaleQuantity(splitInfoByMidAndUnit, -1); + int scale = splitUnitService.findSplitInfoScaleQuantity(splitInfoByMidAndUnit, -1L); sum = ObjectFormatUtil.sum(sum, (materialById.getPrice() / scale / 100 * (double) applicationInRecordP.getQuantity() / 100)); } } @@ -5229,7 +5227,7 @@ public class DepositoryRecordServiceImpl implements DepositoryRecordService { * @return */ @Override - public Double findApplicationRecordByDate(Long end, Long start, Integer type, Integer depositoryId) { + public Double findApplicationRecordByDate(Long end, Long start, Integer type, Long depositoryId) { Map map = new HashMap<>(); map.put("start", start); map.put("end", end); @@ -5253,7 +5251,7 @@ public class DepositoryRecordServiceImpl implements DepositoryRecordService { * @return */ @Override - public Integer findApplicationInRecordByDate(Long end, Long start, Integer depositoryId) { + public Integer findApplicationInRecordByDate(Long end, Long start, Long depositoryId) { Map map = new HashMap<>(); map.put("start", start); map.put("end", end); @@ -5270,7 +5268,7 @@ public class DepositoryRecordServiceImpl implements DepositoryRecordService { * @return */ @Override - public Integer findApplicationOutRecordByDate(Long end, Long start, Integer depositoryId) { + public Integer findApplicationOutRecordByDate(Long end, Long start, Long depositoryId) { Map map = new HashMap<>(); map.put("start", start); map.put("end", end); @@ -5315,7 +5313,7 @@ public class DepositoryRecordServiceImpl implements DepositoryRecordService { * @return */ @Override - public ApplicationInRecordP findApplicationInRecordPById(Integer id) { + public ApplicationInRecordP findApplicationInRecordPById(Long id) { ApplicationInRecord applicationInRecordPById = depositoryRecordMapper.findApplicationInRecordPById(id); return new ApplicationInRecordP(applicationInRecordPById); } @@ -5327,10 +5325,10 @@ public class DepositoryRecordServiceImpl implements DepositoryRecordService { * @return 受影响的行数 */ @Override - public Integer deleteApplicationInRecordById(Integer id, UserByPort userToken, String userAgent) { + public Integer deleteApplicationInRecordById(Long id, UserByPort userToken, String userAgent) { ApplicationInRecord record = depositoryRecordMapper.findApplicationInRecordPById(id); HandlesOtherFunctionalThreadPool.execute(() -> { - if (Integer.compare(record.getAirapproverPass(), 4) == 0 || Integer.compare(record.getAirapproverPass(), 1) == 0) { + if (Long.compare(record.getAirapproverPass(), 4) == 0 || Integer.compare(record.getAirapproverPass(), 1) == 0) { // 如果已经入库 updateInventoryForErrorInRecord(record.getMid(), record.getQuantity(), record.getAirUnit(), record.getPlaceId(), record.getDepositoryId()); } @@ -5345,7 +5343,7 @@ public class DepositoryRecordServiceImpl implements DepositoryRecordService { * @return 受影响的行数 */ @Override - public Integer deleteApplicationInRecordByIds(List list, UserByPort userToken, String userAgent) { + public Integer deleteApplicationInRecordByIds(List list, UserByPort userToken, String userAgent) { List applicationInRecordsByIds = depositoryRecordMapper.findApplicationInRecordsByIds(list); HandlesOtherFunctionalThreadPool.execute(() -> { for (ApplicationInRecord record : applicationInRecordsByIds @@ -5368,7 +5366,7 @@ public class DepositoryRecordServiceImpl implements DepositoryRecordService { * @param placeId 入库库位 * @param depositoryId 入库仓库 */ - void updateInventoryForErrorInRecord(Integer mid, Integer quantity, String unit, Integer placeId, Integer depositoryId) { + void updateInventoryForErrorInRecord(Long mid, Integer quantity, String unit, Long placeId, Long depositoryId) { // 获取当前入库时的物料 Material material = materialMapper.findMaterialById(mid); @@ -5433,14 +5431,14 @@ public class DepositoryRecordServiceImpl implements DepositoryRecordService { // 如果不能满足需求 // 获取剩余不足的数量 - int surplus = quantity - splitInventory.getSaveQuantity(); + long surplus = quantity - splitInventory.getSaveQuantity(); if (splitInfo.getParentId() != null) { // 如果当前拆单有父级 // 将当前库存设置为0 - splitInventory.setSaveQuantity(0); + splitInventory.setSaveQuantity(0L); // 修改库存数量 splitUnitMapper.updateSplitInventory(splitInventory); @@ -5509,9 +5507,9 @@ public class DepositoryRecordServiceImpl implements DepositoryRecordService { // 如果大于 // 获取库存重要减少的数量 - int surplus_redundant = surplus / splitInfo.getQuantity(); + long surplus_redundant = surplus / splitInfo.getQuantity(); // 获取拆单库存处理中要处理数量 - int saveQuantity = surplus - surplus_redundant * splitInfo.getQuantity(); + long saveQuantity = surplus - surplus_redundant * splitInfo.getQuantity(); if (saveQuantity > splitInventory.getSaveQuantity()) { // 如果要处理的数量大于剩余数量 @@ -5571,7 +5569,7 @@ public class DepositoryRecordServiceImpl implements DepositoryRecordService { } else { // 如果拆单库存处理记录不存在 - int scale = splitUnitService.findSplitInfoScaleQuantity(splitInfo, -1); + int scale = splitUnitService.findSplitInfoScaleQuantity(splitInfo, -1L); if (inventory.getQuantity() * scale > quantity) { // 如果当前库存数量满足要求 @@ -5608,7 +5606,7 @@ public class DepositoryRecordServiceImpl implements DepositoryRecordService { insertForSplitInventory.put("placeId", placeAndMaterialByMidAndPid.getPid()); insertForSplitInventory.put("type", "in"); splitUnitService.addSplitInventory(insertForSplitInventory); - Integer new_id = ObjectFormatUtil.toInteger(insertForSplitInventory.get("applicationInId")); + Long new_id = ObjectFormatUtil.toLong(insertForSplitInventory.get("applicationInId")); depositoryRecordMapper.deleteApplicationInRecordById(new_id); } } @@ -5618,22 +5616,6 @@ public class DepositoryRecordServiceImpl implements DepositoryRecordService { } } - /** - * 对查出来的记录进行包装，包装成前端需要的数据 - * - * @param list SimpleDepositoryRecord集合 - * @return 包装好的集合 - */ - private List simplePack(List list) { - List result = new ArrayList<>(list.size()); - for (SimpleDepositoryRecord record : list) { - SimpleDepositoryRecordP d = new SimpleDepositoryRecordP(record); - d.setApplicantName(userMapper.findUserNameById(record.getApplicantId())); - result.add(d); - } - return result; - } - /** * 对查出来的记录进行包装，包装成前端需要的数据 * @@ -5769,10 +5751,10 @@ public class DepositoryRecordServiceImpl implements DepositoryRecordService { * @param id * @return */ - public Boolean findThisIdIsExistForDepository(List ids, Integer id) { - for (Integer did : + public Boolean findThisIdIsExistForDepository(List ids, Long id) { + for (Long did : ids) { - if (Integer.compare(id, did) == 0) { + if (Long.compare(id, did) == 0) { return true; } } @@ -5789,8 +5771,8 @@ public class DepositoryRecordServiceImpl implements DepositoryRecordService { Depository findParentDepository(Depository depository, List depositoryList) { for (Depository d : depositoryList ) { - if (Integer.compare(depository.getParentId(), d.getId()) == 0) { - if (Integer.compare(0, d.getParentId()) == 0) { + if (Long.compare(depository.getParentId(), d.getId()) == 0) { + if (Long.compare(0, d.getParentId()) == 0) { return d; } else { return findParentDepository(d, depositoryList); @@ -5830,7 +5812,7 @@ public class DepositoryRecordServiceImpl implements DepositoryRecordService { * @param echartType 图表类型 * @return */ - public Map getLineOrBarChartData(Integer depositoryId, String type, String dateType, String echartType) { + public Map getLineOrBarChartData(Long depositoryId, String type, String dateType, String echartType) { // 最终返回结果 Map show_data = new HashMap<>(); @@ -5899,7 +5881,7 @@ public class DepositoryRecordServiceImpl implements DepositoryRecordService { * @param echartType 图表类型 * @return */ - public Map getLineOrBarChartDataForInventory(Integer depositoryId, String dateType, String echartType) { + public Map getLineOrBarChartDataForInventory(Long depositoryId, String dateType, String echartType) { // 声明仓库库存数据 Map show_data = new HashMap<>(); @@ -5944,15 +5926,15 @@ public class DepositoryRecordServiceImpl implements DepositoryRecordService { Integer sumForDepository = materialMapper.findInventorySumForDepository(depositoryId); double depositoryInventory = ObjectFormatUtil.divide(sumForDepository, 100.0, 2); List splitInventoryViewByDepository = splitUnitMapper.findSplitInventoryViewByDepository(depositoryId); - Map scaleForSplitInfo = new HashMap<>(); + Map scaleForSplitInfo = new HashMap<>(); for (SplitInventoryView splitInventoryView : splitInventoryViewByDepository) { - Integer sid = splitInventoryView.getSid(); + Long sid = splitInventoryView.getSid(); int scale = 1; if (scaleForSplitInfo.containsKey(sid)) { scale = scaleForSplitInfo.get(sid); } else { SplitInfo splitInfoById = splitUnitMapper.findSplitInfoById(sid); - scale = splitUnitService.findSplitInfoScaleQuantity(splitInfoById, -1); + scale = splitUnitService.findSplitInfoScaleQuantity(splitInfoById, -1L); scaleForSplitInfo.put(sid, scale); } depositoryInventory = ObjectFormatUtil.sum(depositoryInventory, ObjectFormatUtil.divide(splitInventoryView.getSiQuantity(), scale, 2)); @@ -6062,7 +6044,7 @@ public class DepositoryRecordServiceImpl implements DepositoryRecordService { * @param depositoryId 仓库id * @return */ - public Map getLineOrBarChartDataForApplicationRecord(String type, List days, Integer depositoryId, String echartType) { + public Map getLineOrBarChartDataForApplicationRecord(String type, List days, Long depositoryId, String echartType) { Map map = createLineOrBarMap(echartType); int i; List drCountbyDrName = new ArrayList<>(); @@ -6087,7 +6069,7 @@ public class DepositoryRecordServiceImpl implements DepositoryRecordService { * @param materialTypeAll 当前查看物料类型 * @return */ - public Map getSunBurstDataByForApplication(String name, String type, Long start, Long end, List materialTypeAll, Integer depositoryId) { + public Map getSunBurstDataByForApplication(String name, String type, Long start, Long end, List materialTypeAll, Long depositoryId) { Map result = new HashMap<>(); @@ -6156,7 +6138,7 @@ public class DepositoryRecordServiceImpl implements DepositoryRecordService { * @param depositoryId 待查询仓库 * @return */ - public Map getSunBurstDataForInventoryByMonth(String dayName, String mtName, Integer depositoryId) { + public Map getSunBurstDataForInventoryByMonth(String dayName, String mtName, Long depositoryId) { // 定义结果集 Map result = new HashMap(); @@ -6313,7 +6295,7 @@ public class DepositoryRecordServiceImpl implements DepositoryRecordService { * @param mtName 类别名称 * @return */ - public Map getSunBurstDataByMtName(String name, String type, Long start, Long end, String mtName, Integer depositoryId) { + public Map getSunBurstDataByMtName(String name, String type, Long start, Long end, String mtName, Long depositoryId) { List materialTypeByNames = materialTypeMapper.findMaterialTypeByName(mtName); MaterialType materialType = null; if (materialTypeByNames.size() > 0) { @@ -6439,7 +6421,7 @@ public class DepositoryRecordServiceImpl implements DepositoryRecordService { paramForSplitInfo.put("newUnit", recordMin.getUnit()); paramForSplitInfo.put("mid", materialById.getMid()); SplitInfo splitInfo = splitUnitMapper.findSplitInfoByMidAndUnit(paramForSplitInfo); - int scale = splitUnitService.findSplitInfoScaleQuantity(splitInfo, -1); + int scale = splitUnitService.findSplitInfoScaleQuantity(splitInfo, -1L); if (materialById.getPrice() != null) { price_out = materialById.getPrice() / scale * quantity; } @@ -6466,9 +6448,9 @@ public class DepositoryRecordServiceImpl implements DepositoryRecordService { Long start; Long end; MaterialType materialType; - Integer depositoryId; + Long depositoryId; - public getSunBurstDataForApplicationByDepository(String type, Long start, Long end, MaterialType materialType, Integer depositoryId) { + public getSunBurstDataForApplicationByDepository(String type, Long start, Long end, MaterialType materialType, Long depositoryId) { this.type = type; this.start = start; this.end = end; @@ -6507,9 +6489,9 @@ public class DepositoryRecordServiceImpl implements DepositoryRecordService { MaterialType materialType; - Integer depositoryId; + Long depositoryId; - public getSunBurstDataForInventoryByDepository(MaterialType materialType, Integer depositoryId) { + public getSunBurstDataForInventoryByDepository(MaterialType materialType, Long depositoryId) { this.materialType = materialType; this.depositoryId = depositoryId; } diff --git a/src/main/java/com/dreamchaser/depository_manage/service/impl/DepositoryServiceImpl.java b/src/main/java/com/dreamchaser/depository_manage/service/impl/DepositoryServiceImpl.java index b5680a60..62395ac0 100644 --- a/src/main/java/com/dreamchaser/depository_manage/service/impl/DepositoryServiceImpl.java +++ b/src/main/java/com/dreamchaser/depository_manage/service/impl/DepositoryServiceImpl.java @@ -60,12 +60,12 @@ public class DepositoryServiceImpl implements DepositoryService { // 当前名称是否有重复 List condition = depositoryMapper.findDepositoryByCondition(temp); // 公司编号 - Integer cid = ObjectFormatUtil.toInteger(map.get("cid")); + Long cid = ObjectFormatUtil.toLong(map.get("cid")); String companyName = PublicConfig.getCompany(cid, userKey, token).getName(); String adminorgName = ""; // 部门编号 if (!"".equals(map.get("adminorg"))) { - Integer adminorg = ObjectFormatUtil.toInteger(map.get("adminorg")); + Long adminorg = ObjectFormatUtil.toLong(map.get("adminorg")); adminorgName = PublicConfig.getCompany(adminorg, userKey, token).getName(); } // 公司简称 @@ -91,13 +91,13 @@ public class DepositoryServiceImpl implements DepositoryService { map.put("parentId", map.get("depositoryId")); map.remove("depositoryId"); // 获取当前仓库父仓库 - Integer parentId = ObjectFormatUtil.toInteger(map.get("parentId")); + Long parentId = ObjectFormatUtil.toLong(map.get("parentId")); Depository depositoryId = depositoryMapper.findDepositoryById(parentId); // 获取当前选择部门 String adminorgName = ""; // 部门编号 if (!"".equals(map.get("adminorg"))) { - Integer adminorg = ObjectFormatUtil.toInteger(map.get("adminorg")); + Long adminorg = ObjectFormatUtil.toLong(map.get("adminorg")); adminorgName = PublicConfig.getCompany(adminorg, userKey, token).getName(); adminorgName = WordUtil.getPinYinHeadChar(adminorgName).substring(0, 2); } @@ -150,7 +150,7 @@ public class DepositoryServiceImpl implements DepositoryService { List list = depositoryMapper.findDepositoryByCondition(map); for (Depository depository : list) { if (!depository.getAdminorg().isEmpty()) { - Administration company = PublicConfig.getCompany(ObjectFormatUtil.toInteger(depository.getAdminorg()), userKey, token); + Administration company = PublicConfig.getCompany(ObjectFormatUtil.toLong(depository.getAdminorg()), userKey, token); depository.setAdminorgName(company.getName()); } } @@ -180,7 +180,7 @@ public class DepositoryServiceImpl implements DepositoryService { * @return 影响条数 */ @Override - public Integer deleteDepositoryRecordById(Integer id) { + public Integer deleteDepositoryRecordById(Long id) { // 删除权限记录 Map map = new HashMap<>(); map.put("depositoryId", id); @@ -198,7 +198,7 @@ public class DepositoryServiceImpl implements DepositoryService { * @return 影响条数 */ @Override - public Integer deleteDepositoryRecordByIds(List list) { + public Integer deleteDepositoryRecordByIds(List list) { return depositoryMapper.deleteDepositoryRecordByIds(list); } @@ -209,12 +209,12 @@ public class DepositoryServiceImpl implements DepositoryService { * @return 查询结果 */ @Override - public Depository findDepositoryById(Integer id) { + public Depository findDepositoryById(Long id) { return depositoryMapper.findDepositoryById(id); } @Override - public List findDepositoryByIds(List ids) { + public List findDepositoryByIds(List ids) { return depositoryMapper.findDepositoryByIds(ids); } @@ -263,7 +263,7 @@ public class DepositoryServiceImpl implements DepositoryService { * @return 受影响数目 */ @Override - public Integer changeStateToDeletedById(Integer id) { + public Integer changeStateToDeletedById(Long id) { return depositoryMapper.changeStateToDeletedById(id); } @@ -274,7 +274,7 @@ public class DepositoryServiceImpl implements DepositoryService { * @return 受影响数目 */ @Override - public Integer changeStateToDeletedByIds(List ids) { + public Integer changeStateToDeletedByIds(List ids) { return depositoryMapper.changeStateToDeletedByIds(ids); } @@ -292,8 +292,8 @@ public class DepositoryServiceImpl implements DepositoryService { Depository findParentDepository(Depository depository, List depositoryList) { for (Depository d : depositoryList ) { - if (Integer.compare(depository.getParentId(), d.getId()) == 0) { - if (Integer.compare(0, d.getParentId()) == 0) { + if (Long.compare(depository.getParentId(), d.getId()) == 0) { + if (Long.compare(0, d.getParentId()) == 0) { return d; } else { return findParentDepository(d, depositoryList); @@ -310,19 +310,19 @@ public class DepositoryServiceImpl implements DepositoryService { * @return */ @Override - public Map findDepositoryAllNameAndId(UserByPort user) { + public Map findDepositoryAllNameAndId(UserByPort user) { // 返回结果 - Map map = new HashMap<>(); - Integer adminorg = user.getMaindeparment(); + Map map = new HashMap<>(); + Long adminorg = user.getMaindeparment(); // 获取当前用户所在部门管理的仓库 List depositoryByAdminorg = depositoryMapper.findDepositoryByAdminorg(adminorg.toString()); - List depositoryParentIdList = new ArrayList<>(); + List depositoryParentIdList = new ArrayList<>(); List depositoryList = new ArrayList<>(); // 仓库id列表 // 添加到id列表 for (Depository depository : depositoryByAdminorg) { - int parentId = depository.getParentId(); + long parentId = depository.getParentId(); if (parentId != 0) { depositoryList.add(depository); depositoryParentIdList.add(parentId); @@ -332,7 +332,7 @@ public class DepositoryServiceImpl implements DepositoryService { for (Depository depository : depositoryList ) { - Integer id = depository.getId(); + Long id = depository.getId(); if (!depositoryParentIdList.contains(id)) { map.put(depository.getDname() + "," + depository.getCode(), id); } @@ -345,14 +345,14 @@ public class DepositoryServiceImpl implements DepositoryService { List roleAndDepositoryList = new ArrayList<>(); depositoryParentIdList = new ArrayList<>(); for (RoleAndDepository roleAndDepository : depositoryAndRole) { - int parentId = roleAndDepository.getParentId(); + long parentId = roleAndDepository.getParentId(); if (parentId != 0) { roleAndDepositoryList.add(roleAndDepository); depositoryParentIdList.add(parentId); } } for (RoleAndDepository roleAndDepository : roleAndDepositoryList) { - Integer id = roleAndDepository.getDepositoryId(); + long id = roleAndDepository.getDepositoryId(); if (!depositoryParentIdList.contains(id)) { map.put(roleAndDepository.getDepositoryName() + "," + roleAndDepository.getDepositoryCode(), id); } @@ -367,14 +367,14 @@ public class DepositoryServiceImpl implements DepositoryService { * @return */ @Override - public Map findAllDepositoryNameAndId() { + public Map findAllDepositoryNameAndId() { List depositoryAll = depositoryMapper.findDepositoryAll(); - Map map = new HashMap<>(); - List depositoryParentIdList = new ArrayList<>(); + Map map = new HashMap<>(); + List depositoryParentIdList = new ArrayList<>(); List depositoryList = new ArrayList<>(); for (Depository depository : depositoryAll ) { - int parentId = depository.getParentId(); + long parentId = depository.getParentId(); if (parentId != 0) { depositoryList.add(depository); depositoryParentIdList.add(parentId); @@ -383,7 +383,7 @@ public class DepositoryServiceImpl implements DepositoryService { for (Depository depository : depositoryList ) { - int id = depository.getId(); + long id = depository.getId(); if (!depositoryParentIdList.contains(id)) { map.put(depository.getDname() + "," + depository.getCode(), id); } @@ -418,16 +418,16 @@ public class DepositoryServiceImpl implements DepositoryService { * @return */ @Override - public List findAllChildDepositoryById(Integer id, UserByPort userByPort) { + public List findAllChildDepositoryById(Long id, UserByPort userByPort) { // 获取所有仓库 List depositoryAll = depositoryMapper.findDepositoryAll(); // 定义待返回仓库id - List depositoryIdList = new ArrayList<>(); + List depositoryIdList = new ArrayList<>(); // 添加仓库id depositoryIdList.add(id); for (Depository depository : depositoryAll ) { - Integer did = depository.getParentId(); + Long did = depository.getParentId(); if (depositoryIdList.contains(did)) { depositoryIdList.add(depository.getId()); } @@ -436,8 +436,8 @@ public class DepositoryServiceImpl implements DepositoryService { return depositoryIdList; } //用于查询当前用户所拥有及所管理的仓库 - List depositoryIdForUserHas = roleService.findDepositoryIdForUserHas(userByPort); - depositoryIdList = (List) CollectionUtils.intersection(depositoryIdList, depositoryIdForUserHas); + List depositoryIdForUserHas = roleService.findDepositoryIdForUserHas(userByPort); + depositoryIdList = (List) CollectionUtils.intersection(depositoryIdList, depositoryIdForUserHas); return depositoryIdList; } @@ -468,7 +468,7 @@ public class DepositoryServiceImpl implements DepositoryService { * @return 搜索结果 */ @Override - public List selectDepositoryRecordByIds(List ids) { + public List selectDepositoryRecordByIds(List ids) { return depositoryMapper.selectDepositoryByIds(ids); } @@ -477,7 +477,7 @@ public class DepositoryServiceImpl implements DepositoryService { List list = new ArrayList<>(); // 定义仓库id列表 - List depositoryIdList = new ArrayList<>(); + List depositoryIdList = new ArrayList<>(); // 获取所有仓库 List depositoryAll = depositoryMapper.findDepositoryAll(); int totalVal = depositoryAll.size(); @@ -540,8 +540,8 @@ public class DepositoryServiceImpl implements DepositoryService { continue; } JSONObject jsonObject = new JSONObject((Map) list.get(i)); - Integer parentId = jsonObject.getInteger("parentId"); - if (Integer.compare(parentId, 0) != 0) { + Long parentId = jsonObject.getLong("parentId"); + if (Long.compare(parentId, 0) != 0) { if (!checkList(list, parentId)) { // 如果当前列表中不存在其父级 Depository depositoryById = depositoryMapper.findDepositoryById(parentId); @@ -636,7 +636,7 @@ public class DepositoryServiceImpl implements DepositoryService { continue; } // 构造为jsonObject类 - JSONObject jsonObject = new JSONObject((Map) list.get(i)); + JSONObject jsonObject = new JSONObject(ObjectFormatUtil.objToMap(list.get(i),String.class,Object.class)); // 获取当前父级id Long parentId1 = jsonObject.getLong("parentId"); if (Long.compare(parentId, parentId1) == 0) { // 如果当前类型是其父类 @@ -656,14 +656,14 @@ public class DepositoryServiceImpl implements DepositoryService { * @param parentId * @return */ - public Boolean checkList(List list, Integer parentId) { + public Boolean checkList(List list, Long parentId) { for (Object o : list) { if (o == null) { continue; } - JSONObject jsonObject = new JSONObject((Map) o); - Integer pid = jsonObject.getInteger("id"); - if (Integer.compare(pid, parentId) == 0) { + JSONObject jsonObject = new JSONObject(ObjectFormatUtil.objToMap(o,String.class,Object.class)); + Long pid = jsonObject.getLong("id"); + if (Long.compare(pid, parentId) == 0) { return true; } } @@ -677,9 +677,9 @@ public class DepositoryServiceImpl implements DepositoryService { * @param list 用户管理仓库列表 * @return */ - public boolean checkDidInDepositoryIdList(Integer depositoryId, List list) { - for (Integer depository : list) { - if (Integer.compare(depositoryId, depository) == 0) { + public boolean checkDidInDepositoryIdList(Long depositoryId, List list) { + for (Long depository : list) { + if (Long.compare(depositoryId, depository) == 0) { // 是其所管理的仓库 return true; } @@ -705,7 +705,7 @@ public class DepositoryServiceImpl implements DepositoryService { * @return */ @Override - public List InitTreeMenus_Place(Integer depositoryId) { + public List InitTreeMenus_Place(Long depositoryId) { // 根据仓库id查询对应的仓库 Depository depository = depositoryMapper.findDepositoryById(depositoryId); // 定义结果列表 @@ -739,10 +739,10 @@ public class DepositoryServiceImpl implements DepositoryService { */ @Override public List findDepositoryByAdminorgAndUser(UserByPort userByPort) { - Map depositoryAllNameAndId = findDepositoryAllNameAndId(userByPort); - Collection values = depositoryAllNameAndId.values(); - Iterator iterator = values.iterator(); - List list = new ArrayList<>(); + Map depositoryAllNameAndId = findDepositoryAllNameAndId(userByPort); + Collection values = depositoryAllNameAndId.values(); + Iterator iterator = values.iterator(); + List list = new ArrayList<>(); while (iterator.hasNext()) { list.add(iterator.next()); } @@ -760,7 +760,7 @@ public class DepositoryServiceImpl implements DepositoryService { * @return */ @Override - public String findQrCodeByDepository(Integer did) { + public String findQrCodeByDepository(Long did) { // 通过雪花算法计算随机数 Snowflake snowflake = new Snowflake(10, 10, true); String qrCode = snowflake.nextIdStr(); @@ -818,7 +818,7 @@ public class DepositoryServiceImpl implements DepositoryService { * @return */ @Override - public InventoryByMTAndDepository getTodayInventoryByDidAndMt(Integer did, Long mtId) { + public InventoryByMTAndDepository getTodayInventoryByDidAndMt(Long did, Long mtId) { Map map = new HashMap<>(); map.put("depositoryId", did); // 获取所有子类 @@ -834,7 +834,7 @@ public class DepositoryServiceImpl implements DepositoryService { * @return */ @Override - public List getTodayInventoryInfoByDidAndMt(Integer did) { + public List getTodayInventoryInfoByDidAndMt(Long did) { List result = new ArrayList<>(); Map map = new HashMap<>(); map.put("depositoryId", did); @@ -892,7 +892,7 @@ public class DepositoryServiceImpl implements DepositoryService { List list = new ArrayList<>(); // 定义仓库id列表 - List depositoryIdList = new ArrayList<>(); + List depositoryIdList = new ArrayList<>(); // 获取所有仓库 List depositoryAll = depositoryMapper.findDepositoryAll(); Integer totalVal = depositoryAll.size(); @@ -957,7 +957,7 @@ public class DepositoryServiceImpl implements DepositoryService { class Task implements Callable { // 仓库 - List depositoryIdList; + List depositoryIdList; // 部门 String adminorg; // 当前登录用户 @@ -965,7 +965,7 @@ public class DepositoryServiceImpl implements DepositoryService { // 当前选择仓库的类型 String type; - public Task(List depositoryIdList, String type, String adminorg, UserByPort userByPort) { + public Task(List depositoryIdList, String type, String adminorg, UserByPort userByPort) { this.depositoryIdList = depositoryIdList; this.adminorg = adminorg; this.userByPort = userByPort; @@ -979,7 +979,7 @@ public class DepositoryServiceImpl implements DepositoryService { */ List depositories = depositoryMapper.selectDepositoryByIds(depositoryIdList); - List integerList = new ArrayList<>(); + List integerList = new ArrayList<>(); if ("1".equals(type)) { // 如果是因为入库、库存转移而打开的仓库列表 integerList = roleService.findDepositoryIdForUser(userByPort); @@ -1084,9 +1084,9 @@ public class DepositoryServiceImpl implements DepositoryService { */ class TaskForOnlyDepository implements Callable { - List depositoryIdList; + List depositoryIdList; - public TaskForOnlyDepository(List depositoryIdList) { + public TaskForOnlyDepository(List depositoryIdList) { this.depositoryIdList = depositoryIdList; } diff --git a/src/main/java/com/dreamchaser/depository_manage/service/impl/ExcelServiceImpl.java b/src/main/java/com/dreamchaser/depository_manage/service/impl/ExcelServiceImpl.java index 3feeba31..3e554d4d 100644 --- a/src/main/java/com/dreamchaser/depository_manage/service/impl/ExcelServiceImpl.java +++ b/src/main/java/com/dreamchaser/depository_manage/service/impl/ExcelServiceImpl.java @@ -451,7 +451,7 @@ public class ExcelServiceImpl implements ExcelService { * @param pageSize 一张最多打印条数 */ @Override - public List writeExcelForPrint(Integer id, Integer pageSize, UserByPort userToken, String userKey, String token) { + public List writeExcelForPrint(Long id, Integer pageSize, UserByPort userToken, String userKey, String token) { // 生成的表格名称列表 List fileNameList = new ArrayList<>(); @@ -490,7 +490,7 @@ public class ExcelServiceImpl implements ExcelService { // 设置申请人名称 excelInfoByWrite.setApplicantName(applicanter.getName()); // 获取施工单位Id - Integer unitId = record.getConstructionUnitId(); + Long unitId = record.getConstructionUnitId(); if (unitId != null) { ConstructionUnit constructionUnitById = constructionUnitMapper.findConstructionUnitById(unitId); excelInfoByWrite.setConstructionUnitName(constructionUnitById.getName()); @@ -507,7 +507,7 @@ public class ExcelServiceImpl implements ExcelService { if ("".equals(s)) { continue; } - UserByPort checker = PublicConfig.FindUserById(ObjectFormatUtil.toInteger(s), userKey, token); + UserByPort checker = PublicConfig.FindUserById(ObjectFormatUtil.toLong(s), userKey, token); sb.append(checker.getName()); } // 设置审核人名称 @@ -518,7 +518,7 @@ public class ExcelServiceImpl implements ExcelService { // 设置制单人名称 excelInfoByWrite.setProducerName(userToken.getName()); // 定义部门id - Integer adminorgId = record.getAdminorgId(); + Long adminorgId = record.getAdminorgId(); if (adminorgId != null) { Administration company = PublicConfig.getCompany(adminorgId, userKey, token); @@ -560,7 +560,7 @@ public class ExcelServiceImpl implements ExcelService { // 设置物料型号 excelInfoByMinWrite.setMversion(materialById.getVersion()); // 获取出库库位 - Integer placeId = recordMin.getPlaceId(); + Long placeId = recordMin.getPlaceId(); // 定义库位编码 String pcode = ""; if (placeId != null) { @@ -704,7 +704,7 @@ public class ExcelServiceImpl implements ExcelService { if (placeCode == null || placeCode.isEmpty() || "0".equals(placeCode) || "0000".equals(placeCode) || "000000".equals(placeCode)) { // 如果没有输入库位 Map param = new HashMap<>(); // 获取默认库位 - placeById = placeService.findPlaceById(0); + placeById = placeService.findPlaceById(0L); // 修改默认库位库存 placeById.setQuantity(placeById.getQuantity() + (int) (quantity * 100)); placeService.UpdatePlace(placeById); @@ -713,7 +713,7 @@ public class ExcelServiceImpl implements ExcelService { param.put("pid", 0); param.put("quantity", (int) (quantity * 100)); placeService.addMaterialOnPlace(param); - placeAndMaterialByMidAndPid = placeService.findPlaceAndMaterialById(ObjectFormatUtil.toInteger(param.get("id"))); + placeAndMaterialByMidAndPid = placeService.findPlaceAndMaterialById(ObjectFormatUtil.toLong(param.get("id"))); } else { // 如果输入的库位不是默认库位 Map param = new HashMap<>(); @@ -732,7 +732,7 @@ public class ExcelServiceImpl implements ExcelService { param.put("quantity", (int) (quantity * 100)); // 添加对应关系 placeService.addMaterialOnPlace(param); - placeAndMaterialByMidAndPid = placeService.findPlaceAndMaterialById(ObjectFormatUtil.toInteger(param.get("id"))); + placeAndMaterialByMidAndPid = placeService.findPlaceAndMaterialById(ObjectFormatUtil.toLong(param.get("id"))); } if (baseSplitInfoForMid != null) { @@ -743,10 +743,10 @@ public class ExcelServiceImpl implements ExcelService { insertForSplitInfoStringObjectMap.put("mid", material.getId()); insertForSplitInfoStringObjectMap.put("unit", baseSplitInfoForMid.getNewUnit()); SplitInventory splitInventoryByIidAndSid = splitUnitService.findSplitInventoryByIidAndSid(placeAndMaterialByMidAndPid.getId(), baseSplitInfoForMid.getId()); - int splitInfoScaleQuantity = splitUnitService.findSplitInfoScaleQuantity(baseSplitInfoForMid, -1); + int splitInfoScaleQuantity = splitUnitService.findSplitInfoScaleQuantity(baseSplitInfoForMid, -1L); splitUnitService.realInInventoryToDepository(quantity_residue * splitInfoScaleQuantity, splitInventoryByIidAndSid, insertForSplitInfoStringObjectMap, baseSplitInfoForMid, placeAndMaterialByMidAndPid, true); if (insertForSplitInfoStringObjectMap.containsKey("applicationInId")) { - depositoryRecordMapper.deleteApplicationInRecordById(ObjectFormatUtil.toInteger(insertForSplitInfoStringObjectMap.get("applicationInId"))); + depositoryRecordMapper.deleteApplicationInRecordById(ObjectFormatUtil.toLong(insertForSplitInfoStringObjectMap.get("applicationInId"))); } } @@ -973,7 +973,7 @@ public class ExcelServiceImpl implements ExcelService { List errMsg = new ArrayList<>(); // 用于保存当前库位下的存储数量 - Map placeToQuantity = new HashMap<>(); + Map placeToQuantity = new HashMap<>(); // 判断当前库位码是否正确,并存入库位中 for (int i = 0; i < excelInfoByInventories.size(); i++) { // 获取当前库存记录 @@ -1018,7 +1018,7 @@ public class ExcelServiceImpl implements ExcelService { // 如果库位有物料且该库位存放的物料为当前物料 int quantity = (int) (ObjectFormatUtil.toDouble(excelInfoByInventory.getQuantity()) * 100); // 获取当前库位的剩余存储量 - Integer pQuantity = placeToQuantity.get(place.getId()); + Long pQuantity = placeToQuantity.get(place.getId()); if (pQuantity == null) { pQuantity = place.getMax() - place.getQuantity(); } @@ -1042,8 +1042,8 @@ public class ExcelServiceImpl implements ExcelService { excelInfoByInventory.setDepositoryCode("0"); // 设置默认库位 ExcelFileInfoPool.getUserExcelInventoryInfo(userByPort.getNumber()).add(excelInfoByInventory); // 获取当前库位的剩余存储量 - Place place = placeService.findPlaceById(0); - Integer pQuantity = placeToQuantity.get(0); + Place place = placeService.findPlaceById(0L); + Long pQuantity = placeToQuantity.get(0L); // 获取当前库位的剩余存储量 if (pQuantity == null) { pQuantity = place.getMax() - place.getQuantity(); diff --git a/src/main/java/com/dreamchaser/depository_manage/service/impl/GroupServiceImpl.java b/src/main/java/com/dreamchaser/depository_manage/service/impl/GroupServiceImpl.java index 88aeed7a..e79dabf9 100644 --- a/src/main/java/com/dreamchaser/depository_manage/service/impl/GroupServiceImpl.java +++ b/src/main/java/com/dreamchaser/depository_manage/service/impl/GroupServiceImpl.java @@ -77,7 +77,7 @@ public class GroupServiceImpl implements GroupService { * @return */ @Override - public Group findGroupOnlyById(Integer gid) { + public Group findGroupOnlyById(Long gid) { return groupMapper.findGroupOnlyById(gid); } @@ -88,7 +88,7 @@ public class GroupServiceImpl implements GroupService { * @return */ @Override - public String findQrCodeByGid(Integer gid) { + public String findQrCodeByGid(Long gid) { return groupMapper.findQrCodeByGid(gid); } @@ -110,7 +110,7 @@ public class GroupServiceImpl implements GroupService { * @return */ @Override - public GroupInfo findGroupById(Integer id) { + public GroupInfo findGroupById(Long id) { return null; } @@ -175,7 +175,7 @@ public class GroupServiceImpl implements GroupService { Integer quantity = 0; // 用于存储物料名称与物料id - Map materialSimple = new HashMap<>(); + Map materialSimple = new HashMap<>(); for (GroupInfo groupInfo : groupByCondition) { materialSimple.put(groupInfo.getMname(), groupInfo.getMid()); quantity += groupInfo.getQuantity(); @@ -226,10 +226,10 @@ public class GroupServiceImpl implements GroupService { insertForGroup.put("createTime", System.currentTimeMillis()); //获取要使用的gid - Integer gid = null; + Long gid = null; if (map.containsKey("gid")) { // 如果是重新添加对应物料 - gid = ObjectFormatUtil.toInteger(map.get("gid")); + gid = ObjectFormatUtil.toLong(map.get("gid")); } // 获取当前组合数量 Integer groupCount = groupMapper.findAllGroupOnlyCount(new HashMap<>()); @@ -246,7 +246,7 @@ public class GroupServiceImpl implements GroupService { // 插入到数据库 groupMapper.addGroup(insertForGroup); - gid = ObjectFormatUtil.toInteger(insertForGroup.get("id")); + gid = ObjectFormatUtil.toLong(insertForGroup.get("id")); } else { Group groupOnlyById = groupMapper.findGroupOnlyById(gid); groupOnlyById.setGname(map.get("gname").toString()); @@ -355,13 +355,13 @@ public class GroupServiceImpl implements GroupService { */ @Transactional @Override - public Integer delGroupById(Integer id) { + public Integer delGroupById(Long id) { Map param = new HashMap<>(); param.put("gid", id); List groupByCondition = groupMapper.findGroupByCondition(param); - List ids = new ArrayList<>(); + List ids = new ArrayList<>(); for (GroupInfo groupInfo : groupByCondition) { ids.add(groupInfo.getId()); } @@ -378,7 +378,7 @@ public class GroupServiceImpl implements GroupService { * @return */ @Override - public Integer delGroupByIds(List ids) { + public Integer delGroupByIds(List ids) { return null; } @@ -391,7 +391,7 @@ public class GroupServiceImpl implements GroupService { @Override public Integer updateMaterialForGroup(Map map) { // 获取当前要修改的组合明细id - Integer id = ObjectFormatUtil.toInteger(map.get("id")); + Long id = ObjectFormatUtil.toLong(map.get("id")); // 获取当前要修改的物料明细数量 Integer quantity = ObjectFormatUtil.toInteger(map.get("quantity")); String unit = (String) map.get("unit"); @@ -416,7 +416,7 @@ public class GroupServiceImpl implements GroupService { * @return 组合明细 */ @Override - public GroupInfo findGroupInfoByMidAndGid(Integer mid, Integer gid) { + public GroupInfo findGroupInfoByMidAndGid(Long mid, Long gid) { Map map = new HashMap<>(); map.put("mid", mid); map.put("gid", gid); @@ -434,7 +434,7 @@ public class GroupServiceImpl implements GroupService { * @return */ @Override - public Integer delMaterialForGroupById(Integer id) { + public Integer delMaterialForGroupById(Long id) { return groupMapper.delMaterialForGroupById(id); } @@ -445,7 +445,7 @@ public class GroupServiceImpl implements GroupService { * @return */ @Override - public Integer delMaterialForGroupByIds(List ids) { + public Integer delMaterialForGroupByIds(List ids) { return groupMapper.delMaterialForGroupByIds(ids); } @@ -458,7 +458,7 @@ public class GroupServiceImpl implements GroupService { @Override public Integer updateGroupState(Map map) { // 获取待修改组合id - Integer id = ObjectFormatUtil.toInteger(map.get("id")); + Long id = ObjectFormatUtil.toLong(map.get("id")); // 根据主键获取对应组合 Group group = groupMapper.findGroupOnlyById(id); Integer state = 2; @@ -530,7 +530,7 @@ public class GroupServiceImpl implements GroupService { // 定义组合id列表 - List groupIdList = new ArrayList<>(); + List groupIdList = new ArrayList<>(); for (int i = 0; i < allGroupOnly.size(); i++) { @@ -597,7 +597,7 @@ public class GroupServiceImpl implements GroupService { // 获取当前要出库的组合数量 Integer quantityForGroup = ObjectFormatUtil.toInteger(map.get("quantity")); // 获取要出库的组合 - Integer gid = ObjectFormatUtil.toInteger(map.get("gid")); + Long gid = ObjectFormatUtil.toLong(map.get("gid")); // 获取要出库组合的具体信息 List groupInfoByGid = groupMapper.findGroupInfoByGid(gid); @@ -609,7 +609,7 @@ public class GroupServiceImpl implements GroupService { // 用于统计出库物料金额总数 double priceForTotal = 0; - List depositoryIdList = new ArrayList<>(); + List depositoryIdList = new ArrayList<>(); // 获取当前部门所拥有的仓库 List depositoryByAdminorg = depositoryMapper.findDepositoryByAdminorg(userToken.getMaindeparment().toString()); @@ -637,12 +637,12 @@ public class GroupServiceImpl implements GroupService { } else { paramForOut.put("flagForOpenDepository", 2); paramForOut.put("depositoryId", depositoryIdForSelect); - if (depositoryIdList.contains(ObjectFormatUtil.toInteger(depositoryIdForSelect))) { + if (depositoryIdList.contains(ObjectFormatUtil.toLong(depositoryIdForSelect))) { paramForOut.put("flagForOpenDepository", 1); flagForSelectDepository = true; }else{ depositoryIdList = new ArrayList<>(); - depositoryIdList.add(ObjectFormatUtil.toInteger(depositoryIdForSelect)); + depositoryIdList.add(ObjectFormatUtil.toLong(depositoryIdForSelect)); } @@ -650,7 +650,7 @@ public class GroupServiceImpl implements GroupService { // 循环遍历当前部门所拥有的仓库 - for (Integer depositoryId : + for (Long depositoryId : depositoryIdList) { // 用于获取当前物料库存信息 Map paramForMidAndDid = new HashMap<>(); @@ -683,7 +683,7 @@ public class GroupServiceImpl implements GroupService { // 获取拆单记录 SplitInfo splitInfo = splitUnitMapper.findSplitInfoByMidAndUnit(paramForSplitInfo); /// 获取当前拆单与基础单位之间的进制 - int scale = splitUnitService.findSplitInfoScaleQuantity(splitInfo, -1); + int scale = splitUnitService.findSplitInfoScaleQuantity(splitInfo, -1L); if (inventory.size() > 0) { quantityForTotal += quantityForGroup * groupInfo.getQuantity(); priceForTotal += inventory.get(0).getPrice() * 100 / scale * quantityForGroup; @@ -731,7 +731,7 @@ public class GroupServiceImpl implements GroupService { // 获取当前要出库的组合数量 quantityForGroup = ObjectFormatUtil.toInteger(map.get("quantity" + temp)); // 获取要出库的组合 - gid = ObjectFormatUtil.toInteger(map.get("gid" + temp)); + gid = ObjectFormatUtil.toLong(map.get("gid" + temp)); // 获取当前要出库组合的具体信息 groupInfoByGid = groupMapper.findGroupInfoByGid(gid); for (GroupInfo groupInfo : groupInfoByGid) { @@ -784,11 +784,11 @@ public class GroupServiceImpl implements GroupService { // 定义列表用于储存入库单id - List recordIds = new ArrayList<>(); + List recordIds = new ArrayList<>(); // 定义列表用于存储入库仓库id List mtIdList = new ArrayList<>(); // 定义列表用于存储展示的入库单id - List showRecordIds = new ArrayList<>(); + List showRecordIds = new ArrayList<>(); // 循环参数列表 for (String temp : params) { @@ -823,14 +823,14 @@ public class GroupServiceImpl implements GroupService { // 开启一个线程用于发送审批 SendQyWxMessageThreadPool.execute(() -> { - Map> mtIdToRecordId = new HashMap<>(); + Map> mtIdToRecordId = new HashMap<>(); for (int i = 0; i < recordIds.size(); i++) { - Integer recordId = recordIds.get(i); + Long recordId = recordIds.get(i); if (recordId != null) { // 如果当前id不是空 获取对应的入库仓库id Long mtId = mtIdList.get(i); // 将对应仓库与订单id添加映射关系 - List integers = mtIdToRecordId.get(mtId); + List integers = mtIdToRecordId.get(mtId); if (integers != null) { // 如果有对应关系 integers.add(recordId); @@ -848,7 +848,7 @@ public class GroupServiceImpl implements GroupService { // 获取当前仓库 Long next = iterator.next(); // 获取入库到当前仓库的订单id - List integerList = mtIdToRecordId.get(next); + List integerList = mtIdToRecordId.get(next); // 获取当前类型的管理员 @@ -902,14 +902,14 @@ public class GroupServiceImpl implements GroupService { Integer result = 0; // 定义列表用于储存入库单id - List recordIds = new ArrayList<>(); + List recordIds = new ArrayList<>(); // 定义列表用于存储入库仓库id List mtIdLIst = new ArrayList<>(); // 定义列表用于存储展示的入库单id - List showRecordIds = new ArrayList<>(); + List showRecordIds = new ArrayList<>(); // 获取入库的仓库 - Integer depositoryId = ObjectFormatUtil.toInteger(map.get("depositoryId")); + Long depositoryId = ObjectFormatUtil.toLong(map.get("depositoryId")); // 定义参数用与入库 @@ -921,13 +921,13 @@ public class GroupServiceImpl implements GroupService { Double quantityForGroup = ObjectFormatUtil.toDouble(map.get("quantity")); // 获取要出库的组合 - Integer gid = ObjectFormatUtil.toInteger(map.get("gid")); + Long gid = ObjectFormatUtil.toLong(map.get("gid")); // 获取要出库组合的具体信息 List groupInfoByGid = groupMapper.findGroupInfoByGid(gid); // 获取入库的库位 - Integer placeId = ObjectFormatUtil.toInteger(map.get("placeId")); + Long placeId = ObjectFormatUtil.toLong(map.get("placeId")); insertForApplicationInRecord.put("depositoryId", depositoryId); @@ -969,10 +969,10 @@ public class GroupServiceImpl implements GroupService { result += depositoryRecordService.applicationInPlace(insertForApplicationInRecord, flagForApproval); if (!flagForApproval) { // 当不需要审批时删除冗余订单 - depositoryRecordMapper.deleteApplicationInRecordById(ObjectFormatUtil.toInteger(insertForApplicationInRecord.get("applicationInId"))); + depositoryRecordMapper.deleteApplicationInRecordById(ObjectFormatUtil.toLong(insertForApplicationInRecord.get("applicationInId"))); } else { // 如果需要将其添加到列表中待后续使用 - recordIds.add(ObjectFormatUtil.toInteger(insertForApplicationInRecord.get("applicationInId"))); + recordIds.add(ObjectFormatUtil.toLong(insertForApplicationInRecord.get("applicationInId"))); mtIdLIst.add(material.getMaterialTypeId()); insertForApplicationInRecord.remove("applicationInId"); } @@ -984,10 +984,10 @@ public class GroupServiceImpl implements GroupService { result += splitUnitService.addSplitInventory(insertForApplicationInRecord); if (!flagForApproval) { // 当不需要审批时删除冗余订单 - depositoryRecordMapper.deleteApplicationInRecordById(ObjectFormatUtil.toInteger(insertForApplicationInRecord.get("applicationInId"))); + depositoryRecordMapper.deleteApplicationInRecordById(ObjectFormatUtil.toLong(insertForApplicationInRecord.get("applicationInId"))); } else { // 如果需要将其添加到列表中待后续使用 - recordIds.add(ObjectFormatUtil.toInteger(insertForApplicationInRecord.get("applicationInId"))); + recordIds.add(ObjectFormatUtil.toLong(insertForApplicationInRecord.get("applicationInId"))); mtIdLIst.add(material.getMaterialTypeId()); insertForApplicationInRecord.remove("applicationInId"); } @@ -1014,7 +1014,7 @@ public class GroupServiceImpl implements GroupService { paramForUpdateInRecordToGroupId.put("list", recordIds); depositoryRecordMapper.updateApplicationInRecordForToGroupId(paramForUpdateInRecordToGroupId); } - showRecordIds.add(ObjectFormatUtil.toInteger(parentId)); + showRecordIds.add(ObjectFormatUtil.toLong(parentId)); insertForApplicationInRecord.remove("id"); ResultForGroupReturn resultForGroupReturn = new ResultForGroupReturn(); @@ -1036,7 +1036,7 @@ public class GroupServiceImpl implements GroupService { * @return */ @Transactional(rollbackFor = Exception.class) - public Integer insertApplicationOutMinRecord(Map map, String code, Object parentId, Integer gid, Integer quantityForGroup, List depositoryIdList) { + public Integer insertApplicationOutMinRecord(Map map, String code, Object parentId, Long gid, Integer quantityForGroup, List depositoryIdList) { // 用于存储申请数 Integer result = 0; @@ -1054,9 +1054,9 @@ public class GroupServiceImpl implements GroupService { // 定义出库时的单位 String unit = groupInfo.getUnit(); // 实际出库的仓库编号 - int did = -1; + Long did = -1L; // 实际出库的库存编号 - int mid = -1; + Long mid = -1L; if ("-1".equals(unit)) { // 如果是基础单位 @@ -1065,7 +1065,7 @@ public class GroupServiceImpl implements GroupService { Map paramForInventory = new HashMap<>(); paramForInventory.put("mid", groupInfo.getMid()); // 查询各仓库中是否有符合对应数量的库存 - for (Integer depositoryId : depositoryIdList) { + for (Long depositoryId : depositoryIdList) { paramForInventory.put("did", depositoryId); // 获取对应库存 Inventory inventoryByMidAndDid = materialMapper.findInventoryByMidAndDid(paramForInventory); @@ -1092,7 +1092,7 @@ public class GroupServiceImpl implements GroupService { Map paramForPlace = new HashMap<>(); // 待查询物料 paramForPlace.put("mid", groupInfo.getMid()); - for (Integer depositoryId : depositoryIdList) { + for (Long depositoryId : depositoryIdList) { paramForPlace.put("depositoryId", depositoryId); // 获取当前仓库中该物料与库位的对应关系 List materialAndPlaceForViews = placeMapper.findPlaceAndMaterialByDidAndMid(paramForPlace); @@ -1106,9 +1106,9 @@ public class GroupServiceImpl implements GroupService { // 设置id mp.setId(materialAndPlaceForView.getId()); // 设置数量 - mp.setQuantity(materialAndPlaceForView.getInventory().intValue()); + mp.setQuantity(materialAndPlaceForView.getInventory().longValue()); // 获取当前库位下该拆单单位库存数 - double allInventoryForSplitInfo = splitUnitService.findAllInventoryForSplitInfo(-1, mp, splitInfo.getId(), 0, true); + double allInventoryForSplitInfo = splitUnitService.findAllInventoryForSplitInfo(-1L, mp, splitInfo.getId(), 0, true); if (allInventoryForSplitInfo >= quantity) { // 如果当前库存充足 did = materialAndPlaceForView.getDepository_id(); @@ -1156,7 +1156,7 @@ public class GroupServiceImpl implements GroupService { * @return */ @Override - public List findGroupInfoByGid(Integer gid) { + public List findGroupInfoByGid(Long gid) { List groupInfoByGid = groupMapper.findGroupInfoByGid(gid); for (GroupInfo groupInfo : groupInfoByGid) { @@ -1177,11 +1177,11 @@ public class GroupServiceImpl implements GroupService { * @return 受影响的行数 */ @Override - public Integer reviewIn(Map map, Integer userId, UserByPort userToken, String userAgent) { + public Integer reviewIn(Map map, Long userId, UserByPort userToken, String userAgent) { Object id = map.get("id"); // 主订单编号 // 获取当前主订单 - ApplicationInRecord mainRecordP = depositoryRecordMapper.findApplicationInRecordPById(ObjectFormatUtil.toInteger(id)); + ApplicationInRecord mainRecordP = depositoryRecordMapper.findApplicationInRecordPById(ObjectFormatUtil.toLong(id)); // 获取当前审批结果 Integer approverPass = ObjectFormatUtil.toInteger(map.get("approverPass")); @@ -1191,7 +1191,7 @@ public class GroupServiceImpl implements GroupService { List minInRecordList = depositoryRecordMapper.findApplicationInRecordPByToGroupId(mainRecordP.getId()); // 用于存储最终要删除的id列表 - List deleteIds = new ArrayList<>(); + List deleteIds = new ArrayList<>(); if (Integer.compare(approverPass, 1) == 0) { for (ApplicationInRecord minRecordP : minInRecordList) { @@ -1291,10 +1291,10 @@ public class GroupServiceImpl implements GroupService { class Task implements Callable { // 组合id列表 - List groupIdList; + List groupIdList; - public Task(List groupIdList) { + public Task(List groupIdList) { this.groupIdList = groupIdList; } 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 ed1bde49..7576fdcd 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 @@ -189,7 +189,7 @@ public class MaterialServiceImpl implements MaterialService { // 如果存在计量单位字段 String unit = (String) map.get("unit"); if (!"".equals(unit)) { - Integer id = ObjectFormatUtil.toInteger(map.get("id")); + Long id = ObjectFormatUtil.toLong(map.get("id")); Material materialById = materialMapper.findMaterialById(id); if (!unit.equals(materialById.getUnit())) { // 如果更改了计量单位 @@ -215,7 +215,7 @@ public class MaterialServiceImpl implements MaterialService { * @return 受影响的行数 */ @Override - public Integer deleteMaterialById(int id) { + public Integer deleteMaterialById(Long id) { return materialMapper.deleteMaterialById(id); } @@ -378,9 +378,9 @@ public class MaterialServiceImpl implements MaterialService { material.setPrice(material.getPrice() / 100); material.setAmounts(material.getPrice() * material.getQuantity()); // 获取当前物料所处仓库 - Integer depositoryId = material.getDepositoryId(); + Long depositoryId = material.getDepositoryId(); // 获取当前物料所处库位 - Integer mid = material.getId(); + Long mid = material.getId(); List placeByMidAndDid = placeService.findPlaceByMidAndDid(mid, depositoryId); StringBuilder placeCode = new StringBuilder(); for (int j = 0; j < placeByMidAndDid.size(); j++) { @@ -460,7 +460,7 @@ public class MaterialServiceImpl implements MaterialService { * @return 库存信息 */ @Override - public Material findMaterialById(int id) { + public Material findMaterialById(Long id) { Material material = materialMapper.findMaterialById(id); if (material != null) { if (material.getMaterialTypeId() != null) { @@ -485,7 +485,7 @@ public class MaterialServiceImpl implements MaterialService { * @return 库存信息 */ @Override - public Inventory findInventoryById(int id) { + public Inventory findInventoryById(Long id) { Inventory inventoryById = materialMapper.findInventoryById(id); if (inventoryById.getPrice() != null) { inventoryById.setPrice(inventoryById.getPrice() / 100); @@ -546,10 +546,10 @@ public class MaterialServiceImpl implements MaterialService { * @return */ @Override - public Map findInventoryByGroupInfoAndDepository(GroupInfo groupInfo, List depositoryList) { + public Map findInventoryByGroupInfoAndDepository(GroupInfo groupInfo, List depositoryList) { // 用于存储各仓库的库存 - Map resultMap = new HashMap<>(); + Map resultMap = new HashMap<>(); // 获取当前物料在组合中的单位 String unit = groupInfo.getUnit(); @@ -559,7 +559,7 @@ public class MaterialServiceImpl implements MaterialService { map.put("mid", groupInfo.getMid()); if ("-1".equals(unit)) { // 如果是基础单位 - for (Integer depositoryId : depositoryList) { + for (Long depositoryId : depositoryList) { map.put("did", depositoryId); Inventory inventory = materialMapper.findInventoryByMidAndDid(map); @@ -578,7 +578,7 @@ public class MaterialServiceImpl implements MaterialService { // 用户获取对应拆单库存记录 Map paramForSplitInventory = new HashMap<>(); paramForSplitInventory.put("sid", splitInfo.getId()); - for (Integer depositoryId : depositoryList) { + for (Long depositoryId : depositoryList) { double quantity = 0; // 获取该物料在该仓库下的映射关系 @@ -586,9 +586,9 @@ public class MaterialServiceImpl implements MaterialService { for (MaterialAndPlaceForViewP materialAndPlaceForView : placeAndMaterialByDidAndMid) { paramForSplitInventory.put("iid", materialAndPlaceForView.getId()); MaterialAndPlace materialAndPlace = new MaterialAndPlace(); - materialAndPlace.setQuantity((int) (materialAndPlaceForView.getInventory() / 100)); + materialAndPlace.setQuantity((long) (materialAndPlaceForView.getInventory() / 100)); materialAndPlace.setId(materialAndPlaceForView.getId()); - quantity += splitUnitService.findAllInventoryForSplitInfo(-1, materialAndPlace, splitInfo.getId(), 0, true); + quantity += splitUnitService.findAllInventoryForSplitInfo(-1L, materialAndPlace, splitInfo.getId(), 0, true); } resultMap.put(depositoryId, quantity); } @@ -606,7 +606,7 @@ public class MaterialServiceImpl implements MaterialService { * @return */ @Override - public List findInventoryByMidAndDepository(Map map, List depositoryList) { + public List findInventoryByMidAndDepository(Map map, List depositoryList) { Integer mid = ObjectFormatUtil.toInteger(map.get("mid")); // 定义参数用于获取当前物料在仓库下的各库位记录 List placeAndMaterialByDidsAndMid = placeService.findPlaceAndMaterialByDidsAndMid(depositoryList, map); @@ -632,7 +632,7 @@ public class MaterialServiceImpl implements MaterialService { * @return 库存信息 */ @Override - public Material findMaterialAndTypeById(int id) { + public Material findMaterialAndTypeById(Long id) { Material material = materialMapper.findMaterialAndTypeById(id); if (material.getPrice() != null) { @@ -670,7 +670,7 @@ public class MaterialServiceImpl implements MaterialService { * @return 库存信息 */ @Override - public List findMaterialByIds(List ids) { + public List findMaterialByIds(List ids) { List materialList = materialMapper.findInventoryByIds(ids); for (Inventory material : materialList) { if (material.getPrice() != null) { @@ -718,7 +718,7 @@ public class MaterialServiceImpl implements MaterialService { * @return 受影响条数 */ @Override - public Integer changeStateToDeletedById(Integer id) { + public Integer changeStateToDeletedById(Long id) { Map map = new HashMap<>(); map.put("id", id); map.put("updateTime", System.currentTimeMillis()); @@ -732,7 +732,7 @@ public class MaterialServiceImpl implements MaterialService { * @return 受影响条数 */ @Override - public Integer changeStateToDeletedByIds(List ids) { + public Integer changeStateToDeletedByIds(List ids) { Map map = new HashMap<>(); map.put("list", ids); map.put("updateTime", System.currentTimeMillis()); @@ -792,7 +792,7 @@ public class MaterialServiceImpl implements MaterialService { private List pack(List list, Object pid) { List result = new ArrayList<>(list.size()); boolean flagForByPlace = false; - int placeId = -1; + long placeId = -1L; if (pid != null) { try { placeId = ObjectFormatUtil.toInteger(pid); @@ -811,7 +811,7 @@ public class MaterialServiceImpl implements MaterialService { } inventory.setAmounts(inventory.getPrice() * inventory.getQuantity()); // 获取当前物料所处仓库 - Integer depositoryId = inventory.getDepositoryId(); + Long depositoryId = inventory.getDepositoryId(); List placePList = new ArrayList<>(); if (flagForByPlace) { @@ -822,7 +822,7 @@ public class MaterialServiceImpl implements MaterialService { // 如果不是 // 获取当前物料所处库位 - Integer mid = inventory.getId(); + Long mid = inventory.getId(); placePList = placeService.findPlaceByMidAndDid(mid, depositoryId); } @@ -856,7 +856,7 @@ public class MaterialServiceImpl implements MaterialService { for (SplitInfo splitInfo : splitInfoByMid ) { // 获取当前拆单单位的总数 - double saveQuantity = splitUnitService.findAllInventoryForSplitInfo(-1, placeAndMaterialByMidAndPid, splitInfo.getId(), 0, true); + double saveQuantity = splitUnitService.findAllInventoryForSplitInfo(-1L, placeAndMaterialByMidAndPid, splitInfo.getId(), 0, true); if (splitInventoryForUnit.containsKey(splitInfo.getNewUnit())) { // 如果当前存在该拆单类型的记录 @@ -871,7 +871,7 @@ public class MaterialServiceImpl implements MaterialService { if (inventory.getPrice() == null) { inventory.setPrice(0.0); } - int scale = splitUnitService.findSplitInfoScaleQuantity(splitInfo, -1); + int scale = splitUnitService.findSplitInfoScaleQuantity(splitInfo, -1L); BigDecimal bigDecimal = BigDecimal.valueOf(inventory.getPrice() / scale); double split_price = bigDecimal.setScale(2, BigDecimal.ROUND_HALF_UP).doubleValue(); amounts = ObjectFormatUtil.sum(amounts, split_price * saveQuantity); @@ -897,7 +897,7 @@ public class MaterialServiceImpl implements MaterialService { m.setPlaceCode(placeCode.toString()); m.setPlaceKingdeeCode(placeKingdeeCode.toString()); - Integer warningCount = 0; + Long warningCount = 0L; if (depositoryId != null) { m.setDepositoryName(depositoryMapper.findDepositoryNameById(depositoryId)); m.setWarehouseManager(depositoryMapper.findUserNameByDepositoryId(depositoryId)); @@ -996,7 +996,7 @@ public class MaterialServiceImpl implements MaterialService { MaterialType materialTypeByOldId = materialTypeMapper.findMaterialTypeByOldId(material.getMaterialTypeId()); m.setTypeName(materialTypeByOldId.getTname()); m.setTypeId(materialTypeByOldId.getOldId()); - m.setQuantity(1); + m.setQuantity(1L); result.add(m); } return result; @@ -1009,7 +1009,7 @@ public class MaterialServiceImpl implements MaterialService { * @return */ @Override - public List findMaterialByDepositorys(List dids) { + public List findMaterialByDepositorys(List dids) { return materialMapper.findMaterialByDepositorys(dids); } @@ -1026,13 +1026,13 @@ public class MaterialServiceImpl implements MaterialService { size = ObjectFormatUtil.toInteger(map.get("size")); map.put("size", size); } - Integer depositoryId = ObjectFormatUtil.toInteger(map.get("depositoryId")); + Long depositoryId = ObjectFormatUtil.toLong(map.get("depositoryId")); Depository depositoryRecordById = depositoryMapper.findDepositoryById(depositoryId); List materialByDepository = materialMapper.findInventoryByDepository(map); for (Inventory inventory : materialByDepository) { inventory.setDepositoryCode(depositoryRecordById.getCode()); // 获取当前物料所处库位 - Integer mid = inventory.getId(); + Long mid = inventory.getId(); List placeByMidAndDid = placeService.findPlaceByMidAndDid(mid, depositoryId); StringBuilder placeCode = new StringBuilder(); StringBuilder placeKingdeeCode = new StringBuilder(); @@ -1098,7 +1098,7 @@ public class MaterialServiceImpl implements MaterialService { baseSplitInfoForMid = splitUnitService.findBaseSplitInfoForMid(material.getMid()); if (baseSplitInfoForMid != null) { // 获取当前拆单单位与基础单位的进制 - splitInfoScaleQuantity = splitUnitService.findSplitInfoScaleQuantity(baseSplitInfoForMid, -1); + splitInfoScaleQuantity = splitUnitService.findSplitInfoScaleQuantity(baseSplitInfoForMid, -1L); quantity_residue = quantity - Math.floor(quantity); quantity = quantity - quantity_residue; } @@ -1110,7 +1110,7 @@ public class MaterialServiceImpl implements MaterialService { String tempPlaceCode = (String) map.get("tempPlaceCode"); if ("0".equals(tempPlaceCode) || "0000".equals(tempPlaceCode) || "000000".equals(tempPlaceCode)) { // 如果当前导入库位是默认库位 - MaterialAndPlace placeAndMaterialByMidAndPid = placeService.findPlaceAndMaterialByMidAndPid(0, material.getId()); + MaterialAndPlace placeAndMaterialByMidAndPid = placeService.findPlaceAndMaterialByMidAndPid(0L, material.getId()); if (placeAndMaterialByMidAndPid != null) { // 修改当前库位数目 @@ -1124,11 +1124,11 @@ public class MaterialServiceImpl implements MaterialService { param.put("quantity", (int) (quantity * 100)); // 添加对应关系 placeService.addMaterialOnPlace(param); - placeAndMaterialByMidAndPid = placeService.findPlaceAndMaterialById(ObjectFormatUtil.toInteger(param.get("id"))); + placeAndMaterialByMidAndPid = placeService.findPlaceAndMaterialById(ObjectFormatUtil.toLong(param.get("id"))); } // 修改库位存放数量 - Place placeById = placeService.findPlaceById(0); + Place placeById = placeService.findPlaceById(0L); placeById.setQuantity(placeById.getQuantity() + (int) (quantity * 100)); placeService.UpdatePlace(placeById); @@ -1143,7 +1143,7 @@ public class MaterialServiceImpl implements MaterialService { SplitInventory splitInventoryByIidAndSid = splitUnitService.findSplitInventoryByIidAndSid(placeAndMaterialByMidAndPid.getId(), baseSplitInfoForMid.getId()); splitUnitService.realInInventoryToDepository(quantity_residue * splitInfoScaleQuantity, splitInventoryByIidAndSid, insertForSplitInfoStringObjectMap, baseSplitInfoForMid, placeAndMaterialByMidAndPid, true); if (insertForSplitInfoStringObjectMap.containsKey("applicationInId")) { - depositoryRecordMapper.deleteApplicationInRecordById(ObjectFormatUtil.toInteger(insertForSplitInfoStringObjectMap.get("applicationInId"))); + depositoryRecordMapper.deleteApplicationInRecordById(ObjectFormatUtil.toLong(insertForSplitInfoStringObjectMap.get("applicationInId"))); } } @@ -1168,7 +1168,7 @@ public class MaterialServiceImpl implements MaterialService { param.put("quantity", (int) (quantity * 100)); // 添加对应关系 placeService.addMaterialOnPlace(param); - placeAndMaterialByMidAndPid = placeService.findPlaceAndMaterialById(ObjectFormatUtil.toInteger(param.get("id"))); + placeAndMaterialByMidAndPid = placeService.findPlaceAndMaterialById(ObjectFormatUtil.toLong(param.get("id"))); } else { // 如果有对应关系 placeAndMaterialByMidAndPid.setQuantity(placeAndMaterialByMidAndPid.getQuantity() + (int) (quantity * 100)); @@ -1187,7 +1187,7 @@ public class MaterialServiceImpl implements MaterialService { SplitInventory splitInventoryByIidAndSid = splitUnitService.findSplitInventoryByIidAndSid(placeAndMaterialByMidAndPid.getId(), baseSplitInfoForMid.getId()); splitUnitService.realInInventoryToDepository(quantity_residue * splitInfoScaleQuantity, splitInventoryByIidAndSid, insertForSplitInfoStringObjectMap, baseSplitInfoForMid, placeAndMaterialByMidAndPid, true); if (insertForSplitInfoStringObjectMap.containsKey("applicationInId")) { - depositoryRecordMapper.deleteApplicationInRecordById(ObjectFormatUtil.toInteger(insertForSplitInfoStringObjectMap.get("applicationInId"))); + depositoryRecordMapper.deleteApplicationInRecordById(ObjectFormatUtil.toLong(insertForSplitInfoStringObjectMap.get("applicationInId"))); } } } @@ -1198,7 +1198,7 @@ public class MaterialServiceImpl implements MaterialService { Double quantity = ObjectFormatUtil.toDouble(map.get("quantity")); map.put("quantity", (int) (quantity * 100)); - SplitInfo baseSplitInfoForMid = splitUnitService.findBaseSplitInfoForMid(ObjectFormatUtil.toInteger(map.get("id"))); + SplitInfo baseSplitInfoForMid = splitUnitService.findBaseSplitInfoForMid(ObjectFormatUtil.toLong(map.get("id"))); if (baseSplitInfoForMid != null) { map.put("quantity", (int) ((quantity - Math.floor(quantity)) * 100)); } @@ -1299,9 +1299,9 @@ public class MaterialServiceImpl implements MaterialService { */ @Override public Integer addBarCodeByMaterial(Map map) { - Integer mid = ObjectFormatUtil.toInteger(map.get("mid")); + Long mid = ObjectFormatUtil.toLong(map.get("mid")); Material materialById = materialMapper.findMaterialById(mid); - List barCodeList = (ArrayList) map.get("barCodeList"); + List barCodeList = ObjectFormatUtil.objToList(map.get("barCodeList"),String.class); Map param = new HashMap<>(); param.put("list", barCodeList); param.put("code", materialById.getCode()); @@ -1538,7 +1538,7 @@ public class MaterialServiceImpl implements MaterialService { } @Override - public List findMaterialAndProducedDateByMid(Integer mid) { + public List findMaterialAndProducedDateByMid(Long mid) { return materialMapper.findMaterialAndProducedDateByMid(mid); } @@ -1600,17 +1600,17 @@ public class MaterialServiceImpl implements MaterialService { @Override public Integer editPlaceMaterial(Map map) { // 获取要转移的库存信息 - Integer id = ObjectFormatUtil.toInteger(map.get("mid")); + Long id = ObjectFormatUtil.toLong(map.get("mid")); Inventory inventoryByMid = materialMapper.findInventoryById(id); // 获取当前转移之前的库位 - Integer fromPlaceId = ObjectFormatUtil.toInteger(map.get("fromPlaceId")); + Long fromPlaceId = ObjectFormatUtil.toLong(map.get("fromPlaceId")); Place fromPlace = placeService.findPlaceById(fromPlaceId); // 获取当前转移之前的库位与库存的对应关系 MaterialAndPlace pidAndMidForBefore = placeService.findPlaceAndMaterialByMidAndPid(fromPlaceId, id); // 获取要转移的数量 Double quantity = ObjectFormatUtil.toDouble(map.get("quantity")); // 获取转移到的库位 - Integer toPlaceId = ObjectFormatUtil.toInteger(map.get("toPlaceId")); + Long toPlaceId = ObjectFormatUtil.toLong(map.get("toPlaceId")); Place toPlace = placeService.findPlaceById(toPlaceId); // 获取当前转移后的库位与库存的对应关系 MaterialAndPlace pidAndMidForAfter = placeService.findPlaceAndMaterialByMidAndPid(toPlaceId, id); @@ -1618,7 +1618,7 @@ public class MaterialServiceImpl implements MaterialService { // 获取当前转移的计量单位 String unit = (String) map.get("unit"); // 获取转移之前的库存转移的数量 - int beforeQuantity = pidAndMidForBefore.getQuantity() - (int) (quantity * 100); + long beforeQuantity = pidAndMidForBefore.getQuantity() - (long) (quantity * 100); if (inventoryByMid.getUnit().equals(unit)) { // 如果是基础单位 @@ -1701,7 +1701,7 @@ public class MaterialServiceImpl implements MaterialService { // 如果不存在 // 获取当前单位对应的进制 - int scale = splitUnitService.findSplitInfoScaleQuantity(splitInfo, -1); + int scale = splitUnitService.findSplitInfoScaleQuantity(splitInfo, -1L); // 计算当前转移数目对应需要减少的数目 int num = (int) (Math.ceil(quantity / (double) scale)); @@ -1727,7 +1727,7 @@ public class MaterialServiceImpl implements MaterialService { insertForSplitInventory.put("type", "in"); insertForSplitInventory.put("flagForApproval", false); splitUnitService.addSplitInventory(insertForSplitInventory); - Integer new_id = ObjectFormatUtil.toInteger(insertForSplitInventory.get("applicationInIdForOut")); + Long new_id = ObjectFormatUtil.toLong(insertForSplitInventory.get("applicationInIdForOut")); depositoryRecordMapper.deleteApplicationInRecordById(new_id); } @@ -1763,7 +1763,7 @@ public class MaterialServiceImpl implements MaterialService { // 获取进位后当前入库的数量 realQuantity = realQuantity - dispose * splitInfo.getQuantity(); // 设置当前库存数量 - splitInventoryForAfter.setSaveQuantity((int) (realQuantity * 100)); + splitInventoryForAfter.setSaveQuantity((long) (realQuantity * 100)); // 设置当前入库数量 splitInventoryForAfter.setInQuantity(splitInventoryForAfter.getInQuantity() + (int) (quantity * 100)); // 修改库存记录 @@ -1781,7 +1781,7 @@ public class MaterialServiceImpl implements MaterialService { paramForNewMap.put("realQuantity", String.valueOf(dispose)); paramForNewMap.put("quantity", String.valueOf(dispose)); depositoryRecordService.applicationInPlace(paramForNewMap, false); - depositoryRecordMapper.deleteApplicationInRecordById(ObjectFormatUtil.toInteger(paramForNewMap.get("id"))); + depositoryRecordMapper.deleteApplicationInRecordById(ObjectFormatUtil.toLong(paramForNewMap.get("id"))); } // 调用新算法 @@ -1790,7 +1790,7 @@ public class MaterialServiceImpl implements MaterialService { // 如果不大于进制数 // 设置转移后的库存数量 - splitInventoryForAfter.setSaveQuantity((int) (realQuantity * 100)); + splitInventoryForAfter.setSaveQuantity((long) (realQuantity * 100)); // 设置转移后的入库数量 splitInventoryForAfter.setInQuantity(splitInventoryForAfter.getSaveQuantity() + (int) (quantity * 100)); // 修改库存数量 @@ -1828,7 +1828,7 @@ public class MaterialServiceImpl implements MaterialService { paramForNewMap.put("realQuantity", String.valueOf(dispose)); paramForNewMap.put("quantity", String.valueOf(dispose)); depositoryRecordService.applicationInPlace(paramForNewMap, false); - depositoryRecordMapper.deleteApplicationInRecordById(ObjectFormatUtil.toInteger(paramForNewMap.get("id"))); + depositoryRecordMapper.deleteApplicationInRecordById(ObjectFormatUtil.toLong(paramForNewMap.get("id"))); } } else { // 如果不大于 @@ -1877,7 +1877,7 @@ public class MaterialServiceImpl implements MaterialService { paramForNewMap.put("realQuantity", String.valueOf(dispose)); paramForNewMap.put("quantity", String.valueOf(dispose)); depositoryRecordService.applicationInPlace(paramForNewMap, false); - depositoryRecordMapper.deleteApplicationInRecordById(ObjectFormatUtil.toInteger(paramForNewMap.get("applicationInIdForOut"))); + depositoryRecordMapper.deleteApplicationInRecordById(ObjectFormatUtil.toLong(paramForNewMap.get("applicationInIdForOut"))); } } else { @@ -2076,7 +2076,7 @@ public class MaterialServiceImpl implements MaterialService { // 获取当前部门管理的仓库 List depositoryByAdminorg = depositoryMapper.findDepositoryByAdminorg(adminorg); // 获取当前仓库下的所有物料库存 - List dids = new ArrayList<>(); + List dids = new ArrayList<>(); for (Depository depository : depositoryByAdminorg) { // 将仓库编号存储到列表中 dids.add(depository.getId()); @@ -2203,17 +2203,17 @@ public class MaterialServiceImpl implements MaterialService { Map param = new HashMap<>(); param.put("materialTypeId", mt.getOldId()); List materialPByCondition = new ArrayList<>(); - List dids = new ArrayList<>(); + List dids = new ArrayList<>(); if ("0".equals(placeId)) { // 获取当前库位下的所有物料 - dids.add(ObjectFormatUtil.toInteger(depositoryId)); + dids.add(ObjectFormatUtil.toLong(depositoryId)); param.put("list", dids); // 获取当前类别下的物料 List materialByDepositorysAndType = materialMapper.findInventoryByDepositorysAndType(param); for (int i = 0; i < materialByDepositorysAndType.size(); i++) { Inventory material = materialByDepositorysAndType.get(i); Map map = new HashMap<>(); - MaterialAndPlace placeAndMaterialByMidAndPid = placeService.findPlaceAndMaterialByMidAndPid(0, material.getId()); + MaterialAndPlace placeAndMaterialByMidAndPid = placeService.findPlaceAndMaterialByMidAndPid(0L, material.getId()); if (placeAndMaterialByMidAndPid != null) { materialPByCondition.add(material); } @@ -2221,7 +2221,7 @@ public class MaterialServiceImpl implements MaterialService { } else { // 如果要盘点的位置是某个库位 - Integer pid = ObjectFormatUtil.toInteger(placeId); + Long pid = ObjectFormatUtil.toLong(placeId); Place placeById = placeService.findPlaceById(pid); // 获取当前仓库下的所有物料库存 dids.add(placeById.getDid()); @@ -2552,7 +2552,7 @@ public class MaterialServiceImpl implements MaterialService { // 获取所有物料类型 List materialTypeAll = materialTypeMapper.findMaterialTypeAll(); // 获取当前用户所可见的仓库id - List depositoryIdForUserHas = new ArrayList<>(); + List depositoryIdForUserHas = new ArrayList<>(); if ("immediately".equals(type)) { List depositoryByAdminorg = depositoryMapper.findDepositoryByAdminorg(userToken.getMaindeparment().toString()); for (Depository depository : depositoryByAdminorg @@ -2696,7 +2696,7 @@ public class MaterialServiceImpl implements MaterialService { * @return */ @Override - public Integer findInventoryCountByDepository(List depositoryIds) { + public Integer findInventoryCountByDepository(List depositoryIds) { return materialMapper.findInventoryCountByDepository(depositoryIds); } @@ -2739,16 +2739,16 @@ public class MaterialServiceImpl implements MaterialService { * @return */ @Override - public List findInventoryForCompleteOutTask(Map map) { + public List findInventoryForCompleteOutTask(Map map) { Integer pid = ObjectFormatUtil.toInteger(map.get("pid")); // 用于存储物料id - List midList = new ArrayList<>(); - if (Integer.compare(0, pid) == 0) { + List midList = new ArrayList<>(); + if (Long.compare(0, pid) == 0) { // 获取当前仓库下的所有库存 List inventoryList = materialMapper.findInventory(map); for (Inventory inventory : inventoryList) { // 如果该库存明细在默认库位中 - MaterialAndPlace placeAndMaterialByMidAndPid = placeService.findPlaceAndMaterialByMidAndPid(0, inventory.getId()); + MaterialAndPlace placeAndMaterialByMidAndPid = placeService.findPlaceAndMaterialByMidAndPid(0L, inventory.getId()); if (placeAndMaterialByMidAndPid != null) { // 如果是默认库位 midList.add(placeAndMaterialByMidAndPid.getMid()); // 获取库存id @@ -2773,20 +2773,20 @@ public class MaterialServiceImpl implements MaterialService { * @return */ @Override - public Double findInventorySumForDepository(Integer depositoryId) { + public Double findInventorySumForDepository(Long depositoryId) { // 获取当前仓库的库存总数 Integer sumForDepository = materialMapper.findInventorySumForDepository(depositoryId); double result = ObjectFormatUtil.divide(sumForDepository, 100.0, 2); List splitInventoryViewByDepository = splitUnitMapper.findSplitInventoryViewByDepository(depositoryId); - Map scaleForSplitInfo = new HashMap<>(); + Map scaleForSplitInfo = new HashMap<>(); for (SplitInventoryView splitInventoryView : splitInventoryViewByDepository) { - Integer sid = splitInventoryView.getSid(); + Long sid = splitInventoryView.getSid(); int scale = 1; if (scaleForSplitInfo.containsKey(sid)) { scale = scaleForSplitInfo.get(sid); } else { SplitInfo splitInfoById = splitUnitMapper.findSplitInfoById(sid); - scale = splitUnitService.findSplitInfoScaleQuantity(splitInfoById, -1); + scale = splitUnitService.findSplitInfoScaleQuantity(splitInfoById, -1L); scaleForSplitInfo.put(sid, scale); } result = ObjectFormatUtil.sum(result, ObjectFormatUtil.divide(splitInventoryView.getSiQuantity(), scale, 2)); @@ -2830,7 +2830,7 @@ public class MaterialServiceImpl implements MaterialService { for (SplitInfo si : list ) { // 获取当前拆单单位对应的库存数 - double allInventoryForSplitInfo = splitUnitService.findAllInventoryForSplitInfo(-1, placeAndMaterial, si.getId(), 0, true); + double allInventoryForSplitInfo = splitUnitService.findAllInventoryForSplitInfo(-1L, placeAndMaterial, si.getId(), 0, true); splitInventory.put(si.getNewUnit(), allInventoryForSplitInfo); } // 创建默认单位的拆单信息 @@ -3057,9 +3057,9 @@ public class MaterialServiceImpl implements MaterialService { // 相关使用的数据 Map map; // 当前用户可见的仓库 - List depositoryIdList; + List depositoryIdList; - public TaskTestForSelectMname(List materialTypeByCondition, String mname, String type, List depositoryIdList) { + public TaskTestForSelectMname(List materialTypeByCondition, String mname, String type, List depositoryIdList) { this.materialTypeIdList = materialTypeByCondition; this.mname = mname; this.type = type; @@ -3093,7 +3093,7 @@ public class MaterialServiceImpl implements MaterialService { // 如果是盘点 List inventoryList = materialMapper.findInventoryByTypeIdsAndMname(paramForMnameAndMtid); - Integer placeId = ObjectFormatUtil.toInteger(map.get("placeId")); + Long placeId = ObjectFormatUtil.toLong(map.get("placeId")); // 查询当前存在于当前库位的物料 for (Inventory inventory : inventoryList) { diff --git a/src/main/java/com/dreamchaser/depository_manage/service/impl/NoticeServiceImpl.java b/src/main/java/com/dreamchaser/depository_manage/service/impl/NoticeServiceImpl.java index abcd6299..9a4a7e97 100644 --- a/src/main/java/com/dreamchaser/depository_manage/service/impl/NoticeServiceImpl.java +++ b/src/main/java/com/dreamchaser/depository_manage/service/impl/NoticeServiceImpl.java @@ -199,7 +199,7 @@ public class NoticeServiceImpl implements NoticeService { * @return */ @Override - public NoticeP findNoticeById(Integer id,String userKey,String token) { + public NoticeP findNoticeById(Long id,String userKey,String token) { Notice noticeById = noticeMapper.findNoticeById(id); NoticeP noticeP = new NoticeP(noticeById); // 获取发起人 @@ -229,7 +229,7 @@ public class NoticeServiceImpl implements NoticeService { * @return */ @Override - public Integer delNoticeForSoftById(Integer id) { + public Integer delNoticeForSoftById(Long id) { // 获取当前待删除公告 Notice noticeById = noticeMapper.findNoticeById(id); // 设置当前公告状态为删除态 @@ -245,7 +245,7 @@ public class NoticeServiceImpl implements NoticeService { * @return */ @Override - public Integer delNoticeForSoftByIds(List ids) { + public Integer delNoticeForSoftByIds(List ids) { List noticeByIds = noticeMapper.findNoticeByIds(ids); for (Notice n : noticeByIds ) { @@ -261,7 +261,7 @@ public class NoticeServiceImpl implements NoticeService { * @return */ @Override - public Integer delNoticeById(Integer id) { + public Integer delNoticeById(Long id) { return noticeMapper.deleteNoticeById(id); } @@ -272,7 +272,7 @@ public class NoticeServiceImpl implements NoticeService { * @return */ @Override - public Integer delNoticeByIds(List ids) { + public Integer delNoticeByIds(List ids) { return noticeMapper.deleteNoticeByIds(ids); } @@ -284,7 +284,7 @@ public class NoticeServiceImpl implements NoticeService { */ @Override public Integer updateNoticeState(Map map) { - Integer id = ObjectFormatUtil.toInteger(map.get("id")); + Long id = ObjectFormatUtil.toLong(map.get("id")); // 获取当前主键对应的公告信息 Notice noticeById = noticeMapper.findNoticeById(id); if (map.containsKey("state")) { diff --git a/src/main/java/com/dreamchaser/depository_manage/service/impl/PlaceServiceImpl.java b/src/main/java/com/dreamchaser/depository_manage/service/impl/PlaceServiceImpl.java index 2ccb3752..ced39889 100644 --- a/src/main/java/com/dreamchaser/depository_manage/service/impl/PlaceServiceImpl.java +++ b/src/main/java/com/dreamchaser/depository_manage/service/impl/PlaceServiceImpl.java @@ -109,7 +109,7 @@ public class PlaceServiceImpl implements PlaceService { */ @Override public Integer UpdatePlace(Map map) { - Integer id = ObjectFormatUtil.toInteger(map.get("id")); + Long id = ObjectFormatUtil.toLong(map.get("id")); if (map.containsKey("oldCode")) { Place placeById = placeMapper.findPlaceById(id); String oldCode = (String) map.get("oldCode"); @@ -129,7 +129,7 @@ public class PlaceServiceImpl implements PlaceService { */ @Override public Integer editPlaceState(Map map) { - Integer id = ObjectFormatUtil.toInteger(map.get("id")); + Long id = ObjectFormatUtil.toLong(map.get("id")); Integer state = ObjectFormatUtil.toInteger(map.get("state")); Place placeById = placeMapper.findPlaceById(id); placeById.setState(state); @@ -154,7 +154,7 @@ public class PlaceServiceImpl implements PlaceService { * @return */ @Override - public Integer DelPlace(Integer pid) { + public Integer DelPlace(Long pid) { return placeMapper.DelPlace(pid); } @@ -183,7 +183,7 @@ public class PlaceServiceImpl implements PlaceService { * @return */ @Override - public List findPlaceByDid(Integer did) { + public List findPlaceByDid(Long did) { return placeMapper.findPlaceByDid(did); } @@ -193,7 +193,7 @@ public class PlaceServiceImpl implements PlaceService { * @return */ @Override - public Place findPlaceById(Integer id) { + public Place findPlaceById(Long id) { return placeMapper.findPlaceById(id); } @@ -203,7 +203,7 @@ public class PlaceServiceImpl implements PlaceService { * @return */ @Override - public List findPlaceByIdS(List ids) { + public List findPlaceByIdS(List ids) { return placeMapper.findPlaceByIdS(ids); } @@ -215,7 +215,7 @@ public class PlaceServiceImpl implements PlaceService { * @return */ @Override - public Place findPlaceByDidAndCode(Integer did, String code) { + public Place findPlaceByDidAndCode(Long did, String code) { Map paramForPlace = new HashMap<>(); paramForPlace.put("code", code); paramForPlace.put("did", did); @@ -229,7 +229,7 @@ public class PlaceServiceImpl implements PlaceService { * @return */ @Override - public Integer changeStateToDeletedById(Integer id) { + public Integer changeStateToDeletedById(Long id) { return placeMapper.changeStateToDeletedById(id); } @@ -240,7 +240,7 @@ public class PlaceServiceImpl implements PlaceService { * @return */ @Override - public Integer changeStateToDeletedByIds(List ids) { + public Integer changeStateToDeletedByIds(List ids) { return placeMapper.changeStateToDeletedByIds(ids); } @@ -251,7 +251,7 @@ public class PlaceServiceImpl implements PlaceService { * @return */ @Override - public List findPlaceByMidAndDid(Integer mid, Integer depositoryId) { + public List findPlaceByMidAndDid(Long mid, Long depositoryId) { Map map = new HashMap<>(); map.put("mid", mid); map.put("did", depositoryId); @@ -260,7 +260,7 @@ public class PlaceServiceImpl implements PlaceService { List placePList = new ArrayList<>(); for (Place place : placeByCondition) { PlaceP pp = new PlaceP(place); - Integer did = place.getDid(); + Long did = place.getDid(); if (did != 0) { Depository depositoryRecordById = depositoryService.findDepositoryById(did); pp.setDepositoryName(depositoryRecordById.getDname()); @@ -277,7 +277,7 @@ public class PlaceServiceImpl implements PlaceService { * 根据库位获取当前库位所存储的物料 */ @Override - public List findPlaceAndMaterialByPid(Integer id) { + public List findPlaceAndMaterialByPid(Long id) { return placeMapper.findPlaceAndMaterialByPid(id); } @@ -289,7 +289,7 @@ public class PlaceServiceImpl implements PlaceService { * @return */ @Override - public List findPlaceAndMaterialByDidAndMid(Integer did, Integer mid) { + public List findPlaceAndMaterialByDidAndMid(Long did, Long mid) { Map map = new HashMap<>(); map.put("depositoryId", did); map.put("mid", mid); @@ -307,7 +307,7 @@ public class PlaceServiceImpl implements PlaceService { * @return */ @Override - public List findPlaceAndMaterialByDidsAndMid(List dids, Map map) { + public List findPlaceAndMaterialByDidsAndMid(List dids, Map map) { Integer size = 10, page = 1; if (map.containsKey("size")) { size = ObjectFormatUtil.toInteger(map.get("size")); @@ -323,7 +323,7 @@ public class PlaceServiceImpl implements PlaceService { @Override - public Integer findPlaceAndMaterialCountByDidsAndMid(List dids, Map map) { + public Integer findPlaceAndMaterialCountByDidsAndMid(List dids, Map map) { map.put("list", dids); return placeMapper.findPlaceAndMaterialCountByDidsAndMid(map); } @@ -355,7 +355,7 @@ public class PlaceServiceImpl implements PlaceService { * 根据当前库位编号及物料编号获取具体库位 */ @Override - public MaterialAndPlace findPlaceAndMaterialByMidAndPid(Integer pid, Integer mid) { + public MaterialAndPlace findPlaceAndMaterialByMidAndPid(Long pid, Long mid) { Map map = new HashMap<>(); map.put("mid", mid); map.put("pid", pid); @@ -366,12 +366,12 @@ public class PlaceServiceImpl implements PlaceService { * 根据id获取物料与库位的映射 */ @Override - public MaterialAndPlace findPlaceAndMaterialById(Integer id) { + public MaterialAndPlace findPlaceAndMaterialById(Long id) { return placeMapper.findPlaceAndMaterialById(id); } @Override - public MaterialAndPlaceForViewP findPlaceAndMaterialForViewById(Integer id) { + public MaterialAndPlaceForViewP findPlaceAndMaterialForViewById(Long id) { return placeMapper.findPlaceAndMaterialForViewById(id); } @@ -395,7 +395,7 @@ public class PlaceServiceImpl implements PlaceService { * @return */ @Override - public Integer findQuantityByMidAndPid(Integer mid, Integer pid) { + public Integer findQuantityByMidAndPid(Long mid, Long pid) { Map map = new HashMap<>(); map.put("pid", pid); map.put("mid", mid); @@ -420,7 +420,7 @@ public class PlaceServiceImpl implements PlaceService { * @return */ @Override - public Integer deleteMaterialAndPlace(Integer id) { + public Integer deleteMaterialAndPlace(Long id) { return placeMapper.delMaterialOnPlace(id); } @@ -431,7 +431,7 @@ public class PlaceServiceImpl implements PlaceService { * @return */ @Override - public String findQrCodeByPlace(Integer pid) { + public String findQrCodeByPlace(Long pid) { // 通过雪花算法计算随机数 Snowflake snowflake = new Snowflake(10,10,true); String qrCode = snowflake.nextIdStr(); @@ -485,7 +485,7 @@ public class PlaceServiceImpl implements PlaceService { * @return */ @Override - public Integer findPlaceCountByTypeForFlag(Integer flag, Integer did) { + public Integer findPlaceCountByTypeForFlag(Integer flag, Long did) { Map map = new HashMap<>(); map.put("flag", flag); map.put("did", did); diff --git a/src/main/java/com/dreamchaser/depository_manage/service/impl/QyWxOperationService.java b/src/main/java/com/dreamchaser/depository_manage/service/impl/QyWxOperationService.java index d417a1a3..6437ec12 100644 --- a/src/main/java/com/dreamchaser/depository_manage/service/impl/QyWxOperationService.java +++ b/src/main/java/com/dreamchaser/depository_manage/service/impl/QyWxOperationService.java @@ -60,12 +60,12 @@ public class QyWxOperationService { * @param flag 用于判断发送类型是部门负责人还是仓储负责人(true为部门，false为仓储) * @return */ - public JSONObject sendQyWxToApplicationOutMessage(String uid, Integer outId, Boolean flag, String userAgent, String userKey, String token) { + public JSONObject sendQyWxToApplicationOutMessage(String uid, Long outId, Boolean flag, String userAgent, String userKey, String token) { // 获取将要发送申请的订单记录 ApplicationOutRecord applicationOutRecordPById = depositoryRecordMapper.findApplicationOutRecordPById(outId); // 申请人id - Integer applicantId = applicationOutRecordPById.getApplicantId(); + Long applicantId = applicationOutRecordPById.getApplicantId(); // 申请人 UserByPort applicant = PublicConfig.FindUserById(applicantId, userKey, token); @@ -252,7 +252,7 @@ public class QyWxOperationService { * @param mainId 盘点记录编号 * @return */ - public JSONObject sendQyWxToStockTakingDepartmentManagerMessage(String uid, Integer mainId, String userAgent, String userKey, String token) { + public JSONObject sendQyWxToStockTakingDepartmentManagerMessage(String uid, Long mainId, String userAgent, String userKey, String token) { // 获取盘点主记录 StockTaking mainRecord = stockTakingMapper.selectStockTakingById(mainId); @@ -260,7 +260,7 @@ public class QyWxOperationService { List minRecordList = stockTakingMapper.selectStockTakingChildByMainId(mainId); // 申请人id - Integer getOriginator = mainRecord.getOriginator(); + Long getOriginator = mainRecord.getOriginator(); // 申请人 UserByPort originator = PublicConfig.FindUserById(getOriginator, userKey, token); @@ -276,7 +276,7 @@ public class QyWxOperationService { StringBuilder stockTakingInventory = new StringBuilder(); // 获取盘点的仓库 - Integer depositoryId = mainRecord.getDepositoryId(); + Long depositoryId = mainRecord.getDepositoryId(); Depository depository = depositoryMapper.findDepositoryById(depositoryId); Location.append(depository.getDname()); @@ -485,7 +485,7 @@ public class QyWxOperationService { * @param mainId 盘点记录编号 * @return */ - public JSONObject sendQyWxToStockTakingMessage(String uid, Integer mainId, List normalMinId, String userAgent, String userKey, String token) { + public JSONObject sendQyWxToStockTakingMessage(String uid, Long mainId, List normalMinId, String userAgent, String userKey, String token) { // 获取盘点主记录 StockTaking mainRecord = stockTakingMapper.selectStockTakingById(mainId); @@ -497,7 +497,7 @@ public class QyWxOperationService { List minRecordList = stockTakingMapper.selectStockTakingChildByIds(normalMinId); // 申请人id - Integer getOriginator = mainRecord.getOriginator(); + Long getOriginator = mainRecord.getOriginator(); // 申请人 UserByPort originator = PublicConfig.FindUserById(getOriginator, userKey, token); @@ -513,7 +513,7 @@ public class QyWxOperationService { StringBuilder stockTakingInventory = new StringBuilder(); // 获取盘点的仓库 - Integer depositoryId = mainRecord.getDepositoryId(); + Long depositoryId = mainRecord.getDepositoryId(); Depository depository = depositoryMapper.findDepositoryById(depositoryId); Location.append(depository.getDname()); @@ -722,11 +722,11 @@ public class QyWxOperationService { * @param outId 订单编号 * @return */ - public JSONObject sendCcMessageToUsers(String uid, Integer outId, String userAgent, String userKey, String token) { + public JSONObject sendCcMessageToUsers(String uid, Long outId, String userAgent, String userKey, String token) { // 获取已经完成的订单 ApplicationOutRecord recordP = depositoryRecordMapper.findApplicationOutRecordPById(outId); // 申请人id - Integer applicantId = recordP.getApplicantId(); + Long applicantId = recordP.getApplicantId(); // 申请人 UserByPort applicant = PublicConfig.FindUserById(applicantId, userKey, token); // 获取所有子订单 @@ -859,17 +859,17 @@ public class QyWxOperationService { } // 获取转移前的库位 - Integer oldPlaceId = ObjectFormatUtil.toInteger(minRecord.getPid()); + Long oldPlaceId = ObjectFormatUtil.toLong(minRecord.getPid()); Place oldPlace = placeMapper.findPlaceById(oldPlaceId); - Integer depositoryId = mainRecord.getDepositoryId(); + Long depositoryId = mainRecord.getDepositoryId(); Depository fromDepository = depositoryMapper.findDepositoryById(depositoryId); // 盘点位置 String fromLocation = ""; - if (Integer.compare(0, oldPlaceId) == 0) { + if (Long.compare(0, oldPlaceId) == 0) { // 如果转移前的位置为默认库位 fromLocation = fromDepository.getDname() + " - 默认库位"; } else { @@ -960,17 +960,17 @@ public class QyWxOperationService { // 获取转移前的库位 - Integer oldPlaceId = ObjectFormatUtil.toInteger(minRecord.getPid()); + Long oldPlaceId = ObjectFormatUtil.toLong(minRecord.getPid()); Place oldPlace = placeMapper.findPlaceById(oldPlaceId); - Integer depositoryId = mainRecord.getDepositoryId(); + Long depositoryId = mainRecord.getDepositoryId(); Depository fromDepository = depositoryMapper.findDepositoryById(depositoryId); // 盘点位置 String fromLocation = ""; - if (Integer.compare(0, oldPlaceId) == 0) { + if (Long.compare(0, oldPlaceId) == 0) { // 如果转移前的位置为默认库位 fromLocation = fromDepository.getDname() + " - 默认库位"; } else { @@ -1059,18 +1059,18 @@ public class QyWxOperationService { // 获取转移数量 Integer inventory = ObjectFormatUtil.toInteger(map.get("invnetory" + minId)); // 获取转移前的库位 - Integer oldPlaceId = ObjectFormatUtil.toInteger(minRecord.getPid()); + Long oldPlaceId = ObjectFormatUtil.toLong(minRecord.getPid()); Place oldPlace = placeMapper.findPlaceById(oldPlaceId); - Integer depositoryId = mainRecord.getDepositoryId(); + Long depositoryId = mainRecord.getDepositoryId(); Depository fromDepository = depositoryMapper.findDepositoryById(depositoryId); // 获取转移后的数量 - Integer newInventory = minRecord.getNewInventory() - inventory; + Long newInventory = minRecord.getNewInventory() - inventory; // 获取转移到的库位 - Integer newPlaceId = ObjectFormatUtil.toInteger(map.get("placeId")); + Long newPlaceId = ObjectFormatUtil.toLong(map.get("placeId")); Place newPlace = placeMapper.findPlaceById(newPlaceId); @@ -1086,14 +1086,14 @@ public class QyWxOperationService { } - if (Integer.compare(0, oldPlaceId) == 0) { + if (Long.compare(0, oldPlaceId) == 0) { // 如果转移前的位置为默认库位 fromLocation = fromDepository.getDname() + " - 默认库位"; } else { fromLocation = fromDepository.getDname() + " - " + oldPlace.getCode(); } - if (Integer.compare(0, newPlaceId) == 0) { + if (Long.compare(0, newPlaceId) == 0) { // 如果转移后的位置为默认库位 toLocation = toDepository.getDname() + " - 默认库位"; } else { @@ -1144,13 +1144,13 @@ public class QyWxOperationService { // 获取文本卡片模板 - public TemplateCard_text_notice getTextNoticeCard(Integer outMinId, Integer quantity, String userKey, String token) { + public TemplateCard_text_notice getTextNoticeCard(Long outMinId, Integer quantity, String userKey, String token) { // 需要出库的子订单 ApplicationOutRecordMin recordMin = depositoryRecordMapper.findApplicationOutMinById(outMinId); // 获取其主订单 ApplicationOutRecord outRecordP = depositoryRecordMapper.findApplicationOutRecordPById(recordMin.getParentId()); // 申请人id - Integer applicantId = outRecordP.getApplicantId(); + Long applicantId = outRecordP.getApplicantId(); // 申请人 UserByPort applicant = PublicConfig.FindUserById(applicantId, userKey, token); @@ -1272,7 +1272,7 @@ public class QyWxOperationService { * @param outMinId * @return */ - public JSONObject sendNotificationToDepositoryManager(String uid, Integer outMinId, String userAgent, String userKey, String token) { + public JSONObject sendNotificationToDepositoryManager(String uid, Long outMinId, String userAgent, String userKey, String token) { // 定义文本通知型卡片 TextNotice textNotice = new TextNotice(); @@ -1360,7 +1360,7 @@ public class QyWxOperationService { } - public JSONObject updateTemplateCardToQuantity(String response_code, Integer quantity, String userAgent, Integer outMinId, String userKey, String token) { + public JSONObject updateTemplateCardToQuantity(String response_code, Integer quantity, String userAgent, Long outMinId, String userKey, String token) { String url = String.format("https://qyapi.weixin.qq.com/cgi-bin/message/update_template_card?access_token=" + QyWxConfig.GetQYWXToken(userAgent) + "&debug=1"); Map map = new HashMap<>(); map.put("atall", 1); @@ -1401,7 +1401,7 @@ public class QyWxOperationService { * @param mainId 出库的主订单 * @return 发送结果 */ - public JSONObject sendOutApprovalTemplate(String userAgent, UserByPort userToken, Integer mainId, String userKey, String token) { + public JSONObject sendOutApprovalTemplate(String userAgent, UserByPort userToken, Long mainId, String userKey, String token) { // 获取当前出库主订单 ApplicationOutRecord mainRecord = depositoryRecordMapper.findApplicationOutRecordPById(mainId); @@ -1558,7 +1558,7 @@ public class QyWxOperationService { boolean flagForZXCWorkWarehouse = false; // 定义仓库Id列表 - List depositoryIdList = new ArrayList<>(); + List depositoryIdList = new ArrayList<>(); List materialTypeIdList = new ArrayList<>(); for (ApplicationOutRecordMin recordMin : minRecordList) { // 获取明细信息 @@ -1566,10 +1566,10 @@ public class QyWxOperationService { // 获取当前出库物料 Inventory materialById = materialMapper.findInventoryById(recordMin.getMid()); // 获取当前物料所在仓库 - Integer depositoryId = recordMin.getDepositoryId(); + Long depositoryId = recordMin.getDepositoryId(); Depository depositoryById = depositoryMapper.findDepositoryById(depositoryId); Depository depositoryTop = depositoryById; - if (Integer.compare(depositoryById.getParentId(), 0) != 0) { + if (Long.compare(depositoryById.getParentId(), 0) != 0) { // 如果不是 List depositoryAll = depositoryMapper.findDepositoryAll(); depositoryTop = findParentDepository(depositoryById, depositoryAll); @@ -1874,7 +1874,7 @@ public class QyWxOperationService { approval_template_approver_list.add(approval_template_approver_Label); // 获取综合办部门负责人 - List departmentHeadByUser = PublicConfig.findDepartmentHeadByUser(268, userKey, token); + List departmentHeadByUser = PublicConfig.findDepartmentHeadByUser(268L, userKey, token); List ZHBQyWxId = new ArrayList<>(); for (UserByPort userByPort : departmentHeadByUser) { String QyWxId = userByPort.getWorkwechat(); @@ -1917,7 +1917,7 @@ public class QyWxOperationService { // 获取当前仓库所属的部门 String adminorg = depositoryById.getAdminorg(); - List departmentHeadByUser = PublicConfig.findDepartmentHeadByUser(ObjectFormatUtil.toInteger(adminorg), userKey, token); + List departmentHeadByUser = PublicConfig.findDepartmentHeadByUser(ObjectFormatUtil.toLong(adminorg), userKey, token); for (UserByPort departmentHead : departmentHeadByUser ) { String departmentHeadWorkwechat = departmentHead.getWorkwechat(); @@ -1952,7 +1952,7 @@ public class QyWxOperationService { List roleAndMaterialTypeByCondition = roleMapper.findRoleAndMaterialTypeByCondition(paramForUserManager); for (RoleAndMaterialType roleAndMaterialType : roleAndMaterialTypeByCondition) { int classes = roleAndMaterialType.getClasses(); - Integer userId = roleAndMaterialType.getUid(); + Long userId = roleAndMaterialType.getUid(); if (classes == 1) { // 如果是对人设置的权限 UserByPort userByPort = PublicConfig.FindUserById(userId, userKey, token); @@ -1998,7 +1998,7 @@ public class QyWxOperationService { } } } else { - for (Integer depositoryId : depositoryIdList + for (Long depositoryId : depositoryIdList ) { // 获取当前管理员的企业微信userId @@ -2011,7 +2011,7 @@ public class QyWxOperationService { List roleAndDepositoryByCondition = roleMapper.findRoleAndDepositoryByCondition(paramForUserManager); for (RoleAndDepository roleAndDepository : roleAndDepositoryByCondition) { int classes = roleAndDepository.getClasses(); - Integer userId = roleAndDepository.getUserId(); + Long userId = roleAndDepository.getUserId(); if (classes == 1) { // 如果是对人设置的权限 UserByPort userByPort = PublicConfig.FindUserById(userId, userKey, token); @@ -2084,7 +2084,7 @@ public class QyWxOperationService { * @param mainId 出库的主订单 * @return 发送结果 */ - public JSONObject sendOutApprovalTemplateForImmediately(String userAgent, UserByPort userToken, Integer mainId, String userKey, String token) { + public JSONObject sendOutApprovalTemplateForImmediately(String userAgent, UserByPort userToken, Long mainId, String userKey, String token) { // 获取当前出库主订单 ApplicationOutRecord mainRecord = depositoryRecordMapper.findApplicationOutRecordPById(mainId); @@ -2124,7 +2124,7 @@ public class QyWxOperationService { if ("".equals(department)) { continue; } - UserByPort departmentHead = PublicConfig.FindUserById(ObjectFormatUtil.toInteger(department), userKey, token); + UserByPort departmentHead = PublicConfig.FindUserById(ObjectFormatUtil.toLong(department), userKey, token); // 获取用户的用工关系 int emptype = departmentHead.getEmptype(); if (emptype > 10) { @@ -2239,7 +2239,7 @@ public class QyWxOperationService { // 定义仓库Id列表 - List depositoryIdList = new ArrayList<>(); + List depositoryIdList = new ArrayList<>(); List materialTypeIdList = new ArrayList<>(); @@ -2252,7 +2252,7 @@ public class QyWxOperationService { Inventory materialById = materialMapper.findInventoryById(recordMin.getMid()); // 获取当前物料所在仓库 - Integer depositoryId = recordMin.getDepositoryId(); + Long depositoryId = recordMin.getDepositoryId(); Depository depositoryById = depositoryMapper.findDepositoryById(depositoryId); @@ -2456,7 +2456,7 @@ public class QyWxOperationService { if ("".equals(depositorymanager)) { continue; } - UserByPort depositoryManage = PublicConfig.FindUserById(ObjectFormatUtil.toInteger(depositorymanager), userKey, token); + UserByPort depositoryManage = PublicConfig.FindUserById(ObjectFormatUtil.toLong(depositorymanager), userKey, token); // 获取用户的用工关系 int emptype = depositoryManage.getEmptype(); if (emptype > 10) { @@ -2485,7 +2485,7 @@ public class QyWxOperationService { // 定义存储当前管理员的企业微信userId List qywxUserIdList = new ArrayList<>(); // 用于获取当前仓库的管理员列表 - List userIdByMtId = new ArrayList<>(); + List userIdByMtId = new ArrayList<>(); paramForUserManager.put("mtid", mtId); List roleAndMaterialTypeByCondition = roleMapper.findRoleAndMaterialTypeByCondition(paramForUserManager); for (RoleAndMaterialType roleAndMaterialType : roleAndMaterialTypeByCondition) { @@ -2514,7 +2514,7 @@ public class QyWxOperationService { } } - for (Integer userId : userIdByMtId + for (Long userId : userIdByMtId ) { // 获取对应管理员信息 UserByPort userByPort = PublicConfig.FindUserById(userId, userKey, token); @@ -2543,7 +2543,7 @@ public class QyWxOperationService { // 用于查询对应的管理员权限 Map paramForUserManager = new HashMap<>(); - for (Integer depositoryId : depositoryIdList + for (Long depositoryId : depositoryIdList ) { paramForUserManager.put("depositoryId", depositoryId); @@ -2552,7 +2552,7 @@ public class QyWxOperationService { List qywxUserIdList = new ArrayList<>(); // 获取当前仓库的管理员列表 - List userIdByDid = new ArrayList<>(); + List userIdByDid = new ArrayList<>(); List roleAndDepositoryByCondition = roleMapper.findRoleAndDepositoryByCondition(paramForUserManager); for (RoleAndDepository roleAndDepository : roleAndDepositoryByCondition) { @@ -2582,7 +2582,7 @@ public class QyWxOperationService { } - for (Integer userId : userIdByDid + for (Long userId : userIdByDid ) { // 获取对应管理员信息 UserByPort userByPort = PublicConfig.FindUserById(userId, userKey, token); @@ -2635,7 +2635,7 @@ public class QyWxOperationService { * @param QyWxUid 接收人 * @return */ - public JSONObject sendApprovalTemplateIn(String userAgent, UserByPort userToken, List recordIdList, String QyWxUid, String userKey, String token) { + public JSONObject sendApprovalTemplateIn(String userAgent, UserByPort userToken, List recordIdList, String QyWxUid, String userKey, String token) { // 获取当前出库明细 List minRecordList = depositoryRecordMapper.findApplicationInRecordsByIds(recordIdList); @@ -2971,7 +2971,7 @@ public class QyWxOperationService { * @param QyWxUid * @return */ - public JSONObject sendApprovalTemplateStockTaking(String userAgent, UserByPort userToken, Integer mainId, String QyWxUid) { + public JSONObject sendApprovalTemplateStockTaking(String userAgent, UserByPort userToken, Long mainId, String QyWxUid) { // 获取当前盘点主表 StockTaking mainRecord = stockTakingMapper.selectStockTakingById(mainId); // 获取当前主表下的子表 @@ -3419,7 +3419,7 @@ public class QyWxOperationService { * @param userAgent md5加密后user-agent * @return */ - public JSONObject sendNoticeForAllUser(Integer nid, String userAgent, String userKey, String token) { + public JSONObject sendNoticeForAllUser(Long nid, String userAgent, String userKey, String token) { // 获取当前要发生的公告信息 Notice noticeById = noticeMapper.findNoticeById(nid); TextTemplateCard textTemplateCard = new TextTemplateCard(); @@ -3476,13 +3476,13 @@ public class QyWxOperationService { * @param flag 标志当前是什么申请 1出库2盘点 * @return */ - public JSONObject sendMessageForOtherUserByCard(Integer mainId, String uid, String userAgent, Integer flag, String userKey, String token) { + public JSONObject sendMessageForOtherUserByCard(Long mainId, String uid, String userAgent, Integer flag, String userKey, String token) { // 获取当前申请主订单 ApplicationOutRecord aorp = null; StockTaking stockTaking = null; // 用于暂存申请人id - Integer applicantId = null; + Long applicantId = null; // 用于暂存申请时间 Long applicantTime = null; @@ -3559,8 +3559,8 @@ public class QyWxOperationService { Depository findParentDepository(Depository depository, List depositoryList) { for (Depository d : depositoryList ) { - if (Integer.compare(depository.getParentId(), d.getId()) == 0) { - if (Integer.compare(0, d.getParentId()) == 0) { + if (Long.compare(depository.getParentId(), d.getId()) == 0) { + if (Long.compare(0, d.getParentId()) == 0) { return d; } else { return findParentDepository(d, depositoryList); 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 e36dd0dd..8c8f8316 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 @@ -43,8 +43,8 @@ public class RoleServiceImpl implements RoleService { @Override public Integer addUserOrPostRoleAndDepository(Map map) { map.put("authority", 0); - Integer depositoryId = ObjectFormatUtil.toInteger(map.get("depositoryId")); - List depositoryByParent = findChildForDepositoryByParent(depositoryId); + Long depositoryId = ObjectFormatUtil.toLong(map.get("depositoryId")); + List depositoryByParent = findChildForDepositoryByParent(depositoryId); map.put("depositoryIds", depositoryByParent); return roleMapper.addUserOrPostRoleAndDepositorys(map); } @@ -71,7 +71,7 @@ public class RoleServiceImpl implements RoleService { * @return */ @Override - public List findDepositoryAndRole(Integer userid) { + public List findDepositoryAndRole(Long userid) { return roleMapper.findDepositoryAndRole(userid); } @@ -94,7 +94,7 @@ public class RoleServiceImpl implements RoleService { */ @Override public Integer findRoleByUid(String userid) { - return roleMapper.findRoleByUid(ObjectFormatUtil.toInteger(userid)); + return roleMapper.findRoleByUid(ObjectFormatUtil.toLong(userid)); } /** @@ -104,7 +104,7 @@ public class RoleServiceImpl implements RoleService { * @return */ @Override - public List findUserIdByDid(Integer did) { + public List findUserIdByDid(Long did) { return roleMapper.findUserIdByDid(did); } @@ -189,7 +189,7 @@ public class RoleServiceImpl implements RoleService { * @return */ @Override - public RoleAndDepository findRoleAndDepositoryById(Integer id) { + public RoleAndDepository findRoleAndDepositoryById(Long id) { return roleMapper.findRoleAndDepositoryById(id); } @@ -213,7 +213,7 @@ public class RoleServiceImpl implements RoleService { * @return */ @Override - public RoleAndMaterialType findRoleAndMaterialTypeById(Integer id) { + public RoleAndMaterialType findRoleAndMaterialTypeById(Long id) { return roleMapper.findRoleAndMaterialTypeById(id); } @@ -246,7 +246,7 @@ public class RoleServiceImpl implements RoleService { * @return */ @Override - public Integer deleteRoleAndDepositoryById(Integer id) { + public Integer deleteRoleAndDepositoryById(Long id) { return roleMapper.deleteRoleAndDepositoryById(id); } @@ -257,7 +257,7 @@ public class RoleServiceImpl implements RoleService { * @return */ @Override - public Integer deleteRoleAndMaterialTypeById(Integer id) { + public Integer deleteRoleAndMaterialTypeById(Long id) { return roleMapper.deleteRoleAndMaterialTypeById(id); } @@ -268,7 +268,7 @@ public class RoleServiceImpl implements RoleService { * @return */ @Override - public List findRoleAndDepositoryByDid(Integer did) { + public List findRoleAndDepositoryByDid(Long did) { Map map = new HashMap<>(); map.put("depositoryId", did); return roleMapper.findRoleAndDepositoryByCondition(map); @@ -437,7 +437,7 @@ public class RoleServiceImpl implements RoleService { paramForDelete.put("uid", uid); // 获取当前用户所拥有的权限 // 获取当前已拥有的与新拥有的差集 - List depositoryIdList = roleMapper.findDepositoryIdForWarehouseVisiblePermissionByCondition(paramForDelete); + List depositoryIdList = roleMapper.findDepositoryIdForWarehouseVisiblePermissionByCondition(paramForDelete); List depositoryIdsString = depositoryIds.stream().map(Object::toString).collect(Collectors.toList()); List depositoryIdListString = depositoryIdList.stream().map(Object::toString).collect(Collectors.toList()); depositoryIdListString.removeAll(depositoryIdsString); @@ -536,7 +536,7 @@ public class RoleServiceImpl implements RoleService { * @return */ @Override - public List findDepositoryIdForWarehouseVisiblePermissionByCondition(Map map) { + public List findDepositoryIdForWarehouseVisiblePermissionByCondition(Map map) { String type = (String) map.get("type"); if ("person".equals(type)) { // 如果是对人员赋权 @@ -570,7 +570,7 @@ public class RoleServiceImpl implements RoleService { } map.put("uid", map.get("userId")); List roleAndDepositoryByCondition = roleMapper.findRoleAndDepositoryByCondition(map); - List dResult = new ArrayList<>(); + List dResult = new ArrayList<>(); for (RoleAndDepository roleAndDepository : roleAndDepositoryByCondition) { dResult.add(roleAndDepository.getDepositoryId()); } @@ -594,18 +594,18 @@ public class RoleServiceImpl implements RoleService { * @return */ @Override - public List findDepositoryIdForWareHouseVisiblePermissionByUser(UserByPort userToken) { + public List findDepositoryIdForWareHouseVisiblePermissionByUser(UserByPort userToken) { Map paramForFindDepositoryId = new HashMap<>(); paramForFindDepositoryId.put("type", 1); paramForFindDepositoryId.put("uid", userToken.getId()); // 查询该用户是否存在单独设置的仓库 - List depositoryIdListForPerson = roleMapper.findDepositoryIdForWarehouseVisiblePermissionByCondition(paramForFindDepositoryId); + List depositoryIdListForPerson = roleMapper.findDepositoryIdForWarehouseVisiblePermissionByCondition(paramForFindDepositoryId); paramForFindDepositoryId.put("type", 2); paramForFindDepositoryId.put("uid", userToken.getPosition()); // 查询该用户职位是否存在设计的仓库 - List depositoryIdListForPost = roleMapper.findDepositoryIdForWarehouseVisiblePermissionByCondition(paramForFindDepositoryId); + List depositoryIdListForPost = roleMapper.findDepositoryIdForWarehouseVisiblePermissionByCondition(paramForFindDepositoryId); // 取并集 - return (List) CollectionUtils.union(depositoryIdListForPerson, depositoryIdListForPost); + return (List) CollectionUtils.union(depositoryIdListForPerson, depositoryIdListForPost); } /** @@ -615,13 +615,13 @@ public class RoleServiceImpl implements RoleService { * @return */ @Override - public List findDepositoryIdForUserHas(UserByPort userToken) { + public List findDepositoryIdForUserHas(UserByPort userToken) { // 获取当前用户所在部门拥有的仓库 - List depositoryIdList = findDepositoryIdForUser(userToken); + List depositoryIdList = findDepositoryIdForUser(userToken); // 获取额外的设置的仓库 - List depositoryIdForWareHouseVisiblePermissionByUser = findDepositoryIdForWareHouseVisiblePermissionByUser(userToken); + List depositoryIdForWareHouseVisiblePermissionByUser = findDepositoryIdForWareHouseVisiblePermissionByUser(userToken); // 取并集 - depositoryIdList = (List) CollectionUtils.union(depositoryIdForWareHouseVisiblePermissionByUser, depositoryIdList); + depositoryIdList = (List) CollectionUtils.union(depositoryIdForWareHouseVisiblePermissionByUser, depositoryIdList); return depositoryIdList; } @@ -633,9 +633,9 @@ public class RoleServiceImpl implements RoleService { * @return */ @Override - public List findDepositoryIdForUser(UserByPort userToken) { + public List findDepositoryIdForUser(UserByPort userToken) { List depositoryByAdminorg = depositoryMapper.findDepositoryByAdminorg(userToken.getMaindeparment().toString()); - List depositoryIdList = new ArrayList<>(); + List depositoryIdList = new ArrayList<>(); for (Depository depository : depositoryByAdminorg) { depositoryIdList.add(depository.getId()); } @@ -643,8 +643,8 @@ public class RoleServiceImpl implements RoleService { List depositoryAll = depositoryMapper.findDepositoryAll(); for (Depository depository : depositoryAll ) { - Integer parentId = depository.getParentId(); - Integer id = depository.getId(); + Long parentId = depository.getParentId(); + Long id = depository.getId(); if (depositoryIdList.contains(parentId) && !depositoryIdList.contains(id)) { depositoryIdList.add(id); } @@ -668,10 +668,10 @@ public class RoleServiceImpl implements RoleService { * @param depositoryId 当前待查询仓库id * @return */ - public List findChildForDepositoryByParent(Integer depositoryId) { - List result = new ArrayList<>(); + public List findChildForDepositoryByParent(Long depositoryId) { + List result = new ArrayList<>(); result.add(depositoryId); - List parentId = new ArrayList<>(); + List parentId = new ArrayList<>(); parentId.add(depositoryId); List depositoryAll = depositoryMapper.findDepositoryAll(); for (Depository d : depositoryAll) { diff --git a/src/main/java/com/dreamchaser/depository_manage/service/impl/SplitUnitServiceImpl.java b/src/main/java/com/dreamchaser/depository_manage/service/impl/SplitUnitServiceImpl.java index 8c7bb3d3..4585b54a 100644 --- a/src/main/java/com/dreamchaser/depository_manage/service/impl/SplitUnitServiceImpl.java +++ b/src/main/java/com/dreamchaser/depository_manage/service/impl/SplitUnitServiceImpl.java @@ -92,11 +92,11 @@ public class SplitUnitServiceImpl implements SplitUnitService { // 获取当前类型是否有用户进行管理入库审批 Map paramForMtRole = new HashMap<>(); - Material materialById = materialMapper.findMaterialById(ObjectFormatUtil.toInteger(map.get("mid"))); + Material materialById = materialMapper.findMaterialById(ObjectFormatUtil.toLong(map.get("mid"))); paramForMtRole.put("mtid", materialById.getMaterialTypeId()); map.put("mtId", materialById.getMaterialTypeId()); - Integer depositoryId = ObjectFormatUtil.toInteger(map.get("depositoryId")); + long depositoryId = ObjectFormatUtil.toLong(map.get("depositoryId")); // 获取入库的仓库 Depository depositoryById = depositoryMapper.findDepositoryById(depositoryId); List depositoryAll = depositoryMapper.findDepositoryAll(); @@ -125,7 +125,7 @@ public class SplitUnitServiceImpl implements SplitUnitService { // 获取该权限类型 int classes = roleAndDepository.getClasses(); // 获取userid - Integer userId = roleAndDepository.getUserId(); + long userId = roleAndDepository.getUserId(); if (classes == 1) { // 如果是对人设置权限 approverId.append(userId).append(","); @@ -164,7 +164,7 @@ public class SplitUnitServiceImpl implements SplitUnitService { StringBuilder approverId = new StringBuilder(); for (RoleAndMaterialType roleAndMaterialType : roleAndMaterials) { Integer classes = roleAndMaterialType.getClasses(); - Integer uid = roleAndMaterialType.getUid(); + long uid = roleAndMaterialType.getUid(); if (classes == 1) { approverId.append(uid).append(","); } else { @@ -199,7 +199,7 @@ public class SplitUnitServiceImpl implements SplitUnitService { String type = (String) map.get("type"); // 获取当前操作的库存id - Integer iid = ObjectFormatUtil.toInteger(map.get("iid")); + Long iid = ObjectFormatUtil.toLong(map.get("iid")); // 定义库存拆单记录 SplitInventory splitInventory = null; @@ -324,7 +324,7 @@ public class SplitUnitServiceImpl implements SplitUnitService { param.put("quantity", 0); // 添加对应关系 placeMapper.addMaterialOnPlace(param); - placeAndMaterialByMidAndPid = placeMapper.findPlaceAndMaterialById(ObjectFormatUtil.toInteger(param.get("id"))); + placeAndMaterialByMidAndPid = placeMapper.findPlaceAndMaterialById(ObjectFormatUtil.toLong(param.get("id"))); } if (splitInfo != null) { @@ -341,7 +341,7 @@ public class SplitUnitServiceImpl implements SplitUnitService { SplitInventory splitInventoryByIidAndSid = splitUnitMapper.findSplitInventoryByIidAndSid(paramForSplitInventory); result += realInInventoryToDepository(quantity, splitInventoryByIidAndSid, insertForSplitInfoStringObjectMap, splitInfo, placeAndMaterialByMidAndPid, true); if (insertForSplitInfoStringObjectMap.containsKey("applicationInId")) { - depositoryRecordMapper.deleteApplicationInRecordById(ObjectFormatUtil.toInteger(insertForSplitInfoStringObjectMap.get("applicationInId"))); + depositoryRecordMapper.deleteApplicationInRecordById(ObjectFormatUtil.toLong(insertForSplitInfoStringObjectMap.get("applicationInId"))); } } } else { @@ -361,7 +361,7 @@ public class SplitUnitServiceImpl implements SplitUnitService { param.put("quantity", 0); // 添加对应关系 placeMapper.addMaterialOnPlace(param); - placeAndMaterialByMidAndPid = placeMapper.findPlaceAndMaterialById(ObjectFormatUtil.toInteger(param.get("id"))); + placeAndMaterialByMidAndPid = placeMapper.findPlaceAndMaterialById(ObjectFormatUtil.toLong(param.get("id"))); } if (splitInfo != null) { Map insertForSplitInfoStringObjectMap = new HashMap<>(); @@ -377,7 +377,7 @@ public class SplitUnitServiceImpl implements SplitUnitService { SplitInventory splitInventoryByIidAndSid = splitUnitMapper.findSplitInventoryByIidAndSid(paramForSplitInventory); result += realInInventoryToDepository(quantity, splitInventoryByIidAndSid, insertForSplitInfoStringObjectMap, splitInfo, placeAndMaterialByMidAndPid, true); if (insertForSplitInfoStringObjectMap.containsKey("applicationInId")) { - depositoryRecordMapper.deleteApplicationInRecordById(ObjectFormatUtil.toInteger(insertForSplitInfoStringObjectMap.get("applicationInId"))); + depositoryRecordMapper.deleteApplicationInRecordById(ObjectFormatUtil.toLong(insertForSplitInfoStringObjectMap.get("applicationInId"))); } } } @@ -386,7 +386,7 @@ public class SplitUnitServiceImpl implements SplitUnitService { result += realInInventoryToDepository(quantity, null, map, splitInfo, null, true); if (map.containsKey("applicationInId")) { - depositoryRecordMapper.deleteApplicationInRecordById(ObjectFormatUtil.toInteger(map.get("applicationInId"))); + depositoryRecordMapper.deleteApplicationInRecordById(ObjectFormatUtil.toLong(map.get("applicationInId"))); } } return result; @@ -408,7 +408,7 @@ public class SplitUnitServiceImpl implements SplitUnitService { Integer result = 0; // 获取当前进制 - Integer scale = splitInfoForUnit.getQuantity(); + Long scale = splitInfoForUnit.getQuantity(); // 用于存储拆单库存处理操作的数据 Map paramForInsertSplitInventory = new HashMap<>(); @@ -417,7 +417,7 @@ public class SplitUnitServiceImpl implements SplitUnitService { // 如果是入库操作 // 计算处理数量(下取整) - int disposeQuantity = (int) Math.round(Math.floor(quantity / scale)); + long disposeQuantity = (long) Math.round(Math.floor(quantity / scale)); // 最终存储到拆单处理的数量 double saveQuantity = quantity - disposeQuantity * scale; @@ -426,12 +426,12 @@ public class SplitUnitServiceImpl implements SplitUnitService { // 如果有过记录 // 最终存储数量 - int realQuantity = (int) saveQuantity * 100 + splitInventory.getSaveQuantity(); + long realQuantity = (int) saveQuantity * 100 + splitInventory.getSaveQuantity(); if (realQuantity >= scale * 100) { // 如果当前入库的数量大于拆单规定的进制数量 // 计算要进的数目 - int quantity_in = (realQuantity / (scale * 100)); + long quantity_in = (realQuantity / (scale * 100)); // 更新处理数量 disposeQuantity = disposeQuantity * 100 + quantity_in * 100; // 拆单库存实际入库的数量 @@ -444,9 +444,9 @@ public class SplitUnitServiceImpl implements SplitUnitService { // 设置当前计量单位的入库数目 if (splitInventory.getInQuantity() != null) { // 如果当前库存不为空 - splitInventory.setInQuantity((int) Math.round(splitInventory.getInQuantity() + quantity * 100)); + splitInventory.setInQuantity((long) Math.round(splitInventory.getInQuantity() + quantity * 100)); } else { - splitInventory.setInQuantity((int) Math.round(quantity * 100)); + splitInventory.setInQuantity((long) Math.round(quantity * 100)); } result += splitUnitMapper.updateSplitInventory(splitInventory); @@ -473,7 +473,7 @@ public class SplitUnitServiceImpl implements SplitUnitService { // 如果没有记录 // 获取当前拆单记录的父级 - Integer parentId = splitInfoForUnit.getParentId(); + Long parentId = splitInfoForUnit.getParentId(); if (disposeQuantity != 0) { // 用于更改库存的数量 @@ -531,7 +531,7 @@ public class SplitUnitServiceImpl implements SplitUnitService { // 先插入一条库存记录用于后续操作 map.put("quantity", "0"); depositoryRecordService.applicationInPlace(map, flagForApprovalPass); - depositoryRecordMapper.deleteApplicationInRecordById(ObjectFormatUtil.toInteger(map.get("applicationInId"))); + depositoryRecordMapper.deleteApplicationInRecordById(ObjectFormatUtil.toLong(map.get("applicationInId"))); } else { // 如果没有父级 @@ -565,11 +565,11 @@ public class SplitUnitServiceImpl implements SplitUnitService { * @param parentSplitInfoId 目标拆单单位 * @return */ - public int findSplitInfoScaleQuantity(SplitInfo splitInfo, Integer parentSplitInfoId) { + public int findSplitInfoScaleQuantity(SplitInfo splitInfo, Long parentSplitInfoId) { int quantity = 1; // 定义进制 - if (parentSplitInfoId != null && Integer.compare(-1, parentSplitInfoId) != 0) { + if (parentSplitInfoId != null && Long.compare(-1, parentSplitInfoId) != 0) { // 如果待查询的父级不是顶级 - if (Integer.compare(splitInfo.getParentId(), parentSplitInfoId) == 0) { + if (Long.compare(splitInfo.getParentId(), parentSplitInfoId) == 0) { // 如果当前拆单记录是目标拆单单位 quantity *= splitInfo.getQuantity(); @@ -600,7 +600,7 @@ public class SplitUnitServiceImpl implements SplitUnitService { * @param allQuantityFlag 用于标志是否获取全部库存 * @return */ - public double findAllInventoryForSplitInfo(Integer splitInfoId, MaterialAndPlace materialAndPlace, Integer baseSplitInfoId, double saveQuantity, boolean allQuantityFlag) { + public double findAllInventoryForSplitInfo(Long splitInfoId, MaterialAndPlace materialAndPlace, Long baseSplitInfoId, double saveQuantity, boolean allQuantityFlag) { if (allQuantityFlag) { // 用于标志是否第一次计算 @@ -627,7 +627,7 @@ public class SplitUnitServiceImpl implements SplitUnitService { saveQuantity += (double) baseSplitInventory.getSaveQuantity() / 100; } } - if (Integer.compare(-1, splitInfoId) != 0) { + if (Long.compare(-1, splitInfoId) != 0) { flag = true; // 获取当前记录的子记录 SplitInfo splitInfoByParentId = splitUnitMapper.findSplitInfoByParentId(splitInfoId); @@ -654,12 +654,12 @@ public class SplitUnitServiceImpl implements SplitUnitService { SplitInfo parentSplitInfo = splitUnitMapper.findSplitInfoById(splitInfo.getParentId()); return findAllInventoryForSplitInfo(parentSplitInfo.getId(), materialAndPlace, baseSplitInfoId, saveQuantity, allQuantityFlag); } else { - int splitInfoScaleQuantity = findSplitInfoScaleQuantity(baseSplitInfo, -1); + int splitInfoScaleQuantity = findSplitInfoScaleQuantity(baseSplitInfo, -1L); return saveQuantity + (double) (materialAndPlace.getQuantity() / 100) * splitInfoScaleQuantity; } } else { - int splitInfoScaleQuantity = findSplitInfoScaleQuantity(baseSplitInfo, -1); + int splitInfoScaleQuantity = findSplitInfoScaleQuantity(baseSplitInfo, -1L); return saveQuantity + (double) (materialAndPlace.getQuantity() / 100) * splitInfoScaleQuantity; } } @@ -694,7 +694,7 @@ public class SplitUnitServiceImpl implements SplitUnitService { // 获取当前的子类 SplitInfo splitInfoByParentId = splitUnitMapper.findSplitInfoByParentId(splitInfoId); - if (splitInfoByParentId != null && Integer.compare(splitInfoByParentId.getId(), baseSplitInfoId) != 0) { + if (splitInfoByParentId != null && Long.compare(splitInfoByParentId.getId(), baseSplitInfoId) != 0) { // 如果有子类 return findAllInventoryForSplitInfo(splitInfoByParentId.getId(), materialAndPlace, baseSplitInfoId, saveQuantity, allQuantityFlag); } else { @@ -714,7 +714,7 @@ public class SplitUnitServiceImpl implements SplitUnitService { * @return */ @Override - public SplitInventory findSplitInventoryByIidAndSid(Integer Iid, Integer sid) { + public SplitInventory findSplitInventoryByIidAndSid(Long Iid, Long sid) { Map param = new HashMap<>(); param.put("iid", Iid); param.put("sid", sid); @@ -728,7 +728,7 @@ public class SplitUnitServiceImpl implements SplitUnitService { * @return */ @Override - public SplitInfo findSplitInfoByParentId(Integer parentId) { + public SplitInfo findSplitInfoByParentId(Long parentId) { return splitUnitMapper.findSplitInfoByParentId(parentId); } @@ -739,12 +739,12 @@ public class SplitUnitServiceImpl implements SplitUnitService { * @return */ @Override - public boolean findAllSplitInfoForbidden(Integer sid) { + public boolean findAllSplitInfoForbidden(Long sid) { // 获取当前拆单记录所拥有的库存记录 List splitInventoryBySid = splitUnitMapper.findSplitInventoryBySid(sid); for (SplitInventory splitInventory : splitInventoryBySid) { - if (Integer.compare(splitInventory.getOutQuantity(), 0) != 0) { + if (Long.compare(splitInventory.getOutQuantity(), 0) != 0) { // 如果当前库存还未使用完成 return false; } @@ -759,7 +759,7 @@ public class SplitUnitServiceImpl implements SplitUnitService { * @return */ @Override - public SplitInfo findBaseSplitInfoForMid(Integer mid) { + public SplitInfo findBaseSplitInfoForMid(Long mid) { // 获取当前物料的所有拆单记录 List splitInfoByMid = splitUnitMapper.findSplitInfoByMid(mid); SplitInfo result = null; @@ -770,7 +770,7 @@ public class SplitUnitServiceImpl implements SplitUnitService { for (SplitInfo splitInfo : splitInfoByMid ) { if (splitInfo.getParentId() != null) { - if (Integer.compare(splitInfo.getParentId(), result.getId()) == 0) { + if (Long.compare(splitInfo.getParentId(), result.getId()) == 0) { result = splitInfo; } } @@ -788,11 +788,11 @@ public class SplitUnitServiceImpl implements SplitUnitService { * @param inQuantity 最终入库数量 * @param baseSplitInfo 基础拆单记录 */ - public void updateSplitInfoSaveQuantity(SplitInfo splitInfo, double quantity, int iid, Map map, double inQuantity, SplitInfo baseSplitInfo) { + public void updateSplitInfoSaveQuantity(SplitInfo splitInfo, double quantity, long iid, Map map, double inQuantity, SplitInfo baseSplitInfo) { // 获取当前拆单记录的父级拆单记录 - Integer parentId = splitInfo.getParentId(); + Long parentId = splitInfo.getParentId(); // 获取当前拆单记录对应的拆开库存处理记录 Map paramForSplitInventory = new HashMap<>(); @@ -802,7 +802,7 @@ public class SplitUnitServiceImpl implements SplitUnitService { // 获取当前进制 - int scale = splitInfo.getQuantity(); + long scale = splitInfo.getQuantity(); // 计算处理数量(下取整) int disposeQuantity = (int) Math.round(Math.floor(quantity / (double) scale)); @@ -824,9 +824,9 @@ public class SplitUnitServiceImpl implements SplitUnitService { // 定义保存数量 - splitInventory.setSaveQuantity((int) (new_saveQuantity * 100)); + splitInventory.setSaveQuantity((long) (new_saveQuantity * 100)); // 定义添加数量 - splitInventory.setInQuantity((int) (splitInventory.getInQuantity() + new_saveQuantity * 100)); + splitInventory.setInQuantity((long) (splitInventory.getInQuantity() + new_saveQuantity * 100)); // 修改库存拆单库存处理记录 splitUnitMapper.updateSplitInventory(splitInventory); @@ -849,8 +849,8 @@ public class SplitUnitServiceImpl implements SplitUnitService { } } else { // 当前库存拆单记录与新入库的数目不大于预设的进制 - splitInventory.setSaveQuantity((int) (splitInventory.getSaveQuantity() + saveQuantity * 100)); - splitInventory.setInQuantity((int) (splitInventory.getInQuantity() + saveQuantity * 100)); + splitInventory.setSaveQuantity((long) (splitInventory.getSaveQuantity() + saveQuantity * 100)); + splitInventory.setInQuantity((long) (splitInventory.getInQuantity() + saveQuantity * 100)); splitUnitMapper.updateSplitInventory(splitInventory); @@ -960,7 +960,7 @@ public class SplitUnitServiceImpl implements SplitUnitService { * @return */ @Override - public Integer delSplitInfoById(Integer id) { + public Integer delSplitInfoById(Long id) { // 根据主键获取拆单信息 SplitInfo splitInfo = splitUnitMapper.findSplitInfoById(id); // 根据拆单信息获取对应的拆单库存处理记录 @@ -969,8 +969,8 @@ public class SplitUnitServiceImpl implements SplitUnitService { boolean flag = true; for (SplitInventory splitInventory : splitInventoryList) { - Integer saveQuantity = splitInventory.getSaveQuantity(); - if (Integer.compare(saveQuantity, 0) != 0) { + Long saveQuantity = splitInventory.getSaveQuantity(); + if (Long.compare(saveQuantity, 0L) != 0) { // 如果当前记录的剩余库存不为0 flag = false; break; @@ -993,7 +993,7 @@ public class SplitUnitServiceImpl implements SplitUnitService { * @return */ @Override - public Integer realDelSplitInById(Integer id) { + public Integer realDelSplitInById(Long id) { // 根据主键获取拆单信息 SplitInfo splitInfo = splitUnitMapper.findSplitInfoById(id); // 根据拆单信息获取对应的拆单库存处理记录 @@ -1002,8 +1002,8 @@ public class SplitUnitServiceImpl implements SplitUnitService { boolean flag = true; for (SplitInventory splitInventory : splitInventoryList) { - Integer saveQuantity = splitInventory.getSaveQuantity(); - if (Integer.compare(saveQuantity, 0) != 0) { + Long saveQuantity = splitInventory.getSaveQuantity(); + if (Long.compare(saveQuantity, 0) != 0) { // 如果当前记录的剩余库存不为0 flag = false; break; @@ -1037,7 +1037,7 @@ public class SplitUnitServiceImpl implements SplitUnitService { * @return */ @Override - public SplitInfo findSplitInfoById(Integer id) { + public SplitInfo findSplitInfoById(Long id) { return splitUnitMapper.findSplitInfoById(id); } @@ -1048,7 +1048,7 @@ public class SplitUnitServiceImpl implements SplitUnitService { * @return */ @Override - public SplitInfoP findSplitInfoPById(Integer id) { + public SplitInfoP findSplitInfoPById(Long id) { return splitUnitMapper.findSplitInfoPById(id); } @@ -1059,7 +1059,7 @@ public class SplitUnitServiceImpl implements SplitUnitService { * @return */ @Override - public List findSplitInfoByMid(Integer mid) { + public List findSplitInfoByMid(Long mid) { return splitUnitMapper.findSplitInfoByMid(mid); } @@ -1082,7 +1082,7 @@ public class SplitUnitServiceImpl implements SplitUnitService { * @return */ @Override - public List findSplitInventoryByIid(Integer Iid) { + public List findSplitInventoryByIid(Long Iid) { return splitUnitMapper.findSplitInventoryByIid(Iid); } @@ -1097,8 +1097,8 @@ public class SplitUnitServiceImpl implements SplitUnitService { Depository findParentDepository(Depository depository, List depositoryList) { for (Depository d : depositoryList ) { - if (Integer.compare(depository.getParentId(), d.getId()) == 0) { - if (Integer.compare(0, d.getParentId()) == 0) { + if (Long.compare(depository.getParentId(), d.getId()) == 0) { + if (Long.compare(0, d.getParentId()) == 0) { return d; } else { return findParentDepository(d, depositoryList); diff --git a/src/main/java/com/dreamchaser/depository_manage/service/impl/StockTakingServiceImpl.java b/src/main/java/com/dreamchaser/depository_manage/service/impl/StockTakingServiceImpl.java index 0f760fb0..8e85c3ea 100644 --- a/src/main/java/com/dreamchaser/depository_manage/service/impl/StockTakingServiceImpl.java +++ b/src/main/java/com/dreamchaser/depository_manage/service/impl/StockTakingServiceImpl.java @@ -75,9 +75,9 @@ public class StockTakingServiceImpl implements StockTakingService { // 如果是默认库位 // 获取仓库 - depository = depositoryMapper.findDepositoryById(ObjectFormatUtil.toInteger(map.get("depositoryId"))); + depository = depositoryMapper.findDepositoryById(ObjectFormatUtil.toLong(map.get("depositoryId"))); } else { - Place place = placeMapper.findPlaceById(ObjectFormatUtil.toInteger(placeId)); + Place place = placeMapper.findPlaceById(ObjectFormatUtil.toLong(placeId)); depository = depositoryMapper.findDepositoryById(place.getDid()); } map.put("code", createTakingCode(depository.getDname())); @@ -88,9 +88,9 @@ public class StockTakingServiceImpl implements StockTakingService { map.remove("id"); map.put("mainId", id); } - Map needToUpdate = (Map) map.get("needToUpdate"); - Map barCodeListByNoMaterial = (Map) map.get("barCodeListByNoMaterial"); - Integer mid = ObjectFormatUtil.toInteger(map.get("mid")); + Map needToUpdate = ObjectFormatUtil.objToMap(map.get("needToUpdate"),String.class,Object.class); + Map barCodeListByNoMaterial =ObjectFormatUtil.objToMap(map.get("barCodeListByNoMaterial"),String.class,Object.class); + Long mid = ObjectFormatUtil.toLong(map.get("mid")); if (needToUpdate != null) { // 如果需要绑定新条码 @@ -101,7 +101,7 @@ public class StockTakingServiceImpl implements StockTakingService { } Object isUpdate = needToUpdate.get("barCode" + temp); if (isUpdate != null) { - List barCodeList = (ArrayList) barCodeListByNoMaterial.get("barCode" + temp); + List barCodeList = ObjectFormatUtil.objToList(barCodeListByNoMaterial.get("barCode" + temp),String.class); Map param = new HashMap<>(); param.put("list", barCodeList); Inventory materialById = materialMapper.findInventoryById(mid); @@ -146,7 +146,7 @@ public class StockTakingServiceImpl implements StockTakingService { if (flagForSubmit != null && !flagForSubmit) { // 获取盘点时的物料与库位的对应关系id - Integer id = ObjectFormatUtil.toInteger(redisPool.getRedisTemplateByDb(15).opsForHash().get(key, "id")); + Long id = ObjectFormatUtil.toLong(redisPool.getRedisTemplateByDb(15).opsForHash().get(key, "id")); // 获取物料与库位的对应关系 MaterialAndPlaceForViewP placeAndMaterial = placeMapper.findPlaceAndMaterialForViewById(id); // 获取对应的仓库编码 @@ -315,17 +315,6 @@ public class StockTakingServiceImpl implements StockTakingService { return stockTakingMapper.findMyApplyCount(map); } - /** - * 根据主键查询主表 - * - * @param id - * @return - */ - @Override - public StockTaking findStockTakingById(Integer id) { - return stockTakingMapper.selectStockTakingById(id); - } - /** * 根据主键查询主表 * @@ -337,6 +326,7 @@ public class StockTakingServiceImpl implements StockTakingService { return stockTakingMapper.selectStockTakingById(id); } + /** * 根据主表获取所有子表 * @@ -344,7 +334,7 @@ public class StockTakingServiceImpl implements StockTakingService { * @return */ @Override - public List findStockTakingChildPByMainId(Integer mainId) { + public List findStockTakingChildPByMainId(Long mainId) { List stockTakingChildS = stockTakingMapper.selectStockTakingChildByMainId(mainId); List stockTakingChildPS = new ArrayList<>(); for (StockTakingChild stockTakingChild : stockTakingChildS) { @@ -374,7 +364,7 @@ public class StockTakingServiceImpl implements StockTakingService { * @return */ @Override - public StockTakingChildP findStockTakingChildPById(Integer id) { + public StockTakingChildP findStockTakingChildPById(Long id) { return new StockTakingChildP(stockTakingMapper.selectStockTakingChildPById(id)); } @@ -413,7 +403,7 @@ public class StockTakingServiceImpl implements StockTakingService { } String stockTakingResult = "驳回"; // 获取主表编号 - Integer mainId = ObjectFormatUtil.toInteger(o); + Long mainId = ObjectFormatUtil.toLong(o); // 获取主单 StockTaking mainRecord = stockTakingMapper.selectStockTakingById(mainId); @@ -454,7 +444,7 @@ public class StockTakingServiceImpl implements StockTakingService { // 定义出错信息 List err = new ArrayList<>(); - Integer depositoryId = mainRecord.getDepositoryId(); + Long depositoryId = mainRecord.getDepositoryId(); // 获取所有子单 List minRecordList = stockTakingMapper.selectStockTakingChildByMainId(mainId); @@ -462,7 +452,7 @@ public class StockTakingServiceImpl implements StockTakingService { // 获取子单详情 // 获取盘点的物料详情 - Integer placeId = minRecord.getPid(); + Long placeId = minRecord.getPid(); // 获取库位详情 Place placeById = placeMapper.findPlaceById(placeId); @@ -492,20 +482,20 @@ public class StockTakingServiceImpl implements StockTakingService { double newInventory = minRecord.getNewInventory() / 100.0; // 获取当前库位上物料数量 - int oldQuantity = inventoryById.getQuantity() - placeAndMaterialByMidAndPid.getQuantity(); + long oldQuantity = inventoryById.getQuantity() - placeAndMaterialByMidAndPid.getQuantity(); - inventoryById.setQuantity(oldQuantity + (int) (newInventory * 100)); + inventoryById.setQuantity(oldQuantity + (long) (newInventory * 100)); // 用于计算新的库位数量 - int newNumberForPlace = 0; + long newNumberForPlace = 0L; // 用于计算新的库位与物料对应关系的数量 - int newNumberForMatrialAndPlace = 0; + long newNumberForMatrialAndPlace = 0; if ("Inventory_up".equals(takingResult)) { // 如果盘盈 // 更新当前库位数量 - newNumberForPlace = placeById.getQuantity() + (int) (inventory * 100); + newNumberForPlace = placeById.getQuantity() + (long) (inventory * 100); if (newNumberForPlace < placeById.getMax()) { @@ -521,7 +511,7 @@ public class StockTakingServiceImpl implements StockTakingService { continue; } - newNumberForMatrialAndPlace = placeAndMaterialByMidAndPid.getQuantity() + (int) (inventory * 100); + newNumberForMatrialAndPlace = placeAndMaterialByMidAndPid.getQuantity() + (long) (inventory * 100); // 更新物料与库位对应关系的数量 placeAndMaterialByMidAndPid.setQuantity(newNumberForMatrialAndPlace); @@ -540,8 +530,8 @@ public class StockTakingServiceImpl implements StockTakingService { newNumberForMatrialAndPlace = placeAndMaterialByMidAndPid.getQuantity() - (int) (inventory * 100); } else { - placeById.setQuantity(0); - newNumberForMatrialAndPlace = 0; + placeById.setQuantity(0L); + newNumberForMatrialAndPlace = 0L; } @@ -625,7 +615,7 @@ public class StockTakingServiceImpl implements StockTakingService { } String s = QyWxUid1.toString(); s = "PangFuZhen,"; - qyWxOperationService.sendMessageForOtherUserByCard(ObjectFormatUtil.toInteger(mainId), s, userAgent, 2, userKey, token); + qyWxOperationService.sendMessageForOtherUserByCard(ObjectFormatUtil.toLong(mainId), s, userAgent, 2, userKey, token); }); return result; @@ -653,7 +643,7 @@ public class StockTakingServiceImpl implements StockTakingService { throw new MyException("缺少必要参数"); } // 获取主表编号 - Integer mainId = ObjectFormatUtil.toInteger(o); + Long mainId = ObjectFormatUtil.toLong(o); // 获取主单 StockTaking mainRecord = stockTakingMapper.selectStockTakingById(mainId); @@ -694,7 +684,7 @@ public class StockTakingServiceImpl implements StockTakingService { // 获取子单详情 - Integer placeId = minRecord.getPid(); + Long placeId = minRecord.getPid(); // 获取库位详情 Place placeById = placeMapper.findPlaceById(placeId); @@ -745,38 +735,38 @@ public class StockTakingServiceImpl implements StockTakingService { mapForProducedDate.put("producedDate", producedDate); // 获取当前生产日期下的物料与生产日期的对应关系 MaterialAndProducedDate materialAndProducedDate = materialMapper.findMaterialAndProducedDateByMidAndProducedDate(mapForProducedDate); - Integer oldInventory = materialAndProducedDate.getInventory(); + Long oldInventory = materialAndProducedDate.getInventory(); if (newInventory * 100 >= oldInventory) { // 如果当前盘点数量大于库存数量 // 修改当前库存 - materialAndProducedDate.setInventory((int) (newInventory * 100)); + materialAndProducedDate.setInventory((long) (newInventory * 100)); // 修改使用数量 - materialAndProducedDate.setExpendnum((int) (materialAndProducedDate.getQuantity() - newInventory * 100)); + materialAndProducedDate.setExpendnum((long) (materialAndProducedDate.getQuantity() - newInventory * 100)); // 修改物料对应数量 - inventoryById.setQuantity((int) (inventoryById.getQuantity() + newInventory * 100 - oldInventory * 100)); + inventoryById.setQuantity((long) (inventoryById.getQuantity() + newInventory * 100 - oldInventory * 100)); } else { // 如果当前盘点数量小于库存数量 // 修改当前库存 - materialAndProducedDate.setInventory((int) (newInventory * 100)); + materialAndProducedDate.setInventory((long) (newInventory * 100)); // 修改使用数量 - materialAndProducedDate.setExpendnum((int) (materialAndProducedDate.getQuantity() - newInventory * 100)); + materialAndProducedDate.setExpendnum((long) (materialAndProducedDate.getQuantity() - newInventory * 100)); // 修改物料对应数量 - inventoryById.setQuantity((int) (inventoryById.getQuantity() - oldInventory * 100 + newInventory * 100)); + inventoryById.setQuantity((long) (inventoryById.getQuantity() - oldInventory * 100 + newInventory * 100)); } materialMapper.updateMaterialAndProducedDate(materialAndProducedDate); } // 用于计算新的库位数量 - int newNumberForPlace = 0; + long newNumberForPlace = 0; // 用于计算新的库位与物料对应关系的数量 - int newNumberForMatrialAndPlace = 0; + long newNumberForMatrialAndPlace = 0; if ("Inventory_up".equals(takingResult)) { // 如果盘盈 @@ -785,7 +775,7 @@ public class StockTakingServiceImpl implements StockTakingService { if ("-1".equals(unit) || inventoryById.getUnit().equals(minRecord.getUnit())) { // 更新当前库位数量 - newNumberForPlace = placeById.getQuantity() + (int) (inventory * 100); + newNumberForPlace = placeById.getQuantity() + (long) (inventory * 100); if (newNumberForPlace <= placeById.getMax()) { // 如果更新后的库位数量没有上溢 @@ -823,7 +813,7 @@ public class StockTakingServiceImpl implements StockTakingService { // 获取当前盘点后的库存数 double realQuantity = Math.round(inventory) + (double) (splitInventory.getSaveQuantity() / 100); // 定义当前进制 - int scale = splitInfo.getQuantity(); + long scale = splitInfo.getQuantity(); if (realQuantity >= scale) { // 如果当前盘点的数量大于拆单规定的进制数量 @@ -839,7 +829,7 @@ public class StockTakingServiceImpl implements StockTakingService { realQuantity = realQuantity - quantity_in * scale; // 设置当前数量为实际数量 - splitInventory.setSaveQuantity((int) (realQuantity * 100)); + splitInventory.setSaveQuantity((long) (realQuantity * 100)); // 修改当前拆单库存 splitUnitMapper.updateSplitInventory(splitInventory); @@ -856,7 +846,7 @@ public class StockTakingServiceImpl implements StockTakingService { // 如果不需要进位 // 修改当前库存 - splitInventory.setSaveQuantity((int) (realQuantity * 100)); + splitInventory.setSaveQuantity((long) (realQuantity * 100)); // 修改拆单库存 splitUnitMapper.updateSplitInventory(splitInventory); } @@ -872,7 +862,7 @@ public class StockTakingServiceImpl implements StockTakingService { splitUnitService.realInInventoryToDepository(Double.valueOf(inventory), null, paramForUpdateSplitInventory, splitInfo, placeAndMaterialByMidAndPid, false); if (paramForUpdateSplitInventory.containsKey("applicationInId")) { - depositoryRecordMapper.deleteApplicationInRecordById(ObjectFormatUtil.toInteger(paramForUpdateSplitInventory.get("applicationInId"))); + depositoryRecordMapper.deleteApplicationInRecordById(ObjectFormatUtil.toLong(paramForUpdateSplitInventory.get("applicationInId"))); } } @@ -883,7 +873,7 @@ public class StockTakingServiceImpl implements StockTakingService { if ("-1".equals(unit) || inventoryById.getUnit().equals(minRecord.getUnit())) { // 如果盘点的是基础单位 - newNumberForPlace = placeById.getQuantity() - (int) (inventory * 100); + newNumberForPlace = placeById.getQuantity() - (long) (inventory * 100); if (newNumberForPlace > placeById.getMin()) { //如果更新后的库位数量没有下溢 @@ -892,14 +882,14 @@ public class StockTakingServiceImpl implements StockTakingService { placeById.setQuantity(newNumberForPlace); // 更新物料与库位对应关系的数量 - newNumberForMatrialAndPlace = placeAndMaterialByMidAndPid.getQuantity() - (int) (inventory * 100); + newNumberForMatrialAndPlace = placeAndMaterialByMidAndPid.getQuantity() - (long) (inventory * 100); } else { - placeById.setQuantity(0); + placeById.setQuantity(0L); newNumberForMatrialAndPlace = 0; } - inventoryById.setQuantity(inventoryById.getQuantity() - (int) (inventory * 100)); + inventoryById.setQuantity(inventoryById.getQuantity() - (long) (inventory * 100)); placeAndMaterialByMidAndPid.setQuantity(newNumberForMatrialAndPlace); @@ -921,14 +911,14 @@ public class StockTakingServiceImpl implements StockTakingService { // 如果单纯的拆单库存满足数量 // 设置当前拆单库存的数量 - splitInventory.setSaveQuantity(splitInventory.getSaveQuantity() - (int) (inventory * 100)); + splitInventory.setSaveQuantity(splitInventory.getSaveQuantity() - (long) (inventory * 100)); // 修改拆单库存 splitUnitMapper.updateSplitInventory(splitInventory); } else { // 拆单库存如果不能满足 // 获取当前拆单单位对应的所有库存 - double allSplitInventory = splitUnitService.findAllInventoryForSplitInfo(-1, placeAndMaterialByMidAndPid, splitInfo.getId(), 0, true); + double allSplitInventory = splitUnitService.findAllInventoryForSplitInfo(-1L, placeAndMaterialByMidAndPid, splitInfo.getId(), 0, true); if (allSplitInventory - inventory >= 0) { // 获取剩余不足的数量 @@ -945,7 +935,7 @@ public class StockTakingServiceImpl implements StockTakingService { splitInventory.setOutQuantity(splitInventory.getOutQuantity() + splitInventory.getSaveQuantity()); // 将当前库存设置为0 - splitInventory.setSaveQuantity(0); + splitInventory.setSaveQuantity(0L); // 修改库存数量 splitUnitMapper.updateSplitInventory(splitInventory); @@ -978,8 +968,8 @@ public class StockTakingServiceImpl implements StockTakingService { // 设置剩余拆单库存处理数量 - splitInventory.setSaveQuantity(splitInfo.getQuantity() + splitInventory.getSaveQuantity() - (int) (inventory * 100)); - splitInventory.setOutQuantity(splitInventory.getOutQuantity() + (int) (inventory * 100)); + splitInventory.setSaveQuantity(splitInfo.getQuantity() + splitInventory.getSaveQuantity() - (long) (inventory * 100)); + splitInventory.setOutQuantity(splitInventory.getOutQuantity() + (long) (inventory * 100)); splitUnitMapper.updateSplitInventory(splitInventory); } } else { @@ -995,10 +985,10 @@ public class StockTakingServiceImpl implements StockTakingService { // 获取一个数量 surplus_redundant += 1.0; - splitInventory.setSaveQuantity(splitInfo.getQuantity() + splitInventory.getSaveQuantity() - (int) (saveQuantity * 100)); + splitInventory.setSaveQuantity(splitInfo.getQuantity() + splitInventory.getSaveQuantity() - (long) (saveQuantity * 100)); } else { // 如果不大于 - splitInventory.setSaveQuantity(splitInventory.getSaveQuantity() - (int) (saveQuantity * 100)); + splitInventory.setSaveQuantity(splitInventory.getSaveQuantity() - (long) (saveQuantity * 100)); } @@ -1018,7 +1008,7 @@ public class StockTakingServiceImpl implements StockTakingService { } else { inventoryById.setQuantity(inventoryById.getQuantity() - placeAndMaterialByMidAndPid.getQuantity()); placeById.setQuantity(placeById.getQuantity() - placeAndMaterialByMidAndPid.getQuantity()); - placeAndMaterialByMidAndPid.setQuantity(0); + placeAndMaterialByMidAndPid.setQuantity(0L); } } } @@ -1031,11 +1021,11 @@ public class StockTakingServiceImpl implements StockTakingService { inventoryById.setQuantity(inventoryById.getQuantity() - placeAndMaterialByMidAndPid.getQuantity()); - placeAndMaterialByMidAndPid.setQuantity(0); + placeAndMaterialByMidAndPid.setQuantity(0L); List splitInventoryList = splitUnitMapper.findSplitInventoryByIid(placeAndMaterialByMidAndPid.getId()); for (SplitInventory si : splitInventoryList ) { - si.setSaveQuantity(0); + si.setSaveQuantity(0L); splitUnitMapper.updateSplitInventory(si); } } @@ -1044,20 +1034,20 @@ public class StockTakingServiceImpl implements StockTakingService { // 如果不存在拆单记录 // 获取当前拆单单位对应的库存数 - double splitInfoInventory = splitUnitService.findAllInventoryForSplitInfo(-1, placeAndMaterialByMidAndPid, splitInfo.getId(), 0, true); + double splitInfoInventory = splitUnitService.findAllInventoryForSplitInfo(-1L, placeAndMaterialByMidAndPid, splitInfo.getId(), 0, true); - if (Integer.compare(minRecord.getNewInventory(), 0) == 0) { + if (Long.compare(minRecord.getNewInventory(), 0) == 0) { // 如果盘点数量为0 placeById.setQuantity(placeById.getQuantity() - placeAndMaterialByMidAndPid.getQuantity()); inventoryById.setQuantity(inventoryById.getQuantity() - placeAndMaterialByMidAndPid.getQuantity()); - placeAndMaterialByMidAndPid.setQuantity(0); + placeAndMaterialByMidAndPid.setQuantity(0L); } else { // 如果不是0 // 获取当前拆单单位与基础单位之间的进制 - int scale = splitUnitService.findSplitInfoScaleQuantity(splitInfo, -1); + int scale = splitUnitService.findSplitInfoScaleQuantity(splitInfo, -1L); // 获取当前盘点对应基础单位的数量 int residue = (int) (Math.ceil(inventory / (double) scale)); @@ -1084,7 +1074,7 @@ public class StockTakingServiceImpl implements StockTakingService { insertForSplitInventory.put("placeId", placeAndMaterialByMidAndPid.getPid()); insertForSplitInventory.put("type", "in"); splitUnitService.addSplitInventory(insertForSplitInventory); - Integer new_id = ObjectFormatUtil.toInteger(insertForSplitInventory.get("newInMid")); + Long new_id = ObjectFormatUtil.toLong(insertForSplitInventory.get("newInMid")); depositoryRecordMapper.deleteApplicationInRecordById(new_id); } @@ -1138,7 +1128,7 @@ public class StockTakingServiceImpl implements StockTakingService { // 更新其他卡片 SendQyWxMessageThreadPool.execute(() -> { // 获取responseCode（key为申请人number） - Integer originator = mainRecord.getOriginator(); + long originator = mainRecord.getOriginator(); UserByPort userByPort = PublicConfig.FindUserById(originator, userKey, token); int emptype = userByPort.getEmptype(); if (emptype <= 10) { @@ -1181,7 +1171,7 @@ public class StockTakingServiceImpl implements StockTakingService { // 获取主表编号 String o = templateCard.getEventKey().split("StockTakingId")[1]; - Integer mainId = ObjectFormatUtil.toInteger(o); + long mainId = ObjectFormatUtil.toLong(o); // 用于存储子表id List minIds = new ArrayList<>(); @@ -1197,7 +1187,7 @@ public class StockTakingServiceImpl implements StockTakingService { List err = new ArrayList<>(); // 获取盘点的仓库id - Integer depositoryId = mainRecord.getDepositoryId(); + Long depositoryId = mainRecord.getDepositoryId(); // 获取仓库详情 Depository depositoryById = depositoryMapper.findDepositoryById(depositoryId); @@ -1209,7 +1199,7 @@ public class StockTakingServiceImpl implements StockTakingService { // 获取子单详情 - Integer placeId = minRecord.getPid(); + Long placeId = minRecord.getPid(); // 获取库位详情 Place placeById = placeMapper.findPlaceById(placeId); @@ -1260,38 +1250,38 @@ public class StockTakingServiceImpl implements StockTakingService { mapForProducedDate.put("producedDate", producedDate); // 获取当前生产日期下的物料与生产日期的对应关系 MaterialAndProducedDate materialAndProducedDate = materialMapper.findMaterialAndProducedDateByMidAndProducedDate(mapForProducedDate); - Integer oldInventory = materialAndProducedDate.getInventory(); + Long oldInventory = materialAndProducedDate.getInventory(); if (newInventory * 100 >= oldInventory) { // 如果当前盘点数量大于库存数量 // 修改当前库存 - materialAndProducedDate.setInventory((int) (newInventory * 100)); + materialAndProducedDate.setInventory((long) (newInventory * 100)); // 修改使用数量 - materialAndProducedDate.setExpendnum((int) (materialAndProducedDate.getQuantity() - newInventory * 100)); + materialAndProducedDate.setExpendnum((long) (materialAndProducedDate.getQuantity() - newInventory * 100)); // 修改物料对应数量 - inventoryById.setQuantity((int) (inventoryById.getQuantity() + newInventory * 100 - oldInventory * 100)); + inventoryById.setQuantity((long) (inventoryById.getQuantity() + newInventory * 100 - oldInventory * 100)); } else { // 如果当前盘点数量小于库存数量 // 修改当前库存 - materialAndProducedDate.setInventory((int) (newInventory * 100)); + materialAndProducedDate.setInventory((long) (newInventory * 100)); // 修改使用数量 - materialAndProducedDate.setExpendnum((int) (materialAndProducedDate.getQuantity() - newInventory * 100)); + materialAndProducedDate.setExpendnum((long) (materialAndProducedDate.getQuantity() - newInventory * 100)); // 修改物料对应数量 - inventoryById.setQuantity((int) (inventoryById.getQuantity() - oldInventory * 100 + newInventory * 100)); + inventoryById.setQuantity((long) (inventoryById.getQuantity() - oldInventory * 100 + newInventory * 100)); } materialMapper.updateMaterialAndProducedDate(materialAndProducedDate); } // 用于计算新的库位数量 - int newNumberForPlace = 0; + long newNumberForPlace = 0; // 用于计算新的库位与物料对应关系的数量 - int newNumberForMatrialAndPlace = 0; + long newNumberForMatrialAndPlace = 0; if ("Inventory_up".equals(takingResult)) { // 如果盘盈 @@ -1300,7 +1290,7 @@ public class StockTakingServiceImpl implements StockTakingService { if ("-1".equals(unit) || inventoryById.getUnit().equals(minRecord.getUnit())) { // 更新当前库位数量 - newNumberForPlace = placeById.getQuantity() + (int) (inventory * 100); + newNumberForPlace = placeById.getQuantity() + (long) (inventory * 100); if (newNumberForPlace <= placeById.getMax()) { // 如果更新后的库位数量没有上溢 @@ -1314,9 +1304,9 @@ public class StockTakingServiceImpl implements StockTakingService { continue; } - inventoryById.setQuantity(inventoryById.getQuantity() + (int) (inventory * 100)); + inventoryById.setQuantity(inventoryById.getQuantity() + (long) (inventory * 100)); - newNumberForMatrialAndPlace = placeAndMaterialByMidAndPid.getQuantity() + (int) (inventory * 100); + newNumberForMatrialAndPlace = placeAndMaterialByMidAndPid.getQuantity() + (long) (inventory * 100); // 更新物料与库位对应关系的数量 placeAndMaterialByMidAndPid.setQuantity(newNumberForMatrialAndPlace); @@ -1338,7 +1328,7 @@ public class StockTakingServiceImpl implements StockTakingService { // 获取当前盘点后的库存数 double realQuantity = Math.round(inventory) + (double) (splitInventory.getSaveQuantity() / 100); // 定义当前进制 - int scale = splitInfo.getQuantity(); + long scale = splitInfo.getQuantity(); if (realQuantity >= scale) { // 如果当前盘点的数量大于拆单规定的进制数量 @@ -1354,7 +1344,7 @@ public class StockTakingServiceImpl implements StockTakingService { realQuantity = realQuantity - quantity_in * scale; // 设置当前数量为实际数量 - splitInventory.setSaveQuantity((int) (realQuantity * 100)); + splitInventory.setSaveQuantity((long) (realQuantity * 100)); // 修改当前拆单库存 splitUnitMapper.updateSplitInventory(splitInventory); @@ -1371,7 +1361,7 @@ public class StockTakingServiceImpl implements StockTakingService { // 如果不需要进位 // 修改当前库存 - splitInventory.setSaveQuantity((int) (realQuantity * 100)); + splitInventory.setSaveQuantity((long) (realQuantity * 100)); // 修改拆单库存 splitUnitMapper.updateSplitInventory(splitInventory); } @@ -1387,7 +1377,7 @@ public class StockTakingServiceImpl implements StockTakingService { splitUnitService.realInInventoryToDepository(Double.valueOf(inventory), null, paramForUpdateSplitInventory, splitInfo, placeAndMaterialByMidAndPid, false); if (paramForUpdateSplitInventory.containsKey("applicationInId")) { - depositoryRecordMapper.deleteApplicationInRecordById(ObjectFormatUtil.toInteger(paramForUpdateSplitInventory.get("applicationInId"))); + depositoryRecordMapper.deleteApplicationInRecordById(ObjectFormatUtil.toLong(paramForUpdateSplitInventory.get("applicationInId"))); } } @@ -1410,7 +1400,7 @@ public class StockTakingServiceImpl implements StockTakingService { newNumberForMatrialAndPlace = placeAndMaterialByMidAndPid.getQuantity() - (int) (inventory * 100); } else { - placeById.setQuantity(0); + placeById.setQuantity(0L); newNumberForMatrialAndPlace = 0; } @@ -1443,7 +1433,7 @@ public class StockTakingServiceImpl implements StockTakingService { // 拆单库存如果不能满足 // 获取当前拆单单位对应的所有库存 - double allSplitInventory = splitUnitService.findAllInventoryForSplitInfo(-1, placeAndMaterialByMidAndPid, splitInfo.getId(), 0, true); + double allSplitInventory = splitUnitService.findAllInventoryForSplitInfo(-1L, placeAndMaterialByMidAndPid, splitInfo.getId(), 0, true); if (allSplitInventory - inventory >= 0) { // 获取剩余不足的数量 @@ -1460,7 +1450,7 @@ public class StockTakingServiceImpl implements StockTakingService { splitInventory.setOutQuantity(splitInventory.getOutQuantity() + splitInventory.getSaveQuantity()); // 将当前库存设置为0 - splitInventory.setSaveQuantity(0); + splitInventory.setSaveQuantity(0L); // 修改库存数量 splitUnitMapper.updateSplitInventory(splitInventory); @@ -1533,7 +1523,7 @@ public class StockTakingServiceImpl implements StockTakingService { } else { inventoryById.setQuantity(inventoryById.getQuantity() - placeAndMaterialByMidAndPid.getQuantity()); placeById.setQuantity(placeById.getQuantity() - placeAndMaterialByMidAndPid.getQuantity()); - placeAndMaterialByMidAndPid.setQuantity(0); + placeAndMaterialByMidAndPid.setQuantity(0L); } } } @@ -1546,11 +1536,11 @@ public class StockTakingServiceImpl implements StockTakingService { inventoryById.setQuantity(inventoryById.getQuantity() - placeAndMaterialByMidAndPid.getQuantity()); - placeAndMaterialByMidAndPid.setQuantity(0); + placeAndMaterialByMidAndPid.setQuantity(0L); List splitInventoryList = splitUnitMapper.findSplitInventoryByIid(placeAndMaterialByMidAndPid.getId()); for (SplitInventory si : splitInventoryList ) { - si.setSaveQuantity(0); + si.setSaveQuantity(0L); splitUnitMapper.updateSplitInventory(si); } } @@ -1559,20 +1549,20 @@ public class StockTakingServiceImpl implements StockTakingService { // 如果不存在拆单记录 // 获取当前拆单单位对应的库存数 - double splitInfoInventory = splitUnitService.findAllInventoryForSplitInfo(-1, placeAndMaterialByMidAndPid, splitInfo.getId(), 0, true); + double splitInfoInventory = splitUnitService.findAllInventoryForSplitInfo(-1L, placeAndMaterialByMidAndPid, splitInfo.getId(), 0, true); - if (Integer.compare(minRecord.getNewInventory(), 0) == 0) { + if (Long.compare(minRecord.getNewInventory(), 0) == 0) { // 如果盘点数量为0 placeById.setQuantity(placeById.getQuantity() - placeAndMaterialByMidAndPid.getQuantity()); inventoryById.setQuantity(inventoryById.getQuantity() - placeAndMaterialByMidAndPid.getQuantity()); - placeAndMaterialByMidAndPid.setQuantity(0); + placeAndMaterialByMidAndPid.setQuantity(0L); } else { // 如果不是0 // 获取当前拆单单位与基础单位之间的进制 - int scale = splitUnitService.findSplitInfoScaleQuantity(splitInfo, -1); + int scale = splitUnitService.findSplitInfoScaleQuantity(splitInfo, -1L); // 获取当前盘点对应基础单位的数量 int residue = (int) (Math.ceil(inventory / (double) scale)); @@ -1599,7 +1589,7 @@ public class StockTakingServiceImpl implements StockTakingService { insertForSplitInventory.put("placeId", placeAndMaterialByMidAndPid.getPid()); insertForSplitInventory.put("type", "in"); splitUnitService.addSplitInventory(insertForSplitInventory); - Integer new_id = ObjectFormatUtil.toInteger(insertForSplitInventory.get("newInMid")); + Long new_id = ObjectFormatUtil.toLong(insertForSplitInventory.get("newInMid")); depositoryRecordMapper.deleteApplicationInRecordById(new_id); } @@ -1717,7 +1707,7 @@ public class StockTakingServiceImpl implements StockTakingService { String stockTakingResult = "驳回"; // 获取主单 - StockTaking mainRecord = stockTakingMapper.selectStockTakingById(ObjectFormatUtil.toInteger(mainId)); + StockTaking mainRecord = stockTakingMapper.selectStockTakingById(ObjectFormatUtil.toLong(mainId)); // 获取当前主表中的处理时间 Long reviewTime = mainRecord.getReviewTime(); @@ -1763,13 +1753,13 @@ public class StockTakingServiceImpl implements StockTakingService { List err = new ArrayList<>(); - Integer depositoryId = mainRecord.getDepositoryId(); + Long depositoryId = mainRecord.getDepositoryId(); // 获取所有子单 - List minRecordList = stockTakingMapper.selectStockTakingChildByMainId(ObjectFormatUtil.toInteger(mainId)); + List minRecordList = stockTakingMapper.selectStockTakingChildByMainId(ObjectFormatUtil.toLong(mainId)); for (StockTakingChild minRecord : minRecordList) { // 获取子单详情 - Integer placeId = minRecord.getPid(); + Long placeId = minRecord.getPid(); // 获取库位详情 Place placeById = placeMapper.findPlaceById(placeId); @@ -1801,20 +1791,20 @@ public class StockTakingServiceImpl implements StockTakingService { double newInventory = minRecord.getNewInventory() / 100.0; // 获取当前库位上物料数量 - int oldQuantity = inventoryById.getQuantity() - placeAndMaterialByMidAndPid.getQuantity(); + long oldQuantity = inventoryById.getQuantity() - placeAndMaterialByMidAndPid.getQuantity(); - inventoryById.setQuantity(oldQuantity + (int) (newInventory * 100)); + inventoryById.setQuantity(oldQuantity + (long) (newInventory * 100)); // 用于计算新的库位数量 - int newNumberForPlace = 0; + long newNumberForPlace = 0; // 用于计算新的库位与物料对应关系的数量 - int newNumberForMatrialAndPlace = 0; + long newNumberForMatrialAndPlace = 0; if ("Inventory_up".equals(takingResult)) { // 如果盘盈 // 更新当前库位数量 - newNumberForPlace = placeById.getQuantity() + (int) (inventory * 100); + newNumberForPlace = placeById.getQuantity() + (long) (inventory * 100); if (newNumberForPlace < placeById.getMax()) { @@ -1830,14 +1820,14 @@ public class StockTakingServiceImpl implements StockTakingService { continue; } - newNumberForMatrialAndPlace = placeAndMaterialByMidAndPid.getQuantity() + (int) (inventory * 100); + newNumberForMatrialAndPlace = placeAndMaterialByMidAndPid.getQuantity() + (long) (inventory * 100); // 更新物料与库位对应关系的数量 placeAndMaterialByMidAndPid.setQuantity(newNumberForMatrialAndPlace); } else { // 如果盘亏 - newNumberForPlace = placeById.getQuantity() - (int) (inventory * 100); + newNumberForPlace = placeById.getQuantity() - (long) (inventory * 100); if (newNumberForPlace > placeById.getMin()) { //如果更新后的库位数量没有下溢 @@ -1846,10 +1836,10 @@ public class StockTakingServiceImpl implements StockTakingService { placeById.setQuantity(newNumberForPlace); // 更新物料与库位对应关系的数量 - newNumberForMatrialAndPlace = placeAndMaterialByMidAndPid.getQuantity() - (int) (inventory * 100); + newNumberForMatrialAndPlace = placeAndMaterialByMidAndPid.getQuantity() - (long) (inventory * 100); } else { - placeById.setQuantity(0); + placeById.setQuantity(0L); newNumberForMatrialAndPlace = 0; } @@ -1882,8 +1872,8 @@ public class StockTakingServiceImpl implements StockTakingService { // if (workwechat == null || "".equals(workwechat)) { // workwechat = originator.getWechat(); // } - JSONObject jsonObject = qyWxOperationService.sendQyWxToStockTakingMessage("PangFuZhen,", ObjectFormatUtil.toInteger(mainId), normalMinId, userAgent, userKey, token); -// JSONObject jsonObject = qyWxOperationService.sendQyWxToStockTakingMessage(workwechat, ObjectFormatUtil.toInteger(mainId), normalMinId, userAgent, userKey, token); + JSONObject jsonObject = qyWxOperationService.sendQyWxToStockTakingMessage("PangFuZhen,", ObjectFormatUtil.toLong(mainId), normalMinId, userAgent, userKey, token); +// JSONObject jsonObject = qyWxOperationService.sendQyWxToStockTakingMessage(workwechat, ObjectFormatUtil.toLong(mainId), normalMinId, userAgent, userKey, token); // 将当前返回结果保存到redis中 // if (jsonObject != null) { // Map QyWxMessageMap = new HashMap<>(); @@ -1933,7 +1923,7 @@ public class StockTakingServiceImpl implements StockTakingService { @Override public Integer stockTakingTransfer(Map map, UserByPort userToken, String userAgent, String userKey, String token) { // 获取当前转移的id - List minIds = (List) map.get("minIds"); + List minIds = ObjectFormatUtil.objToList(map.get("minIds"),Long.class); Integer res = 0; @@ -1944,7 +1934,7 @@ public class StockTakingServiceImpl implements StockTakingService { // 定义转移前的库位 Place oldPlace = null; // 获取转移到的库位 - Integer newPlaceId = ObjectFormatUtil.toInteger(map.get("placeId")); + Long newPlaceId = ObjectFormatUtil.toLong(map.get("placeId")); Place newPlace = placeMapper.findPlaceById(newPlaceId); @@ -1954,7 +1944,7 @@ public class StockTakingServiceImpl implements StockTakingService { // 设置转移到到库位的总数 double sumTransfer = (double) newPlace.getQuantity() / 100; - for (Integer minId : minIds) { + for (Long minId : minIds) { // 获取对应子订单 StockTakingChild minRecord = stockTakingMapper.selectStockTakingChildPById(minId); @@ -1996,17 +1986,17 @@ public class StockTakingServiceImpl implements StockTakingService { sumTransferAfter += minRecord.getInventory() - inventory_transfer; // 获取新转移的库位所在仓库 - Integer depositoryId = newPlace.getDid(); - if (Integer.compare(depositoryId, 0) == 0) { + Long depositoryId = newPlace.getDid(); + if (Long.compare(depositoryId, 0) == 0) { // 如果转入的为默认库位 - depositoryId = ObjectFormatUtil.toInteger(map.get("depositoryId")); + depositoryId = ObjectFormatUtil.toLong(map.get("depositoryId")); } - if (Integer.compare(newPlace.getDid(), oldPlace.getDid()) != 0) { + if (Long.compare(newPlace.getDid(), oldPlace.getDid()) != 0) { // 转移前后不在同一仓库 - inventoryById.setQuantity((int) (newInventory * 100)); + inventoryById.setQuantity((long) (newInventory * 100)); // 用于获取转移后仓库的物料信息 Map paramForMaterialToDepository = new HashMap<>(); @@ -2090,10 +2080,10 @@ public class StockTakingServiceImpl implements StockTakingService { if (splitInfo.getParentId() != null) { // 如果当前拆单还有父级 SplitInfo parentSplitInfo = splitUnitMapper.findSplitInfoById(splitInfo.getParentId()); - map.put("price", String.valueOf(inventoryById.getPrice() / splitUnitService.findSplitInfoScaleQuantity(splitInfo, -1))); + map.put("price", String.valueOf(inventoryById.getPrice() / splitUnitService.findSplitInfoScaleQuantity(splitInfo, -1L))); // 调用现有的拆单库存变化逻辑 - splitUnitService.updateSplitInfoSaveQuantity(parentSplitInfo, disposeQuantity, ObjectFormatUtil.toInteger(paramForMaterialAndPlace.get("id")), map, disposeQuantity, splitInfo); + splitUnitService.updateSplitInfoSaveQuantity(parentSplitInfo, disposeQuantity, ObjectFormatUtil.toLong(paramForMaterialAndPlace.get("id")), map, disposeQuantity, splitInfo); } else { // 如果没有父级 @@ -2101,7 +2091,7 @@ public class StockTakingServiceImpl implements StockTakingService { // 调用现有入库逻辑进行修改库存 depositoryRecordService.applicationInPlace(map, false); // 删除入库单 - depositoryRecordMapper.deleteApplicationInRecordById(ObjectFormatUtil.toInteger(map.get("id"))); + depositoryRecordMapper.deleteApplicationInRecordById(ObjectFormatUtil.toLong(map.get("id"))); map.remove("id"); } @@ -2128,7 +2118,7 @@ public class StockTakingServiceImpl implements StockTakingService { SplitInventory splitInventory = splitUnitMapper.findSplitInventoryByIidAndSid(paramForSplitInventory); // 定义当前拆单对应的进制数 - int scale = splitInfo.getQuantity(); + long scale = splitInfo.getQuantity(); // 计算处理数量(下取整) int disposeQuantity = (int) (Math.round(Math.floor(inventory_transfer / (double) splitInfo.getQuantity()))); @@ -2164,7 +2154,7 @@ public class StockTakingServiceImpl implements StockTakingService { } // 设置当前拆单对应的库存数量 - splitInventory.setSaveQuantity((int) (realQuantity * 100)); + splitInventory.setSaveQuantity((long) (realQuantity * 100)); // 修改库存数量 splitUnitMapper.updateSplitInventory(splitInventory); @@ -2194,7 +2184,7 @@ public class StockTakingServiceImpl implements StockTakingService { // 获取当前的单价 map.put("price", String.valueOf(inventoryById.getPrice() / 100)); depositoryRecordService.applicationInPlace(map, false); - depositoryRecordMapper.deleteApplicationInRecordById(ObjectFormatUtil.toInteger(map.get("id"))); + depositoryRecordMapper.deleteApplicationInRecordById(ObjectFormatUtil.toLong(map.get("id"))); map.remove("id"); } } @@ -2244,7 +2234,7 @@ public class StockTakingServiceImpl implements StockTakingService { // 获取对应的父级 SplitInfo parentSplitInfo = splitUnitMapper.findSplitInfoById(splitInfo.getParentId()); // 设置当前的单价 - map.put("price", String.valueOf(inventoryById.getPrice() / splitUnitService.findSplitInfoScaleQuantity(splitInfo, -1))); + map.put("price", String.valueOf(inventoryById.getPrice() / splitUnitService.findSplitInfoScaleQuantity(splitInfo, -1L))); // 调用现有的拆单库存修改逻辑 splitUnitService.updateSplitInfoSaveQuantity(parentSplitInfo, disposeQuantity, newPlaceAndMaterial.getId(), map, inventory_transfer, splitInfo); } else { @@ -2254,7 +2244,7 @@ public class StockTakingServiceImpl implements StockTakingService { // 调用相关的入库逻辑 depositoryRecordService.applicationInPlace(map, false); // 删除对应的入库订单 - depositoryRecordMapper.deleteApplicationInRecordById(ObjectFormatUtil.toInteger(map.get("id"))); + depositoryRecordMapper.deleteApplicationInRecordById(ObjectFormatUtil.toLong(map.get("id"))); map.remove("id"); } @@ -2291,7 +2281,7 @@ public class StockTakingServiceImpl implements StockTakingService { if ("-1".equals(unit)) { // 如果是基础单位 - inventory.setQuantity((int) (inventory_transfer * 100)); + inventory.setQuantity((long) (inventory_transfer * 100)); inventory.setAmounts(inventory_transfer * inventoryById.getPrice()); // 添加一条库存记录 @@ -2314,7 +2304,7 @@ public class StockTakingServiceImpl implements StockTakingService { SplitInfo splitInfo = splitUnitMapper.findSplitInfoByMidAndUnit(paramForSplitInfo); - inventory.setQuantity(0); + inventory.setQuantity(0L); inventory.setAmounts(0.0); // 先插入一条库存记录 @@ -2328,7 +2318,7 @@ public class StockTakingServiceImpl implements StockTakingService { placeMapper.addMaterialOnPlace(paramForMaterialAndPlace); // 设置当前的进制 - int scale = splitInfo.getQuantity(); + long scale = splitInfo.getQuantity(); // 计算处理数量(下取整) @@ -2373,7 +2363,7 @@ public class StockTakingServiceImpl implements StockTakingService { ; map.put("quantity", String.valueOf(disposeQuantity)); depositoryRecordService.applicationInPlace(map, false); - depositoryRecordMapper.deleteApplicationInRecordById(ObjectFormatUtil.toInteger(map.get("id"))); + depositoryRecordMapper.deleteApplicationInRecordById(ObjectFormatUtil.toLong(map.get("id"))); map.remove("id"); } } else { @@ -2393,7 +2383,7 @@ public class StockTakingServiceImpl implements StockTakingService { // 获取转移前物料于库位的对应关系 if ("-1".equals(unit)) { // 如果是基础单位 - oldPlaceAndMaterial.setQuantity((int) newInventory * 100); + oldPlaceAndMaterial.setQuantity((long) newInventory * 100); placeMapper.updateMaterialAndPlace(oldPlaceAndMaterial); } else { // 如果是拆单单位 @@ -2415,7 +2405,7 @@ public class StockTakingServiceImpl implements StockTakingService { // 如果当前记录存在 // 设置当前拆单库存数 - splitInventory.setSaveQuantity((int) (newInventory * 100)); + splitInventory.setSaveQuantity((long) (newInventory * 100)); // 修改当前拆单库存 splitUnitMapper.updateSplitInventory(splitInventory); @@ -2452,7 +2442,7 @@ public class StockTakingServiceImpl implements StockTakingService { if ("-1".equals(unit)) { // 如果是基础单位 - oldPlaceAndMaterial.setQuantity((int) (newInventory * 100)); + oldPlaceAndMaterial.setQuantity((long) (newInventory * 100)); placeMapper.updateMaterialAndPlace(oldPlaceAndMaterial); @@ -2495,7 +2485,7 @@ public class StockTakingServiceImpl implements StockTakingService { if (oldSplitInventory != null) { // 如果该拆单库存存在 - oldSplitInventory.setSaveQuantity((int) newInventory * 100); + oldSplitInventory.setSaveQuantity((long) newInventory * 100); // 修改当前物料库存 splitUnitMapper.updateSplitInventory(oldSplitInventory); } else { @@ -2517,7 +2507,7 @@ public class StockTakingServiceImpl implements StockTakingService { SplitInventory newSplitInventory = splitUnitMapper.findSplitInventoryByIidAndSid(paramForSplitInventory); // 定义当前拆单对应的进制数 - int scale = splitInfo.getQuantity(); + long scale = splitInfo.getQuantity(); // 计算处理数量(下取整) int disposeQuantity = (int) Math.round(Math.floor(inventory_transfer / (double) splitInfo.getQuantity())); @@ -2553,7 +2543,7 @@ public class StockTakingServiceImpl implements StockTakingService { } // 设置当前拆单对应的库存数量 - newSplitInventory.setSaveQuantity((int) realQuantity * 100); + newSplitInventory.setSaveQuantity((long) realQuantity * 100); // 修改库存数量 splitUnitMapper.updateSplitInventory(newSplitInventory); @@ -2583,7 +2573,7 @@ public class StockTakingServiceImpl implements StockTakingService { // 获取当前的单价 map.put("price", String.valueOf(inventoryById.getPrice() / 100)); depositoryRecordService.applicationInPlace(map, false); - depositoryRecordMapper.deleteApplicationInRecordById(ObjectFormatUtil.toInteger(map.get("id"))); + depositoryRecordMapper.deleteApplicationInRecordById(ObjectFormatUtil.toLong(map.get("id"))); map.remove("id"); } } @@ -2633,7 +2623,7 @@ public class StockTakingServiceImpl implements StockTakingService { // 获取对应的父级 SplitInfo parentSplitInfo = splitUnitMapper.findSplitInfoById(splitInfo.getParentId()); // 设置当前的单价 - map.put("price", String.valueOf(inventoryById.getPrice() / splitUnitService.findSplitInfoScaleQuantity(splitInfo, -1))); + map.put("price", String.valueOf(inventoryById.getPrice() / splitUnitService.findSplitInfoScaleQuantity(splitInfo, -1L))); // 调用现有的拆单库存修改逻辑 splitUnitService.updateSplitInfoSaveQuantity(parentSplitInfo, disposeQuantity, newPlaceAndMaterial.getId(), map, inventory_transfer, splitInfo); } else { @@ -2643,7 +2633,7 @@ public class StockTakingServiceImpl implements StockTakingService { // 调用相关的入库逻辑 depositoryRecordService.applicationInPlace(map, false); // 删除对应的入库订单 - depositoryRecordMapper.deleteApplicationInRecordById(ObjectFormatUtil.toInteger(map.get("id"))); + depositoryRecordMapper.deleteApplicationInRecordById(ObjectFormatUtil.toLong(map.get("id"))); map.remove("id"); } @@ -2696,7 +2686,7 @@ public class StockTakingServiceImpl implements StockTakingService { SplitInfo parentSplitInfo = splitUnitMapper.findSplitInfoById(splitInfo.getParentId()); // 计算当前拆单下的单价 - map.put("price", String.valueOf(inventoryById.getPrice() / splitUnitService.findSplitInfoScaleQuantity(splitInfo, -1))); + map.put("price", String.valueOf(inventoryById.getPrice() / splitUnitService.findSplitInfoScaleQuantity(splitInfo, -1L))); // 调用现有的拆单库存变化逻辑 splitUnitService.updateSplitInfoSaveQuantity(parentSplitInfo, disposeQuantity, ObjectFormatUtil.toInteger(paramForMaterialAndPlace.get("id")), map, disposeQuantity, splitInfo); @@ -2708,7 +2698,7 @@ public class StockTakingServiceImpl implements StockTakingService { // 调用现有入库逻辑进行修改库存 depositoryRecordService.applicationInPlace(map, false); // 删除入库单 - depositoryRecordMapper.deleteApplicationInRecordById(ObjectFormatUtil.toInteger(map.get("id"))); + depositoryRecordMapper.deleteApplicationInRecordById(ObjectFormatUtil.toLong(map.get("id"))); map.remove("id"); } @@ -2736,21 +2726,21 @@ public class StockTakingServiceImpl implements StockTakingService { if (oldPlace != null) { // 更新转移前库位数量 - oldPlace.setQuantity((int) sumTransferAfter * 100); + oldPlace.setQuantity((long) sumTransferAfter * 100); placeMapper.UpdatePlace(oldPlace); } // 更新转移后库位数量 - newPlace.setQuantity((int) sumTransfer * 100); + newPlace.setQuantity((long) sumTransfer * 100); placeMapper.UpdatePlace(newPlace); // 开启一个线程用于发送转移信息给盘点人员 StockTaking finalMainRecord = mainRecord; SendQyWxMessageThreadPool.execute(() -> { - Integer originator = finalMainRecord.getOriginator(); + long originator = finalMainRecord.getOriginator(); map.put("minIds", minIds); StringBuilder departMentHeadQyWxName = new StringBuilder(); - UserByPort userByPort = PublicConfig.FindUserById(ObjectFormatUtil.toInteger(originator), userKey, token); + UserByPort userByPort = PublicConfig.FindUserById(ObjectFormatUtil.toLong(originator), userKey, token); int emptype = userByPort.getEmptype(); if (emptype <= 10) { String workwechat = userByPort.getWorkwechat(); @@ -2810,7 +2800,7 @@ public class StockTakingServiceImpl implements StockTakingService { // 获取主表编号 String o = templateCard.getEventKey().split("StockTakingId")[1]; - Integer mainId = ObjectFormatUtil.toInteger(o); + long mainId = ObjectFormatUtil.toLong(o); // 用于标识是否向盘点人员发送卡片 @@ -2838,7 +2828,7 @@ public class StockTakingServiceImpl implements StockTakingService { List minRecordList = stockTakingMapper.selectStockTakingChildByMainId(mainId); for (StockTakingChild minRecord : minRecordList) { // 获取子单详情 - Integer placeId = minRecord.getPid(); + Long placeId = minRecord.getPid(); // 获取库位详情 Place placeById = placeMapper.findPlaceById(placeId); @@ -2868,20 +2858,20 @@ public class StockTakingServiceImpl implements StockTakingService { // 获取当前库位上物料数量 - int oldQuantity = materialById.getQuantity() - placeAndMaterialByMidAndPid.getQuantity(); + long oldQuantity = materialById.getQuantity() - placeAndMaterialByMidAndPid.getQuantity(); - materialById.setQuantity(oldQuantity + (int) (newInventory * 100)); + materialById.setQuantity(oldQuantity + (long) (newInventory * 100)); // 用于计算新的库位数量 - int newNumberForPlace = 0; + long newNumberForPlace = 0; // 用于计算新的库位与物料对应关系的数量 - int newNumberForMatrialAndPlace = 0; + long newNumberForMatrialAndPlace = 0; if ("Inventory_up".equals(takingResult)) { // 如果盘盈 // 更新当前库位数量 - newNumberForPlace = placeById.getQuantity() + (int) (inventory * 100); + newNumberForPlace = placeById.getQuantity() + (long) (inventory * 100); if (newNumberForPlace < placeById.getMax()) { @@ -2897,14 +2887,14 @@ public class StockTakingServiceImpl implements StockTakingService { continue; } - newNumberForMatrialAndPlace = placeAndMaterialByMidAndPid.getQuantity() + (int) (inventory * 100); + newNumberForMatrialAndPlace = placeAndMaterialByMidAndPid.getQuantity() + (long) (inventory * 100); // 更新物料与库位对应关系的数量 placeAndMaterialByMidAndPid.setQuantity(newNumberForMatrialAndPlace); } else { // 如果盘亏 - newNumberForPlace = placeById.getQuantity() - (int) (inventory * 100); + newNumberForPlace = placeById.getQuantity() - (long) (inventory * 100); if (newNumberForPlace > placeById.getMin()) { //如果更新后的库位数量没有下溢 @@ -2913,10 +2903,10 @@ public class StockTakingServiceImpl implements StockTakingService { placeById.setQuantity(newNumberForPlace); // 更新物料与库位对应关系的数量 - newNumberForMatrialAndPlace = placeAndMaterialByMidAndPid.getQuantity() - (int) (inventory * 100); + newNumberForMatrialAndPlace = placeAndMaterialByMidAndPid.getQuantity() - (long) (inventory * 100); } else { - placeById.setQuantity(0); + placeById.setQuantity(0L); newNumberForMatrialAndPlace = 0; } diff --git a/src/main/java/com/dreamchaser/depository_manage/service/impl/UserServiceImpl.java b/src/main/java/com/dreamchaser/depository_manage/service/impl/UserServiceImpl.java new file mode 100644 index 00000000..e5d5631d --- /dev/null +++ b/src/main/java/com/dreamchaser/depository_manage/service/impl/UserServiceImpl.java @@ -0,0 +1,35 @@ +package com.dreamchaser.depository_manage.service.impl; + +import com.dreamchaser.depository_manage.entity.UserByPort; +import com.dreamchaser.depository_manage.hrNew_mapper.UserMapper; +import com.dreamchaser.depository_manage.service.UserService; +import org.springframework.beans.factory.annotation.Autowired; + +public class UserServiceImpl implements UserService { + + @Autowired + private UserMapper userMapper; + + /** + * 通过id获取用户信息 + * @param id 待获取用户id + * @return + */ + @Override + public UserByPort findUserById(Long id) { + return userMapper.findUserById(id); + } + + /** + * 通过工号获取用户信息 + * @param number 待获取用户工号 + * @return + */ + @Override + public UserByPort findUserByNumber(String number) { + return userMapper.findUserByNumber(number); + } + + + +} diff --git a/src/test/java/com/dreamchaser/depository_manage/BarChartTest.java b/src/test/java/com/dreamchaser/depository_manage/BarChartTest.java index 8ac21b17..e90d0ac1 100644 --- a/src/test/java/com/dreamchaser/depository_manage/BarChartTest.java +++ b/src/test/java/com/dreamchaser/depository_manage/BarChartTest.java @@ -80,7 +80,7 @@ public class BarChartTest { map.put("captchaId", "UksBSXVFy0xVZbXUC4dQ"); // JSONObject jsonObject = PublicConfig.baseLogin(map); // UserByPort userByPort = JSONObject.toJavaObject((JSONObject) jsonObject.get("usercont"), UserByPort.class); - Map barChartData = getBarChartDataByDateType(28,"1", "day"); + Map barChartData = getBarChartDataByDateType(28L,"1", "day"); System.out.println(barChartData); } @@ -95,7 +95,7 @@ public class BarChartTest { * @param dateType 日期类型（month按月，day按天（月初至今）） * @return */ - public Map getBarChartDataByDateType(Integer depositoryId, String type, String dateType) { + public Map getBarChartDataByDateType(Long depositoryId, String type, String dateType) { // 获取至今的日期名称 List dayNames = new ArrayList<>(); List dayTimeSpaces = new ArrayList<>(); @@ -131,7 +131,7 @@ public class BarChartTest { /** * 根据日期获取出入库的数量(用于柱状图) */ - public Map getBarChartDataForApplicationRecord(String type, Integer depositoryId, List days) { + public Map getBarChartDataForApplicationRecord(String type, Long depositoryId, List days) { Map map = new HashMap<>(); map.put("type", "bar"); Map emphasisItem = new HashMap<>(); diff --git a/src/test/java/com/dreamchaser/depository_manage/InterfaceTest.java b/src/test/java/com/dreamchaser/depository_manage/InterfaceTest.java index e4281cf3..e6b872cf 100644 --- a/src/test/java/com/dreamchaser/depository_manage/InterfaceTest.java +++ b/src/test/java/com/dreamchaser/depository_manage/InterfaceTest.java @@ -15,7 +15,7 @@ public class InterfaceTest { @Test public void run() { - List userByPortList = PublicConfig.findUserByAdminorgAndPosition(116, "设备员", null, null); + List userByPortList = PublicConfig.findUserByAdminorgAndPosition(116L, "设备员", null, null); System.out.println(userByPortList); } } diff --git a/src/test/java/com/dreamchaser/depository_manage/InventoryLineChartTest.java b/src/test/java/com/dreamchaser/depository_manage/InventoryLineChartTest.java index b771ad99..cb0e1692 100644 --- a/src/test/java/com/dreamchaser/depository_manage/InventoryLineChartTest.java +++ b/src/test/java/com/dreamchaser/depository_manage/InventoryLineChartTest.java @@ -46,7 +46,7 @@ public class InventoryLineChartTest { @Test public void main() { - Map day = getLineOrBarChartDataForInventory(41, "day", "line"); + Map day = getLineOrBarChartDataForInventory(41L, "day", "line"); System.out.println(day); } @@ -57,7 +57,7 @@ public class InventoryLineChartTest { * @param dateType 日期类型（day按天month按月） * @return */ - public Map getLineOrBarChartDataForInventory(Integer depositoryId, String dateType, String echartType) { + public Map getLineOrBarChartDataForInventory(Long depositoryId, String dateType, String echartType) { // 声明仓库库存数据 Map show_data = new HashMap<>(); @@ -220,7 +220,7 @@ public class InventoryLineChartTest { * @param depositoryId 仓库id * @return */ - public Map getLineOrBarChartDataForApplicationRecord(String type, List days, Integer depositoryId, String echartType) { + public Map getLineOrBarChartDataForApplicationRecord(String type, List days, Long depositoryId, String echartType) { Map map = new HashMap<>(); if ("line".equals(echartType)) { map.put("type", "line"); diff --git a/src/test/java/com/dreamchaser/depository_manage/LineChartTest.java b/src/test/java/com/dreamchaser/depository_manage/LineChartTest.java index 5ae53471..4cfa35c3 100644 --- a/src/test/java/com/dreamchaser/depository_manage/LineChartTest.java +++ b/src/test/java/com/dreamchaser/depository_manage/LineChartTest.java @@ -34,7 +34,7 @@ public class LineChartTest { @Test public void main() { - Map day = getLineOrBarChartData(28, "1", "day","bar"); + Map day = getLineOrBarChartData(28L, "1", "day","bar"); System.out.println(day); } @@ -45,7 +45,7 @@ public class LineChartTest { * @param dateType 日期类型（day按天month按月） * @return */ - public Map getLineOrBarChartData(Integer depositoryId, String type, String dateType, String echartType) { + public Map getLineOrBarChartData(Long depositoryId, String type, String dateType, String echartType) { // 获取至今的日期名称 @@ -87,7 +87,7 @@ public class LineChartTest { * @param depositoryId 仓库id * @return */ - public Map getLineOrBarChartDataForApplicationRecord(String type, List days, Integer depositoryId, String echartType) { + public Map getLineOrBarChartDataForApplicationRecord(String type, List days, Long depositoryId, String echartType) { Map map = new HashMap<>(); if("line".equals(echartType)){ map.put("type", "line"); diff --git a/src/test/java/com/dreamchaser/depository_manage/MoreDatasourceTest.java b/src/test/java/com/dreamchaser/depository_manage/MoreDatasourceTest.java new file mode 100644 index 00000000..19fc52a7 --- /dev/null +++ b/src/test/java/com/dreamchaser/depository_manage/MoreDatasourceTest.java @@ -0,0 +1,44 @@ +package com.dreamchaser.depository_manage; + +import com.dreamchaser.depository_manage.entity.Administration; +import com.dreamchaser.depository_manage.entity.UserByPort; +import com.dreamchaser.depository_manage.hrNew_mapper.UserMapper; +import org.junit.Test; +import org.junit.runner.RunWith; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.boot.test.context.SpringBootTest; +import org.springframework.test.context.junit4.SpringRunner; + +import java.util.ArrayList; +import java.util.List; + +@SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT) +@RunWith(SpringRunner.class) +public class MoreDatasourceTest { + @Autowired + UserMapper userMapper; + + @Test + public void test() { + UserByPort userById = userMapper.findUserById(6235L); + System.out.println(userById); + } + + /** + * 获取当前部门的部门负责人 + * + * @param departmentId 待获取部门id + * @return + */ + public List findDepartmentHeaderById(Integer departmentId) { + + List userByPortList = new ArrayList<>(); + + return userByPortList; + } + + + public Administration findTopAdministrationById(Long id){ + return null; + } +} diff --git a/src/test/java/com/dreamchaser/depository_manage/SomeTest.java b/src/test/java/com/dreamchaser/depository_manage/QyWxCallBackTest.java similarity index 96% rename from src/test/java/com/dreamchaser/depository_manage/SomeTest.java rename to src/test/java/com/dreamchaser/depository_manage/QyWxCallBackTest.java index ad0f1eb6..1d95b777 100644 --- a/src/test/java/com/dreamchaser/depository_manage/SomeTest.java +++ b/src/test/java/com/dreamchaser/depository_manage/QyWxCallBackTest.java @@ -17,7 +17,7 @@ import java.util.*; @SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT) @RunWith(SpringRunner.class) -public class SomeTest { +public class QyWxCallBackTest { @Autowired DepositoryRecordService depositoryRecordService; @@ -153,7 +153,7 @@ public class SomeTest { boolean flagForLabel = true; // 默认为标签 // 获取当前的主订单 - ApplicationOutRecordP applicationOutRecordPById = depositoryRecordService.findApplicationOutRecordPById(ObjectFormatUtil.toInteger(mainId)); + ApplicationOutRecordP applicationOutRecordPById = depositoryRecordService.findApplicationOutRecordPById(ObjectFormatUtil.toLong(mainId)); if (Integer.compare(applicationOutRecordPById.getFlagForOpenDepository(), 2) == 0) { // 如果是申请的开放仓库 @@ -312,15 +312,5 @@ public class SomeTest { } - @Test - public void otherTest(){ - Map monthBeginToNow = DateUtil.getMonthBeginToNow(); - Object dayName = monthBeginToNow.get("dayName"); - Object dayTimeSpace = monthBeginToNow.get("dayTimeSpace"); - List dayNames = ObjectFormatUtil.objToList(dayName,String.class); - List dayTimeSpaces = ObjectFormatUtil.objToList(dayTimeSpace,Long.class); - System.out.println(dayNames); - System.out.println(dayTimeSpaces); - } }