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:11:36 +08:00
parent 6a90f576b1
commit 1a091ecd6b
1 changed files with 16 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

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