pfz_smile
/
depositroy
2
0
Fork 0
Code Issues Pull Requests Projects Releases 1 Wiki Activity
Browse Source

修改部门页面的扫码功能

lwx_dev
erdanergou 3 years ago
parent
68951df83e
commit
6e2a357dae
8 changed files with 90 additions and 90 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 8
      src/main/java/com/dreamchaser/depository_manage/config/PortConfig.java
  2. 48
      src/main/java/com/dreamchaser/depository_manage/controller/DepositoryRecordController.java
  3. 24
      src/main/java/com/dreamchaser/depository_manage/controller/GroupController.java
  4. 4
      src/main/java/com/dreamchaser/depository_manage/controller/StockTakingController.java
  5. 44
      src/main/java/com/dreamchaser/depository_manage/service/impl/DepositoryRecordServiceImpl.java
  6. 14
      src/main/java/com/dreamchaser/depository_manage/service/impl/QyWxOperationService.java
  7. 34
      src/main/java/com/dreamchaser/depository_manage/service/impl/StockTakingServiceImpl.java
  8. 4
      src/main/resources/application-test.yml

8
src/main/java/com/dreamchaser/depository_manage/config/PortConfig.java
View File

@ -26,10 +26,10 @@ public class PortConfig {
// 接口地址 // 接口地址
// public static String external_url = "http://172.20.2.87:39168"; 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 = "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://172.20.2.87:6666";
public static String external_url_6666 = "http://127.0.0.1:6666"; // public static String external_url_6666 = "http://127.0.0.1:6666";
/** /**

48
src/main/java/com/dreamchaser/depository_manage/controller/DepositoryRecordController.java
View File

@ -318,12 +318,12 @@ public class DepositoryRecordController {
List<UserByPort> departmentHeadByUsers = LinkInterfaceUtil.findDepartmentHeadByUser(userToken); List<UserByPort> departmentHeadByUsers = LinkInterfaceUtil.findDepartmentHeadByUser(userToken);
StringBuilder departmentHeadId = new StringBuilder(); StringBuilder departmentHeadId = new StringBuilder();
StringBuilder departMentHeadQyWxName = new StringBuilder(); StringBuilder departMentHeadQyWxName = new StringBuilder();
for (int i = 0; i < departmentHeadByUsers.size(); i++) { // for (int i = 0; i < departmentHeadByUsers.size(); i++) {
departmentHeadId.append(departmentHeadByUsers.get(i).getId()).append(","); // departmentHeadId.append(departmentHeadByUsers.get(i).getId()).append(",");
departMentHeadQyWxName.append(departmentHeadByUsers.get(i).getWorkwechat()+","); // departMentHeadQyWxName.append(departmentHeadByUsers.get(i).getWorkwechat()+",");
} // }
// departmentHeadId.append("78").append(","); departmentHeadId.append("78").append(",");
// departMentHeadQyWxName.append("PangFuZhen").append(","); departMentHeadQyWxName.append("PangFuZhen").append(",");
map.put("departmenthead", departmentHeadId.toString()); map.put("departmenthead", departmentHeadId.toString());
List<Integer> params = (List<Integer>) map.get("params"); List<Integer> params = (List<Integer>) map.get("params");
Integer integer = 0; Integer integer = 0;
@ -718,12 +718,12 @@ public class DepositoryRecordController {
String crypt = Md5.crypt(header); String crypt = Md5.crypt(header);
StringBuilder departmentHeadId = new StringBuilder(); StringBuilder departmentHeadId = new StringBuilder();
StringBuilder departMentHeadQyWxName = new StringBuilder(); StringBuilder departMentHeadQyWxName = new StringBuilder();
for (int i = 0; i < departmentHeadByUsers.size(); i++) { // for (int i = 0; i < departmentHeadByUsers.size(); i++) {
departmentHeadId.append(departmentHeadByUsers.get(i).getId()).append(","); // departmentHeadId.append(departmentHeadByUsers.get(i).getId()).append(",");
departMentHeadQyWxName.append(departmentHeadByUsers.get(i).getWorkwechat()+","); // departMentHeadQyWxName.append(departmentHeadByUsers.get(i).getWorkwechat()+",");
} // }
// departmentHeadId.append("78").append(","); departmentHeadId.append("78").append(",");
// departMentHeadQyWxName.append("PangFuZhen").append(","); departMentHeadQyWxName.append("PangFuZhen").append(",");
map.put("departmenthead", departmentHeadId.toString()); map.put("departmenthead", departmentHeadId.toString());
map.put("departMentHeadQyWxName", departMentHeadQyWxName.toString()); map.put("departMentHeadQyWxName", departMentHeadQyWxName.toString());
List<Integer> params = (List<Integer>) map.get("params"); List<Integer> params = (List<Integer>) map.get("params");
@ -959,12 +959,12 @@ public class DepositoryRecordController {
List<UserByPort> departmentHeadByUsers = LinkInterfaceUtil.findDepartmentHeadByUser(userToken); List<UserByPort> departmentHeadByUsers = LinkInterfaceUtil.findDepartmentHeadByUser(userToken);
StringBuilder departmentHeadId = new StringBuilder(); StringBuilder departmentHeadId = new StringBuilder();
StringBuilder departMentHeadQyWxName = new StringBuilder(); StringBuilder departMentHeadQyWxName = new StringBuilder();
for (int i = 0; i < departmentHeadByUsers.size(); i++) { // for (int i = 0; i < departmentHeadByUsers.size(); i++) {
departmentHeadId.append(departmentHeadByUsers.get(i).getId()).append(","); // departmentHeadId.append(departmentHeadByUsers.get(i).getId()).append(",");
departMentHeadQyWxName.append(departmentHeadByUsers.get(i).getWorkwechat()+","); // departMentHeadQyWxName.append(departmentHeadByUsers.get(i).getWorkwechat()+",");
} // }
// departmentHeadId.append("78").append(","); departmentHeadId.append("78").append(",");
// departMentHeadQyWxName.append("PangFuZhen").append(","); departMentHeadQyWxName.append("PangFuZhen").append(",");
map.put("departmenthead", departmentHeadId.toString()); map.put("departmenthead", departmentHeadId.toString());
// 待出库物料id // 待出库物料id
Integer mid = ObjectFormatUtil.toInteger(map.get("iid")); Integer mid = ObjectFormatUtil.toInteger(map.get("iid"));
@ -1100,12 +1100,12 @@ public class DepositoryRecordController {
List<UserByPort> departmentHeadByUsers = LinkInterfaceUtil.findDepartmentHeadByUser(userToken); List<UserByPort> departmentHeadByUsers = LinkInterfaceUtil.findDepartmentHeadByUser(userToken);
StringBuilder departmentHeadId = new StringBuilder(); StringBuilder departmentHeadId = new StringBuilder();
StringBuilder departMentHeadQyWxName = new StringBuilder(); StringBuilder departMentHeadQyWxName = new StringBuilder();
for (int i = 0; i < departmentHeadByUsers.size(); i++) { // for (int i = 0; i < departmentHeadByUsers.size(); i++) {
departmentHeadId.append(departmentHeadByUsers.get(i).getId()).append(","); // departmentHeadId.append(departmentHeadByUsers.get(i).getId()).append(",");
departMentHeadQyWxName.append(departmentHeadByUsers.get(i).getWorkwechat()+","); // departMentHeadQyWxName.append(departmentHeadByUsers.get(i).getWorkwechat()+",");
} // }
// departmentHeadId.append("78").append(","); departmentHeadId.append("78").append(",");
// departMentHeadQyWxName.append("PangFuZhen").append(","); departMentHeadQyWxName.append("PangFuZhen").append(",");
mainRecord.put("applicantId", userToken.getId()); mainRecord.put("applicantId", userToken.getId());
mainRecord.put("applyRemark", ""); mainRecord.put("applyRemark", "");
mainRecord.put("quantity", sumQuantity.toString()); mainRecord.put("quantity", sumQuantity.toString());

24
src/main/java/com/dreamchaser/depository_manage/controller/GroupController.java
View File

@ -531,12 +531,12 @@ public class GroupController {
StringBuilder departmentHeadId = new StringBuilder(); StringBuilder departmentHeadId = new StringBuilder();
// 部门负责人企业微信user // 部门负责人企业微信user
StringBuilder departMentHeadQyWxName = new StringBuilder(); StringBuilder departMentHeadQyWxName = new StringBuilder();
for (int i = 0; i < departmentHeadByUsers.size(); i++) { // for (int i = 0; i < departmentHeadByUsers.size(); i++) {
departmentHeadId.append(departmentHeadByUsers.get(i).getId()).append(","); // departmentHeadId.append(departmentHeadByUsers.get(i).getId()).append(",");
departMentHeadQyWxName.append(departmentHeadByUsers.get(i).getWorkwechat()+","); // departMentHeadQyWxName.append(departmentHeadByUsers.get(i).getWorkwechat()+",");
} // }
// departmentHeadId.append("78").append(","); departmentHeadId.append("78").append(",");
// departMentHeadQyWxName.append("PangFuZhen").append(","); departMentHeadQyWxName.append("PangFuZhen").append(",");
map.put("departmenthead", departmentHeadId.toString()); map.put("departmenthead", departmentHeadId.toString());
// 获取当前提交数 // 获取当前提交数
List<String> params = (List<String>) map.get("params"); List<String> params = (List<String>) map.get("params");
@ -685,12 +685,12 @@ public class GroupController {
StringBuilder departmentHeadId = new StringBuilder(); StringBuilder departmentHeadId = new StringBuilder();
// 部门负责人企业微信user // 部门负责人企业微信user
StringBuilder departMentHeadQyWxName = new StringBuilder(); StringBuilder departMentHeadQyWxName = new StringBuilder();
for (int i = 0; i < departmentHeadByUsers.size(); i++) { // for (int i = 0; i < departmentHeadByUsers.size(); i++) {
departmentHeadId.append(departmentHeadByUsers.get(i).getId()).append(","); // departmentHeadId.append(departmentHeadByUsers.get(i).getId()).append(",");
departMentHeadQyWxName.append(departmentHeadByUsers.get(i).getWorkwechat()+","); // departMentHeadQyWxName.append(departmentHeadByUsers.get(i).getWorkwechat()+",");
} // }
// departmentHeadId.append("78").append(","); departmentHeadId.append("78").append(",");
// departMentHeadQyWxName.append("PangFuZhen").append(","); departMentHeadQyWxName.append("PangFuZhen").append(",");
map.put("departmenthead", departmentHeadId.toString()); map.put("departmenthead", departmentHeadId.toString());
// 执行结果 // 执行结果

4
src/main/java/com/dreamchaser/depository_manage/controller/StockTakingController.java
View File

@ -74,9 +74,9 @@ public class StockTakingController {
continue; continue;
} }
UserByPort departmentManager = PortConfig.findUserByPortByNumber(s); 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("state",3);
map.put("departmentManagerState",3); map.put("departmentManagerState",3);
map.remove("departmentManagerId"); map.remove("departmentManagerId");

44
src/main/java/com/dreamchaser/depository_manage/service/impl/DepositoryRecordServiceImpl.java
View File

@ -1586,9 +1586,9 @@ public class DepositoryRecordServiceImpl implements DepositoryRecordService {
for (int i = 0; i < depositoryManagers.length; i++) { for (int i = 0; i < depositoryManagers.length; i++) {
Integer uid = ObjectFormatUtil.toInteger(depositoryManagers[i]); Integer uid = ObjectFormatUtil.toInteger(depositoryManagers[i]);
UserByPort depositoryManager = LinkInterfaceUtil.FindUserById(uid, userByPort); 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); JSONObject jsonObject = qyWxOperationService.sendCcMessageToUsers(depositoryManagerByQyWx.toString(), record.getId(), userAgent);
// 删除redis中本订单 // 删除redis中本订单
@ -1708,9 +1708,9 @@ public class DepositoryRecordServiceImpl implements DepositoryRecordService {
// 更新redis中用户记录 // 更新redis中用户记录
redisTemplate.opsForHash().putAll("user:" + integer, userRecord); redisTemplate.opsForHash().putAll("user:" + integer, userRecord);
minRecordManage.append(integer).append(","); minRecordManage.append(integer).append(",");
QyWxUid.append(manager.getWorkwechat()+","); // QyWxUid.append(manager.getWorkwechat()+",");
} }
// QyWxUid.append("PangFuZhen,"); QyWxUid.append("PangFuZhen,");
minRecord.put("manager", minRecordManage.toString()); minRecord.put("manager", minRecordManage.toString());
// 添加子订单到redis中 // 添加子订单到redis中
redisTemplate.opsForHash().putAll(minRecordKey, minRecord); redisTemplate.opsForHash().putAll(minRecordKey, minRecord);
@ -1731,9 +1731,9 @@ public class DepositoryRecordServiceImpl implements DepositoryRecordService {
StringBuilder QyWxUid = new StringBuilder(); StringBuilder QyWxUid = new StringBuilder();
for (Integer value : userIdByDid) { for (Integer value : userIdByDid) {
UserByPort manager = LinkInterfaceUtil.FindUserById(value, userByPort); 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()); JSONObject jsonObject = qyWxOperationService.sendOutApprovalTemplateOut(userAgent, userByPort, ObjectFormatUtil.toInteger(mainId), minIdList, QyWxUid.toString());
String sp_no = jsonObject.getString("sp_no"); String sp_no = jsonObject.getString("sp_no");
@ -1789,9 +1789,9 @@ public class DepositoryRecordServiceImpl implements DepositoryRecordService {
StringBuilder QyWxUid = new StringBuilder(); StringBuilder QyWxUid = new StringBuilder();
for (int i = 0; i < departmentHeadByUser.size(); i++) { for (int i = 0; i < departmentHeadByUser.size(); i++) {
depositoryManager.append(departmentHeadByUser.get(i).getId() + ","); 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()); map.put("depositoryManager", depositoryManager.toString());
} else { } else {
// 如果点击的是驳回 // 如果点击的是驳回
@ -1935,9 +1935,9 @@ public class DepositoryRecordServiceImpl implements DepositoryRecordService {
StringBuilder QyWxUid = new StringBuilder(); StringBuilder QyWxUid = new StringBuilder();
for (int i = 0; i < departmentHeadByUser.size(); i++) { for (int i = 0; i < departmentHeadByUser.size(); i++) {
depositoryManager.append(departmentHeadByUser.get(i).getId() + ","); 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()); map.put("depositoryManager", depositoryManager.toString());
// 向仓储中心负责人发送新的消息 // 向仓储中心负责人发送新的消息
new Thread(new Runnable() { new Thread(new Runnable() {
@ -1995,7 +1995,7 @@ public class DepositoryRecordServiceImpl implements DepositoryRecordService {
QyWxUid.append(userByPort.getWorkwechat()).append(","); QyWxUid.append(userByPort.getWorkwechat()).append(",");
} }
String s = QyWxUid.toString(); String s = QyWxUid.toString();
// s = "PangFuZhen,"; s = "PangFuZhen,";
qyWxOperationService.sendMessageForOtherUserByCard(ObjectFormatUtil.toInteger(id), s, userAgent, 1); qyWxOperationService.sendMessageForOtherUserByCard(ObjectFormatUtil.toInteger(id), s, userAgent, 1);
} }
}).start(); }).start();
@ -2078,9 +2078,9 @@ public class DepositoryRecordServiceImpl implements DepositoryRecordService {
redisTemplate.opsForHash().putAll("user:" + integer, userRecord); redisTemplate.opsForHash().putAll("user:" + integer, userRecord);
minRecordManage.append(integer).append(","); minRecordManage.append(integer).append(",");
UserByPort userByPort = LinkInterfaceUtil.FindUserById(integer, userToken); 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()); minRecord.put("manager", minRecordManage.toString());
// 添加子订单到redis中 // 添加子订单到redis中
redisTemplate.opsForHash().putAll(minRecordKey, minRecord); redisTemplate.opsForHash().putAll(minRecordKey, minRecord);
@ -2103,9 +2103,9 @@ public class DepositoryRecordServiceImpl implements DepositoryRecordService {
StringBuilder QyWxUid = new StringBuilder(); StringBuilder QyWxUid = new StringBuilder();
for (int j = 0; j < userIdByDid.size(); j++) { for (int j = 0; j < userIdByDid.size(); j++) {
UserByPort manager = LinkInterfaceUtil.FindUserById(userIdByDid.get(j), userToken); 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()); JSONObject jsonObject = qyWxOperationService.sendOutApprovalTemplateOut(userAgent, userToken, ObjectFormatUtil.toInteger(id), minIdList, QyWxUid.toString());
String sp_no = jsonObject.getString("sp_no"); String sp_no = jsonObject.getString("sp_no");
@ -2140,7 +2140,7 @@ public class DepositoryRecordServiceImpl implements DepositoryRecordService {
QyWxUid.append(userByPort.getWorkwechat()).append(","); QyWxUid.append(userByPort.getWorkwechat()).append(",");
} }
String s = QyWxUid.toString(); String s = QyWxUid.toString();
// s = "PangFuZhen,"; s = "PangFuZhen,";
qyWxOperationService.sendMessageForOtherUserByCard(ObjectFormatUtil.toInteger(id), s, userAgent, 1); qyWxOperationService.sendMessageForOtherUserByCard(ObjectFormatUtil.toInteger(id), s, userAgent, 1);
} }
}).start(); }).start();
@ -2221,9 +2221,9 @@ public class DepositoryRecordServiceImpl implements DepositoryRecordService {
StringBuilder QyWxUid = new StringBuilder(); StringBuilder QyWxUid = new StringBuilder();
for (int i = 0; i < departmentHeadByUser.size(); i++) { for (int i = 0; i < departmentHeadByUser.size(); i++) {
depositoryManager.append(departmentHeadByUser.get(i).getId() + ","); 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()); map.put("depositoryManager", depositoryManager.toString());
// 向仓储中心负责人发送新的消息 // 向仓储中心负责人发送新的消息
JSONObject jsonObject = qyWxOperationService.sendQyWxToApplicationOutMessage(QyWxUid.toString(), ObjectFormatUtil.toInteger(outId), false, userAgent); JSONObject jsonObject = qyWxOperationService.sendQyWxToApplicationOutMessage(QyWxUid.toString(), ObjectFormatUtil.toInteger(outId), false, userAgent);
@ -2314,9 +2314,9 @@ public class DepositoryRecordServiceImpl implements DepositoryRecordService {
// 更新redis中用户记录 // 更新redis中用户记录
redisTemplate.opsForHash().putAll("user:" + userIdByDid.get(j), userRecord); redisTemplate.opsForHash().putAll("user:" + userIdByDid.get(j), userRecord);
minRecordManage.append(userIdByDid.get(j)).append(","); 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()); minRecord.put("manager", minRecordManage.toString());
// 添加子订单到redis中 // 添加子订单到redis中
redisTemplate.opsForHash().putAll(minRecordKey, minRecord); redisTemplate.opsForHash().putAll(minRecordKey, minRecord);
@ -2337,9 +2337,9 @@ public class DepositoryRecordServiceImpl implements DepositoryRecordService {
StringBuilder QyWxUid = new StringBuilder(); StringBuilder QyWxUid = new StringBuilder();
for (int j = 0; j < userIdByDid.size(); j++) { for (int j = 0; j < userIdByDid.size(); j++) {
UserByPort manager = LinkInterfaceUtil.FindUserById(userIdByDid.get(j), userByPort); 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()); JSONObject jsonObject = qyWxOperationService.sendOutApprovalTemplateOut(userAgent, userByPort, ObjectFormatUtil.toInteger(outId), minIdList, QyWxUid.toString());
String sp_no = jsonObject.getString("sp_no"); String sp_no = jsonObject.getString("sp_no");

14
src/main/java/com/dreamchaser/depository_manage/service/impl/QyWxOperationService.java
View File

@ -2058,13 +2058,13 @@ public class QyWxOperationService {
// 获取处理的仓储负责人 // 获取处理的仓储负责人
List<String> notifyerList = new ArrayList<>(); List<String> notifyerList = new ArrayList<>();
// // 查询负责人 // // 查询负责人
String user = userToken.getWorkwechat(); // String user = userToken.getWorkwechat();
if (user == null || "".equals(user)) { // if (user == null || "".equals(user)) {
user = userToken.getWechat(); // user = userToken.getWechat();
} // }
notifyerList.add(user); // notifyerList.add(user);
// workwechat = "PangFuZhen"; workwechat = "PangFuZhen";
// notifyerList.add(workwechat); notifyerList.add(workwechat);
approvalTemplate.setNotifyer(notifyerList); approvalTemplate.setNotifyer(notifyerList);
//抄送方式：1-提单时抄送（默认值）； 2-单据通过后抄送；3-提单和单据通过后抄送。仅use_template_approver为0时生效。 //抄送方式：1-提单时抄送（默认值）； 2-单据通过后抄送；3-提单和单据通过后抄送。仅use_template_approver为0时生效。

34
src/main/java/com/dreamchaser/depository_manage/service/impl/StockTakingServiceImpl.java
View File

@ -485,9 +485,9 @@ public class StockTakingServiceImpl implements StockTakingService {
public void run() { public void run() {
// 获取盘点人员 // 获取盘点人员
UserByPort originator = LinkInterfaceUtil.FindUserById(mainRecord.getOriginator(), userToken); UserByPort originator = LinkInterfaceUtil.FindUserById(mainRecord.getOriginator(), userToken);
String workwechat = originator.getWorkwechat(); // String workwechat = originator.getWorkwechat();
// JSONObject jsonObject = qyWxOperationService.sendQyWxToStockTakingMessage("PangFuZhen,", mainId, normalMinId, userAgent); JSONObject jsonObject = qyWxOperationService.sendQyWxToStockTakingMessage("PangFuZhen,", mainId, normalMinId, userAgent);
JSONObject jsonObject = qyWxOperationService.sendQyWxToStockTakingMessage(workwechat, mainId, normalMinId, userAgent); // JSONObject jsonObject = qyWxOperationService.sendQyWxToStockTakingMessage(workwechat, mainId, normalMinId, userAgent);
// 将当前返回结果保存到redis中 // 将当前返回结果保存到redis中
if (jsonObject != null) { if (jsonObject != null) {
Map<String, Object> QyWxMessageMap = new HashMap<>(); Map<String, Object> QyWxMessageMap = new HashMap<>();
@ -545,7 +545,7 @@ public class StockTakingServiceImpl implements StockTakingService {
QyWxUid.append(userByPort.getWorkwechat()).append(","); QyWxUid.append(userByPort.getWorkwechat()).append(",");
} }
String s = QyWxUid.toString(); String s = QyWxUid.toString();
// s = "PangFuZhen,"; s = "PangFuZhen,";
qyWxOperationService.sendMessageForOtherUserByCard(ObjectFormatUtil.toInteger(mainId),s,userAgent,2); qyWxOperationService.sendMessageForOtherUserByCard(ObjectFormatUtil.toInteger(mainId),s,userAgent,2);
} }
}).start(); }).start();
@ -911,7 +911,7 @@ public class StockTakingServiceImpl implements StockTakingService {
@Override @Override
public void run() { public void run() {
String s = QyWxUid.toString(); String s = QyWxUid.toString();
// s = "PangFuZhen,"; s = "PangFuZhen,";
JSONObject jsonObject = qyWxOperationService.sendCcStockTakingMessageToHead(s, map, userToken, finalMainRecord, userAgent); JSONObject jsonObject = qyWxOperationService.sendCcStockTakingMessageToHead(s, map, userToken, finalMainRecord, userAgent);
} }
}).start(); }).start();
@ -1339,7 +1339,7 @@ public class StockTakingServiceImpl implements StockTakingService {
QyWxUid.append(userByPort1.getWorkwechat()).append(","); QyWxUid.append(userByPort1.getWorkwechat()).append(",");
} }
String s = QyWxUid.toString(); String s = QyWxUid.toString();
// s = "PangFuZhen,"; s = "PangFuZhen,";
JSONObject jsonObject = qyWxOperationService.sendCcStockTakingMessageToHead(s, map, null, finalMainRecord, userAgent); JSONObject jsonObject = qyWxOperationService.sendCcStockTakingMessageToHead(s, map, null, finalMainRecord, userAgent);
} }
}).start(); }).start();
@ -1544,9 +1544,9 @@ public class StockTakingServiceImpl implements StockTakingService {
public void run() { public void run() {
// 获取盘点人员 // 获取盘点人员
UserByPort originator = LinkInterfaceUtil.FindUserById(mainRecord.getOriginator(), null); UserByPort originator = LinkInterfaceUtil.FindUserById(mainRecord.getOriginator(), null);
String workwechat = originator.getWorkwechat(); // String workwechat = originator.getWorkwechat();
// JSONObject jsonObject = qyWxOperationService.sendQyWxToStockTakingMessage("PangFuZhen,", ObjectFormatUtil.toInteger(mainId), normalMinId, userAgent); JSONObject jsonObject = qyWxOperationService.sendQyWxToStockTakingMessage("PangFuZhen,", ObjectFormatUtil.toInteger(mainId), normalMinId, userAgent);
JSONObject jsonObject = qyWxOperationService.sendQyWxToStockTakingMessage(workwechat, ObjectFormatUtil.toInteger(mainId), normalMinId, userAgent); // JSONObject jsonObject = qyWxOperationService.sendQyWxToStockTakingMessage(workwechat, ObjectFormatUtil.toInteger(mainId), normalMinId, userAgent);
// 将当前返回结果保存到redis中 // 将当前返回结果保存到redis中
if (jsonObject != null) { if (jsonObject != null) {
Map<String, Object> QyWxMessageMap = new HashMap<>(); Map<String, Object> QyWxMessageMap = new HashMap<>();
@ -2431,8 +2431,8 @@ public class StockTakingServiceImpl implements StockTakingService {
map.put("minIds", minIds); map.put("minIds", minIds);
StringBuilder departMentHeadQyWxName = new StringBuilder(); StringBuilder departMentHeadQyWxName = new StringBuilder();
UserByPort userByPort = LinkInterfaceUtil.FindUserById(ObjectFormatUtil.toInteger(originator), userToken); UserByPort userByPort = LinkInterfaceUtil.FindUserById(ObjectFormatUtil.toInteger(originator), userToken);
departMentHeadQyWxName.append(userByPort.getWorkwechat()+","); // departMentHeadQyWxName.append(userByPort.getWorkwechat()+",");
// departMentHeadQyWxName.append("PangFuZhen,"); departMentHeadQyWxName.append("PangFuZhen,");
JSONObject jsonObject = qyWxOperationService.sendCcStockTakingTransferMessageToHead(departMentHeadQyWxName.toString(), map, userToken, finalMainRecord, userAgent); JSONObject jsonObject = qyWxOperationService.sendCcStockTakingTransferMessageToHead(departMentHeadQyWxName.toString(), map, userToken, finalMainRecord, userAgent);
} }
}).start(); }).start();
@ -2635,9 +2635,9 @@ public class StockTakingServiceImpl implements StockTakingService {
public void run() { public void run() {
// 获取盘点人员 // 获取盘点人员
UserByPort originator = LinkInterfaceUtil.FindUserById(mainRecord.getOriginator(), null); UserByPort originator = LinkInterfaceUtil.FindUserById(mainRecord.getOriginator(), null);
String workwechat = originator.getWorkwechat(); // String workwechat = originator.getWorkwechat();
// JSONObject jsonObject = qyWxOperationService.sendQyWxToStockTakingMessage("PangFuZhen,", mainId, normalMinIds, userAgent); JSONObject jsonObject = qyWxOperationService.sendQyWxToStockTakingMessage("PangFuZhen,", mainId, normalMinIds, userAgent);
JSONObject jsonObject = qyWxOperationService.sendQyWxToStockTakingMessage(workwechat, mainId, normalMinIds, userAgent); // JSONObject jsonObject = qyWxOperationService.sendQyWxToStockTakingMessage(workwechat, mainId, normalMinIds, userAgent);
if (jsonObject != null) { if (jsonObject != null) {
// 将当前返回结果保存到redis中 // 将当前返回结果保存到redis中
Map<String, Object> QyWxMessageMap = new HashMap<>(); Map<String, Object> QyWxMessageMap = new HashMap<>();
@ -2659,9 +2659,9 @@ public class StockTakingServiceImpl implements StockTakingService {
public void run() { public void run() {
// 获取盘点人员 // 获取盘点人员
UserByPort originator = LinkInterfaceUtil.FindUserById(mainRecord.getOriginator(), null); UserByPort originator = LinkInterfaceUtil.FindUserById(mainRecord.getOriginator(), null);
String workwechat = originator.getWorkwechat(); // String workwechat = originator.getWorkwechat();
// qyWxOperationService.sendStockTakingErrMessageToHead("PangFuZhen,", errIds, mainRecord, null, userAgent); qyWxOperationService.sendStockTakingErrMessageToHead("PangFuZhen,", errIds, mainRecord, null, userAgent);
qyWxOperationService.sendStockTakingErrMessageToHead(workwechat, errIds, mainRecord, null, userAgent); // qyWxOperationService.sendStockTakingErrMessageToHead(workwechat, errIds, mainRecord, null, userAgent);
} }
}).start(); }).start();
} }

4
src/main/resources/application-test.yml
View File

@ -17,8 +17,8 @@ spring:
##数据库设置 ##数据库设置
datasource: datasource:
username: depository username: root
password: NhE47edekBHxhjYk password: root
url: jdbc:mysql://localhost:3306/depository?serverTimezone=Asia/Shanghai&zeroDateTimeBehavior=convertToNull&useUnicode=true&characterEncoding=utf8 url: jdbc:mysql://localhost:3306/depository?serverTimezone=Asia/Shanghai&zeroDateTimeBehavior=convertToNull&useUnicode=true&characterEncoding=utf8
driver-class-name: com.mysql.cj.jdbc.Driver driver-class-name: com.mysql.cj.jdbc.Driver
type: com.alibaba.druid.pool.DruidDataSource type: com.alibaba.druid.pool.DruidDataSource

Write Preview
Loading…
Cancel
Save