diff --git a/mes-module-chemmes/mes-module-chemmes-biz/src/main/java/com/ningxia/yunxi/chemmes/module/biz/dal/mysql/purorderitem/PurOrderItemMapper.java b/mes-module-chemmes/mes-module-chemmes-biz/src/main/java/com/ningxia/yunxi/chemmes/module/biz/dal/mysql/purorderitem/PurOrderItemMapper.java index 3ce7535..11a3b8a 100644 --- a/mes-module-chemmes/mes-module-chemmes-biz/src/main/java/com/ningxia/yunxi/chemmes/module/biz/dal/mysql/purorderitem/PurOrderItemMapper.java +++ b/mes-module-chemmes/mes-module-chemmes-biz/src/main/java/com/ningxia/yunxi/chemmes/module/biz/dal/mysql/purorderitem/PurOrderItemMapper.java @@ -1,13 +1,16 @@ package com.ningxia.yunxi.chemmes.module.biz.dal.mysql.purorderitem; import cn.hutool.core.util.ObjectUtil; +import com.baomidou.mybatisplus.annotation.InterceptorIgnore; import com.github.yulichang.wrapper.MPJLambdaWrapper; import com.ningxia.yunxi.chemmes.framework.common.pojo.PageResult; import com.ningxia.yunxi.chemmes.framework.mybatis.core.mapper.BaseMapperX; import com.ningxia.yunxi.chemmes.module.biz.controller.admin.purorderitem.vo.PurOrderItemPageReqVO; import com.ningxia.yunxi.chemmes.module.biz.dal.dataobject.purorder.PurOrderDO; import com.ningxia.yunxi.chemmes.module.biz.dal.dataobject.purorderitem.PurOrderItemDO; +import org.apache.ibatis.annotations.Delete; import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; import java.util.List; @@ -39,4 +42,15 @@ public interface PurOrderItemMapper extends BaseMapperX { return selectList(PurOrderItemDO::getPurId, purId); } + /** + * 根据采购订单ID物理删除明细 + * 使用 @Delete 注解直接写 SQL, bypass 逻辑删除和多租户插件 + * + * @param purId 采购订单ID + * @return 删除的记录数 + */ + @Delete("DELETE FROM tsc_pur_order_item WHERE pur_id = #{purId}") + @InterceptorIgnore(tenantLine = "true") + int physicalDeleteByPurId(@Param("purId") Integer purId); + } diff --git a/mes-module-chemmes/mes-module-chemmes-biz/src/main/java/com/ningxia/yunxi/chemmes/module/biz/service/purorder/PurOrderServiceImpl.java b/mes-module-chemmes/mes-module-chemmes-biz/src/main/java/com/ningxia/yunxi/chemmes/module/biz/service/purorder/PurOrderServiceImpl.java index d5f3be0..944dfa1 100644 --- a/mes-module-chemmes/mes-module-chemmes-biz/src/main/java/com/ningxia/yunxi/chemmes/module/biz/service/purorder/PurOrderServiceImpl.java +++ b/mes-module-chemmes/mes-module-chemmes-biz/src/main/java/com/ningxia/yunxi/chemmes/module/biz/service/purorder/PurOrderServiceImpl.java @@ -79,6 +79,7 @@ public class PurOrderServiceImpl implements PurOrderService { } @Override + @Transactional(rollbackFor = Exception.class) public void deletePurOrder(Integer id) { // 校验存在 PurOrderDO purOrderDO = purOrderMapper.selectById(id); @@ -90,6 +91,7 @@ public class PurOrderServiceImpl implements PurOrderService { } // 删除 purOrderMapper.deleteById(id); + deletePurOrderItemByPurId(id); } private void validatePurOrderExists(Integer id) { @@ -141,7 +143,7 @@ public class PurOrderServiceImpl implements PurOrderService { } private void deletePurOrderItemByPurId(Integer purId) { - purOrderItemMapper.delete(PurOrderItemDO::getPurId, purId); + purOrderItemMapper.physicalDeleteByPurId(purId); } @@ -159,7 +161,5 @@ public class PurOrderServiceImpl implements PurOrderService { purOrderDO.setPurStatus(approveResult); purOrderMapper.updateById(purOrderDO); } - } - } diff --git a/mes-ui/mes-ui-admin-vue3/src/views/biz/purorder/index.vue b/mes-ui/mes-ui-admin-vue3/src/views/biz/purorder/index.vue index 94d6b09..ad49622 100644 --- a/mes-ui/mes-ui-admin-vue3/src/views/biz/purorder/index.vue +++ b/mes-ui/mes-ui-admin-vue3/src/views/biz/purorder/index.vue @@ -82,11 +82,10 @@ - -
采购单信息
-
- -
+ +
+
+
采购单信息
@@ -151,13 +152,14 @@ - +
+ +