bonus
/
Bonus-Cloud-Material
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

新购接口优化

This commit is contained in:
sxu 2024-11-15 11:01:01 +08:00
parent 9e525fc5e9
commit 6a90f576b1
1 changed files with 24 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
bonus-modules/bonus-material/src/main/java/com/bonus/material/purchase/service/impl/PurchaseCheckInfoServiceImpl.java
View File

@ -240,15 +240,27 @@ public class PurchaseCheckInfoServiceImpl implements IPurchaseCheckInfoService {
AjaxResult result = new AjaxResult();
purchaseDto.getTaskIds().removeIf(Objects::isNull);
for (Long taskId : purchaseDto.getTaskIds()) {
boolean updateResult = tmTaskMapper.updateTmTaskStatusByTaskId(taskId,
purchaseDto.getStatus()
) > 0;
if (updateResult) {
result = purchaseCheckDetailsMapper.batchUpdateDetailsTaskStatus(taskId,
purchaseDto.getStatus(), purchaseDto.getCheckResult()
) > 0 ? AjaxResult.success("验收状态更改成功") : AjaxResult.error("验收状态更改失败");
} else {
result = AjaxResult.error("SQL未报错，但修改任务0条");
PurchaseQueryDto purchaseQueryDto = new PurchaseQueryDto();
purchaseQueryDto.setTaskId(purchaseQueryDto.getTaskId());
List<PurchaseCheckDetails> purchaseCheckDetails = purchaseCheckDetailsMapper.selectPurchaseCheckDetailsListByQueryDto(purchaseQueryDto);
List<PurchaseCheckDetails> codeList = purchaseCheckDetails.stream().filter(o -> MaTypeManageTypeEnum.CODE_DEVICE.equals(o.getManageType())).collect(Collectors.toList());
List<PurchaseCheckDetails> numList = purchaseCheckDetails.stream().filter(o -> MaTypeManageTypeEnum.NUMBER_DEVICE.equals(o.getManageType())).collect(Collectors.toList());
if (!CollectionUtils.isEmpty(numList) && numList.size() > 0) {
for (PurchaseCheckDetails details : numList) {
details.setStatus(PurchaseTaskStatusEnum.TO_STORE.getStatus());
purchaseCheckDetailsMapper.updatePurchaseDetails(details);
}
}
if (!CollectionUtils.isEmpty(codeList) && codeList.size() > 0) {
for (PurchaseCheckDetails details : codeList) {
details.setStatus(PurchaseTaskStatusEnum.TO_CHECK.getStatus());
purchaseCheckDetailsMapper.updatePurchaseDetails(details);
}
int taskCount = tmTaskMapper.updateTmTaskStatusByTaskId(taskId, PurchaseTaskStatusEnum.TO_CHECK.getStatus());
result = taskCount > 0 ? AjaxResult.success("验收状态更改成功") : AjaxResult.error("验收状态更改失败");
} if (!CollectionUtils.isEmpty(numList) && numList.size() > 0) {
int taskCount = tmTaskMapper.updateTmTaskStatusByTaskId(taskId, PurchaseTaskStatusEnum.TO_STORE.getStatus());
result = taskCount > 0 ? AjaxResult.success("待入库状态更改成功") : AjaxResult.error("待入库状态更改失败");
}
}
return result;
@ -266,6 +278,9 @@ public class PurchaseCheckInfoServiceImpl implements IPurchaseCheckInfoService {
Long taskId = purchaseCheckDetailsList.get(0).getTaskId();
Integer status = purchaseCheckDetailsList.get(0).getStatus();
for (PurchaseCheckDetails details : purchaseCheckDetailsList) {
if (MaTypeManageTypeEnum.NUMBER_DEVICE.getTypeId().equals(details.getManageType())) {
details.setStatus(PurchaseTaskStatusEnum.TO_STORE.getStatus());
}
result = purchaseCheckDetailsMapper.updatePurchaseDetails(details) > 0 ? AjaxResult.success("details验收状态更改成功") : AjaxResult.error("details验收状态更改失败");
}
//查询是否这个taskId是否已全部验收通过，如果是的，更新整个task的任务状态