From f0a426bb721f7e0dfb7ec4f2d9977644d4cbf8a4 Mon Sep 17 00:00:00 2001 From: yinq Date: Thu, 21 Aug 2025 14:34:28 +0800 Subject: [PATCH] =?UTF-8?q?change=20-=20add=E6=8F=90=E8=B5=84=E5=8D=95?= =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E5=88=A0=E9=99=A4=E9=80=BB=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mapper/MesPurchaseApplyProcessMapper.java | 4 ++-- .../MesPurchaseApplyProcessServiceImpl.java | 20 ++++++++++++---- .../mes/MesPurchaseApplyProcessMapper.xml | 2 +- .../views/mes/purchaseApplyProcess/index.vue | 23 ++++++++++--------- 4 files changed, 31 insertions(+), 18 deletions(-) diff --git a/hw-modules/hw-mes/src/main/java/com/hw/mes/mapper/MesPurchaseApplyProcessMapper.java b/hw-modules/hw-mes/src/main/java/com/hw/mes/mapper/MesPurchaseApplyProcessMapper.java index 16ae2511..c56bfe5a 100644 --- a/hw-modules/hw-mes/src/main/java/com/hw/mes/mapper/MesPurchaseApplyProcessMapper.java +++ b/hw-modules/hw-mes/src/main/java/com/hw/mes/mapper/MesPurchaseApplyProcessMapper.java @@ -80,9 +80,9 @@ public interface MesPurchaseApplyProcessMapper { /** * 通过采购申请流程主键删除采购申请流程明细信息 * - * @param purchaseApplyId 采购申请流程ID + * @param taskCode 任务编号 * @return 结果 */ - public int deleteMesPurchaseApplyProcessDetailByTaskCode(Long purchaseApplyId); + public int deleteMesPurchaseApplyProcessDetailByTaskCode(String taskCode); } diff --git a/hw-modules/hw-mes/src/main/java/com/hw/mes/service/impl/MesPurchaseApplyProcessServiceImpl.java b/hw-modules/hw-mes/src/main/java/com/hw/mes/service/impl/MesPurchaseApplyProcessServiceImpl.java index 329784b8..bd943d2b 100644 --- a/hw-modules/hw-mes/src/main/java/com/hw/mes/service/impl/MesPurchaseApplyProcessServiceImpl.java +++ b/hw-modules/hw-mes/src/main/java/com/hw/mes/service/impl/MesPurchaseApplyProcessServiceImpl.java @@ -9,6 +9,7 @@ import com.hw.common.core.exception.ServiceException; import com.hw.common.core.utils.DateUtils; import com.hw.common.core.utils.MailUtils; import com.hw.common.security.utils.SecurityUtils; +import com.hw.mes.domain.MesRaiseCapitalBom; import com.hw.mes.service.IMesPurchaseApplyProcessDetailService; import com.hw.mes.service.IMesRaiseCapitalBomService; import com.hw.system.api.RemoteSysCommonService; @@ -106,8 +107,10 @@ public class MesPurchaseApplyProcessServiceImpl implements IMesPurchaseApplyProc @Transactional @Override public int deleteMesPurchaseApplyProcessByPurchaseApplyIds(Long[] purchaseApplyIds) { - mesPurchaseApplyProcessMapper.deleteMesPurchaseApplyProcessDetailByTaskCodes(purchaseApplyIds); - return mesPurchaseApplyProcessMapper.deleteMesPurchaseApplyProcessByPurchaseApplyIds(purchaseApplyIds); + for (Long purchaseApplyId : purchaseApplyIds) { + this.deleteMesPurchaseApplyProcessByPurchaseApplyId(purchaseApplyId); + } + return 1; } /** @@ -119,8 +122,17 @@ public class MesPurchaseApplyProcessServiceImpl implements IMesPurchaseApplyProc @Transactional @Override public int deleteMesPurchaseApplyProcessByPurchaseApplyId(Long purchaseApplyId) { - mesPurchaseApplyProcessMapper.deleteMesPurchaseApplyProcessDetailByTaskCode(purchaseApplyId); - return mesPurchaseApplyProcessMapper.deleteMesPurchaseApplyProcessByPurchaseApplyId(purchaseApplyId); + MesPurchaseApplyProcess applyProcess = mesPurchaseApplyProcessMapper.selectMesPurchaseApplyProcessByPurchaseApplyId(purchaseApplyId); + String taskCode = applyProcess.getTaskCode(); + MesRaiseCapitalBom capitalBom = new MesRaiseCapitalBom(); + capitalBom.setTaskCode(taskCode); + List mesRaiseCapitalBoms = mesRaiseCapitalBomService.selectMesRaiseCapitalBomList(capitalBom); + if (!mesRaiseCapitalBoms.isEmpty()) { + throw new ServiceException("请先删除对应的提资单BOM信息"); + } + mesPurchaseApplyProcessMapper.deleteMesPurchaseApplyProcessDetailByTaskCode(taskCode); + mesPurchaseApplyProcessMapper.deleteMesPurchaseApplyProcessByPurchaseApplyId(purchaseApplyId); + return 1; } /** diff --git a/hw-modules/hw-mes/src/main/resources/mapper/mes/MesPurchaseApplyProcessMapper.xml b/hw-modules/hw-mes/src/main/resources/mapper/mes/MesPurchaseApplyProcessMapper.xml index 8f45d3f8..2f5eafe7 100644 --- a/hw-modules/hw-mes/src/main/resources/mapper/mes/MesPurchaseApplyProcessMapper.xml +++ b/hw-modules/hw-mes/src/main/resources/mapper/mes/MesPurchaseApplyProcessMapper.xml @@ -167,7 +167,7 @@ - + delete from mes_purchase_apply_process_detail where task_code = #{taskCode} diff --git a/hw-ui/src/views/mes/purchaseApplyProcess/index.vue b/hw-ui/src/views/mes/purchaseApplyProcess/index.vue index b859ca37..5d088a3f 100644 --- a/hw-ui/src/views/mes/purchaseApplyProcess/index.vue +++ b/hw-ui/src/views/mes/purchaseApplyProcess/index.vue @@ -48,17 +48,18 @@ - - - - - - - - - - - + + 删除 + +