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 b3cb3518..dbbbc592 100644 --- a/src/main/java/com/dreamchaser/depository_manage/controller/DepositoryRecordController.java +++ b/src/main/java/com/dreamchaser/depository_manage/controller/DepositoryRecordController.java @@ -1,5 +1,6 @@ package com.dreamchaser.depository_manage.controller; +import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; import com.dreamchaser.depository_manage.config.PublicConfig; import com.dreamchaser.depository_manage.entity.*; @@ -18,7 +19,6 @@ import org.springframework.web.bind.annotation.*; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import java.io.File; -import java.math.BigDecimal; import java.util.*; import java.util.concurrent.TimeUnit; @@ -468,7 +468,7 @@ public class DepositoryRecordController { // 如果是个人 // 获取管理员数据 - UserByPort userByPort = userService.findUserByIdForNoPack(uid); + UserByPort userByPort = PublicConfig.FindUserById(uid,finalUserKey,finalToken); // 获取用户的用工关系 int emptype = userByPort.getEmptype(); if (emptype > 10) { @@ -485,7 +485,7 @@ public class DepositoryRecordController { // 定义用于获取当前岗位下的人的参数map Map paramForGetUserByPost = new HashMap<>(); paramForGetUserByPost.put("position", uid); - List userByPortList = userService.findUserByConditionForNoPack(paramForGetUserByPost); + List userByPortList = PublicConfig.FindUserByMap(paramForGetUserByPost,finalUserKey,finalToken); for (UserByPort userByPort : userByPortList) { int emptype = userByPort.getEmptype(); if (emptype > 10) { @@ -529,7 +529,7 @@ public class DepositoryRecordController { // 如果是个人 // 获取管理员数据 - UserByPort userByPort = userService.findUserByIdForNoPack(uid); + UserByPort userByPort = PublicConfig.FindUserById(uid,finalUserKey,finalToken); // 获取用户的用工关系 int emptype = userByPort.getEmptype(); if (emptype > 10) { @@ -546,7 +546,7 @@ public class DepositoryRecordController { // 定义用于获取当前岗位下的人的参数map Map paramForGetUserByPost = new HashMap<>(); paramForGetUserByPost.put("position", uid); - List userByPortList = userService.findUserByConditionForNoPack(paramForGetUserByPost); + List userByPortList = PublicConfig.FindUserByMap(paramForGetUserByPost,finalUserKey,finalToken); for (UserByPort userByPort : userByPortList) { int emptype = userByPort.getEmptype(); if (emptype > 10) { @@ -1097,23 +1097,29 @@ public class DepositoryRecordController { /** * 将选中的物料暂存到redis中 * - * @param map + * @param jsonObject * @param request * @return */ @PostMapping("/addApplicationToRedis") - public RestResponse addApplicationToRedis(@RequestBody Map map, HttpServletRequest request) { + public RestResponse addApplicationToRedis(@RequestBody JSONObject jsonObject, HttpServletRequest request) { String token = request.getHeader("user-token"); if (token == null) { token = (String) request.getSession().getAttribute("userToken"); } UserByPort userToken = AuthenticationTokenPool.getUserToken(token); - List mids = (List) map.get("mids"); - List depositoryIds = (List) map.get("depositoryIds"); - List placeCodes = (List) map.get("placeCodes"); + JSONArray mids = jsonObject.getJSONArray("mids"); + JSONArray depositoryIds = jsonObject.getJSONArray("depositoryIds"); + JSONArray placeCodes = jsonObject.getJSONArray("placeCodes"); +// List mids = ObjectFormatUtil.objToList(map.get("mids"),Long.class); +// List depositoryIds = ObjectFormatUtil.objToList(map.get("depositoryIds"),Long.class); +// List placeCodes = ObjectFormatUtil.objToList(map.get("placeCodes"),String.class); List nowmids = redisPool.getRedisTemplateByDb(15).opsForList().range("mids" + userToken.getId(), 0, -1); + if(nowmids == null){ + nowmids = new ArrayList<>(); + } for (int i = 0; i < mids.size(); i++) { - if (nowmids.contains(mids.get(i))) { + if (nowmids.contains(mids.get(i).toString())) { continue; } redisPool.getRedisTemplateByDb(15).opsForList().leftPush("mids" + userToken.getId(), mids.get(i).toString()); @@ -1130,27 +1136,28 @@ public class DepositoryRecordController { /** * 将选中的物料从redis中删除 * - * @param map + * @param jsonParam * @param request * @return */ @PostMapping("/deleteApplicationToRedis") - public RestResponse deleteApplicationToRedis(@RequestBody Map map, HttpServletRequest request) { + public RestResponse deleteApplicationToRedis(@RequestBody JSONObject jsonParam, HttpServletRequest request) { String token = request.getHeader("user-token"); if (token == null) { token = (String) request.getSession().getAttribute("userToken"); } UserByPort userToken = AuthenticationTokenPool.getUserToken(token); - List mids = (List) map.get("iids"); - List depositoryIds = (List) map.get("depositoryIds"); - List placeCodes = (List) map.get("placeCodes"); - for (Integer mid : mids) { + + JSONArray iids = jsonParam.getJSONArray("iids"); + JSONArray depositoryIds = jsonParam.getJSONArray("depositoryIds"); + JSONArray placeCodes = jsonParam.getJSONArray("placeCodes"); + for (Object mid : iids) { redisPool.getRedisTemplateByDb(15).opsForList().remove("mids" + userToken.getId(), 1, mid.toString()); } - for (Integer depositoryId : depositoryIds) { + for (Object depositoryId : depositoryIds) { redisPool.getRedisTemplateByDb(15).opsForList().remove("depositoryIds" + userToken.getId(), 1, depositoryId.toString()); } - for (String placeCode : placeCodes) { + for (Object placeCode : placeCodes) { redisPool.getRedisTemplateByDb(15).opsForList().remove("placeCodes" + userToken.getId(), 1, placeCode + " "); } return CrudUtil.insertHandle(1, 1); @@ -1787,7 +1794,8 @@ public class DepositoryRecordController { } }); - } else if ("out".equals(type)) { + } + else if ("out".equals(type)) { // 获取部门负责人 List departmentHeadByUsers = userService.getDepartmentHeaderByIdForNoPack(userToken.getMaindeparment()); StringBuilder departmentHeadId = new StringBuilder(); @@ -1842,12 +1850,12 @@ public class DepositoryRecordController { /** * 构造多个出入库表单 * - * @param map + * @param jsonParam * @param request * @return */ @PostMapping("/createMultiApplications") - public RestResponse createMultiApplications(@RequestBody Map map, HttpServletRequest request) { + public RestResponse createMultiApplications(@RequestBody JSONObject jsonParam, HttpServletRequest request) { String usertoken = request.getHeader("user-token"); String userkey = request.getHeader("user-key"); if (usertoken == null) { @@ -1860,15 +1868,15 @@ public class DepositoryRecordController { String header = request.getHeader("user-agent"); String crypt = Md5.crypt(header); // 获取要处理的类型 - String type = (String) map.get("type"); + String type = jsonParam.getString("type"); Integer success = 0; - 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); + JSONArray mids =jsonParam.getJSONArray("mids"); + JSONArray iids = jsonParam.getJSONArray("iids"); + JSONArray depositoryIds = jsonParam.getJSONArray("depositoryIds"); + JSONArray quantitys = jsonParam.getJSONArray("quantitys"); + JSONArray placeCodes = jsonParam.getJSONArray("placeCodes"); + JSONArray applyRemarks = jsonParam.getJSONArray("applyRemarks"); + JSONArray units = jsonParam.getJSONArray("units"); StringBuilder errMsg = new StringBuilder(); Long id = 0L; if ("in".equals(type)) { @@ -1878,9 +1886,9 @@ public class DepositoryRecordController { List recordIds = new ArrayList<>(); for (int i = 0; i < mids.size(); i++) { // 获取库位 - String placeCode = placeCodes.get(i); + String placeCode = (String) placeCodes.get(i); // 获取当前仓库编号 - Long depositoryId = depositoryIds.get(i); + Object depositoryId = depositoryIds.get(i); // 获取当前申请数量 Double integer = ObjectFormatUtil.toDouble(quantitys.get(i)); String quantity = integer.toString(); @@ -1891,9 +1899,9 @@ public class DepositoryRecordController { Place place = placeService.findPlaceByDidAndCode(depositoryId, placeCode); placeId = place.getId(); } - Long mid = mids.get(i); - String applyRemark = applyRemarks.get(i); - String unit = units.get(i); + Object mid = mids.get(i); + String applyRemark = (String) applyRemarks.get(i); + String unit = (String) units.get(i); Map inRecord = new HashMap<>(); inRecord.put("applicantId", userToken.getId()); inRecord.put("mid", mid); @@ -2110,16 +2118,16 @@ public class DepositoryRecordController { id = ObjectFormatUtil.toLong(mainRecord.get("id")); for (int i = 0; i < iids.size(); i++) { // 出库物料 - Long mid = iids.get(i); + Long mid = ObjectFormatUtil.toLong(iids.get(i)); // 出库数量 Double integer = ObjectFormatUtil.toDouble(quantitys.get(i)); // 获取当前仓库编号 - Long depositoryId = depositoryIds.get(i); + Long depositoryId = ObjectFormatUtil.toLong(depositoryIds.get(i)); String quantity = String.valueOf((int) (integer * 100)); // 获取库位 - String placeCode = placeCodes.get(i); + String placeCode = (String) placeCodes.get(i); - String unit = units.get(i); + String unit = (String) units.get(i); // 获取每个库位编码 String[] s = placeCode.split(" "); Long place = 0L; @@ -2150,13 +2158,13 @@ public class DepositoryRecordController { if (Long.compare(0, place) == 0) { // 如果当前库位是默认库位 Integer quantityByMidAndPid = placeService.findQuantityByMidAndPid(mid, 0L); - if (quantityByMidAndPid > integer) { + if (quantityByMidAndPid != null && quantityByMidAndPid > integer) { // 如果默认库位中该物料数量可以出库 flag = true; } } if (flag) { - String applyRemark = applyRemarks.get(i); + String applyRemark = (String)applyRemarks.get(i); Map outRecord = new HashMap<>(); outRecord.put("quantity", quantity); outRecord.put("mid", mid); 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 2bfbb976..ab78a654 100644 --- a/src/main/java/com/dreamchaser/depository_manage/controller/MaterialController.java +++ b/src/main/java/com/dreamchaser/depository_manage/controller/MaterialController.java @@ -1704,9 +1704,9 @@ public class MaterialController { String materialCode = materialService.findMaterialCodeByQrCode(qrCode); Map result = new HashMap<>(); // 0为非法码，1为物料，2为库位，3为仓库 - Integer flag = 0; + int flag = 0; // 1为二维码2为条形码 - Integer CodeType = 0; + int CodeType = 0; if (materialCode != null) { // 如果当前不为空,则扫描的为物料二维码 flag = 1; 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 11858f32..fa86a1d3 100644 --- a/src/main/java/com/dreamchaser/depository_manage/converter/ExcelDepositoryInfoConverter.java +++ b/src/main/java/com/dreamchaser/depository_manage/converter/ExcelDepositoryInfoConverter.java @@ -3,19 +3,16 @@ package com.dreamchaser.depository_manage.converter; import com.alibaba.excel.converters.Converter; import com.alibaba.excel.enums.CellDataTypeEnum; -import com.alibaba.excel.exception.ExcelDataConvertException; import com.alibaba.excel.metadata.GlobalConfiguration; import com.alibaba.excel.metadata.data.ReadCellData; import com.alibaba.excel.metadata.data.WriteCellData; import com.alibaba.excel.metadata.property.ExcelContentProperty; import com.dreamchaser.depository_manage.entity.Depository; -import com.dreamchaser.depository_manage.entity.MaterialType; import com.dreamchaser.depository_manage.service.DepositoryService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; import javax.annotation.PostConstruct; -import java.util.List; /** * 用于将仓库编码转为仓库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 b04ef11f..9772fec5 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 @@ -72,7 +72,7 @@ public interface DepositoryMapper { * @param id 参数id * @return 对应仓库信息 */ - Depository findDepositoryById(Long id); + Depository findDepositoryById(Object 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 9d0dd059..d13e0275 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 @@ -205,7 +205,7 @@ public interface MaterialMapper { * @param id 库存id * @return 库存信息 */ - Material findMaterialById(Long id); + Material findMaterialById(Object 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 071f2f63..465e51ad 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 @@ -80,7 +80,7 @@ public interface PlaceMapper { * @param did * @return */ - List findPlaceByDid(Long did); + List findPlaceByDid(Object did); /** * 根据id将库位状态改为删除 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 9de79f82..7f3a70cf 100644 --- a/src/main/java/com/dreamchaser/depository_manage/service/DepositoryService.java +++ b/src/main/java/com/dreamchaser/depository_manage/service/DepositoryService.java @@ -55,7 +55,7 @@ public interface DepositoryService { * @param id * @return 查询数据 */ - Depository findDepositoryById(Long id); + Depository findDepositoryById(Object id); /** 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 b3d2aab0..5336c047 100644 --- a/src/main/java/com/dreamchaser/depository_manage/service/MaterialService.java +++ b/src/main/java/com/dreamchaser/depository_manage/service/MaterialService.java @@ -134,7 +134,7 @@ public interface MaterialService { * @param id 库存id * @return 库存信息 */ - Material findMaterialById(Long id); + Material findMaterialById(Object id); /** * 根据库存id查询库存信息 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 3e327cb6..0ab5de1d 100644 --- a/src/main/java/com/dreamchaser/depository_manage/service/PlaceService.java +++ b/src/main/java/com/dreamchaser/depository_manage/service/PlaceService.java @@ -72,7 +72,7 @@ public interface PlaceService { * @param did * @return */ - List findPlaceByDid(Long did); + List findPlaceByDid(Object did); /** @@ -95,7 +95,7 @@ public interface PlaceService { * @param code 库位编码 * @return */ - Place findPlaceByDidAndCode(Long did,String code); + Place findPlaceByDidAndCode(Object did, String code); /** * 根据id将库位状态改为删除 @@ -198,7 +198,7 @@ public interface PlaceService { * @param pid * @return */ - Integer findQuantityByMidAndPid(Long mid,Long pid); + Integer findQuantityByMidAndPid(Object mid, Long pid); /** * 修改当前库位存放物料 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 33391157..0638cb41 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 @@ -8,8 +8,6 @@ import com.dreamchaser.depository_manage.entity.*; import com.dreamchaser.depository_manage.entity.MaterialAndPlace; import com.dreamchaser.depository_manage.exception.MyException; import com.dreamchaser.depository_manage.depository_mapper.*; -import com.dreamchaser.depository_manage.hrNew_mapper.AdministrativeMapper; -import com.dreamchaser.depository_manage.hrNew_mapper.UserMapper; import com.dreamchaser.depository_manage.pojo.*; import com.dreamchaser.depository_manage.pojo.callBackXml.approvalCallBackXml.ApprovalInfo_Details; import com.dreamchaser.depository_manage.pojo.callBackXml.approvalCallBackXml.ApprovalInfo_Details_Approver; @@ -245,7 +243,7 @@ public class DepositoryRecordServiceImpl implements DepositoryRecordService { } else { List depositoryIdForUserHas = roleService.findDepositoryIdForUser(userToken); map.put("flagForOpenDepository", 2); - if (depositoryIdForUserHas.contains(ObjectFormatUtil.toInteger(depositoryId))) { + if (depositoryIdForUserHas.contains(ObjectFormatUtil.toLong(depositoryId))) { map.put("flagForOpenDepository", 1); } @@ -756,7 +754,7 @@ public class DepositoryRecordServiceImpl implements DepositoryRecordService { // 定义用于获取当前岗位下的人的参数map Map paramForGetUserByPost = new HashMap<>(); paramForGetUserByPost.put("position", roleAndDepository.getUserId()); - List userByPortList = userService.findUserByConditionForNoPack(paramForGetUserByPost); + List userByPortList = PublicConfig.FindUserByMap(paramForGetUserByPost,null,null); for (UserByPort userByPort : userByPortList) { int emptype = userByPort.getEmptype(); if (emptype > 10) { @@ -795,7 +793,7 @@ public class DepositoryRecordServiceImpl implements DepositoryRecordService { // 定义用于获取当前岗位下的人的参数map Map paramForGetUserByPost = new HashMap<>(); paramForGetUserByPost.put("position", uid); - List userByPortList = userService.findUserByConditionForNoPack(paramForGetUserByPost); + List userByPortList = PublicConfig.FindUserByMap(paramForGetUserByPost,null,null); for (UserByPort userByPort : userByPortList) { int emptype = userByPort.getEmptype(); if (emptype > 10) { @@ -1923,7 +1921,7 @@ public class DepositoryRecordServiceImpl implements DepositoryRecordService { // 强行完成出库 // 获取当前出库人员 - UserByPort userByPort = userService.findUserByIdForNoPack(outRecordMin.getCheckId()); + UserByPort userByPort = PublicConfig.FindUserById(outRecordMin.getCheckId(),userKey,token); outRecord.setPass(1); updateApplicationMinOutInfo(id, outRecordMin, outRecord, (double) (quantity), userByPort, placeById.getId(), userAgent, userKey, token); @@ -1942,7 +1940,7 @@ public class DepositoryRecordServiceImpl implements DepositoryRecordService { for (RoleAndMaterialType mt : materialTypeIdForIn ) { // 获取管理员数据 - UserByPort userByPort = userService.findUserByIdForNoPack(mt.getUid()); + UserByPort userByPort = PublicConfig.FindUserById(mt.getUid(),userKey,token); // 获取用户的用工关系 int emptype = userByPort.getEmptype(); if (emptype > 10) { @@ -1960,7 +1958,7 @@ public class DepositoryRecordServiceImpl implements DepositoryRecordService { for (RoleAndDepository mt : materialTypeIdForIn ) { // 获取管理员数据 - UserByPort userByPort = userService.findUserByIdForNoPack(mt.getUserId()); + UserByPort userByPort = PublicConfig.FindUserById(mt.getUserId(),userKey,token); // 获取用户的用工关系 int emptype = userByPort.getEmptype(); if (emptype > 10) { @@ -2369,7 +2367,7 @@ public class DepositoryRecordServiceImpl implements DepositoryRecordService { continue; } Long uid = ObjectFormatUtil.toLong(s); - UserByPort depositoryManager = userService.findUserByIdForNoPack(uid); + UserByPort depositoryManager = PublicConfig.FindUserById(uid,userKey,token); // 获取用户的用工关系 int emptype = depositoryManager.getEmptype(); if (emptype > 10) { @@ -2916,7 +2914,9 @@ public class DepositoryRecordServiceImpl implements DepositoryRecordService { // 获取审批人userId String userId = approver.getUserId(); // 获取审批人 - UserByPort userByPort = userService.findUserByWorkWechat(userId); +// UserByPort userByPort = userService.findUserByWorkWechat(userId); + Map userByQyWxUserId = PublicConfig.findUserByQyWxUserId(userId); + UserByPort userByPort = (UserByPort) userByQyWxUserId.get("user"); Map map = new HashMap<>(); map.put("approverId", userByPort.getId()); map.put("approverTime", System.currentTimeMillis()); @@ -3096,7 +3096,8 @@ public class DepositoryRecordServiceImpl implements DepositoryRecordService { map.put("transferId", transferId); // 获取当前转移物料仓库 Depository depositoryRecordById = depositoryMapper.findDepositoryById(material.getDepositoryId()); - Administration company = administrativeService.findAdministrationById(userByPort.getMaindeparment()); +// Administration company = administrativeService.findAdministrationById(userByPort.getMaindeparment()); + Administration company = PublicConfig.getCompany(userByPort.getMaindeparment(),userKey,token); // 生成出库订单 map.put("code", createCode(depositoryRecordById.getDname(), "outOrderNumber", "out", company.getName())); Object placeId = map.get("fromPlaceId"); @@ -3186,7 +3187,7 @@ public class DepositoryRecordServiceImpl implements DepositoryRecordService { List minByParent = depositoryRecordMapper.findApplicationOutRecordMinByParent(record.getId()); // 获取申请用户 - UserByPort applicantUser = userService.findUserByIdForNoPack(record.getApplicantId()); + UserByPort applicantUser = PublicConfig.FindUserById(record.getApplicantId(),userKey,token); // 用于标志该仓库是否为前置仓下的仓库 boolean flagForHasOtherDepository = true; //默认是前置仓下的仓库 // 获取当前出库是否为开放出库 @@ -3194,9 +3195,11 @@ public class DepositoryRecordServiceImpl implements DepositoryRecordService { int flagForOpenDepository = record.getFlagForOpenDepository(); if (manager1 != null && !"".equals(manager1)) { flagForHasOtherDepository = false; - } else { + } + else { if (flagForOpenDepository != 1) { // 如果是开放仓库 + flagForHasOtherDepository = false; } else { @@ -3272,7 +3275,9 @@ public class DepositoryRecordServiceImpl implements DepositoryRecordService { // 获取当前仓库所属的部门 String adminorg = depositoryById.getAdminorg(); - List departmentHeadByUser = userService.getDepartmentHeaderByIdForNoPack(ObjectFormatUtil.toLong(adminorg)); +// List departmentHeadByUser = userService.getDepartmentHeaderByIdForNoPack(ObjectFormatUtil.toLong(adminorg)); + List departmentHeadByUser = PublicConfig.findDepartmentHeadByUser(ObjectFormatUtil.toLong(adminorg),userKey,token); + for (UserByPort departmentHead : departmentHeadByUser ) { depositoryManager.append(departmentHead.getId()).append(","); @@ -3287,7 +3292,7 @@ public class DepositoryRecordServiceImpl implements DepositoryRecordService { // 获取仓储中心负责人 - List departmentHeadByUser = userService.getDepartmentHeaderByIdForNoPack(361L); + List departmentHeadByUser = PublicConfig.findDepartmentHeadByUser(361L,userKey,token); for (UserByPort userByPort : departmentHeadByUser) { depositoryManager.append(userByPort.getId()).append(","); @@ -3306,7 +3311,7 @@ public class DepositoryRecordServiceImpl implements DepositoryRecordService { // 如果是第一个节点 List qyWxLabelUserList = QyWxConfig.getQyWxLabelUserListForLabelName(userAgent, "平衡岗"); for (String s : qyWxLabelUserList) { - UserByPort user = userService.findUserByWorkWechat(s); + UserByPort user = (UserByPort) PublicConfig.findUserByQyWxUserId(s).get("user"); String workwechat = user.getWorkwechat(); if (workwechat == null || "".equals(workwechat)) { workwechat = user.getWechat(); @@ -3336,7 +3341,7 @@ public class DepositoryRecordServiceImpl implements DepositoryRecordService { if ("".equals(depositorymanager)) { continue; } - UserByPort depositoryManage = userService.findUserByIdForNoPack(ObjectFormatUtil.toLong(depositorymanager)); + UserByPort depositoryManage = PublicConfig.FindUserById(ObjectFormatUtil.toLong(depositorymanager),userKey,token); // 获取用户的用工关系 int emptype = depositoryManage.getEmptype(); if (emptype > 10) { @@ -3395,7 +3400,7 @@ public class DepositoryRecordServiceImpl implements DepositoryRecordService { if ("".equals(s)) { continue; } - UserByPort userByPort = userService.findUserByIdForNoPack(ObjectFormatUtil.toLong(s)); + UserByPort userByPort = PublicConfig.FindUserById(ObjectFormatUtil.toLong(s),userKey,token); // 获取用户的用工关系 int emptype = userByPort.getEmptype(); if (emptype > 10) { @@ -3411,7 +3416,8 @@ public class DepositoryRecordServiceImpl implements DepositoryRecordService { s = "PangFuZhen,"; qyWxOperationService.sendMessageForOtherUserByCard(ObjectFormatUtil.toLong(id), s, userAgent, 1, userKey, token); }); - } else if (map.containsKey("balancePosterPass") && !flagForHasOtherDepository) { + } + else if (map.containsKey("balancePosterPass") && !flagForHasOtherDepository) { // 如果是平衡岗人员审批且进入该流程 String result = ""; @@ -3431,7 +3437,7 @@ public class DepositoryRecordServiceImpl implements DepositoryRecordService { // 获取综合办负责人 - List departmentHeadByUser = userService.getDepartmentHeaderByIdForNoPack(268L); + List departmentHeadByUser = PublicConfig.findDepartmentHeadByUser(268L,userKey,token); for (UserByPort userByPort : departmentHeadByUser) { depositoryManager.append(userByPort.getId()).append(","); @@ -3456,7 +3462,7 @@ public class DepositoryRecordServiceImpl implements DepositoryRecordService { if ("".equals(depositorymanager)) { continue; } - UserByPort depositoryManage = userService.findUserByIdForNoPack(ObjectFormatUtil.toLong(depositorymanager)); + UserByPort depositoryManage = PublicConfig.FindUserById(ObjectFormatUtil.toLong(depositorymanager),userKey,token); // 获取用户的用工关系 int emptype = depositoryManage.getEmptype(); if (emptype > 10) { @@ -3515,7 +3521,7 @@ public class DepositoryRecordServiceImpl implements DepositoryRecordService { if ("".equals(s)) { continue; } - UserByPort userByPort = userService.findUserByIdForNoPack(ObjectFormatUtil.toLong(s)); + UserByPort userByPort = PublicConfig.FindUserById(ObjectFormatUtil.toLong(s),userKey,token); // 获取用户的用工关系 int emptype = userByPort.getEmptype(); if (emptype > 10) { @@ -3531,7 +3537,8 @@ public class DepositoryRecordServiceImpl implements DepositoryRecordService { s = "PangFuZhen,"; qyWxOperationService.sendMessageForOtherUserByCard(ObjectFormatUtil.toLong(id), s, userAgent, 1, userKey, token); }); - } else { + } + else { String result = ""; // 开启线程更改其他用户卡片模板样式 String simpleTime = DateUtil.getSimpleTime(new Date()); @@ -3634,7 +3641,7 @@ public class DepositoryRecordServiceImpl implements DepositoryRecordService { // 定义用于获取当前岗位下的人的参数map Map paramForGetUserByPost = new HashMap<>(); paramForGetUserByPost.put("position", roleAndMaterialType.getUid()); - List userByPortList = userService.findUserByConditionForNoPack(paramForGetUserByPost); + List userByPortList = PublicConfig.FindUserByMap(paramForGetUserByPost,userKey,token); for (UserByPort userByPort : userByPortList) { int emptype = userByPort.getEmptype(); if (emptype > 10) { @@ -3657,7 +3664,7 @@ public class DepositoryRecordServiceImpl implements DepositoryRecordService { for (Long integer : userIdByDid) { // 获取仓库管理员信息 - UserByPort manager = userService.findUserByIdForNoPack(integer); + UserByPort manager = PublicConfig.FindUserById(integer,userKey,token); // 获取用户的用工关系 int emptype = manager.getEmptype(); if (emptype > 10) { @@ -3721,7 +3728,7 @@ public class DepositoryRecordServiceImpl implements DepositoryRecordService { // 定义用于获取当前岗位下的人的参数map Map paramForGetUserByPost = new HashMap<>(); paramForGetUserByPost.put("position", roleAndDepository.getUserId()); - List userByPortList = userService.findUserByConditionForNoPack(paramForGetUserByPost); + List userByPortList = PublicConfig.FindUserByMap(paramForGetUserByPost,userKey,token); for (UserByPort userByPort : userByPortList) { int emptype = userByPort.getEmptype(); if (emptype > 10) { @@ -3746,7 +3753,7 @@ public class DepositoryRecordServiceImpl implements DepositoryRecordService { // 修改redis中用户的数据 updateRedisDataForUserManager(integer, minRecordKey); // 获取仓库管理员信息 - UserByPort manager = userService.findUserByIdForNoPack(integer); + UserByPort manager = PublicConfig.FindUserById(integer,userKey,token); // 获取用户的用工关系 int emptype = manager.getEmptype(); if (emptype > 10) { @@ -3784,7 +3791,7 @@ public class DepositoryRecordServiceImpl implements DepositoryRecordService { if ("".equals(s)) { continue; } - UserByPort userByPort = userService.findUserByIdForNoPack(ObjectFormatUtil.toLong(s)); + UserByPort userByPort = PublicConfig.FindUserById(ObjectFormatUtil.toLong(s),userKey,token); // 获取用户的用工关系 int emptype = userByPort.getEmptype(); if (emptype > 10) { @@ -3831,7 +3838,7 @@ public class DepositoryRecordServiceImpl implements DepositoryRecordService { SendQyWxMessageThreadPool.execute(() -> { // 获取responseCode（key为申请人number） //获取部门负责人信息 - UserByPort departHead = userService.findUserByIdForNoPack(ObjectFormatUtil.toLong(record.getDepartmenthead())); + UserByPort departHead = PublicConfig.FindUserById(ObjectFormatUtil.toLong(record.getDepartmenthead()),userKey,token); // 获取用户的用工关系 int emptype = departHead.getEmptype(); if (emptype <= 10) { @@ -5803,7 +5810,7 @@ public class DepositoryRecordServiceImpl implements DepositoryRecordService { List result = new ArrayList<>(list.size()); for (SimpleApplicationOutRecord record : list) { SimpleApplicationOutOrInRecordP d = new SimpleApplicationOutOrInRecordP(record); - UserByPort userByPort = userService.findUserByIdForNoPack(record.getApplicantId()); + UserByPort userByPort = userService.findUserById(record.getApplicantId()); d.setApplyRemark(d.getApplyRemark() == null ? "" : d.getApplyRemark()); d.setApplicantName(userByPort.getMaindeparmentname() + "_" + userByPort.getName()); @@ -5816,7 +5823,7 @@ public class DepositoryRecordServiceImpl implements DepositoryRecordService { List result = new ArrayList<>(list.size()); for (SimpleApplicationInRecord record : list) { SimpleApplicationOutOrInRecordP d = new SimpleApplicationOutOrInRecordP(record); - UserByPort userByPort = userService.findUserByIdForNoPack(record.getApplicantId()); + UserByPort userByPort = userService.findUserById(record.getApplicantId()); d.setApplyRemark(d.getApplyRemark() == null ? "" : d.getApplyRemark()); d.setApplicantName(userByPort.getMaindeparmentname() + "_" + userByPort.getName()); result.add(d); 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 3576825f..09f90ae2 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 @@ -209,7 +209,7 @@ public class DepositoryServiceImpl implements DepositoryService { * @return 查询结果 */ @Override - public Depository findDepositoryById(Long id) { + public Depository findDepositoryById(Object id) { return depositoryMapper.findDepositoryById(id); } 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 1b62a58f..99dd36fc 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 @@ -719,7 +719,7 @@ public class GroupServiceImpl implements GroupService { paramForOut.put("state", "待部门负责人审核"); paramForOut.put("applyRemark", map.get("applyRemark")); // 获取当前部门名称 - Administration company = administrativeMapper.findAdministrationById(userToken.getMaindeparment()); + Administration company = PublicConfig.getCompany(userToken.getMaindeparment(),userKey,token); // 构造出库订单编码 String code = createOutCode("outOrderNumber", company.getName()); paramForOut.put("code", code); @@ -785,7 +785,7 @@ public class GroupServiceImpl implements GroupService { // 获取当前提交数 - List params = (List) map.get("params"); + List params = ObjectFormatUtil.objToList(map.get("params"),String.class); // 用于存储申请数 Integer result = 0; @@ -868,7 +868,7 @@ public class GroupServiceImpl implements GroupService { for (RoleAndMaterialType mt : materialTypeIdForIn ) { // 获取管理员数据 - UserByPort userByPort = userMapper.findUserById(mt.getUid()); + UserByPort userByPort = PublicConfig.FindUserById(mt.getUid(),userKey,token); // 获取用户的用工关系 int emptype = userByPort.getEmptype(); if(emptype > 10){ 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 23f875e0..cd3f1039 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 @@ -460,7 +460,7 @@ public class MaterialServiceImpl implements MaterialService { * @return 库存信息 */ @Override - public Material findMaterialById(Long id) { + public Material findMaterialById(Object id) { Material material = materialMapper.findMaterialById(id); if (material != null) { if (material.getMaterialTypeId() != null) { 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 dc06586b..c390f2dc 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 @@ -183,7 +183,7 @@ public class PlaceServiceImpl implements PlaceService { * @return */ @Override - public List findPlaceByDid(Long did) { + public List findPlaceByDid(Object did) { return placeMapper.findPlaceByDid(did); } @@ -215,7 +215,7 @@ public class PlaceServiceImpl implements PlaceService { * @return */ @Override - public Place findPlaceByDidAndCode(Long did, String code) { + public Place findPlaceByDidAndCode(Object did, String code) { Map paramForPlace = new HashMap<>(); paramForPlace.put("code", code); paramForPlace.put("did", did); @@ -395,7 +395,7 @@ public class PlaceServiceImpl implements PlaceService { * @return */ @Override - public Integer findQuantityByMidAndPid(Long mid, Long pid) { + public Integer findQuantityByMidAndPid(Object mid, Long pid) { Map map = new HashMap<>(); map.put("pid", pid); map.put("mid", mid); 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 711012b0..cd8b629a 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 @@ -11,7 +11,6 @@ import com.dreamchaser.depository_manage.entity.*; import com.dreamchaser.depository_manage.exception.MyException; import com.dreamchaser.depository_manage.depository_mapper.*; import com.dreamchaser.depository_manage.hrNew_mapper.AdministrativeMapper; -import com.dreamchaser.depository_manage.hrNew_mapper.UserMapper; import com.dreamchaser.depository_manage.pojo.RoleAndDepository; import com.dreamchaser.depository_manage.pojo.RoleAndMaterialType; import com.dreamchaser.depository_manage.service.UserService; @@ -735,7 +734,7 @@ public class QyWxOperationService { // 申请人id Long applicantId = recordP.getApplicantId(); // 申请人 - UserByPort applicant = userService.findUserByIdForNoPack(applicantId); + UserByPort applicant =PublicConfig.FindUserById(applicantId,userKey,token); // 获取所有子订单 List applicationOutRecordMinByParent = depositoryRecordMapper.findApplicationOutRecordMinByParent(outId); @@ -769,7 +768,7 @@ public class QyWxOperationService { // 获取仓库信息 Depository depositoryRecordById = depositoryMapper.findDepositoryById(recordMin.getDepositoryId()); // 获取处理人信息 - UserByPort userByPort = userService.findUserByIdForNoPack(recordMin.getCheckId()); + UserByPort userByPort = PublicConfig.FindUserById(recordMin.getCheckId(),userKey,token); // 获取对应出库单位 String unit = recordMin.getUnit(); @@ -2656,7 +2655,7 @@ public class QyWxOperationService { // 获取申请人的userId - UserByPort userByPort = userService.findUserByIdForNoPack(minRecordList.get(0).getApplicantId()); + UserByPort userByPort = PublicConfig.FindUserById(minRecordList.get(0).getApplicantId(),userKey,token); // 获取用户的用工关系 int emptype = userByPort.getEmptype(); if (emptype > 10) { 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 f9ff0fcc..cff3b1d8 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 @@ -14,6 +14,7 @@ import com.dreamchaser.depository_manage.security.pool.SendQyWxMessageThreadPool import com.dreamchaser.depository_manage.service.DepositoryRecordService; import com.dreamchaser.depository_manage.service.SplitUnitService; import com.dreamchaser.depository_manage.service.StockTakingService; +import com.dreamchaser.depository_manage.service.UserService; import com.dreamchaser.depository_manage.utils.DateUtil; import com.dreamchaser.depository_manage.utils.ObjectFormatUtil; import com.dreamchaser.depository_manage.utils.WordUtil; @@ -56,6 +57,9 @@ public class StockTakingServiceImpl implements StockTakingService { @Autowired private RedisPool redisPool; + @Autowired + private UserService userService; + /** * 用于插入盘点记录主表 * @@ -255,7 +259,7 @@ public class StockTakingServiceImpl implements StockTakingService { SimpleStockTakingP ssp = new SimpleStockTakingP(stockTaking); Depository depositoryRecordById = depositoryMapper.findDepositoryById(stockTaking.getDepositoryId()); ssp.setDepositoryName(depositoryRecordById.getDname()); - UserByPort userByPort = PublicConfig.FindUserById(stockTaking.getOriginator(), userKey, token); + UserByPort userByPort = userService.findUserById(stockTaking.getOriginator()); ssp.setOriginatorName(userByPort.getMaindeparmentname() + "_" + userByPort.getName()); stockTakingPS.add(ssp); } diff --git a/src/main/resources/templates/pages/applicationForStorageCenter/application-out_back.html b/src/main/resources/templates/pages/applicationForStorageCenter/application-out_back.html index a2cac2bc..558019d6 100644 --- a/src/main/resources/templates/pages/applicationForStorageCenter/application-out_back.html +++ b/src/main/resources/templates/pages/applicationForStorageCenter/application-out_back.html @@ -501,6 +501,9 @@ flagForForm = true; data = data.field; var params = []; + if(data.outType === ""){ + delete data["outType"]; + } data.params = params; $.ajax({ url: "/depositoryRecord/applicationOut", diff --git a/src/main/resources/templates/pages/depository/table-stock.html b/src/main/resources/templates/pages/depository/table-stock.html index d427a62b..96058c67 100644 --- a/src/main/resources/templates/pages/depository/table-stock.html +++ b/src/main/resources/templates/pages/depository/table-stock.html @@ -403,9 +403,9 @@ req.depositoryIds = []; req.placeCodes = []; for (i = 0, len = data.length; i < len; i++) { - req.mids[i] = data[i].id; - req.depositoryIds[i] = data[i].depositoryId; - req.placeCodes[i] = data[i].placeCode; + req.mids[i] = String(data[i].id); + req.depositoryIds[i] = String(data[i].depositoryId); + req.placeCodes[i] = String(data[i].placeCode); } if (req.mids.length > 0) { $.ajax({ diff --git a/src/main/resources/templates/pages/scanQrCode/ScanBarOrQrCodeOut.html b/src/main/resources/templates/pages/scanQrCode/ScanBarOrQrCodeOut.html index 4825090f..1244a475 100644 --- a/src/main/resources/templates/pages/scanQrCode/ScanBarOrQrCodeOut.html +++ b/src/main/resources/templates/pages/scanQrCode/ScanBarOrQrCodeOut.html @@ -63,7 +63,11 @@ } else { wxScan = wxScan.parent.wx; } - wxScan.scanQRCode({ + var result = "1641262864907149312";//当needResult为1时返回处理结果 + var req = {}; + req.qrCode = result; + outboundLogic(req); + /*wxScan.scanQRCode({ desc: 'scanQRCode desc', needResult: 1, // 默认为0，扫描结果由企业微信处理，1则直接返回扫描结果， scanType: ["barCode", "qrCode"], // 可以指定扫二维码还是条形码（一维码），默认二者都有 @@ -82,7 +86,7 @@ } - }); + });*/ }); diff --git a/src/test/java/com/dreamchaser/depository_manage/QyWxCallBackTest.java b/src/test/java/com/dreamchaser/depository_manage/QyWxCallBackTest.java index 1d95b777..00c4eaaa 100644 --- a/src/test/java/com/dreamchaser/depository_manage/QyWxCallBackTest.java +++ b/src/test/java/com/dreamchaser/depository_manage/QyWxCallBackTest.java @@ -241,7 +241,7 @@ public class QyWxCallBackTest { ApprovalInfo approvalInfo = new ApprovalInfo(); approvalInfo.setTemplateId("3WKiKVCzyLv3Y1LaHZxp4DimQEpCdvYP52HsAUtF"); - approvalInfo.setSpNo("202307110024"); + approvalInfo.setSpNo("202307240005"); // 模拟第一个节点（部门负责人） @@ -251,7 +251,7 @@ public class QyWxCallBackTest { List approvalInfo_Details1 = new ArrayList<>(); ApprovalInfo_Details ad1 = new ApprovalInfo_Details(); ad1.setSpStatus("2"); - ad1.setSpTime("1689062324000"); + ad1.setSpTime("1690159327000"); ApprovalInfo_Details_Approver approver1 = new ApprovalInfo_Details_Approver(); approver1.setUserId("WoBenShanLiang_3"); ad1.setApprover(approver1);