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

bug检测

lwx_dev
erdanergou 3 years ago
parent
7f000c5be5
commit
50c90c4993
6 changed files with 63 additions and 63 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 24
      src/main/java/com/dreamchaser/depository_manage/controller/DepositoryRecordController.java
  2. 8
      src/main/java/com/dreamchaser/depository_manage/controller/GroupController.java
  3. 7
      src/main/java/com/dreamchaser/depository_manage/controller/StockTakingController.java
  4. 42
      src/main/java/com/dreamchaser/depository_manage/service/impl/DepositoryRecordServiceImpl.java
  5. 2
      src/main/java/com/dreamchaser/depository_manage/service/impl/QyWxOperationService.java
  6. 43
      src/main/java/com/dreamchaser/depository_manage/service/impl/StockTakingServiceImpl.java

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

@ -355,7 +355,7 @@ public class DepositoryRecordController {
}
}).start();*/
/*// 开启一个线程开启审批
// 开启一个线程开启审批
new Thread(new Runnable() {
@Override
public void run() {
@ -368,7 +368,7 @@ public class DepositoryRecordController {
// 设置过期为7天
redisTemplateForHash.expire(sp_no, 7, TimeUnit.DAYS);
}
}).start();*/
}).start();
}
} else {
@ -429,7 +429,7 @@ public class DepositoryRecordController {
}
}).start();*/
/* // 开启一个线程开启审批
// 开启一个线程开启审批
new Thread(new Runnable() {
@Override
public void run() {
@ -442,7 +442,7 @@ public class DepositoryRecordController {
// 设置过期为7天
redisTemplateForHash.expire(sp_no, 7, TimeUnit.DAYS);
}
}).start();*/
}).start();
}
@ -751,7 +751,7 @@ public class DepositoryRecordController {
}).start();*/
// 开启一个线程开启审批
/*new Thread(new Runnable() {
new Thread(new Runnable() {
@Override
public void run() {
JSONObject jsonObject = qyWxOperationService.sendOutApprovalTemplate(crypt, userToken, ObjectFormatUtil.toInteger(id));
@ -763,7 +763,7 @@ public class DepositoryRecordController {
// 设置过期为7天
redisTemplateForHash.expire(sp_no, 7, TimeUnit.DAYS);
}
}).start();*/
}).start();
} else if (params.size() > 0) {
for (int i = 0; i < params.size(); i++) {
@ -804,7 +804,7 @@ public class DepositoryRecordController {
}
}).start();*/
// 开启一个线程开启审批
/*new Thread(new Runnable() {
new Thread(new Runnable() {
@Override
public void run() {
JSONObject jsonObject = qyWxOperationService.sendOutApprovalTemplate(crypt, userToken, ObjectFormatUtil.toInteger(id));
@ -816,7 +816,7 @@ public class DepositoryRecordController {
// 设置过期为7天
redisTemplateForHash.expire(sp_no, 7, TimeUnit.DAYS);
}
}).start();*/
}).start();
}
if (params.size() < 1) {
@ -1001,7 +1001,7 @@ public class DepositoryRecordController {
// 开启一个线程开启审批
/*new Thread(new Runnable() {
new Thread(new Runnable() {
@Override
public void run() {
JSONObject jsonObject = qyWxOperationService.sendOutApprovalTemplate(crypt, userToken, ObjectFormatUtil.toInteger(id));
@ -1013,7 +1013,7 @@ public class DepositoryRecordController {
// 设置过期为7天
redisTemplateForHash.expire(sp_no, 7, TimeUnit.DAYS);
}
}).start();*/
}).start();
}
}
@ -1194,7 +1194,7 @@ public class DepositoryRecordController {
}).start();*/
/* // 开启一个线程开启审批
// 开启一个线程开启审批
new Thread(new Runnable() {
@Override
public void run() {
@ -1207,7 +1207,7 @@ public class DepositoryRecordController {
// 设置过期为7天
redisTemplateForHash.expire(sp_no, 7, TimeUnit.DAYS);
}
}).start();*/
}).start();
}
if (success == 0) {

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

@ -557,7 +557,7 @@ public class GroupController {
}
Object id = map.get("id"); // 获取主订单编号
// 开启一个线程开启审批
/* new Thread(new Runnable() {
new Thread(new Runnable() {
@Override
public void run() {
JSONObject jsonObject = qyWxOperationService.sendOutApprovalTemplate(crypt, userToken, ObjectFormatUtil.toInteger(id));
@ -569,7 +569,7 @@ public class GroupController {
// 设置过期为7天
redisTemplateForHash.expire(sp_no, 7, TimeUnit.DAYS);
}
}).start();*/
}).start();
if (integer != 0 && params.size() < 1) {
return CrudUtil.postHandle(integer, result);
@ -731,7 +731,7 @@ public class GroupController {
}
Object id = map.get("id"); // 获取主订单编号
// 开启一个线程开启审批
/*new Thread(new Runnable() {
new Thread(new Runnable() {
@Override
public void run() {
JSONObject jsonObject = qyWxOperationService.sendOutApprovalTemplate(crypt, userToken, ObjectFormatUtil.toInteger(id));
@ -743,7 +743,7 @@ public class GroupController {
// 设置过期为7天
redisTemplateForHash.expire(sp_no, 7, TimeUnit.DAYS);
}
}).start();*/
}).start();
return CrudUtil.postHandle(integer, result);
}

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

