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 b0d53176..966470ad 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 @@ -253,14 +253,14 @@ public class PurchaseCheckInfoServiceImpl implements IPurchaseCheckInfoService { } if (!CollectionUtils.isEmpty(codeList) && codeList.size() > 0) { for (PurchaseCheckDetails details : codeList) { - details.setStatus(PurchaseTaskStatusEnum.TO_CHECK.getStatus()); + details.setStatus(PurchaseTaskStatusEnum.TO_BIND.getStatus()); purchaseCheckDetailsMapper.updatePurchaseDetails(details); } - int taskCount = tmTaskMapper.updateTmTaskStatusByTaskId(taskId, PurchaseTaskStatusEnum.TO_CHECK.getStatus()); - result = taskCount > 0 ? AjaxResult.success("验收状态更改成功") : AjaxResult.error("验收状态更改失败"); + 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("待入库状态更改成功") : AjaxResult.error("待入库状态更改失败"); + result = taskCount > 0 ? AjaxResult.success("task待入库状态更改成功") : AjaxResult.error("task待入库状态更改失败"); } } return result; @@ -276,17 +276,24 @@ public class PurchaseCheckInfoServiceImpl implements IPurchaseCheckInfoService { AjaxResult result = new AjaxResult(); if (!CollectionUtils.isEmpty(purchaseCheckDetailsList)) { Long taskId = purchaseCheckDetailsList.get(0).getTaskId(); - Integer status = purchaseCheckDetailsList.get(0).getStatus(); + //Integer status = purchaseCheckDetailsList.get(0).getStatus(); for (PurchaseCheckDetails details : purchaseCheckDetailsList) { - if (MaTypeManageTypeEnum.NUMBER_DEVICE.getTypeId().equals(details.getManageType())) { + if (MaTypeManageTypeEnum.CODE_DEVICE.getTypeId().equals(details.getManageType())) { + details.setStatus(PurchaseTaskStatusEnum.TO_BIND.getStatus()); + } 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验收状态更改失败"); + result = purchaseCheckDetailsMapper.updatePurchaseDetails(details) > 0 ? AjaxResult.success("details绑定或待入库状态更改成功") : AjaxResult.error("details绑定或待入库状态更改失败"); } //查询是否这个taskId是否已全部验收通过,如果是的,更新整个task的任务状态 - int count = purchaseCheckDetailsMapper.getCountOfNoneThisStatus(taskId, status); + int count = purchaseCheckDetailsMapper.getCountOfNoneThisStatus(taskId, PurchaseTaskStatusEnum.TO_CHECK.getStatus()); if (count == 0) { - result = tmTaskMapper.updateTmTaskStatusByTaskId(taskId, status) > 0 ? AjaxResult.success("task验收状态更改成功") : AjaxResult.error("task验收状态更改失败"); + 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;