From 9375b80f37ae91c00c04c4c56dad8b50814f1c9c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=88=98=E5=B8=85?= Date: Fri, 5 Sep 2025 15:21:34 +0800 Subject: [PATCH] =?UTF-8?q?1.=E5=85=A5=E5=BA=93=E5=8D=95=E4=BF=AE=E6=94=B9?= =?UTF-8?q?=E6=97=B6=E6=8F=90=E4=BA=A4=E6=B2=A1=E6=9C=89=E4=BF=9D=E5=AD=98?= =?UTF-8?q?=E4=BE=9B=E5=BA=94=E5=95=86=E9=97=AE=E9=A2=98=E4=BF=AE=E5=A4=8D?= =?UTF-8?q?=202.=E6=89=B9=E9=87=8F=E5=88=A0=E9=99=A4=E6=95=85=E9=9A=9C?= =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E5=A2=9E=E5=8A=A0=E6=8A=A5=E4=BF=AE=E5=8D=95?= =?UTF-8?q?=E4=BD=BF=E7=94=A8=E6=A0=A1=E9=AA=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/ErpMaintainProjectServiceImpl.java | 21 ++++++++++++------- .../impl/ErpMaterialPutawayServiceImpl.java | 1 + .../views/business/materialPutaway/index.vue | 6 +++--- 3 files changed, 17 insertions(+), 11 deletions(-) diff --git a/maintain-business/src/main/java/com/maintain/business/service/impl/ErpMaintainProjectServiceImpl.java b/maintain-business/src/main/java/com/maintain/business/service/impl/ErpMaintainProjectServiceImpl.java index cf16be4..a1327a4 100644 --- a/maintain-business/src/main/java/com/maintain/business/service/impl/ErpMaintainProjectServiceImpl.java +++ b/maintain-business/src/main/java/com/maintain/business/service/impl/ErpMaintainProjectServiceImpl.java @@ -2,14 +2,12 @@ package com.maintain.business.service.impl; import cn.hutool.core.bean.BeanUtil; import cn.hutool.extra.pinyin.PinyinUtil; -import com.maintain.business.domain.ErpMaintainMalfunction; -import com.maintain.business.domain.ErpMalfunctionProject; -import com.maintain.business.domain.ErpProjectType; +import com.maintain.business.domain.*; import com.maintain.business.domain.bo.ErpMalfunctionProjectBo; import com.maintain.business.domain.vo.ErpMalfunctionProjectVo; -import com.maintain.business.mapper.ErpMaintainMalfunctionMapper; -import com.maintain.business.mapper.ErpMalfunctionProjectMapper; -import com.maintain.business.mapper.ErpProjectTypeMapper; +import com.maintain.business.domain.vo.ErpRepairFormProjectVo; +import com.maintain.business.mapper.*; +import com.maintain.common.exception.ServiceException; import com.maintain.common.pinyin.PinyinUtils; import com.maintain.common.utils.StringUtils; import com.maintain.common.core.page.TableDataInfo; @@ -21,14 +19,13 @@ import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Service; import com.maintain.business.domain.bo.ErpMaintainProjectBo; import com.maintain.business.domain.vo.ErpMaintainProjectVo; -import com.maintain.business.domain.ErpMaintainProject; -import com.maintain.business.mapper.ErpMaintainProjectMapper; import com.maintain.business.service.IErpMaintainProjectService; import org.springframework.transaction.annotation.Transactional; import java.util.List; import java.util.Map; import java.util.Collection; +import java.util.Set; import java.util.stream.Collectors; /** @@ -45,6 +42,7 @@ public class ErpMaintainProjectServiceImpl implements IErpMaintainProjectService private final ErpProjectTypeMapper projectTypeMapper; private final ErpMalfunctionProjectMapper malfunctionProjectMapper; private final ErpMaintainMalfunctionMapper maintainMalfunctionMapper; + private final ErpRepairFormProjectMapper repairFormProjectMapper; /** @@ -176,11 +174,18 @@ public class ErpMaintainProjectServiceImpl implements IErpMaintainProjectService /** * 批量删除维修项目 */ + @Transactional @Override public Boolean deleteWithValidByIds(Collection ids, Boolean isValid) { if(isValid){ //TODO 做一些业务上的校验,判断是否需要校验 + List projectVos = repairFormProjectMapper.selectVoList(new LambdaQueryWrapper().in(ErpRepairFormProject::getMaintainId, ids)); + if (!projectVos.isEmpty()) { + Set collect = projectVos.stream().map(ErpRepairFormProjectVo::getProjectName).collect(Collectors.toSet()); + throw new ServiceException("删除失败，维修项目 "+collect+" 已被使用！"); + } } + maintainMalfunctionMapper.delete(new LambdaQueryWrapper().in(ErpMaintainMalfunction::getMaintainId, ids)); return baseMapper.deleteBatchIds(ids) > 0; } } diff --git a/maintain-business/src/main/java/com/maintain/business/service/impl/ErpMaterialPutawayServiceImpl.java b/maintain-business/src/main/java/com/maintain/business/service/impl/ErpMaterialPutawayServiceImpl.java index 91f17f1..846c2c6 100644 --- a/maintain-business/src/main/java/com/maintain/business/service/impl/ErpMaterialPutawayServiceImpl.java +++ b/maintain-business/src/main/java/com/maintain/business/service/impl/ErpMaterialPutawayServiceImpl.java @@ -247,6 +247,7 @@ public class ErpMaterialPutawayServiceImpl implements IErpMaterialPutawayService List inventoryRecordList = collect.stream().map(item -> { ErpMaterialInventoryRecord record = new ErpMaterialInventoryRecord(); record.setInfoId(item.getId()); + record.setVendorId(item.getVendorId()); record.setMaterialId(item.getMaterialId()); record.setWarehouseId(warehouseVo.getId()); record.setDeptId(warehouseVo.getDeptId()); diff --git a/maintain-ui/src/views/business/materialPutaway/index.vue b/maintain-ui/src/views/business/materialPutaway/index.vue index 47a31bd..5894dc2 100644 --- a/maintain-ui/src/views/business/materialPutaway/index.vue +++ b/maintain-ui/src/views/business/materialPutaway/index.vue @@ -264,17 +264,17 @@ - + - + - + -- 2.22.0