diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/purchase/service/impl/PurchaseCheckInfoServiceImpl.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/purchase/service/impl/PurchaseCheckInfoServiceImpl.java index 966470ad..f7cbda57 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/purchase/service/impl/PurchaseCheckInfoServiceImpl.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/purchase/service/impl/PurchaseCheckInfoServiceImpl.java @@ -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 = purchaseCheckDetailsMapper.selectPurchaseCheckDetailsListByQueryDto(purchaseQueryDto); - List codeList = purchaseCheckDetails.stream().filter(o -> MaTypeManageTypeEnum.CODE_DEVICE.equals(o.getManageType())).collect(Collectors.toList()); - List 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 codeList = purchaseCheckDetails.stream().filter(o -> MaTypeManageTypeEnum.CODE_DEVICE.getTypeId().equals(o.getManageType())).collect(Collectors.toList()); + List 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) {