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

新购绑定

This commit is contained in:
mashuai 2024-10-22 14:16:53 +08:00
parent 2bed78391e
commit 1c70d63c42
4 changed files with 16 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
bonus-modules/bonus-material/src/main/java/com/bonus/material/purchase/controller/PurchaseBindController.java
View File

@ -74,6 +74,6 @@ public class PurchaseBindController extends BaseController {
@RequiresPermissions("purchase:bind:query")
@GetMapping(value = "/getById")
public AjaxResult getInfo(PurchaseDto dto) {
return AjaxResult.success(purchaseBindService.selectPurchaseCheckInfoById(dto));
return purchaseBindService.selectPurchaseCheckInfoById(dto);
}
}

2
bonus-modules/bonus-material/src/main/java/com/bonus/material/purchase/service/IPurchaseBindService.java
View File

@ -24,7 +24,7 @@ public interface IPurchaseBindService {
* @param dto
* @return
*/
List<PurchaseVo> selectPurchaseCheckInfoById(PurchaseDto dto);
AjaxResult selectPurchaseCheckInfoById(PurchaseDto dto);
/**
* 获取新购绑定二级明细列表

7
bonus-modules/bonus-material/src/main/java/com/bonus/material/purchase/service/impl/PurchaseBindServiceImpl.java
View File

@ -63,8 +63,11 @@ public class PurchaseBindServiceImpl implements IPurchaseBindService {
* @return
*/
@Override
public List<PurchaseVo> selectPurchaseCheckInfoById(PurchaseDto dto) {
return purchaseBindMapper.selectPurchaseCheckInfoById(dto);
public AjaxResult selectPurchaseCheckInfoById(PurchaseDto dto) {
if (dto == null || dto.getTaskId() == null || dto.getTypeId() == null) {
return AjaxResult.error(HttpCodeEnum.FAIL.getCode(), "参数不能为空");
}
return AjaxResult.success(purchaseBindMapper.selectPurchaseCheckInfoById(dto));
}
/**

18
bonus-modules/bonus-material/src/main/java/com/bonus/material/purchase/service/impl/PurchaseStorageServiceImpl.java
View File

@ -76,7 +76,7 @@ public class PurchaseStorageServiceImpl implements IPurchaseStorageService {
*/
@Override
public AjaxResult warehouse(PurchaseDto dto) {
if (dto.getId() != null) {
if (dto.getTaskId() != null) {
//外层入库
return processByTaskIds(dto);
} else if (dto.getPurchaseId() != null) {
@ -93,7 +93,7 @@ public class PurchaseStorageServiceImpl implements IPurchaseStorageService {
*/
@Override
public AjaxResult reject(PurchaseDto dto) {
if (dto.getId() != null) {
if (dto.getTaskId() != null) {
//外层驳回
return rejectByTaskIds(dto);
} else if (dto.getPurchaseId() != null) {
@ -115,7 +115,7 @@ public class PurchaseStorageServiceImpl implements IPurchaseStorageService {
List<PurchaseVo> details = purchaseStorageMapper.getDetails(purchaseDto);
if (CollectionUtils.isNotEmpty(details)) {
result += updateRejectAndStatus(Integer.parseInt(purchaseDto.getPurchaseId()));
List<PurchaseVo> statusList = purchaseStorageMapper.select(details.get(0).getId().toString());
List<PurchaseVo> statusList = purchaseStorageMapper.select(details.get(0).getTaskId().toString());
result += updateTaskStatus(statusList);
}
if (result > 0) {
@ -142,11 +142,11 @@ public class PurchaseStorageServiceImpl implements IPurchaseStorageService {
* @return
*/
private AjaxResult rejectByTaskIds(PurchaseDto dto) {
List<Integer> taskIdList = parseIds(dto.getId());
List<Integer> taskIdList = parseIds(dto.getTaskId());
int result = 0;
try {
for (Integer taskId : taskIdList) {
dto.setId(String.valueOf(taskId));
dto.setTaskId(String.valueOf(taskId));
List<PurchaseVo> details;
details = purchaseStorageMapper.getDetails(dto);
for (PurchaseVo purchaseVo : details) {
@ -176,7 +176,7 @@ public class PurchaseStorageServiceImpl implements IPurchaseStorageService {
List<PurchaseVo> details = purchaseStorageMapper.getDetails(purchaseDto);
if (CollectionUtils.isNotEmpty(details)) {
result += updatePurchaseInfoAndDetails(details.get(0), Integer.parseInt(purchaseDto.getPurchaseId()));
List<PurchaseVo> statusList = purchaseStorageMapper.select(details.get(0).getId().toString());
List<PurchaseVo> statusList = purchaseStorageMapper.select(details.get(0).getTaskId().toString());
result += updateTaskStatus(statusList);
}
if (result > 0) {
@ -210,11 +210,11 @@ public class PurchaseStorageServiceImpl implements IPurchaseStorageService {
* @return
*/
private AjaxResult processByTaskIds(PurchaseDto dto) {
List<Integer> taskIdList = parseIds(dto.getId());
List<Integer> taskIdList = parseIds(dto.getTaskId());
int result = 0;
try {
for (Integer taskId : taskIdList) {
dto.setId(String.valueOf(taskId));
dto.setTaskId(String.valueOf(taskId));
List<PurchaseVo> details;
details = purchaseStorageMapper.getDetails(dto);
result += updateDetailsAndStatus(details);
@ -257,7 +257,7 @@ public class PurchaseStorageServiceImpl implements IPurchaseStorageService {
private int updateTaskStatus(List<PurchaseVo> details) {
Map<Integer, List<Integer>> groupedByIdStatus = details.stream()
.collect(Collectors.groupingBy(
PurchaseVo::getId,
PurchaseVo::getTaskId,
Collectors.mapping(PurchaseVo::getStatus, Collectors.toList())
));