|
|
|
@ -10,6 +10,7 @@ import com.dreamchaser.depository_manage.pojo.*; |
|
|
|
import com.dreamchaser.depository_manage.pojo.callBackXml.approvalCallBackXml.ApprovalInfo_Details; |
|
|
|
import com.dreamchaser.depository_manage.pojo.callBackXml.approvalCallBackXml.ApprovalInfo_Details_Approver; |
|
|
|
import com.dreamchaser.depository_manage.pojo.callBackXml.callBackXml_button_templatecard.TemplateCard; |
|
|
|
import com.dreamchaser.depository_manage.security.pool.HandlesOtherfunctionalThreadPool; |
|
|
|
import com.dreamchaser.depository_manage.security.pool.RedisPool; |
|
|
|
import com.dreamchaser.depository_manage.security.pool.SendQyWxMessageThreadPool; |
|
|
|
import com.dreamchaser.depository_manage.service.DepositoryRecordService; |
|
|
|
@ -289,7 +290,7 @@ public class DepositoryRecordServiceImpl implements DepositoryRecordService { |
|
|
|
List<ApplicationOutRecordMin> applicationOutRecordMinByParent = depositoryRecordMapper.findApplicationOutRecordMinByParent(id); |
|
|
|
|
|
|
|
// 开启一个线程去删除redis中的数据
|
|
|
|
SendQyWxMessageThreadPool.execute(() -> { |
|
|
|
HandlesOtherfunctionalThreadPool.execute(() -> { |
|
|
|
// 获取该用户在redis中的订单记录
|
|
|
|
String key = "user:" + recordP.getApplicantId(); |
|
|
|
// 获取当前用户所有处理单
|
|
|
|
@ -317,7 +318,7 @@ public class DepositoryRecordServiceImpl implements DepositoryRecordService { |
|
|
|
}); |
|
|
|
|
|
|
|
// 开启一个线程去删除子订单
|
|
|
|
SendQyWxMessageThreadPool.execute(() -> depositoryRecordMapper.deleteApplicationOutRecordMinById(id)); |
|
|
|
HandlesOtherfunctionalThreadPool.execute(() -> depositoryRecordMapper.deleteApplicationOutRecordMinById(id)); |
|
|
|
|
|
|
|
return integer; |
|
|
|
} |
|
|
|
@ -331,7 +332,7 @@ public class DepositoryRecordServiceImpl implements DepositoryRecordService { |
|
|
|
Integer integer = depositoryRecordMapper.deleteApplicationOutRecordByIds(list); |
|
|
|
|
|
|
|
// 开启一个线程去删除redis中的数据
|
|
|
|
SendQyWxMessageThreadPool.execute(() -> { |
|
|
|
HandlesOtherfunctionalThreadPool.execute(() -> { |
|
|
|
for (ApplicationOutRecord recordP : recordPList |
|
|
|
) { |
|
|
|
// 获取该用户在redis中的订单记录
|
|
|
|
@ -360,7 +361,7 @@ public class DepositoryRecordServiceImpl implements DepositoryRecordService { |
|
|
|
|
|
|
|
}); |
|
|
|
// 开启一个线程用于删除
|
|
|
|
SendQyWxMessageThreadPool.execute(() -> depositoryRecordMapper.deleteApplicationOutRecordMinByIds(list)); |
|
|
|
HandlesOtherfunctionalThreadPool.execute(() -> depositoryRecordMapper.deleteApplicationOutRecordMinByIds(list)); |
|
|
|
|
|
|
|
return integer; |
|
|
|
} |
|
|
|
@ -1098,7 +1099,7 @@ public class DepositoryRecordServiceImpl implements DepositoryRecordService { |
|
|
|
updateApplicationMinOutInfo(id, applicationOutMinById, record, trueOut, userByPort, placeId, userAgent); |
|
|
|
|
|
|
|
// 更新入库批次中的物料数量
|
|
|
|
SendQyWxMessageThreadPool.execute(() -> { |
|
|
|
HandlesOtherfunctionalThreadPool.execute(() -> { |
|
|
|
// 获取出库物料id
|
|
|
|
Integer mid1 = inventory.getId(); |
|
|
|
// 获取当前物料对应的生产日期
|
|
|
|
@ -2931,8 +2932,7 @@ public class DepositoryRecordServiceImpl implements DepositoryRecordService { |
|
|
|
String departmenthead = record.getDepartmenthead(); |
|
|
|
String[] split = departmenthead.split(","); |
|
|
|
StringBuilder QyWxUid = new StringBuilder(); |
|
|
|
for (int i = 0; i < split.length; i++) { |
|
|
|
String s = split[i]; |
|
|
|
for (String s : split) { |
|
|
|
if ("".equals(s)) { |
|
|
|
continue; |
|
|
|
} |
|
|
|
@ -4664,7 +4664,7 @@ public class DepositoryRecordServiceImpl implements DepositoryRecordService { |
|
|
|
@Override |
|
|
|
public Integer deleteApplicationInRecordById(Integer id, UserByPort userToken, String userAgent) { |
|
|
|
ApplicationInRecord record = depositoryRecordMapper.findApplicationInRecordPById(id); |
|
|
|
SendQyWxMessageThreadPool.execute(() -> { |
|
|
|
HandlesOtherfunctionalThreadPool.execute(() -> { |
|
|
|
if (Integer.compare(record.getAirapproverPass(), 4) == 0 || Integer.compare(record.getAirapproverPass(), 1) == 0) { |
|
|
|
// 如果已经入库
|
|
|
|
updateInventoryForErrorInRecord(record.getMid(), record.getQuantity(), record.getAirUnit(), record.getPlaceId(), record.getDepositoryId()); |
|
|
|
@ -4682,7 +4682,7 @@ public class DepositoryRecordServiceImpl implements DepositoryRecordService { |
|
|
|
@Override |
|
|
|
public Integer deleteApplicationInRecordByIds(List<Integer> list, UserByPort userToken, String userAgent) { |
|
|
|
List<ApplicationInRecord> applicationInRecordsByIds = depositoryRecordMapper.findApplicationInRecordsByIds(list); |
|
|
|
SendQyWxMessageThreadPool.execute(() -> { |
|
|
|
HandlesOtherfunctionalThreadPool.execute(() -> { |
|
|
|
for (ApplicationInRecord record : applicationInRecordsByIds |
|
|
|
) { |
|
|
|
if (Integer.compare(record.getAirapproverPass(), 4) == 0 || Integer.compare(record.getAirapproverPass(), 1) == 0) { |
|
|
|
|