diff --git a/src/main/java/com/dreamchaser/depository_manage/config/QyWxConfig.java b/src/main/java/com/dreamchaser/depository_manage/config/QyWxConfig.java index 55c03560..be00eed2 100644 --- a/src/main/java/com/dreamchaser/depository_manage/config/QyWxConfig.java +++ b/src/main/java/com/dreamchaser/depository_manage/config/QyWxConfig.java @@ -186,7 +186,7 @@ public class QyWxConfig { } /** - * 获取 + * 获取当前标签成员 * @param tempToken * @param TAGID * @return 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 4c30e5d6..9bd8a25d 100644 --- a/src/main/java/com/dreamchaser/depository_manage/controller/PageController.java +++ b/src/main/java/com/dreamchaser/depository_manage/controller/PageController.java @@ -3,6 +3,7 @@ package com.dreamchaser.depository_manage.controller; import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; import com.dreamchaser.depository_manage.config.PortConfig; +import com.dreamchaser.depository_manage.config.QyWxConfig; import com.dreamchaser.depository_manage.entity.*; import com.dreamchaser.depository_manage.entity.MaterialAndPlace; import com.dreamchaser.depository_manage.exception.MyException; @@ -2209,13 +2210,26 @@ public class PageController { UserByPort userToken = (UserByPort) request.getAttribute("userToken"); ModelAndView mv = new ModelAndView(); // 获取仓储中心详情 - Administration company = LinkInterfaceUtil.getCompany(361, userToken); +// Administration company = LinkInterfaceUtil.getCompany(361, userToken); // 获取仓储中心负责人 - List departmentHeadByUser = PortConfig.findDepartmentHeadByUser(company, userToken); +// List departmentHeadByUser = PortConfig.findDepartmentHeadByUser(company, userToken); StringBuilder departmentHeadName = new StringBuilder(); StringBuilder departmentHeadId = new StringBuilder(); - for (int i = 0; i < departmentHeadByUser.size(); i++) { - UserByPort userByPort = departmentHeadByUser.get(i); + // 获取当前userAgent + String header = request.getHeader("user-agent"); + String crypt = Md5.crypt(header); + // 获取当前用户部门对应企业微信中的部门信息 + JSONObject userPortByQyWx = PortConfig.getUserPortByQyWx(userToken.getMaindeparment()); + Integer portByQyWxInteger = userPortByQyWx.getInteger("wechatorganizationid"); + // 获取当前部门信息 + qywxDepartment qyWxDepartment = QyWxConfig.getQyWxDepartment(crypt, portByQyWxInteger); + // 获取当前部门的负责人列表 + List department_leader = qyWxDepartment.getDepartment_leader(); + for (String department : + department_leader) { + // 通过userId获取对应用户信息 + Map portInfo = PortConfig.findUserByQyWxUserId(department); + UserByPort userByPort = (UserByPort) portInfo.get("user"); departmentHeadName.append(userByPort.getName()).append(","); departmentHeadId.append(userByPort.getId()).append(","); } 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 d0bc58be..ae7070bb 100644 --- a/src/main/java/com/dreamchaser/depository_manage/controller/StockTakingController.java +++ b/src/main/java/com/dreamchaser/depository_manage/controller/StockTakingController.java @@ -69,9 +69,8 @@ public class StockTakingController { // 用于设置企业微信接收人 StringBuilder QyWxDepartmentManager = new StringBuilder(); String[] split = departmentManagerId.split(","); - for (int i = 0; i < split.length; i++) { - String s = split[i]; - if("".equals(s)){ + for (String s : split) { + if ("".equals(s)) { continue; } UserByPort departmentManager = PortConfig.findUserByPortByNumber(s); 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 1fd85415..b21721a4 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 @@ -290,9 +290,8 @@ public class QyWxOperationService { Location.append(" - ").append(place.getCode()); } - for (int i = 0; i < minRecordList.size(); i++) { + for (StockTakingChildP childP : minRecordList) { // 获取子订单信息 - StockTakingChildP childP = minRecordList.get(i); // 获取当前申请物料 Inventory materialById = materialMapper.findInventoryById(childP.getMid()); // 设置物料名称 @@ -539,9 +538,8 @@ public class QyWxOperationService { Location.append(" - ").append(place.getCode()); } - for (int i = 0; i < minRecordList.size(); i++) { + for (StockTakingChildP childP : minRecordList) { // 获取子订单信息 - StockTakingChildP childP = minRecordList.get(i); // 获取当前申请物料 Inventory materialById = materialMapper.findInventoryById(childP.getMid()); // 设置物料名称 @@ -1404,14 +1402,13 @@ public class QyWxOperationService { if (workwechat == null || "".equals(workwechat)) { workwechat = userToken.getWechat(); } -// String workwechat = "PangFuZhen"; // 设置申请人 approvalTemplate.setCreator_userid(workwechat); // 设置模板id approvalTemplate.setTemplate_id(QyWxConfig.out_approval_template_id); - // 设置审批人模式为通过接口设置 + // 设置审批人模式为通过接口设置(系统内部自定义) approvalTemplate.setUse_template_approver(0); @@ -1525,7 +1522,7 @@ public class QyWxOperationService { List contents_detail = new ArrayList<>(); - // 设置标志位,用于标志是否全为办公用品库 + // 设置标志位,用于标志是否全为办公用品库或消防用品库 boolean flag = true; for (ApplicationOutRecordMin recordMin : minRecordList) { // 获取明细信息 @@ -1628,7 +1625,7 @@ public class QyWxOperationService { detail_list_control_info_value_dname.put("text", depositoryById.getDname()); detail_list_control_info_depositoryName.put("value", detail_list_control_info_value_dname); - if(!depositoryById.getDname().contains("办公用品库")){ + if(!(depositoryById.getDname().contains("办公用品库")||depositoryById.getDname().contains("消防用品库"))){ // 如果不是办公用品库 flag = false; } @@ -2124,8 +2121,8 @@ public class QyWxOperationService { approval_template_approver.setAttr(1); List userIdList = new ArrayList<>(); String[] split = QyWxUid.split(","); - for (int i = 0; i < split.length; i++) { - userIdList.add(split[i]); + for (String value : split) { + userIdList.add(value); } approval_template_approver.setUserid(userIdList); 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 064843c3..aedcbb1e 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 @@ -102,7 +102,8 @@ public class StockTakingServiceImpl implements StockTakingService { Map barCodeListByNoMaterial = (Map) map.get("barCodeListByNoMaterial"); Integer mid = ObjectFormatUtil.toInteger(map.get("mid")); if (needToUpdate != null) { - // 如果需要绑定条码 + // 如果需要绑定新条码 + String temp = map.get("temp").toString(); if ("0".equals(temp)) { // 如果是0 diff --git a/src/main/resources/templates/pages/post/selectManager.html b/src/main/resources/templates/pages/post/selectManager.html index 1ab7ad2f..f9b11ad5 100644 --- a/src/main/resources/templates/pages/post/selectManager.html +++ b/src/main/resources/templates/pages/post/selectManager.html @@ -14,29 +14,29 @@