@ -141,7 +141,7 @@ public class StockTakingController {
}).start();*/
// 用于发送审批
/*new Thread(new Runnable() {
new Thread(new Runnable() {
@Override
public void run() {
JSONObject jsonObject = qyWxOperationService.sendApprovalTemplateStockTaking(crypt, userToken, ObjectFormatUtil.toInteger(mainId), QyWxDepartmentManager.toString());
@ -154,7 +154,6 @@ public class StockTakingController {
redisTemplateForHash.expire(sp_no,7,TimeUnit.DAYS);
}
}).start();
*/
}
else{
@ -179,7 +178,7 @@ public class StockTakingController {
}).start();*/
// 用于发送审批
/*new Thread(new Runnable() {
new Thread(new Runnable() {
@Override
public void run() {
JSONObject jsonObject = qyWxOperationService.sendApprovalTemplateStockTaking(crypt, userToken, ObjectFormatUtil.toInteger(mainId), QyWxDepartmentManager.toString());
@ -191,7 +190,7 @@ public class StockTakingController {
// 设置过期时间为7天
redisTemplateForHash.expire(sp_no,7,TimeUnit.DAYS);
}
}).start();*/
}).start();
}

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

@ -1618,7 +1618,7 @@ public class DepositoryRecordServiceImpl implements DepositoryRecordService {
// depositoryManagerByQyWx.append(depositoryManager.getWorkwechat()+",");
}
depositoryManagerByQyWx.append("PangFuZhen,");
// JSONObject jsonObject = qyWxOperationService.sendCcMessageToUsers(depositoryManagerByQyWx.toString(), record.getId(), userAgent);
JSONObject jsonObject = qyWxOperationService.sendCcMessageToUsers(depositoryManagerByQyWx.toString(), record.getId(), userAgent);
// 删除redis中本订单
redisTemplate.delete("record:" + record.getId());
@ -1742,15 +1742,15 @@ public class DepositoryRecordServiceImpl implements DepositoryRecordService {
// 添加子订单到redis中
redisTemplate.opsForHash().putAll(minRecordKey, minRecord);
// 开启线程向仓库管理员发送消息
/*new Thread(new Runnable() {
new Thread(new Runnable() {
@Override
public void run() {
JSONObject jsonObject = qyWxOperationService.sendNotificationToDepositoryManager(QyWxUid.toString(), applicationOutRecordMin.getId(),userAgent);
}
}).start();*/
}).start();
}
/*for (int i = 0; i < depositoryIdList.size(); i++) {
for (int i = 0; i < depositoryIdList.size(); i++) {
Object o = minIdByDepository.get("depository" + depositoryIdList.get(i));
if (o != null) {
List<Integer> minIdList = (List<Integer>) o;
@ -1777,7 +1777,7 @@ public class DepositoryRecordServiceImpl implements DepositoryRecordService {
} else {
continue;
}
}*/
}
// 将主订单插入到redis中
redisTemplate.opsForHash().put("record:" + recordP.getId(), "minRecord", minRecordByMain.toString());
@ -1967,7 +1967,7 @@ public class DepositoryRecordServiceImpl implements DepositoryRecordService {
QyWxUid.append("PangFuZhen,");
map.put("depositoryManager", depositoryManager.toString());
// 向仓储中心负责人发送新的消息
/*new Thread(new Runnable() {
new Thread(new Runnable() {
@Override
public void run() {
JSONObject jsonObject = qyWxOperationService.sendQyWxToApplicationOutMessage(QyWxUid.toString(), ObjectFormatUtil.toInteger(id), false, userAgent);
@ -1981,7 +1981,7 @@ public class DepositoryRecordServiceImpl implements DepositoryRecordService {
// 设置过期时间为三天
redisTemplate.expire("user:" + userToken.getNumber() + ":QyWxOutId:" + id, 72, TimeUnit.HOURS);
}
}).start();*/
}).start();
} else {
@ -1994,7 +1994,7 @@ public class DepositoryRecordServiceImpl implements DepositoryRecordService {
// 开启线程更改其他用户卡片模板样式
String finalResult = result;
/*new Thread(new Runnable() {
new Thread(new Runnable() {
@Override
public void run() {
// 获取responseCode（key为申请人number）
@ -2025,7 +2025,7 @@ public class DepositoryRecordServiceImpl implements DepositoryRecordService {
s = "PangFuZhen,";
qyWxOperationService.sendMessageForOtherUserByCard(ObjectFormatUtil.toInteger(id), s, userAgent, 1);
}
}).start();*/
}).start();
} else {
String result = "";
// 开启线程更改其他用户卡片模板样式
@ -2112,16 +2112,16 @@ public class DepositoryRecordServiceImpl implements DepositoryRecordService {
redisTemplate.opsForHash().putAll(minRecordKey, minRecord);
/*// 开启线程向仓库管理员发送消息
// 开启线程向仓库管理员发送消息
new Thread(new Runnable() {
@Override
public void run() {
JSONObject jsonObject = qyWxOperationService.sendNotificationToDepositoryManager(QyWxUid.toString(), applicationOutRecordMin.getId(), userAgent);
}
}).start();*/
}).start();
}
/* for (int i = 0; i < depositoryIdList.size(); i++) {
for (int i = 0; i < depositoryIdList.size(); i++) {
Object o = minIdByDepository.get("depository" + depositoryIdList.get(i));
if (o != null) {
List<Integer> minIdList = (List<Integer>) o;
@ -2169,7 +2169,7 @@ public class DepositoryRecordServiceImpl implements DepositoryRecordService {
s = "PangFuZhen,";
qyWxOperationService.sendMessageForOtherUserByCard(ObjectFormatUtil.toInteger(id), s, userAgent, 1);
}
}).start();*/
}).start();
// 将主订单插入到redis中
redisTemplate.opsForHash().put("record:" + record.getId(), "minRecord", minRecordByMain.toString());
@ -2182,7 +2182,7 @@ public class DepositoryRecordServiceImpl implements DepositoryRecordService {
}
// 开启线程更改其他用户卡片模板样式
String finalResult = result;
/*new Thread(new Runnable() {
new Thread(new Runnable() {
@Override
public void run() {
// 获取responseCode（key为申请人number）
@ -2192,7 +2192,7 @@ public class DepositoryRecordServiceImpl implements DepositoryRecordService {
String responseCode = (String) redisTemplate.opsForHash().get(key, "responseCode");
qyWxOperationService.updateTemplateCard(responseCode, userToken.getName(), finalResult, userAgent);
}
}).start();*/
}).start();
}
@ -2251,7 +2251,7 @@ public class DepositoryRecordServiceImpl implements DepositoryRecordService {
}
QyWxUid.append("PangFuZhen" + ",");
map.put("depositoryManager", depositoryManager.toString());
/*// 向仓储中心负责人发送新的消息
// 向仓储中心负责人发送新的消息
JSONObject jsonObject = qyWxOperationService.sendQyWxToApplicationOutMessage(QyWxUid.toString(), ObjectFormatUtil.toInteger(outId), false, userAgent);
// 将当前返回结果保存到redis中
Map<String, Object> QyWxMessageMap = new HashMap<>();
@ -2260,7 +2260,7 @@ public class DepositoryRecordServiceImpl implements DepositoryRecordService {
// key user:300450:QyWxOut:1
redisTemplate.opsForHash().putAll("user:" + userByPort.getNumber() + ":QyWxOutId:" + outId, QyWxMessageMap);
// 设置过期时间为三天
redisTemplate.expire("user:" + userByPort.getNumber() + ":QyWxOutId:" + outId, 72, TimeUnit.HOURS);*/
redisTemplate.expire("user:" + userByPort.getNumber() + ":QyWxOutId:" + outId, 72, TimeUnit.HOURS);
} else {
updateInventoryForOutRefused(recordP);
// 如果点击的是驳回
@ -2346,16 +2346,16 @@ public class DepositoryRecordServiceImpl implements DepositoryRecordService {
minRecord.put("manager", minRecordManage.toString());
// 添加子订单到redis中
redisTemplate.opsForHash().putAll(minRecordKey, minRecord);
/*// 开启线程向仓库管理员发送消息
// 开启线程向仓库管理员发送消息
new Thread(new Runnable() {
@Override
public void run() {
JSONObject jsonObject = qyWxOperationService.sendNotificationToDepositoryManager(QyWxUid.toString(), applicationOutRecordMin.getId(), userAgent);
}
}).start();*/
}).start();
}
/*for (int i = 0; i < depositoryIdList.size(); i++) {
for (int i = 0; i < depositoryIdList.size(); i++) {
Object o = minIdByDepository.get("depository" + depositoryIdList.get(i));
if (o != null) {
List<Integer> minIdList = (List<Integer>) o;
@ -2382,7 +2382,7 @@ public class DepositoryRecordServiceImpl implements DepositoryRecordService {
} else {
continue;
}
}*/
}
// 将主订单插入到redis中
redisTemplate.opsForHash().put("record:" + recordP.getId(), "minRecord", minRecordByMain.toString());
map.put("state", "仓储中心负责人审核通过");

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

