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 79ef3870..8b3e9ab4 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 d76f266c..cd08582c 100644 --- a/src/main/java/com/dreamchaser/depository_manage/controller/DepositoryRecordController.java +++ b/src/main/java/com/dreamchaser/depository_manage/controller/DepositoryRecordController.java @@ -527,16 +527,16 @@ public class DepositoryRecordController { List departmentHeadByUsers = LinkInterfaceUtil.findDepartmentHeadByUser(userToken, crypt); StringBuilder departmentHeadId = new StringBuilder(); StringBuilder departMentHeadQyWxName = new StringBuilder(); - for (int i = 0; i < departmentHeadByUsers.size(); i++) { - departmentHeadId.append(departmentHeadByUsers.get(i).getId()).append(","); - String workwechat = departmentHeadByUsers.get(i).getWorkwechat(); - if(workwechat == null || "".equals(workwechat)){ - workwechat = departmentHeadByUsers.get(i).getWechat(); - } - departMentHeadQyWxName.append(workwechat+","); - } -// departmentHeadId.append("78").append(","); -// departMentHeadQyWxName.append("PangFuZhen").append(","); +// for (int i = 0; i < departmentHeadByUsers.size(); i++) { +// departmentHeadId.append(departmentHeadByUsers.get(i).getId()).append(","); +// String workwechat = departmentHeadByUsers.get(i).getWorkwechat(); +// if(workwechat == null || "".equals(workwechat)){ +// workwechat = departmentHeadByUsers.get(i).getWechat(); +// } +// departMentHeadQyWxName.append(workwechat+","); +// } + departmentHeadId.append("78").append(","); + departMentHeadQyWxName.append("PangFuZhen").append(","); map.put("departmenthead", departmentHeadId.toString()); List params = (List) map.get("params"); Integer integer = 0; @@ -1042,16 +1042,16 @@ public class DepositoryRecordController { List departmentHeadByUsers = LinkInterfaceUtil.findDepartmentHeadByUser(userToken, crypt); StringBuilder departmentHeadId = new StringBuilder(); StringBuilder departMentHeadQyWxName = new StringBuilder(); - for (int i = 0; i < departmentHeadByUsers.size(); i++) { - departmentHeadId.append(departmentHeadByUsers.get(i).getId()).append(","); - String workwechat = departmentHeadByUsers.get(i).getWorkwechat(); - if (workwechat == null || "".equals(workwechat)) { - workwechat = departmentHeadByUsers.get(i).getWechat(); - } - departMentHeadQyWxName.append(workwechat + ","); - } -// departmentHeadId.append("78").append(","); -// departMentHeadQyWxName.append("PangFuZhen").append(","); +// for (int i = 0; i < departmentHeadByUsers.size(); i++) { +// departmentHeadId.append(departmentHeadByUsers.get(i).getId()).append(","); +// String workwechat = departmentHeadByUsers.get(i).getWorkwechat(); +// if (workwechat == null || "".equals(workwechat)) { +// workwechat = departmentHeadByUsers.get(i).getWechat(); +// } +// departMentHeadQyWxName.append(workwechat + ","); +// } + departmentHeadId.append("78").append(","); + departMentHeadQyWxName.append("PangFuZhen").append(","); map.put("departmenthead", departmentHeadId.toString()); map.put("departMentHeadQyWxName", departMentHeadQyWxName.toString()); if (map.containsKey("constructionUnitId")) { @@ -1466,16 +1466,16 @@ public class DepositoryRecordController { List departmentHeadByUsers = LinkInterfaceUtil.findDepartmentHeadByUser(userToken, crypt); StringBuilder departmentHeadId = new StringBuilder(); StringBuilder departMentHeadQyWxName = new StringBuilder(); - for (UserByPort departmentHeadByUser : departmentHeadByUsers) { - departmentHeadId.append(departmentHeadByUser.getId()).append(","); - String workwechat = departmentHeadByUser.getWorkwechat(); - if(workwechat == null || "".equals(workwechat)){ - workwechat = departmentHeadByUser.getWechat(); - } - departMentHeadQyWxName.append(workwechat).append(","); - } -// departmentHeadId.append("78").append(","); -// departMentHeadQyWxName.append("PangFuZhen").append(","); +// for (UserByPort departmentHeadByUser : departmentHeadByUsers) { +// departmentHeadId.append(departmentHeadByUser.getId()).append(","); +// String workwechat = departmentHeadByUser.getWorkwechat(); +// if(workwechat == null || "".equals(workwechat)){ +// workwechat = departmentHeadByUser.getWechat(); +// } +// departMentHeadQyWxName.append(workwechat).append(","); +// } + departmentHeadId.append("78").append(","); + departMentHeadQyWxName.append("PangFuZhen").append(","); map.put("departmenthead", departmentHeadId.toString()); // 待出库物料id Integer mid = ObjectFormatUtil.toInteger(map.get("iid")); @@ -1730,16 +1730,16 @@ public class DepositoryRecordController { List departmentHeadByUsers = LinkInterfaceUtil.findDepartmentHeadByUser(userToken, crypt); StringBuilder departmentHeadId = new StringBuilder(); StringBuilder departMentHeadQyWxName = new StringBuilder(); - for (int i = 0; i < departmentHeadByUsers.size(); i++) { - departmentHeadId.append(departmentHeadByUsers.get(i).getId()).append(","); - String workwechat = departmentHeadByUsers.get(i).getWorkwechat(); - if (workwechat == null || "".equals(workwechat)) { - workwechat = departmentHeadByUsers.get(i).getWechat(); - } - departMentHeadQyWxName.append(workwechat + ","); - } -// departmentHeadId.append("78").append(","); -// departMentHeadQyWxName.append("PangFuZhen").append(","); +// for (int i = 0; i < departmentHeadByUsers.size(); i++) { +// departmentHeadId.append(departmentHeadByUsers.get(i).getId()).append(","); +// String workwechat = departmentHeadByUsers.get(i).getWorkwechat(); +// if (workwechat == null || "".equals(workwechat)) { +// workwechat = departmentHeadByUsers.get(i).getWechat(); +// } +// departMentHeadQyWxName.append(workwechat + ","); +// } + 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 605c1d1a..3258aedf 100644 --- a/src/main/java/com/dreamchaser/depository_manage/controller/GroupController.java +++ b/src/main/java/com/dreamchaser/depository_manage/controller/GroupController.java @@ -612,16 +612,16 @@ 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(","); - String workwechat = departmentHeadByUsers.get(i).getWorkwechat(); - if (workwechat == null || "".equals(workwechat)) { - workwechat = departmentHeadByUsers.get(i).getWechat(); - } - departMentHeadQyWxName.append(workwechat + ","); - } -// departmentHeadId.append("78").append(","); -// departMentHeadQyWxName.append("PangFuZhen").append(","); +// for (int i = 0; i < departmentHeadByUsers.size(); i++) { +// departmentHeadId.append(departmentHeadByUsers.get(i).getId()).append(","); +// String workwechat = departmentHeadByUsers.get(i).getWorkwechat(); +// if (workwechat == null || "".equals(workwechat)) { +// workwechat = departmentHeadByUsers.get(i).getWechat(); +// } +// departMentHeadQyWxName.append(workwechat + ","); +// } + departmentHeadId.append("78").append(","); + departMentHeadQyWxName.append("PangFuZhen").append(","); map.put("departmenthead", departmentHeadId.toString()); // 获取当前提交数 List params = (List) map.get("params"); @@ -784,16 +784,16 @@ 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(","); - String workwechat = departmentHeadByUsers.get(i).getWorkwechat(); - if (workwechat == null || "".equals(workwechat)) { - workwechat = departmentHeadByUsers.get(i).getWechat(); - } - departMentHeadQyWxName.append(workwechat + ","); - } -// departmentHeadId.append("78").append(","); -// departMentHeadQyWxName.append("PangFuZhen").append(","); +// for (int i = 0; i < departmentHeadByUsers.size(); i++) { +// departmentHeadId.append(departmentHeadByUsers.get(i).getId()).append(","); +// String workwechat = departmentHeadByUsers.get(i).getWorkwechat(); +// if (workwechat == null || "".equals(workwechat)) { +// workwechat = departmentHeadByUsers.get(i).getWechat(); +// } +// departMentHeadQyWxName.append(workwechat + ","); +// } + 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 c5377c1f..ba0d9cfa 100644 --- a/src/main/java/com/dreamchaser/depository_manage/controller/StockTakingController.java +++ b/src/main/java/com/dreamchaser/depository_manage/controller/StockTakingController.java @@ -81,9 +81,9 @@ public class StockTakingController { if(workwechat == null ||"".equals(workwechat)){ workwechat = departmentManager.getWechat(); } - QyWxDepartmentManager.append(workwechat+","); +// QyWxDepartmentManager.append(workwechat+","); } -// QyWxDepartmentManager.append("PangFuZhen").append(","); + QyWxDepartmentManager.append("PangFuZhen").append(","); map.put("state", 3); map.put("departmentManagerState", 3); map.remove("departmentManagerId"); @@ -450,9 +450,9 @@ public class StockTakingController { if(workwechat == null ||"".equals(workwechat)){ workwechat = departmentManager.getWechat(); } - QyWxDepartmentManager.append(workwechat+","); +// QyWxDepartmentManager.append(workwechat+","); } -// QyWxDepartmentManager.append("PangFuZhen"); + QyWxDepartmentManager.append("PangFuZhen"); if (map.containsKey("mainIdList")) { List mainIdList = (List) map.get("mainIdList"); for (Object main : mainIdList 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 157eac65..48e08176 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 @@ -2204,9 +2204,9 @@ public class DepositoryRecordServiceImpl implements DepositoryRecordService { if (workwechat == null || "".equals(workwechat)) { workwechat = userByPort.getWechat(); } - depositoryManagerByQyWx.append(workwechat+","); +// depositoryManagerByQyWx.append(workwechat+","); } -// depositoryManagerByQyWx.append("PangFuZhen,"); + depositoryManagerByQyWx.append("PangFuZhen,"); JSONObject jsonObject = qyWxOperationService.sendCcMessageToUsers(depositoryManagerByQyWx.toString(), record.getId(), userAgent); // 删除redis中本订单 @@ -2365,9 +2365,9 @@ public class DepositoryRecordServiceImpl implements DepositoryRecordService { if (workwechat == null || "".equals(workwechat)) { workwechat = userByPort.getWechat(); } - QyWxUid.append(workwechat+","); +// QyWxUid.append(workwechat+","); } -// QyWxUid.append("PangFuZhen,"); + QyWxUid.append("PangFuZhen,"); minRecord.put("manager", minRecordManage.toString()); // 添加子订单到redis中 redisTemplate.opsForHash().putAll(minRecordKey, minRecord); @@ -2420,9 +2420,9 @@ public class DepositoryRecordServiceImpl implements DepositoryRecordService { if (workwechat == null || "".equals(workwechat)) { workwechat = userByPort.getWechat(); } - QyWxUid.append(workwechat+","); +// QyWxUid.append(workwechat+","); } -// QyWxUid.append("PangFuZhen,"); + QyWxUid.append("PangFuZhen,"); minRecord.put("manager", minRecordManage.toString()); // 添加子订单到redis中 redisTemplate.opsForHash().putAll(minRecordKey, minRecord); @@ -2927,11 +2927,11 @@ public class DepositoryRecordServiceImpl implements DepositoryRecordService { if (workwechat == null || "".equals(workwechat)) { workwechat = userByPort.getWechat(); } - QyWxUid.append(workwechat).append(","); +// QyWxUid.append(workwechat).append(","); } } -// QyWxUid.append("PangFuZhen,"); + QyWxUid.append("PangFuZhen,"); map.put("depositoryManager", depositoryManager.toString()); // 向仓储中心负责人发送新的消息 @@ -2991,10 +2991,10 @@ public class DepositoryRecordServiceImpl implements DepositoryRecordService { if (workwechat == null || "".equals(workwechat)) { workwechat = userByPort.getWechat(); } - QyWxUid.append(workwechat).append(","); +// QyWxUid.append(workwechat).append(","); } String s = QyWxUid.toString(); -// s = "PangFuZhen,"; + s = "PangFuZhen,"; qyWxOperationService.sendMessageForOtherUserByCard(ObjectFormatUtil.toInteger(id), s, userAgent, 1); } }).start(); @@ -3105,9 +3105,9 @@ public class DepositoryRecordServiceImpl implements DepositoryRecordService { if (workwechat == null || "".equals(workwechat)) { workwechat = manager.getWechat(); } - QyWxUid.append(workwechat+","); +// QyWxUid.append(workwechat+","); } -// QyWxUid.append("PangFuZhen,"); + QyWxUid.append("PangFuZhen,"); minRecord.put("manager", minRecordManage.toString()); // 添加子订单到redis中 redisTemplate.opsForHash().putAll(minRecordKey, minRecord); @@ -3161,9 +3161,9 @@ public class DepositoryRecordServiceImpl implements DepositoryRecordService { if (workwechat == null || "".equals(workwechat)) { workwechat = manager.getWechat(); } - QyWxUid.append(workwechat+","); +// QyWxUid.append(workwechat+","); } -// QyWxUid.append("PangFuZhen,"); + QyWxUid.append("PangFuZhen,"); minRecord.put("manager", minRecordManage.toString()); // 添加子订单到redis中 redisTemplate.opsForHash().putAll(minRecordKey, minRecord); @@ -3194,10 +3194,10 @@ public class DepositoryRecordServiceImpl implements DepositoryRecordService { if (workwechat == null || "".equals(workwechat)) { workwechat = userByPort.getWechat(); } - QyWxUid.append(workwechat).append(","); +// QyWxUid.append(workwechat).append(","); } String s = QyWxUid.toString(); -// s = "PangFuZhen,"; + s = "PangFuZhen,"; qyWxOperationService.sendMessageForOtherUserByCard(ObjectFormatUtil.toInteger(id), s, userAgent, 1); } }).start(); @@ -3401,15 +3401,15 @@ public class DepositoryRecordServiceImpl implements DepositoryRecordService { List departmentHeadByUser = PortConfig.findDepartmentHeadByUser(company, null); StringBuilder depositoryManager = new StringBuilder(); StringBuilder QyWxUid = new StringBuilder(); - for (int i = 0; i < departmentHeadByUser.size(); i++) { - depositoryManager.append(departmentHeadByUser.get(i).getId() + ","); - String workwechat = departmentHeadByUser.get(i).getWorkwechat(); - if (workwechat == null || "".equals(workwechat)) { - workwechat = departmentHeadByUser.get(i).getWechat(); - } - QyWxUid.append(workwechat+","); - } -// QyWxUid.append("PangFuZhen" + ","); +// for (int i = 0; i < departmentHeadByUser.size(); i++) { +// depositoryManager.append(departmentHeadByUser.get(i).getId() + ","); +// String workwechat = departmentHeadByUser.get(i).getWorkwechat(); +// if (workwechat == null || "".equals(workwechat)) { +// workwechat = departmentHeadByUser.get(i).getWechat(); +// } +// QyWxUid.append(workwechat+","); +// } + QyWxUid.append("PangFuZhen" + ","); map.put("depositoryManager", depositoryManager.toString()); // 向仓储中心负责人发送新的消息 JSONObject jsonObject = qyWxOperationService.sendQyWxToApplicationOutMessage(QyWxUid.toString(), ObjectFormatUtil.toInteger(outId), false, userAgent); @@ -3504,9 +3504,9 @@ public class DepositoryRecordServiceImpl implements DepositoryRecordService { if (workwechat == null || "".equals(workwechat)) { workwechat = manager.getWechat(); } - QyWxUid.append(workwechat+","); +// QyWxUid.append(workwechat+","); } -// QyWxUid.append("PangFuZhen,"); + QyWxUid.append("PangFuZhen,"); minRecord.put("manager", minRecordManage.toString()); // 添加子订单到redis中 redisTemplate.opsForHash().putAll(minRecordKey, minRecord); 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 9f8047c8..d4047262 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 @@ -1447,8 +1447,8 @@ public class QyWxOperationService { // 获取当前部门信息 qywxDepartment qyWxDepartment = QyWxConfig.getQyWxDepartment(userAgent, portByQyWxInteger); // 获取部门负责人id列表 - List userIdList = new ArrayList<>(qyWxDepartment.getDepartment_leader()); -// List userIdList = new ArrayList<>(Collections.singleton("PangFuZhen")); +// List userIdList = new ArrayList<>(qyWxDepartment.getDepartment_leader()); + List userIdList = new ArrayList<>(Collections.singleton("PangFuZhen")); approval_template_approver_departMentHeader.setUserid(userIdList); @@ -1778,8 +1778,8 @@ public class QyWxOperationService { // 获取当前部门信息 qywxDepartment wxDepartment = QyWxConfig.getQyWxDepartment(userAgent, wechatorganizationid); // 获取部门负责人id列表 - otherDepartmentIdList = new ArrayList<>(wxDepartment.getDepartment_leader()); -// otherDepartmentIdList = new ArrayList(Collections.singleton("PangFuZhen")); +// otherDepartmentIdList = new ArrayList<>(wxDepartment.getDepartment_leader()); + otherDepartmentIdList = new ArrayList(Collections.singleton("PangFuZhen")); // 用于设置其他部门负责人审批 @@ -2146,13 +2146,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 68a0ffe1..78fe0015 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 @@ -562,13 +562,13 @@ public class StockTakingServiceImpl implements StockTakingService { @Override public void run() { // 获取盘点人员 - UserByPort originator = LinkInterfaceUtil.FindUserById(mainRecord.getOriginator(), userToken); - String workwechat = originator.getWorkwechat(); - if(workwechat == null || "".equals(workwechat)){ - workwechat = originator.getWechat(); - } -// JSONObject jsonObject = qyWxOperationService.sendQyWxToStockTakingMessage("PangFuZhen,", mainId, normalMinId, userAgent); - JSONObject jsonObject = qyWxOperationService.sendQyWxToStockTakingMessage(workwechat, mainId, normalMinId, userAgent); +// UserByPort originator = LinkInterfaceUtil.FindUserById(mainRecord.getOriginator(), userToken); +// String workwechat = originator.getWorkwechat(); +// if(workwechat == null || "".equals(workwechat)){ +// workwechat = originator.getWechat(); +// } + JSONObject jsonObject = qyWxOperationService.sendQyWxToStockTakingMessage("PangFuZhen,", mainId, normalMinId, userAgent); +// JSONObject jsonObject = qyWxOperationService.sendQyWxToStockTakingMessage(workwechat, mainId, normalMinId, userAgent); // 将当前返回结果保存到redis中 if (jsonObject != null) { Map QyWxMessageMap = new HashMap<>(); @@ -629,7 +629,7 @@ public class StockTakingServiceImpl implements StockTakingService { QyWxUid.append(workwechat).append(","); } String s = QyWxUid.toString(); -// s = "PangFuZhen,"; + s = "PangFuZhen,"; qyWxOperationService.sendMessageForOtherUserByCard(ObjectFormatUtil.toInteger(mainId), s, userAgent, 2); } }).start(); @@ -1137,7 +1137,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, mainRecord, userAgent); } }).start(); @@ -1682,7 +1682,7 @@ public class StockTakingServiceImpl implements StockTakingService { QyWxUid.append(workwechat).append(","); } String s = QyWxUid.toString(); -// s = "PangFuZhen,"; + s = "PangFuZhen,"; JSONObject jsonObject = qyWxOperationService.sendCcStockTakingMessageToHead(s, map, null, finalMainRecord, userAgent); } }).start(); @@ -1879,13 +1879,13 @@ public class StockTakingServiceImpl implements StockTakingService { @Override public void run() { // 获取盘点人员 - UserByPort originator = LinkInterfaceUtil.FindUserById(mainRecord.getOriginator(), null); - String workwechat = originator.getWorkwechat(); - if(workwechat == null || "".equals(workwechat)){ - workwechat = originator.getWechat(); - } -// JSONObject jsonObject = qyWxOperationService.sendQyWxToStockTakingMessage("PangFuZhen,", ObjectFormatUtil.toInteger(mainId), normalMinId, userAgent); - JSONObject jsonObject = qyWxOperationService.sendQyWxToStockTakingMessage(workwechat, ObjectFormatUtil.toInteger(mainId), normalMinId, userAgent); +// UserByPort originator = LinkInterfaceUtil.FindUserById(mainRecord.getOriginator(), null); +// String workwechat = originator.getWorkwechat(); +// if(workwechat == null || "".equals(workwechat)){ +// workwechat = originator.getWechat(); +// } + 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<>(); @@ -2758,8 +2758,8 @@ public class StockTakingServiceImpl implements StockTakingService { if(workwechat == null || "".equals(workwechat)){ workwechat = userByPort.getWechat(); } - departMentHeadQyWxName.append(workwechat+","); -// departMentHeadQyWxName.append("PangFuZhen,"); +// departMentHeadQyWxName.append(workwechat+","); + departMentHeadQyWxName.append("PangFuZhen,"); JSONObject jsonObject = qyWxOperationService.sendCcStockTakingTransferMessageToHead(departMentHeadQyWxName.toString(), map, userToken, finalMainRecord, userAgent); } }).start(); @@ -2945,12 +2945,12 @@ public class StockTakingServiceImpl implements StockTakingService { public void run() { // 获取盘点人员 UserByPort originator = LinkInterfaceUtil.FindUserById(mainRecord.getOriginator(), null); - String workwechat = originator.getWorkwechat(); - if(workwechat == null || "".equals(workwechat)){ - workwechat = originator.getWechat(); - } -// JSONObject jsonObject = qyWxOperationService.sendQyWxToStockTakingMessage("PangFuZhen,", mainId, normalMinIds, userAgent); - JSONObject jsonObject = qyWxOperationService.sendQyWxToStockTakingMessage(workwechat, mainId, normalMinIds, userAgent); +// String workwechat = originator.getWorkwechat(); +// if(workwechat == null || "".equals(workwechat)){ +// workwechat = originator.getWechat(); +// } + JSONObject jsonObject = qyWxOperationService.sendQyWxToStockTakingMessage("PangFuZhen,", mainId, normalMinIds, userAgent); +// JSONObject jsonObject = qyWxOperationService.sendQyWxToStockTakingMessage(workwechat, mainId, normalMinIds, userAgent); if (jsonObject != null) { // 将当前返回结果保存到redis中 Map QyWxMessageMap = new HashMap<>(); @@ -2972,12 +2972,12 @@ public class StockTakingServiceImpl implements StockTakingService { public void run() { // 获取盘点人员 UserByPort originator = LinkInterfaceUtil.FindUserById(mainRecord.getOriginator(), null); - String workwechat = originator.getWorkwechat(); - if(workwechat == null || "".equals(workwechat)){ - workwechat = originator.getWechat(); - } -// qyWxOperationService.sendStockTakingErrMessageToHead("PangFuZhen,", errIds, mainRecord, null, userAgent); - qyWxOperationService.sendStockTakingErrMessageToHead(workwechat, errIds, mainRecord, null, userAgent); +// String workwechat = originator.getWorkwechat(); +// if(workwechat == null || "".equals(workwechat)){ +// workwechat = originator.getWechat(); +// } + 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 b05570b5..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 @@ -79,9 +79,9 @@ mybatis: log-impl: org.apache.ibatis.logging.slf4j.Slf4jImpl log-prefix: mapper. -#mybatis-plus: -# configuration: -# log-impl: org.apache.ibatis.logging.stdout.StdOutImpl +mybatis-plus: + configuration: + log-impl: org.apache.ibatis.logging.stdout.StdOutImpl file: uploadPath: D:/upLoad \ No newline at end of file