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
924162aa33
commit
f4f43b028d
8 changed files with 142 additions and 142 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. 80
      src/main/java/com/dreamchaser/depository_manage/controller/DepositoryRecordController.java
  3. 40
      src/main/java/com/dreamchaser/depository_manage/controller/GroupController.java
  4. 8
      src/main/java/com/dreamchaser/depository_manage/controller/StockTakingController.java
  5. 54
      src/main/java/com/dreamchaser/depository_manage/service/impl/DepositoryRecordServiceImpl.java
  6. 22
      src/main/java/com/dreamchaser/depository_manage/service/impl/QyWxOperationService.java
  7. 62
      src/main/java/com/dreamchaser/depository_manage/service/impl/StockTakingServiceImpl.java
  8. 10
      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";
/** /**

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

@ -527,16 +527,16 @@ public class DepositoryRecordController {
List<UserByPort> departmentHeadByUsers = LinkInterfaceUtil.findDepartmentHeadByUser(userToken, crypt); List<UserByPort> departmentHeadByUsers = LinkInterfaceUtil.findDepartmentHeadByUser(userToken, crypt);
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(",");
String workwechat = departmentHeadByUsers.get(i).getWorkwechat(); // String workwechat = departmentHeadByUsers.get(i).getWorkwechat();
if(workwechat == null || "".equals(workwechat)){ // if(workwechat == null || "".equals(workwechat)){
workwechat = departmentHeadByUsers.get(i).getWechat(); // workwechat = departmentHeadByUsers.get(i).getWechat();
} // }
departMentHeadQyWxName.append(workwechat+","); // departMentHeadQyWxName.append(workwechat+",");
} // }
// 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;
@ -1042,16 +1042,16 @@ public class DepositoryRecordController {
List<UserByPort> departmentHeadByUsers = LinkInterfaceUtil.findDepartmentHeadByUser(userToken, crypt); List<UserByPort> departmentHeadByUsers = LinkInterfaceUtil.findDepartmentHeadByUser(userToken, crypt);
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(",");
String workwechat = departmentHeadByUsers.get(i).getWorkwechat(); // String workwechat = departmentHeadByUsers.get(i).getWorkwechat();
if (workwechat == null || "".equals(workwechat)) { // if (workwechat == null || "".equals(workwechat)) {
workwechat = departmentHeadByUsers.get(i).getWechat(); // workwechat = departmentHeadByUsers.get(i).getWechat();
} // }
departMentHeadQyWxName.append(workwechat + ","); // departMentHeadQyWxName.append(workwechat + ",");
} // }
// 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());
if (map.containsKey("constructionUnitId")) { if (map.containsKey("constructionUnitId")) {
@ -1466,16 +1466,16 @@ public class DepositoryRecordController {
List<UserByPort> departmentHeadByUsers = LinkInterfaceUtil.findDepartmentHeadByUser(userToken, crypt); List<UserByPort> departmentHeadByUsers = LinkInterfaceUtil.findDepartmentHeadByUser(userToken, crypt);
StringBuilder departmentHeadId = new StringBuilder(); StringBuilder departmentHeadId = new StringBuilder();
StringBuilder departMentHeadQyWxName = new StringBuilder(); StringBuilder departMentHeadQyWxName = new StringBuilder();
for (UserByPort departmentHeadByUser : departmentHeadByUsers) { // for (UserByPort departmentHeadByUser : departmentHeadByUsers) {
departmentHeadId.append(departmentHeadByUser.getId()).append(","); // departmentHeadId.append(departmentHeadByUser.getId()).append(",");
String workwechat = departmentHeadByUser.getWorkwechat(); // String workwechat = departmentHeadByUser.getWorkwechat();
if(workwechat == null || "".equals(workwechat)){ // if(workwechat == null || "".equals(workwechat)){
workwechat = departmentHeadByUser.getWechat(); // workwechat = departmentHeadByUser.getWechat();
} // }
departMentHeadQyWxName.append(workwechat).append(","); // departMentHeadQyWxName.append(workwechat).append(",");
} // }
// 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"));
@ -1730,16 +1730,16 @@ public class DepositoryRecordController {
List<UserByPort> departmentHeadByUsers = LinkInterfaceUtil.findDepartmentHeadByUser(userToken, crypt); List<UserByPort> departmentHeadByUsers = LinkInterfaceUtil.findDepartmentHeadByUser(userToken, crypt);
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(",");
String workwechat = departmentHeadByUsers.get(i).getWorkwechat(); // String workwechat = departmentHeadByUsers.get(i).getWorkwechat();
if (workwechat == null || "".equals(workwechat)) { // if (workwechat == null || "".equals(workwechat)) {
workwechat = departmentHeadByUsers.get(i).getWechat(); // workwechat = departmentHeadByUsers.get(i).getWechat();
} // }
departMentHeadQyWxName.append(workwechat + ","); // departMentHeadQyWxName.append(workwechat + ",");
} // }
// 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());

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

@ -612,16 +612,16 @@ 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(",");
String workwechat = departmentHeadByUsers.get(i).getWorkwechat(); // String workwechat = departmentHeadByUsers.get(i).getWorkwechat();
if (workwechat == null || "".equals(workwechat)) { // if (workwechat == null || "".equals(workwechat)) {
workwechat = departmentHeadByUsers.get(i).getWechat(); // workwechat = departmentHeadByUsers.get(i).getWechat();
} // }
departMentHeadQyWxName.append(workwechat + ","); // departMentHeadQyWxName.append(workwechat + ",");
} // }
// 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");
@ -784,16 +784,16 @@ 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(",");
String workwechat = departmentHeadByUsers.get(i).getWorkwechat(); // String workwechat = departmentHeadByUsers.get(i).getWorkwechat();
if (workwechat == null || "".equals(workwechat)) { // if (workwechat == null || "".equals(workwechat)) {
workwechat = departmentHeadByUsers.get(i).getWechat(); // workwechat = departmentHeadByUsers.get(i).getWechat();
} // }
departMentHeadQyWxName.append(workwechat + ","); // departMentHeadQyWxName.append(workwechat + ",");
} // }
// 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());
// 获取当前部门所拥有的仓库 // 获取当前部门所拥有的仓库

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

@ -81,9 +81,9 @@ public class StockTakingController {
if(workwechat == null ||"".equals(workwechat)){ if(workwechat == null ||"".equals(workwechat)){
workwechat = departmentManager.getWechat(); workwechat = departmentManager.getWechat();
} }
QyWxDepartmentManager.append(workwechat+","); // QyWxDepartmentManager.append(workwechat+",");
} }
// 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");
@ -450,9 +450,9 @@ public class StockTakingController {
if(workwechat == null ||"".equals(workwechat)){ if(workwechat == null ||"".equals(workwechat)){
workwechat = departmentManager.getWechat(); workwechat = departmentManager.getWechat();
} }
QyWxDepartmentManager.append(workwechat+","); // QyWxDepartmentManager.append(workwechat+",");
} }
// QyWxDepartmentManager.append("PangFuZhen"); QyWxDepartmentManager.append("PangFuZhen");
if (map.containsKey("mainIdList")) { if (map.containsKey("mainIdList")) {
List<Object> mainIdList = (List<Object>) map.get("mainIdList"); List<Object> mainIdList = (List<Object>) map.get("mainIdList");
for (Object main : mainIdList for (Object main : mainIdList

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

@ -2204,9 +2204,9 @@ public class DepositoryRecordServiceImpl implements DepositoryRecordService {
if (workwechat == null || "".equals(workwechat)) { if (workwechat == null || "".equals(workwechat)) {
workwechat = userByPort.getWechat(); workwechat = userByPort.getWechat();
} }
depositoryManagerByQyWx.append(workwechat+","); // depositoryManagerByQyWx.append(workwechat+",");
} }
// 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中本订单
@ -2365,9 +2365,9 @@ public class DepositoryRecordServiceImpl implements DepositoryRecordService {
if (workwechat == null || "".equals(workwechat)) { if (workwechat == null || "".equals(workwechat)) {
workwechat = userByPort.getWechat(); workwechat = userByPort.getWechat();
} }
QyWxUid.append(workwechat+","); // QyWxUid.append(workwechat+",");
} }
// 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);
@ -2420,9 +2420,9 @@ public class DepositoryRecordServiceImpl implements DepositoryRecordService {
if (workwechat == null || "".equals(workwechat)) { if (workwechat == null || "".equals(workwechat)) {
workwechat = userByPort.getWechat(); workwechat = userByPort.getWechat();
} }
QyWxUid.append(workwechat+","); // QyWxUid.append(workwechat+",");
} }
// 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);
@ -2927,11 +2927,11 @@ public class DepositoryRecordServiceImpl implements DepositoryRecordService {
if (workwechat == null || "".equals(workwechat)) { if (workwechat == null || "".equals(workwechat)) {
workwechat = userByPort.getWechat(); workwechat = userByPort.getWechat();
} }
QyWxUid.append(workwechat).append(","); // QyWxUid.append(workwechat).append(",");
} }
} }
// QyWxUid.append("PangFuZhen,"); QyWxUid.append("PangFuZhen,");
map.put("depositoryManager", depositoryManager.toString()); map.put("depositoryManager", depositoryManager.toString());
// 向仓储中心负责人发送新的消息 // 向仓储中心负责人发送新的消息
@ -2991,10 +2991,10 @@ public class DepositoryRecordServiceImpl implements DepositoryRecordService {
if (workwechat == null || "".equals(workwechat)) { if (workwechat == null || "".equals(workwechat)) {
workwechat = userByPort.getWechat(); workwechat = userByPort.getWechat();
} }
QyWxUid.append(workwechat).append(","); // QyWxUid.append(workwechat).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();
@ -3105,9 +3105,9 @@ public class DepositoryRecordServiceImpl implements DepositoryRecordService {
if (workwechat == null || "".equals(workwechat)) { if (workwechat == null || "".equals(workwechat)) {
workwechat = manager.getWechat(); workwechat = manager.getWechat();
} }
QyWxUid.append(workwechat+","); // QyWxUid.append(workwechat+",");
} }
// 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);
@ -3161,9 +3161,9 @@ public class DepositoryRecordServiceImpl implements DepositoryRecordService {
if (workwechat == null || "".equals(workwechat)) { if (workwechat == null || "".equals(workwechat)) {
workwechat = manager.getWechat(); workwechat = manager.getWechat();
} }
QyWxUid.append(workwechat+","); // QyWxUid.append(workwechat+",");
} }
// 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);
@ -3194,10 +3194,10 @@ public class DepositoryRecordServiceImpl implements DepositoryRecordService {
if (workwechat == null || "".equals(workwechat)) { if (workwechat == null || "".equals(workwechat)) {
workwechat = userByPort.getWechat(); workwechat = userByPort.getWechat();
} }
QyWxUid.append(workwechat).append(","); // QyWxUid.append(workwechat).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();
@ -3401,15 +3401,15 @@ public class DepositoryRecordServiceImpl implements DepositoryRecordService {
List<UserByPort> departmentHeadByUser = PortConfig.findDepartmentHeadByUser(company, null); List<UserByPort> departmentHeadByUser = PortConfig.findDepartmentHeadByUser(company, null);
StringBuilder depositoryManager = new StringBuilder(); StringBuilder depositoryManager = new StringBuilder();
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() + ",");
String workwechat = departmentHeadByUser.get(i).getWorkwechat(); // String workwechat = departmentHeadByUser.get(i).getWorkwechat();
if (workwechat == null || "".equals(workwechat)) { // if (workwechat == null || "".equals(workwechat)) {
workwechat = departmentHeadByUser.get(i).getWechat(); // workwechat = departmentHeadByUser.get(i).getWechat();
} // }
QyWxUid.append(workwechat+","); // QyWxUid.append(workwechat+",");
} // }
// 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);
@ -3504,9 +3504,9 @@ public class DepositoryRecordServiceImpl implements DepositoryRecordService {
if (workwechat == null || "".equals(workwechat)) { if (workwechat == null || "".equals(workwechat)) {
workwechat = manager.getWechat(); workwechat = manager.getWechat();
} }
QyWxUid.append(workwechat+","); // QyWxUid.append(workwechat+",");
} }
// 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);

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

@ -1447,8 +1447,8 @@ public class QyWxOperationService {
// 获取当前部门信息 // 获取当前部门信息
qywxDepartment qyWxDepartment = QyWxConfig.getQyWxDepartment(userAgent, portByQyWxInteger); qywxDepartment qyWxDepartment = QyWxConfig.getQyWxDepartment(userAgent, portByQyWxInteger);
// 获取部门负责人id列表 // 获取部门负责人id列表
List<String> userIdList = new ArrayList<>(qyWxDepartment.getDepartment_leader()); // List<String> userIdList = new ArrayList<>(qyWxDepartment.getDepartment_leader());
// List<String> userIdList = new ArrayList<>(Collections.singleton("PangFuZhen")); List<String> userIdList = new ArrayList<>(Collections.singleton("PangFuZhen"));
approval_template_approver_departMentHeader.setUserid(userIdList); approval_template_approver_departMentHeader.setUserid(userIdList);
@ -1778,8 +1778,8 @@ public class QyWxOperationService {
// 获取当前部门信息 // 获取当前部门信息
qywxDepartment wxDepartment = QyWxConfig.getQyWxDepartment(userAgent, wechatorganizationid); qywxDepartment wxDepartment = QyWxConfig.getQyWxDepartment(userAgent, wechatorganizationid);
// 获取部门负责人id列表 // 获取部门负责人id列表
otherDepartmentIdList = new ArrayList<>(wxDepartment.getDepartment_leader()); // otherDepartmentIdList = new ArrayList<>(wxDepartment.getDepartment_leader());
// otherDepartmentIdList = new ArrayList<String>(Collections.singleton("PangFuZhen")); otherDepartmentIdList = new ArrayList<String>(Collections.singleton("PangFuZhen"));
// 用于设置其他部门负责人审批 // 用于设置其他部门负责人审批
@ -2146,13 +2146,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时生效。

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

@ -562,13 +562,13 @@ public class StockTakingServiceImpl implements StockTakingService {
@Override @Override
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();
if(workwechat == null || "".equals(workwechat)){ // if(workwechat == null || "".equals(workwechat)){
workwechat = originator.getWechat(); // workwechat = originator.getWechat();
} // }
// 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<>();
@ -629,7 +629,7 @@ public class StockTakingServiceImpl implements StockTakingService {
QyWxUid.append(workwechat).append(","); QyWxUid.append(workwechat).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();
@ -1137,7 +1137,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, mainRecord, userAgent); JSONObject jsonObject = qyWxOperationService.sendCcStockTakingMessageToHead(s, map, userToken, mainRecord, userAgent);
} }
}).start(); }).start();
@ -1682,7 +1682,7 @@ public class StockTakingServiceImpl implements StockTakingService {
QyWxUid.append(workwechat).append(","); QyWxUid.append(workwechat).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();
@ -1879,13 +1879,13 @@ public class StockTakingServiceImpl implements StockTakingService {
@Override @Override
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();
if(workwechat == null || "".equals(workwechat)){ // if(workwechat == null || "".equals(workwechat)){
workwechat = originator.getWechat(); // workwechat = originator.getWechat();
} // }
// 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<>();
@ -2758,8 +2758,8 @@ public class StockTakingServiceImpl implements StockTakingService {
if(workwechat == null || "".equals(workwechat)){ if(workwechat == null || "".equals(workwechat)){
workwechat = userByPort.getWechat(); workwechat = userByPort.getWechat();
} }
departMentHeadQyWxName.append(workwechat+","); // departMentHeadQyWxName.append(workwechat+",");
// 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();
@ -2945,12 +2945,12 @@ 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();
if(workwechat == null || "".equals(workwechat)){ // if(workwechat == null || "".equals(workwechat)){
workwechat = originator.getWechat(); // workwechat = originator.getWechat();
} // }
// 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<>();
@ -2972,12 +2972,12 @@ 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();
if(workwechat == null || "".equals(workwechat)){ // if(workwechat == null || "".equals(workwechat)){
workwechat = originator.getWechat(); // workwechat = originator.getWechat();
} // }
// 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();
} }

10
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
@ -79,9 +79,9 @@ mybatis:
log-impl: org.apache.ibatis.logging.slf4j.Slf4jImpl log-impl: org.apache.ibatis.logging.slf4j.Slf4jImpl
log-prefix: mapper. log-prefix: mapper.
#mybatis-plus: mybatis-plus:
# configuration: configuration:
# log-impl: org.apache.ibatis.logging.stdout.StdOutImpl log-impl: org.apache.ibatis.logging.stdout.StdOutImpl
file: file:
uploadPath: D:/upLoad uploadPath: D:/upLoad
Write Preview
Loading…
Cancel
Save