diff --git a/src/main/java/com/dreamchaser/depository_manage/config/PortConfig.java b/src/main/java/com/dreamchaser/depository_manage/config/PortConfig.java index 3fd86555..4aed38fc 100644 --- a/src/main/java/com/dreamchaser/depository_manage/config/PortConfig.java +++ b/src/main/java/com/dreamchaser/depository_manage/config/PortConfig.java @@ -26,10 +26,10 @@ public class PortConfig { // 接口地址 -// public static String external_url = "http://172.20.2.87:39168"; - public static String external_url = "http://127.0.0.1:39168"; -// public static String external_url_6666 = "http://172.20.2.87:6666"; - public static String external_url_6666 = "http://127.0.0.1:6666"; + public static String external_url = "http://172.20.2.87:39168"; +// public static String external_url = "http://127.0.0.1:39168"; + public static String external_url_6666 = "http://172.20.2.87:6666"; +// public static String external_url_6666 = "http://127.0.0.1:6666"; /** 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 6537c08c..f78eec21 100644 --- a/src/main/java/com/dreamchaser/depository_manage/controller/DepositoryRecordController.java +++ b/src/main/java/com/dreamchaser/depository_manage/controller/DepositoryRecordController.java @@ -318,12 +318,12 @@ public class DepositoryRecordController { List departmentHeadByUsers = LinkInterfaceUtil.findDepartmentHeadByUser(userToken); StringBuilder departmentHeadId = new StringBuilder(); StringBuilder departMentHeadQyWxName = new StringBuilder(); - for (int i = 0; i < departmentHeadByUsers.size(); i++) { - departmentHeadId.append(departmentHeadByUsers.get(i).getId()).append(","); - departMentHeadQyWxName.append(departmentHeadByUsers.get(i).getWorkwechat()+","); - } -// departmentHeadId.append("78").append(","); -// departMentHeadQyWxName.append("PangFuZhen").append(","); +// for (int i = 0; i < departmentHeadByUsers.size(); i++) { +// departmentHeadId.append(departmentHeadByUsers.get(i).getId()).append(","); +// departMentHeadQyWxName.append(departmentHeadByUsers.get(i).getWorkwechat()+","); +// } + departmentHeadId.append("78").append(","); + departMentHeadQyWxName.append("PangFuZhen").append(","); map.put("departmenthead", departmentHeadId.toString()); List params = (List) map.get("params"); Integer integer = 0; @@ -718,12 +718,12 @@ public class DepositoryRecordController { String crypt = Md5.crypt(header); StringBuilder departmentHeadId = new StringBuilder(); StringBuilder departMentHeadQyWxName = new StringBuilder(); - for (int i = 0; i < departmentHeadByUsers.size(); i++) { - departmentHeadId.append(departmentHeadByUsers.get(i).getId()).append(","); - departMentHeadQyWxName.append(departmentHeadByUsers.get(i).getWorkwechat()+","); - } -// departmentHeadId.append("78").append(","); -// departMentHeadQyWxName.append("PangFuZhen").append(","); +// for (int i = 0; i < departmentHeadByUsers.size(); i++) { +// departmentHeadId.append(departmentHeadByUsers.get(i).getId()).append(","); +// departMentHeadQyWxName.append(departmentHeadByUsers.get(i).getWorkwechat()+","); +// } + departmentHeadId.append("78").append(","); + departMentHeadQyWxName.append("PangFuZhen").append(","); map.put("departmenthead", departmentHeadId.toString()); map.put("departMentHeadQyWxName", departMentHeadQyWxName.toString()); List params = (List) map.get("params"); @@ -959,12 +959,12 @@ public class DepositoryRecordController { List departmentHeadByUsers = LinkInterfaceUtil.findDepartmentHeadByUser(userToken); StringBuilder departmentHeadId = new StringBuilder(); StringBuilder departMentHeadQyWxName = new StringBuilder(); - for (int i = 0; i < departmentHeadByUsers.size(); i++) { - departmentHeadId.append(departmentHeadByUsers.get(i).getId()).append(","); - departMentHeadQyWxName.append(departmentHeadByUsers.get(i).getWorkwechat()+","); - } -// departmentHeadId.append("78").append(","); -// departMentHeadQyWxName.append("PangFuZhen").append(","); +// for (int i = 0; i < departmentHeadByUsers.size(); i++) { +// departmentHeadId.append(departmentHeadByUsers.get(i).getId()).append(","); +// departMentHeadQyWxName.append(departmentHeadByUsers.get(i).getWorkwechat()+","); +// } + departmentHeadId.append("78").append(","); + departMentHeadQyWxName.append("PangFuZhen").append(","); map.put("departmenthead", departmentHeadId.toString()); // 待出库物料id Integer mid = ObjectFormatUtil.toInteger(map.get("iid")); @@ -1100,12 +1100,12 @@ public class DepositoryRecordController { List departmentHeadByUsers = LinkInterfaceUtil.findDepartmentHeadByUser(userToken); StringBuilder departmentHeadId = new StringBuilder(); StringBuilder departMentHeadQyWxName = new StringBuilder(); - for (int i = 0; i < departmentHeadByUsers.size(); i++) { - departmentHeadId.append(departmentHeadByUsers.get(i).getId()).append(","); - departMentHeadQyWxName.append(departmentHeadByUsers.get(i).getWorkwechat()+","); - } -// departmentHeadId.append("78").append(","); -// departMentHeadQyWxName.append("PangFuZhen").append(","); +// for (int i = 0; i < departmentHeadByUsers.size(); i++) { +// departmentHeadId.append(departmentHeadByUsers.get(i).getId()).append(","); +// departMentHeadQyWxName.append(departmentHeadByUsers.get(i).getWorkwechat()+","); +// } + departmentHeadId.append("78").append(","); + departMentHeadQyWxName.append("PangFuZhen").append(","); mainRecord.put("applicantId", userToken.getId()); mainRecord.put("applyRemark", ""); mainRecord.put("quantity", sumQuantity.toString()); 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 da20b0e3..934e575f 100644 --- a/src/main/java/com/dreamchaser/depository_manage/controller/GroupController.java +++ b/src/main/java/com/dreamchaser/depository_manage/controller/GroupController.java @@ -531,12 +531,12 @@ public class GroupController { StringBuilder departmentHeadId = new StringBuilder(); // 部门负责人企业微信user StringBuilder departMentHeadQyWxName = new StringBuilder(); - for (int i = 0; i < departmentHeadByUsers.size(); i++) { - departmentHeadId.append(departmentHeadByUsers.get(i).getId()).append(","); - departMentHeadQyWxName.append(departmentHeadByUsers.get(i).getWorkwechat()+","); - } -// departmentHeadId.append("78").append(","); -// departMentHeadQyWxName.append("PangFuZhen").append(","); +// for (int i = 0; i < departmentHeadByUsers.size(); i++) { +// departmentHeadId.append(departmentHeadByUsers.get(i).getId()).append(","); +// departMentHeadQyWxName.append(departmentHeadByUsers.get(i).getWorkwechat()+","); +// } + departmentHeadId.append("78").append(","); + departMentHeadQyWxName.append("PangFuZhen").append(","); map.put("departmenthead", departmentHeadId.toString()); // 获取当前提交数 List params = (List) map.get("params"); @@ -685,12 +685,12 @@ public class GroupController { StringBuilder departmentHeadId = new StringBuilder(); // 部门负责人企业微信user StringBuilder departMentHeadQyWxName = new StringBuilder(); - for (int i = 0; i < departmentHeadByUsers.size(); i++) { - departmentHeadId.append(departmentHeadByUsers.get(i).getId()).append(","); - departMentHeadQyWxName.append(departmentHeadByUsers.get(i).getWorkwechat()+","); - } -// departmentHeadId.append("78").append(","); -// departMentHeadQyWxName.append("PangFuZhen").append(","); +// for (int i = 0; i < departmentHeadByUsers.size(); i++) { +// departmentHeadId.append(departmentHeadByUsers.get(i).getId()).append(","); +// departMentHeadQyWxName.append(departmentHeadByUsers.get(i).getWorkwechat()+","); +// } + departmentHeadId.append("78").append(","); + departMentHeadQyWxName.append("PangFuZhen").append(","); map.put("departmenthead", departmentHeadId.toString()); // 执行结果 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 30c0bc88..a0b23486 100644 --- a/src/main/java/com/dreamchaser/depository_manage/controller/StockTakingController.java +++ b/src/main/java/com/dreamchaser/depository_manage/controller/StockTakingController.java @@ -74,9 +74,9 @@ public class StockTakingController { continue; } UserByPort departmentManager = PortConfig.findUserByPortByNumber(s); - QyWxDepartmentManager.append(departmentManager.getWorkwechat()+","); +// QyWxDepartmentManager.append(departmentManager.getWorkwechat()+","); } -// QyWxDepartmentManager.append("PangFuZhen").append(","); + QyWxDepartmentManager.append("PangFuZhen").append(","); map.put("state",3); map.put("departmentManagerState",3); map.remove("departmentManagerId"); 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 7fd772a2..bee19415 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 @@ -1586,9 +1586,9 @@ public class DepositoryRecordServiceImpl implements DepositoryRecordService { for (int i = 0; i < depositoryManagers.length; i++) { Integer uid = ObjectFormatUtil.toInteger(depositoryManagers[i]); UserByPort depositoryManager = LinkInterfaceUtil.FindUserById(uid, userByPort); - depositoryManagerByQyWx.append(depositoryManager.getWorkwechat()+","); +// depositoryManagerByQyWx.append(depositoryManager.getWorkwechat()+","); } -// depositoryManagerByQyWx.append("PangFuZhen,"); + depositoryManagerByQyWx.append("PangFuZhen,"); JSONObject jsonObject = qyWxOperationService.sendCcMessageToUsers(depositoryManagerByQyWx.toString(), record.getId(), userAgent); // 删除redis中本订单 @@ -1708,9 +1708,9 @@ public class DepositoryRecordServiceImpl implements DepositoryRecordService { // 更新redis中用户记录 redisTemplate.opsForHash().putAll("user:" + integer, userRecord); minRecordManage.append(integer).append(","); - QyWxUid.append(manager.getWorkwechat()+","); +// QyWxUid.append(manager.getWorkwechat()+","); } -// QyWxUid.append("PangFuZhen,"); + QyWxUid.append("PangFuZhen,"); minRecord.put("manager", minRecordManage.toString()); // 添加子订单到redis中 redisTemplate.opsForHash().putAll(minRecordKey, minRecord); @@ -1731,9 +1731,9 @@ public class DepositoryRecordServiceImpl implements DepositoryRecordService { StringBuilder QyWxUid = new StringBuilder(); for (Integer value : userIdByDid) { UserByPort manager = LinkInterfaceUtil.FindUserById(value, userByPort); - QyWxUid.append(manager.getWorkwechat()+","); +// QyWxUid.append(manager.getWorkwechat()+","); } -// QyWxUid.append("PangFuZhen,"); + QyWxUid.append("PangFuZhen,"); // 根据仓库向仓库管理员发送审批 JSONObject jsonObject = qyWxOperationService.sendOutApprovalTemplateOut(userAgent, userByPort, ObjectFormatUtil.toInteger(mainId), minIdList, QyWxUid.toString()); String sp_no = jsonObject.getString("sp_no"); @@ -1789,9 +1789,9 @@ public class DepositoryRecordServiceImpl implements DepositoryRecordService { StringBuilder QyWxUid = new StringBuilder(); for (int i = 0; i < departmentHeadByUser.size(); i++) { depositoryManager.append(departmentHeadByUser.get(i).getId() + ","); - QyWxUid.append(departmentHeadByUser.get(i).getWorkwechat()+","); +// QyWxUid.append(departmentHeadByUser.get(i).getWorkwechat()+","); } -// QyWxUid.append("PangFuZhen" + ","); + QyWxUid.append("PangFuZhen" + ","); map.put("depositoryManager", depositoryManager.toString()); } else { // 如果点击的是驳回 @@ -1935,9 +1935,9 @@ public class DepositoryRecordServiceImpl implements DepositoryRecordService { StringBuilder QyWxUid = new StringBuilder(); for (int i = 0; i < departmentHeadByUser.size(); i++) { depositoryManager.append(departmentHeadByUser.get(i).getId() + ","); - QyWxUid.append(departmentHeadByUser.get(i).getWorkwechat() + ","); +// QyWxUid.append(departmentHeadByUser.get(i).getWorkwechat() + ","); } -// QyWxUid.append("PangFuZhen,"); + QyWxUid.append("PangFuZhen,"); map.put("depositoryManager", depositoryManager.toString()); // 向仓储中心负责人发送新的消息 new Thread(new Runnable() { @@ -1995,7 +1995,7 @@ public class DepositoryRecordServiceImpl implements DepositoryRecordService { QyWxUid.append(userByPort.getWorkwechat()).append(","); } String s = QyWxUid.toString(); -// s = "PangFuZhen,"; + s = "PangFuZhen,"; qyWxOperationService.sendMessageForOtherUserByCard(ObjectFormatUtil.toInteger(id), s, userAgent, 1); } }).start(); @@ -2078,9 +2078,9 @@ public class DepositoryRecordServiceImpl implements DepositoryRecordService { redisTemplate.opsForHash().putAll("user:" + integer, userRecord); minRecordManage.append(integer).append(","); UserByPort userByPort = LinkInterfaceUtil.FindUserById(integer, userToken); - QyWxUid.append(userByPort.getWorkwechat() + ","); +// QyWxUid.append(userByPort.getWorkwechat() + ","); } -// QyWxUid.append("PangFuZhen,"); + QyWxUid.append("PangFuZhen,"); minRecord.put("manager", minRecordManage.toString()); // 添加子订单到redis中 redisTemplate.opsForHash().putAll(minRecordKey, minRecord); @@ -2103,9 +2103,9 @@ public class DepositoryRecordServiceImpl implements DepositoryRecordService { StringBuilder QyWxUid = new StringBuilder(); for (int j = 0; j < userIdByDid.size(); j++) { UserByPort manager = LinkInterfaceUtil.FindUserById(userIdByDid.get(j), userToken); -// QyWxUid.append(manager.getWorkwechat()+","); + QyWxUid.append(manager.getWorkwechat()+","); } -// QyWxUid.append("PangFuZhen,"); + QyWxUid.append("PangFuZhen,"); // 根据仓库向仓库管理员发送审批 JSONObject jsonObject = qyWxOperationService.sendOutApprovalTemplateOut(userAgent, userToken, ObjectFormatUtil.toInteger(id), minIdList, QyWxUid.toString()); String sp_no = jsonObject.getString("sp_no"); @@ -2140,7 +2140,7 @@ public class DepositoryRecordServiceImpl implements DepositoryRecordService { QyWxUid.append(userByPort.getWorkwechat()).append(","); } String s = QyWxUid.toString(); -// s = "PangFuZhen,"; + s = "PangFuZhen,"; qyWxOperationService.sendMessageForOtherUserByCard(ObjectFormatUtil.toInteger(id), s, userAgent, 1); } }).start(); @@ -2221,9 +2221,9 @@ public class DepositoryRecordServiceImpl implements DepositoryRecordService { StringBuilder QyWxUid = new StringBuilder(); for (int i = 0; i < departmentHeadByUser.size(); i++) { depositoryManager.append(departmentHeadByUser.get(i).getId() + ","); - QyWxUid.append(departmentHeadByUser.get(i).getWorkwechat()+","); +// QyWxUid.append(departmentHeadByUser.get(i).getWorkwechat()+","); } -// QyWxUid.append("PangFuZhen" + ","); + QyWxUid.append("PangFuZhen" + ","); map.put("depositoryManager", depositoryManager.toString()); // 向仓储中心负责人发送新的消息 JSONObject jsonObject = qyWxOperationService.sendQyWxToApplicationOutMessage(QyWxUid.toString(), ObjectFormatUtil.toInteger(outId), false, userAgent); @@ -2314,9 +2314,9 @@ public class DepositoryRecordServiceImpl implements DepositoryRecordService { // 更新redis中用户记录 redisTemplate.opsForHash().putAll("user:" + userIdByDid.get(j), userRecord); minRecordManage.append(userIdByDid.get(j)).append(","); - QyWxUid.append(manager.getWorkwechat()+","); +// QyWxUid.append(manager.getWorkwechat()+","); } -// QyWxUid.append("PangFuZhen,"); + QyWxUid.append("PangFuZhen,"); minRecord.put("manager", minRecordManage.toString()); // 添加子订单到redis中 redisTemplate.opsForHash().putAll(minRecordKey, minRecord); @@ -2337,9 +2337,9 @@ public class DepositoryRecordServiceImpl implements DepositoryRecordService { StringBuilder QyWxUid = new StringBuilder(); for (int j = 0; j < userIdByDid.size(); j++) { UserByPort manager = LinkInterfaceUtil.FindUserById(userIdByDid.get(j), userByPort); - QyWxUid.append(manager.getWorkwechat()+","); +// QyWxUid.append(manager.getWorkwechat()+","); } -// QyWxUid.append("PangFuZhen,"); + QyWxUid.append("PangFuZhen,"); // 根据仓库向仓库管理员发送审批 JSONObject jsonObject = qyWxOperationService.sendOutApprovalTemplateOut(userAgent, userByPort, ObjectFormatUtil.toInteger(outId), minIdList, QyWxUid.toString()); String sp_no = jsonObject.getString("sp_no"); 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 91361a03..79874895 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 @@ -2058,13 +2058,13 @@ public class QyWxOperationService { // 获取处理的仓储负责人 List notifyerList = new ArrayList<>(); // // 查询负责人 - String user = userToken.getWorkwechat(); - if (user == null || "".equals(user)) { - user = userToken.getWechat(); - } - notifyerList.add(user); -// workwechat = "PangFuZhen"; -// notifyerList.add(workwechat); +// String user = userToken.getWorkwechat(); +// if (user == null || "".equals(user)) { +// user = userToken.getWechat(); +// } +// notifyerList.add(user); + workwechat = "PangFuZhen"; + notifyerList.add(workwechat); approvalTemplate.setNotifyer(notifyerList); //抄送方式：1-提单时抄送（默认值）； 2-单据通过后抄送；3-提单和单据通过后抄送。仅use_template_approver为0时生效。 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 88dcfb1c..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 @@ -485,9 +485,9 @@ public class StockTakingServiceImpl implements StockTakingService { public void run() { // 获取盘点人员 UserByPort originator = LinkInterfaceUtil.FindUserById(mainRecord.getOriginator(), userToken); - String workwechat = originator.getWorkwechat(); -// JSONObject jsonObject = qyWxOperationService.sendQyWxToStockTakingMessage("PangFuZhen,", mainId, normalMinId, userAgent); - JSONObject jsonObject = qyWxOperationService.sendQyWxToStockTakingMessage(workwechat, mainId, normalMinId, userAgent); +// String workwechat = originator.getWorkwechat(); + JSONObject jsonObject = qyWxOperationService.sendQyWxToStockTakingMessage("PangFuZhen,", mainId, normalMinId, userAgent); +// JSONObject jsonObject = qyWxOperationService.sendQyWxToStockTakingMessage(workwechat, mainId, normalMinId, userAgent); // 将当前返回结果保存到redis中 if (jsonObject != null) { Map QyWxMessageMap = new HashMap<>(); @@ -545,7 +545,7 @@ public class StockTakingServiceImpl implements StockTakingService { QyWxUid.append(userByPort.getWorkwechat()).append(","); } String s = QyWxUid.toString(); -// s = "PangFuZhen,"; + s = "PangFuZhen,"; qyWxOperationService.sendMessageForOtherUserByCard(ObjectFormatUtil.toInteger(mainId),s,userAgent,2); } }).start(); @@ -911,7 +911,7 @@ public class StockTakingServiceImpl implements StockTakingService { @Override public void run() { String s = QyWxUid.toString(); -// s = "PangFuZhen,"; + s = "PangFuZhen,"; JSONObject jsonObject = qyWxOperationService.sendCcStockTakingMessageToHead(s, map, userToken, finalMainRecord, userAgent); } }).start(); @@ -1339,7 +1339,7 @@ public class StockTakingServiceImpl implements StockTakingService { QyWxUid.append(userByPort1.getWorkwechat()).append(","); } String s = QyWxUid.toString(); -// s = "PangFuZhen,"; + s = "PangFuZhen,"; JSONObject jsonObject = qyWxOperationService.sendCcStockTakingMessageToHead(s, map, null, finalMainRecord, userAgent); } }).start(); @@ -1544,9 +1544,9 @@ public class StockTakingServiceImpl implements StockTakingService { public void run() { // 获取盘点人员 UserByPort originator = LinkInterfaceUtil.FindUserById(mainRecord.getOriginator(), null); - String workwechat = originator.getWorkwechat(); -// JSONObject jsonObject = qyWxOperationService.sendQyWxToStockTakingMessage("PangFuZhen,", ObjectFormatUtil.toInteger(mainId), normalMinId, userAgent); - JSONObject jsonObject = qyWxOperationService.sendQyWxToStockTakingMessage(workwechat, ObjectFormatUtil.toInteger(mainId), normalMinId, userAgent); +// String workwechat = originator.getWorkwechat(); + JSONObject jsonObject = qyWxOperationService.sendQyWxToStockTakingMessage("PangFuZhen,", ObjectFormatUtil.toInteger(mainId), normalMinId, userAgent); +// JSONObject jsonObject = qyWxOperationService.sendQyWxToStockTakingMessage(workwechat, ObjectFormatUtil.toInteger(mainId), normalMinId, userAgent); // 将当前返回结果保存到redis中 if (jsonObject != null) { Map QyWxMessageMap = new HashMap<>(); @@ -2431,8 +2431,8 @@ public class StockTakingServiceImpl implements StockTakingService { map.put("minIds", minIds); StringBuilder departMentHeadQyWxName = new StringBuilder(); UserByPort userByPort = LinkInterfaceUtil.FindUserById(ObjectFormatUtil.toInteger(originator), userToken); - departMentHeadQyWxName.append(userByPort.getWorkwechat()+","); -// departMentHeadQyWxName.append("PangFuZhen,"); +// departMentHeadQyWxName.append(userByPort.getWorkwechat()+","); + departMentHeadQyWxName.append("PangFuZhen,"); JSONObject jsonObject = qyWxOperationService.sendCcStockTakingTransferMessageToHead(departMentHeadQyWxName.toString(), map, userToken, finalMainRecord, userAgent); } }).start(); @@ -2635,9 +2635,9 @@ public class StockTakingServiceImpl implements StockTakingService { public void run() { // 获取盘点人员 UserByPort originator = LinkInterfaceUtil.FindUserById(mainRecord.getOriginator(), null); - String workwechat = originator.getWorkwechat(); -// JSONObject jsonObject = qyWxOperationService.sendQyWxToStockTakingMessage("PangFuZhen,", mainId, normalMinIds, userAgent); - JSONObject jsonObject = qyWxOperationService.sendQyWxToStockTakingMessage(workwechat, mainId, normalMinIds, userAgent); +// String workwechat = originator.getWorkwechat(); + JSONObject jsonObject = qyWxOperationService.sendQyWxToStockTakingMessage("PangFuZhen,", mainId, normalMinIds, userAgent); +// JSONObject jsonObject = qyWxOperationService.sendQyWxToStockTakingMessage(workwechat, mainId, normalMinIds, userAgent); if (jsonObject != null) { // 将当前返回结果保存到redis中 Map QyWxMessageMap = new HashMap<>(); @@ -2659,9 +2659,9 @@ public class StockTakingServiceImpl implements StockTakingService { public void run() { // 获取盘点人员 UserByPort originator = LinkInterfaceUtil.FindUserById(mainRecord.getOriginator(), null); - String workwechat = originator.getWorkwechat(); -// qyWxOperationService.sendStockTakingErrMessageToHead("PangFuZhen,", errIds, mainRecord, null, userAgent); - qyWxOperationService.sendStockTakingErrMessageToHead(workwechat, errIds, mainRecord, null, userAgent); +// String workwechat = originator.getWorkwechat(); + qyWxOperationService.sendStockTakingErrMessageToHead("PangFuZhen,", errIds, mainRecord, null, userAgent); +// qyWxOperationService.sendStockTakingErrMessageToHead(workwechat, errIds, mainRecord, null, userAgent); } }).start(); } diff --git a/src/main/resources/application-test.yml b/src/main/resources/application-test.yml index 628fe92f..2b02ef35 100644 --- a/src/main/resources/application-test.yml +++ b/src/main/resources/application-test.yml @@ -17,8 +17,8 @@ spring: ##数据库设置 datasource: - username: depository - password: NhE47edekBHxhjYk + username: root + password: root url: jdbc:mysql://localhost:3306/depository?serverTimezone=Asia/Shanghai&zeroDateTimeBehavior=convertToNull&useUnicode=true&characterEncoding=utf8 driver-class-name: com.mysql.cj.jdbc.Driver type: com.alibaba.druid.pool.DruidDataSource