From 9245aa992d9f1d15840dd57551bf7aa31f850f8a Mon Sep 17 00:00:00 2001 From: mashuai Date: Mon, 15 Sep 2025 19:22:14 +0800 Subject: [PATCH] =?UTF-8?q?=E5=8A=9F=E8=83=BD=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/WarehousingServiceImpl.java | 18 +++++++++--------- .../impl/PurchaseStorageServiceImpl.java | 4 ++-- .../impl/RepairInputDetailsServiceImpl.java | 4 ++-- 3 files changed, 13 insertions(+), 13 deletions(-) diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/ma/service/impl/WarehousingServiceImpl.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/ma/service/impl/WarehousingServiceImpl.java index 21614604..90bd7675 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/ma/service/impl/WarehousingServiceImpl.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/ma/service/impl/WarehousingServiceImpl.java @@ -174,15 +174,6 @@ public class WarehousingServiceImpl implements WarehousingService { } for (int i = 0; i < dto.getMachIneDtoList().size(); i++) { MachIneDto machIneDto = dto.getMachIneDtoList().get(i); - machIneDto.setCode(code); - machIneDto.setIsCode(dto.getIsCode()); - machIneDto.setTypeId(dto.getTypeId()); - machIneDto.setCreator(dto.getCreator()); - machIneDto.setPutInType(dto.getPutInType()); - machIneDto.setNum(dto.getNum()); - machIneDto.setCheckMan(dto.getCheckMan()); - machIneDto.setInfoId(dto.getMachIneDtoList().get(0).getInfoId()); - res += insertMachineInfo(machIneDto); //根据类型追加ma_type表里面的num Type type = new Type(); type.setModelTitle("盘点入库"); @@ -193,6 +184,15 @@ public class WarehousingServiceImpl implements WarehousingService { type.setMaId(machIneDto.getMaId()); type.setMaCode(machIneDto.getMaCode()); res += typeService.updateNumAddOrSubtract(type); + machIneDto.setCode(code); + machIneDto.setIsCode(dto.getIsCode()); + machIneDto.setTypeId(dto.getTypeId()); + machIneDto.setCreator(dto.getCreator()); + machIneDto.setPutInType(dto.getPutInType()); + machIneDto.setNum(dto.getNum()); + machIneDto.setCheckMan(dto.getCheckMan()); + machIneDto.setInfoId(dto.getMachIneDtoList().get(0).getInfoId()); + res += insertMachineInfo(machIneDto); } return res; } 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 afb08ea3..05406a3f 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 @@ -249,13 +249,13 @@ public class PurchaseStorageServiceImpl implements IPurchaseStorageService { type.setCode(tmTask.getCode()); } dto.setTypeId(purchaseDto.getTypeId()); - if (1 > purchaseStorageMapper.updateMachineByCode(dto)) {throw new RuntimeException("入库失败,更新物资入库状态0条");} - //if (1 > purchaseStorageMapper.updateStorageNum(BigDecimal.ONE, dto.getTypeId())) {throw new RuntimeException("入库失败,库存增加0");} type.setModelTitle("新购入库"); type.setTypeId(Long.valueOf(purchaseDto.getTypeId())); type.setInputNum(BigDecimal.ONE); type.setStyle("4"); if (1 > typeService.updateNumAddOrSubtract(type)) {throw new RuntimeException("入库失败,库存增加0");} + if (1 > purchaseStorageMapper.updateMachineByCode(dto)) {throw new RuntimeException("入库失败,更新物资入库状态0条");} + //if (1 > purchaseStorageMapper.updateStorageNum(BigDecimal.ONE, dto.getTypeId())) {throw new RuntimeException("入库失败,库存增加0");} List bindMaList = purchaseBindMapper.getMachineById(purchaseDto); if (CollectionUtils.isNotEmpty(bindMaList)) { // 还有已绑定的设备， 那就不动状态了,这块由设备绑定阶段来决定是否修改成待入库状态 by阮 2025-01-10号修改逻辑 diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/repair/service/impl/RepairInputDetailsServiceImpl.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/repair/service/impl/RepairInputDetailsServiceImpl.java index 6b600753..2b2b977a 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/repair/service/impl/RepairInputDetailsServiceImpl.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/repair/service/impl/RepairInputDetailsServiceImpl.java @@ -675,8 +675,6 @@ public class RepairInputDetailsServiceImpl implements IRepairInputDetailsService inputDetails.setAuditBy(SecurityUtils.getLoginUser().getUserid()); inputDetails.setAuditTime(DateUtils.getNowDate()); result += repairInputDetailsMapper.updateRepairInputDetails(inputDetails); - inputDetails.setStatus(MaMachineStatusEnum.IN_STORE.getStatus().toString()); - updateRepairInputInfo(inputDetails); Type type = new Type(); type.setModelTitle("修试入库"); type.setCode(repairInputDetails.getInputCode()); @@ -685,6 +683,8 @@ public class RepairInputDetailsServiceImpl implements IRepairInputDetailsService type.setInputNum(BigDecimal.valueOf(1)); type.setMaId(inputDetails.getMaId()); typeService.updateNumAddOrSubtract(type); + inputDetails.setStatus(MaMachineStatusEnum.IN_STORE.getStatus().toString()); + updateRepairInputInfo(inputDetails); } if (result > 0) { updateTaskStatus(repairInputDetails);