bonus
/
Material_Station_System
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

新购接口优化

This commit is contained in:
sxu 2024-11-15 13:15:12 +08:00
parent a412b1e706
commit e3476a9dd4
1 changed files with 31 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -239,31 +239,35 @@ public class PurchaseCheckInfoServiceImpl implements IPurchaseCheckInfoService {
try {
AjaxResult result = new AjaxResult();
purchaseDto.getTaskIds().removeIf(Objects::isNull);
int updateCount = 0;
for (Long taskId : purchaseDto.getTaskIds()) {
PurchaseQueryDto purchaseQueryDto = new PurchaseQueryDto();
purchaseQueryDto.setTaskId(purchaseQueryDto.getTaskId());
purchaseQueryDto.setTaskId(taskId);
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);
}
}
List<PurchaseCheckDetails> codeList = purchaseCheckDetails.stream().filter(o -> MaTypeManageTypeEnum.CODE_DEVICE.getTypeId().equals(o.getManageType())).collect(Collectors.toList());
List<PurchaseCheckDetails> numList = purchaseCheckDetails.stream().filter(o -> MaTypeManageTypeEnum.NUMBER_DEVICE.getTypeId().equals(o.getManageType())).collect(Collectors.toList());
if (!CollectionUtils.isEmpty(codeList) && codeList.size() > 0) {
for (PurchaseCheckDetails details : codeList) {
details.setStatus(PurchaseTaskStatusEnum.TO_BIND.getStatus());
purchaseCheckDetailsMapper.updatePurchaseDetails(details);
updateCount += purchaseCheckDetailsMapper.updatePurchaseDetails(details);
}
int taskCount = tmTaskMapper.updateTmTaskStatusByTaskId(taskId, PurchaseTaskStatusEnum.TO_BIND.getStatus());
result = taskCount > 0 ? AjaxResult.success("task绑定状态更改成功") : AjaxResult.error("task绑定状态更改失败");
} if (!CollectionUtils.isEmpty(numList) && numList.size() > 0) {
int taskCount = tmTaskMapper.updateTmTaskStatusByTaskId(taskId, PurchaseTaskStatusEnum.TO_STORE.getStatus());
result = taskCount > 0 ? AjaxResult.success("task待入库状态更改成功") : AjaxResult.error("task待入库状态更改失败");
}
if (!CollectionUtils.isEmpty(numList) && numList.size() > 0) {
for (PurchaseCheckDetails details : numList) {
details.setStatus(PurchaseTaskStatusEnum.TO_STORE.getStatus());
updateCount += purchaseCheckDetailsMapper.updatePurchaseDetails(details);
}
}
// // 维护tm_task的状态，但因为新购任务中的物资可以部分流转，所以汇总的状态失去意义，不再维护
// if (!CollectionUtils.isEmpty(codeList) && codeList.size() > 0) {
// int taskCount = tmTaskMapper.updateTmTaskStatusByTaskId(taskId, PurchaseTaskStatusEnum.TO_BIND.getStatus());
// result = taskCount > 0 ? AjaxResult.success("task绑定状态更改成功") : AjaxResult.error("task绑定状态更改失败");
// } if (!CollectionUtils.isEmpty(numList) && numList.size() > 0) {
// int taskCount = tmTaskMapper.updateTmTaskStatusByTaskId(taskId, PurchaseTaskStatusEnum.TO_STORE.getStatus());
// result = taskCount > 0 ? AjaxResult.success("task待入库状态更改成功") : AjaxResult.error("task待入库状态更改失败");
// }
}
return result;
return updateCount > 0 ? AjaxResult.success("验证成功") : AjaxResult.error("无验证信息");
} catch (Exception e) {
return AjaxResult.error("验收状态更改失败,异常报错:" + e.getMessage());
}
@ -283,18 +287,18 @@ public class PurchaseCheckInfoServiceImpl implements IPurchaseCheckInfoService {
} else 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的任务状态
int count = purchaseCheckDetailsMapper.getCountOfNoneThisStatus(taskId, PurchaseTaskStatusEnum.TO_CHECK.getStatus());
if (count == 0) {
int toCheckCount = purchaseCheckDetailsMapper.getCountOfNoneThisStatus(taskId, PurchaseTaskStatusEnum.TO_BIND.getStatus());
if (toCheckCount == 0) {
result = tmTaskMapper.updateTmTaskStatusByTaskId(taskId, PurchaseTaskStatusEnum.TO_STORE.getStatus()) > 0 ? AjaxResult.success("task待入库状态更改成功") : AjaxResult.error("task待入库状态更改失败");
} else {
result = tmTaskMapper.updateTmTaskStatusByTaskId(taskId, PurchaseTaskStatusEnum.TO_BIND.getStatus()) > 0 ? AjaxResult.success("task绑定状态更改成功") : AjaxResult.error("task绑定状态更改失败");
}
result = purchaseCheckDetailsMapper.updatePurchaseDetails(details) > 0 ? AjaxResult.success("detail验证成功") : AjaxResult.error("details无验证信息");
}
// // 维护tm_task的状态，但因为新购任务中的物资可以部分流转，所以汇总的状态失去意义，不再维护
// int count = purchaseCheckDetailsMapper.getCountOfNoneThisStatus(taskId, PurchaseTaskStatusEnum.TO_CHECK.getStatus());
// if (count == 0) {
// int toCheckCount = purchaseCheckDetailsMapper.getCountOfNoneThisStatus(taskId, PurchaseTaskStatusEnum.TO_BIND.getStatus());
// if (toCheckCount == 0) {
// result = tmTaskMapper.updateTmTaskStatusByTaskId(taskId, PurchaseTaskStatusEnum.TO_STORE.getStatus()) > 0 ? AjaxResult.success("task待入库状态更改成功") : AjaxResult.error("task待入库状态更改失败");
// } else {
// result = tmTaskMapper.updateTmTaskStatusByTaskId(taskId, PurchaseTaskStatusEnum.TO_BIND.getStatus()) > 0 ? AjaxResult.success("task绑定状态更改成功") : AjaxResult.error("task绑定状态更改失败");
// }
// }
}
return result;
} catch (Exception e) {