diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/purchase/service/impl/PurchaseStorageServiceImpl.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/purchase/service/impl/PurchaseStorageServiceImpl.java index 8a870291..09431f89 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/purchase/service/impl/PurchaseStorageServiceImpl.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/purchase/service/impl/PurchaseStorageServiceImpl.java @@ -202,7 +202,6 @@ public class PurchaseStorageServiceImpl implements IPurchaseStorageService { * @return */ private AjaxResult processByPurchaseIds(PurchaseDto purchaseDto) { - purchaseDto.setStatus(PurchaseTaskStatusEnum.IN_STORE.getStatus()); int result = 0; try { //判断为数量还是编码入库 @@ -213,6 +212,7 @@ public class PurchaseStorageServiceImpl implements IPurchaseStorageService { } else { //编码入库 List purchaseVoList = purchaseBindMapper.selectPurchaseCheckInfoById(purchaseDto); + result += purchaseStorageMapper.updateNum(purchaseDto.getPurchaseId(), purchaseDto.getInPutList().size()); for (PurchaseDto dto : purchaseDto.getInPutList()) { if (CollectionUtils.isNotEmpty(purchaseVoList)) { for (PurchaseVo purchaseVo : purchaseVoList) { @@ -224,10 +224,9 @@ public class PurchaseStorageServiceImpl implements IPurchaseStorageService { } dto.setTypeId(purchaseDto.getTypeId()); result += purchaseStorageMapper.insertMachine(dto); - result += purchaseStorageMapper.updateNum(purchaseDto.getPurchaseId(), purchaseDto.getInPutList().size()); - List list = purchaseBindMapper.getMachineById(dto); + List list = purchaseBindMapper.getMachineById(purchaseDto); if (CollectionUtils.isNotEmpty(list)) { - result += purchaseStorageMapper.updateStatusById(PurchaseTaskStatusEnum.TASK_IN_PROGRESS.getStatus(), Integer.parseInt(purchaseDto.getPurchaseId())); + result += purchaseStorageMapper.updateStatusById(PurchaseTaskStatusEnum.TO_STORE.getStatus(), Integer.parseInt(purchaseDto.getPurchaseId())); } else { result += purchaseStorageMapper.updateStatusById(PurchaseTaskStatusEnum.IN_STORE.getStatus(), Integer.parseInt(purchaseDto.getPurchaseId())); }