@ -1551,7 +1551,7 @@ public class QyWxOperationService {
detail_list_control_info_outNumber.put("title", detail_list_control_info_title_list_outNumber);
Map<String, String> detail_list_control_info_value_outNumber = new HashMap<>();
detail_list_control_info_value_outNumber.put("new_number", recordMin.getQuantity().toString() + materialById.getQuantity());
detail_list_control_info_value_outNumber.put("new_number", recordMin.getQuantity().toString());
detail_list_control_info_outNumber.put("value", detail_list_control_info_value_outNumber);
// 请求单位

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

@ -474,7 +474,7 @@ public class StockTakingServiceImpl implements StockTakingService {
if (normalMinId.size() > 0) {
/*// 抄送盘点调账记录给盘点人员
// 抄送盘点调账记录给盘点人员
new Thread(new Runnable() {
@Override
public void run() {
@ -494,7 +494,7 @@ public class StockTakingServiceImpl implements StockTakingService {
redisTemplate.expire("user:" + userToken.getNumber() + ":QyWxStockTakingCompleteId:" + mainId, 72, TimeUnit.HOURS);
}
}
}).start();*/
}).start();
} else {
map.put("state", 1);
}
@ -511,7 +511,7 @@ public class StockTakingServiceImpl implements StockTakingService {
// 更新其他卡片
String finalStockTakingResult = stockTakingResult;
/*new Thread(new Runnable() {
new Thread(new Runnable() {
@Override
public void run() {
// 获取responseCode（key为申请人number）
@ -522,10 +522,10 @@ public class StockTakingServiceImpl implements StockTakingService {
String responseCode = (String) redisTemplate.opsForHash().get(key, "responseCode");
qyWxOperationService.updateTemplateCard(responseCode, userToken.getName(), finalStockTakingResult, userAgent);
}
}).start();*/
}).start();
// 开启流程通知其他人忽略审批流程
/*new Thread(new Runnable() {
new Thread(new Runnable() {
@Override
public void run() {
String departmentManager1 = mainRecord.getDepartmentManager();
@ -543,7 +543,7 @@ public class StockTakingServiceImpl implements StockTakingService {
s = "PangFuZhen,";
qyWxOperationService.sendMessageForOtherUserByCard(ObjectFormatUtil.toInteger(mainId),s,userAgent,2);
}
}).start();*/
}).start();
return result;
}
@ -902,16 +902,16 @@ public class StockTakingServiceImpl implements StockTakingService {
map.put("minIds", minIds);
// 开启一个线程用于发送抄送信息给负责人
StockTaking finalMainRecord = mainRecord;
/*new Thread(new Runnable() {
new Thread(new Runnable() {
@Override
public void run() {
String s = QyWxUid.toString();
s = "PangFuZhen,";
JSONObject jsonObject = qyWxOperationService.sendCcStockTakingMessageToHead(s, map, userToken, finalMainRecord, userAgent);
}
}).start();*/
}).start();
/*// 更新其他卡片
// 更新其他卡片
new Thread(new Runnable() {
@Override
public void run() {
@ -923,7 +923,7 @@ public class StockTakingServiceImpl implements StockTakingService {
String responseCode = (String) redisTemplate.opsForHash().get(key, "responseCode");
qyWxOperationService.updateTemplateCard(responseCode, userToken.getName(), "处理", userAgent);
}
}).start();*/
}).start();
return result;
}
@ -1318,7 +1318,7 @@ public class StockTakingServiceImpl implements StockTakingService {
// 开启一个线程用于发送抄送信息给负责人
StockTaking finalMainRecord = mainRecord;
/* new Thread(new Runnable() {
new Thread(new Runnable() {
@Override
public void run() {
map.put("minIds", minIds);
@ -1337,7 +1337,7 @@ public class StockTakingServiceImpl implements StockTakingService {
s = "PangFuZhen,";
JSONObject jsonObject = qyWxOperationService.sendCcStockTakingMessageToHead(s, map, null, finalMainRecord, userAgent);
}
}).start();*/
}).start();
return 1;
}
@ -1534,7 +1534,7 @@ public class StockTakingServiceImpl implements StockTakingService {
// 抄送盘点调账记录给盘点人员
if (normalMinId.size() > 0) {
/*new Thread(new Runnable() {
new Thread(new Runnable() {
@Override
public void run() {
// 获取盘点人员
@ -1553,7 +1553,7 @@ public class StockTakingServiceImpl implements StockTakingService {
redisTemplate.expire("user:" + approver_user.getNumber() + ":QyWxStockTakingCompleteId:" + mainId, 72, TimeUnit.HOURS);
}
}
}).start();*/
}).start();
} else {
map.put("state", 1);
@ -2418,18 +2418,19 @@ public class StockTakingServiceImpl implements StockTakingService {
// 开启一个线程用于发送转移信息给盘点人员
StockTaking finalMainRecord = mainRecord;
/*new Thread(new Runnable() {
new Thread(new Runnable() {
@Override
public void run() {
Integer originator = finalMainRecord.getOriginator();
map.put("minIds", minRecorIds);
map.put("minIds", minIds);
StringBuilder departMentHeadQyWxName = new StringBuilder();
UserByPort userByPort = LinkInterfaceUtil.FindUserById(ObjectFormatUtil.toInteger(originator), userToken);
// departMentHeadQyWxName.append(userByPort.getWorkwechat()+",");
departMentHeadQyWxName.append("PangFuZhen,");
JSONObject jsonObject = qyWxOperationService.sendCcStockTakingTransferMessageToHead(departMentHeadQyWxName.toString(), map, userToken, finalMainRecord, userAgent);
}
}).start();*/
}).start();
// 更新盘点记录
@ -2624,7 +2625,7 @@ public class StockTakingServiceImpl implements StockTakingService {
if (flag) {
// 抄送盘点调账记录给盘点人员
/*new Thread(new Runnable() {
new Thread(new Runnable() {
@Override
public void run() {
// 获取盘点人员
@ -2644,11 +2645,11 @@ public class StockTakingServiceImpl implements StockTakingService {
redisTemplate.expire("user:" + originator.getNumber() + ":QyWxStockTakingCompleteId:" + mainId, 72, TimeUnit.HOURS);
}
}
}).start();*/
}).start();
} else {
// 发送错误消息提醒负责人
/*new Thread(new Runnable() {
new Thread(new Runnable() {
@Override
public void run() {
// 获取盘点人员
@ -2657,7 +2658,7 @@ public class StockTakingServiceImpl implements StockTakingService {
qyWxOperationService.sendStockTakingErrMessageToHead("PangFuZhen,", errIds, mainRecord, null, userAgent);
// qyWxOperationService.sendStockTakingErrMessageToHead(workwechat, errIds, mainRecord, null, userAgent);
}
}).start();*/
}).start();
}
} else {
map.put("state", departmentManagerState);

Write Preview
Loading…
Cancel
Save