✨ feat(mes): 增强退货单功能，新增行数据校验与删除逻辑

- 新增退货数量字段的校验，确保其大于 0 - 增加根据行 ID 删除明细的功能 - 新增退货单编码的定义 - 增强退货单状态校验，确保状态为草稿才能进行删除操作

✨ feat(mes): 增强退货单功能，新增行数据校验与删除逻辑
- 新增退货数量字段的校验，确保其大于 0 - 增加根据行 ID 删除明细的功能 - 新增退货单编码的定义 - 增强退货单状态校验，确保状态为草稿才能进行删除操作
YunaiV
1 parent 383e265e
Showing 10 changed files with 119 additions and 27 deletions
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/returnvendor/vo/detail/MesWmReturnVendorDetailSaveReqVO.java
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/wm/returnvendor/MesWmReturnVendorDetailMapper.java
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/wm/returnvendor/MesWmReturnVendorMapper.java
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/enums/ErrorCodeConstants.java
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/enums/md/autocode/MesMdAutoCodeRuleCodeEnum.java
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/returnvendor/MesWmReturnVendorDetailService.java
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/returnvendor/MesWmReturnVendorDetailServiceImpl.java
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/returnvendor/MesWmReturnVendorLineServiceImpl.java
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/returnvendor/MesWmReturnVendorService.java
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/returnvendor/MesWmReturnVendorServiceImpl.java
 package cn.iocoder.yudao.module.mes.controller.admin.wm.returnvendor.vo.detail;
  
 import io.swagger.v3.oas.annotations.media.Schema;
+import jakarta.validation.constraints.DecimalMin;
 import jakarta.validation.constraints.NotNull;
 import lombok.Data;
  
@@ -27,6 +28,7 @@ public class MesWmReturnVendorDetailSaveReqVO {
  
     @Schema(description = "退货数量", requiredMode = Schema.RequiredMode.REQUIRED, example = "300.00")
     @NotNull(message = "退货数量不能为空")
+    @DecimalMin(value = "0", inclusive = false, message = "退货数量必须大于 0")
     private BigDecimal quantity;
  
     @Schema(description = "批次编号", example = "1")
@@ -48,3 +50,4 @@ public class MesWmReturnVendorDetailSaveReqVO {
     private String remark;
  
 }
+
@@ -24,4 +24,8 @@ public interface MesWmReturnVendorDetailMapper extends BaseMapperX&lt;MesWmReturnVe
         delete(MesWmReturnVendorDetailDO::getReturnId, returnId);
     }
  
+    default void deleteByLineId(Long lineId) {
+        delete(MesWmReturnVendorDetailDO::getLineId, lineId);
+    }
+
 }
@@ -26,4 +26,8 @@ public interface MesWmReturnVendorMapper extends BaseMapperX&lt;MesWmReturnVendorDO
         return selectCount(MesWmReturnVendorDO::getVendorId, vendorId);
     }
  
+    default MesWmReturnVendorDO selectByCode(String code) {
+        return selectOne(MesWmReturnVendorDO::getCode, code);
+    }
+
 }
@@ -473,8 +473,12 @@ public interface ErrorCodeConstants {
     ErrorCode WM_RETURN_VENDOR_NO_LINE = new ErrorCode(1_040_711_002, "供应商退货单至少需要一条行数据");
     ErrorCode WM_RETURN_VENDOR_DETAIL_QUANTITY_MISMATCH = new ErrorCode(1_040_711_003, "供应商退货单行数量与明细数量不一致");
     ErrorCode WM_RETURN_VENDOR_CANCEL_NOT_ALLOWED = new ErrorCode(1_040_711_004, "供应商退货单已完成或已取消，无法取消");
+    ErrorCode WM_RETURN_VENDOR_CODE_DUPLICATE = new ErrorCode(1_040_711_005, "供应商退货单编号已存在");
+    ErrorCode WM_RETURN_VENDOR_NO_DETAIL = new ErrorCode(1_040_711_006, "供应商退货单没有拣货明细，无法执行退货");
+    ErrorCode WM_RETURN_VENDOR_DETAIL_ITEM_MISMATCH = new ErrorCode(1_040_711_007, "拣货明细的物料与退货单行的物料不一致");
     ErrorCode WM_RETURN_VENDOR_LINE_NOT_EXISTS = new ErrorCode(1_040_711_100, "供应商退货单行不存在");
     ErrorCode WM_RETURN_VENDOR_DETAIL_NOT_EXISTS = new ErrorCode(1_040_711_200, "供应商退货单明细不存在");
+    ErrorCode WM_RETURN_VENDOR_DETAIL_QUANTITY_INVALID = new ErrorCode(1_040_711_201, "退货明细数量必须大于 0");
  
     // ========== MES 仓库管理-产品收货单（1-040-712-000） ==========
     ErrorCode WM_PRODUCT_RECPT_NOT_EXISTS = new ErrorCode(1_040_712_000, "产品收货单不存在");
@@ -19,6 +19,7 @@ public enum MesMdAutoCodeRuleCodeEnum {
     TM_TOOL_TYPE_CODE("TM_TOOL_TYPE_CODE", "工具类型编码"),
     WM_ARRIVAL_NOTICE_CODE("WM_ARRIVAL_NOTICE_CODE", "到货通知单编码"),
     WM_ITEM_RECEIPT_CODE("WM_ITEM_RECEIPT_CODE", "采购入库单编码"),
+    WM_RETURN_VENDOR_CODE("WM_RETURN_VENDOR_CODE", "采购退货单编码"),
     WM_SN_CODE("WM_SN_CODE", "SN 码"),
     WM_PACKAGE_CODE("WM_PACKAGE_CODE", "装箱单编码"),
     WM_BATCH_CODE("WM_BATCH_CODE", "批次编码"),
@@ -64,4 +64,11 @@ public interface MesWmReturnVendorDetailService {
      */
     void deleteReturnVendorDetailByReturnId(Long returnId);
  
+    /**
+     * 根据行ID删除明细
+     *
+     * @param lineId 行ID
+     */
+    void deleteReturnVendorDetailByLineId(Long lineId);
+
 }
 package cn.iocoder.yudao.module.mes.service.wm.returnvendor;
  
+import cn.hutool.core.util.ObjUtil;
 import cn.iocoder.yudao.framework.common.util.object.BeanUtils;
 import cn.iocoder.yudao.module.mes.controller.admin.wm.returnvendor.vo.detail.MesWmReturnVendorDetailSaveReqVO;
 import cn.iocoder.yudao.module.mes.dal.dataobject.wm.returnvendor.MesWmReturnVendorDetailDO;
+import cn.iocoder.yudao.module.mes.dal.dataobject.wm.returnvendor.MesWmReturnVendorLineDO;
 import cn.iocoder.yudao.module.mes.dal.mysql.wm.returnvendor.MesWmReturnVendorDetailMapper;
 import cn.iocoder.yudao.module.mes.service.md.item.MesMdItemService;
 import jakarta.annotation.Resource;
@@ -13,6 +15,7 @@ import org.springframework.validation.annotation.Validated;
 import java.util.List;
  
 import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception;
+import static cn.iocoder.yudao.module.mes.enums.ErrorCodeConstants.WM_RETURN_VENDOR_DETAIL_ITEM_MISMATCH;
 import static cn.iocoder.yudao.module.mes.enums.ErrorCodeConstants.WM_RETURN_VENDOR_DETAIL_NOT_EXISTS;
  
 /**
@@ -35,9 +38,11 @@ public class MesWmReturnVendorDetailServiceImpl implements MesWmReturnVendorDeta
     @Override
     public Long createReturnVendorDetail(MesWmReturnVendorDetailSaveReqVO createReqVO) {
         // 校验父数据存在
-        returnVendorLineService.validateReturnVendorLineExists(createReqVO.getLineId());
+        MesWmReturnVendorLineDO line = returnVendorLineService.validateReturnVendorLineExists(createReqVO.getLineId());
         // 校验物料存在
         itemService.validateItemExists(createReqVO.getItemId());
+        // 校验物料与行物料一致
+        validateItemConsistency(createReqVO.getItemId(), line);
  
         // 插入
         MesWmReturnVendorDetailDO detail = BeanUtils.toBean(createReqVO, MesWmReturnVendorDetailDO.class);
@@ -50,9 +55,11 @@ public class MesWmReturnVendorDetailServiceImpl implements MesWmReturnVendorDeta
         // 校验存在
         validateReturnVendorDetailExists(updateReqVO.getId());
         // 校验父数据存在
-        returnVendorLineService.validateReturnVendorLineExists(updateReqVO.getLineId());
+        MesWmReturnVendorLineDO line = returnVendorLineService.validateReturnVendorLineExists(updateReqVO.getLineId());
         // 校验物料存在
         itemService.validateItemExists(updateReqVO.getItemId());
+        // 校验物料与行物料一致
+        validateItemConsistency(updateReqVO.getItemId(), line);
  
         // 更新
         MesWmReturnVendorDetailDO updateObj = BeanUtils.toBean(updateReqVO, MesWmReturnVendorDetailDO.class);
@@ -87,10 +94,24 @@ public class MesWmReturnVendorDetailServiceImpl implements MesWmReturnVendorDeta
         returnVendorDetailMapper.deleteByReturnId(returnId);
     }
  
+    @Override
+    public void deleteReturnVendorDetailByLineId(Long lineId) {
+        returnVendorDetailMapper.deleteByLineId(lineId);
+    }
+
     private void validateReturnVendorDetailExists(Long id) {
         if (returnVendorDetailMapper.selectById(id) == null) {
             throw exception(WM_RETURN_VENDOR_DETAIL_NOT_EXISTS);
         }
     }
  
+    /**
+     * 校验明细物料与行物料一致
+     */
+    private void validateItemConsistency(Long detailItemId, MesWmReturnVendorLineDO line) {
+        if (ObjUtil.notEqual(detailItemId, line.getItemId())) {
+            throw exception(WM_RETURN_VENDOR_DETAIL_ITEM_MISMATCH);
+        }
+    }
+
 }
@@ -10,6 +10,7 @@ import cn.iocoder.yudao.module.mes.service.md.item.MesMdItemService;
 import jakarta.annotation.Resource;
 import org.springframework.context.annotation.Lazy;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
 import org.springframework.validation.annotation.Validated;
  
 import java.util.List;
@@ -31,14 +32,15 @@ public class MesWmReturnVendorLineServiceImpl implements MesWmReturnVendorLineSe
     @Lazy
     private MesWmReturnVendorService returnVendorService;
     @Resource
+    @Lazy
+    private MesWmReturnVendorDetailService returnVendorDetailService;
+    @Resource
     private MesMdItemService itemService;
  
     @Override
     public Long createReturnVendorLine(MesWmReturnVendorLineSaveReqVO createReqVO) {
-        // 校验父数据存在
-        returnVendorService.validateReturnVendorExists(createReqVO.getReturnId());
-        // 校验物料存在
-        itemService.validateItemExists(createReqVO.getItemId());
+        // 校验数据
+        validateReturnVendorLineSaveData(createReqVO);
  
         // 插入
         MesWmReturnVendorLineDO line = BeanUtils.toBean(createReqVO, MesWmReturnVendorLineDO.class);
@@ -50,10 +52,8 @@ public class MesWmReturnVendorLineServiceImpl implements MesWmReturnVendorLineSe
     public void updateReturnVendorLine(MesWmReturnVendorLineSaveReqVO updateReqVO) {
         // 校验存在
         validateReturnVendorLineExists(updateReqVO.getId());
-        // 校验父数据存在
-        returnVendorService.validateReturnVendorExists(updateReqVO.getReturnId());
-        // 校验物料存在
-        itemService.validateItemExists(updateReqVO.getItemId());
+        // 校验数据
+        validateReturnVendorLineSaveData(updateReqVO);
  
         // 更新
         MesWmReturnVendorLineDO updateObj = BeanUtils.toBean(updateReqVO, MesWmReturnVendorLineDO.class);
@@ -61,10 +61,16 @@ public class MesWmReturnVendorLineServiceImpl implements MesWmReturnVendorLineSe
     }
  
     @Override
+    @Transactional(rollbackFor = Exception.class)
     public void deleteReturnVendorLine(Long id) {
-        // 校验存在
-        validateReturnVendorLineExists(id);
-        // 删除
+        // 1.1 校验存在
+        MesWmReturnVendorLineDO line = validateReturnVendorLineExists(id);
+        // 1.2 校验父数据为草稿状态
+        returnVendorService.validateReturnVendorExistsAndPrepare(line.getReturnId());
+
+        // 2.1 级联删除该行下的明细
+        returnVendorDetailService.deleteReturnVendorDetailByLineId(id);
+        // 2.2 删除行
         returnVendorLineMapper.deleteById(id);
     }
  
@@ -97,4 +103,11 @@ public class MesWmReturnVendorLineServiceImpl implements MesWmReturnVendorLineSe
         return line;
     }
  
+    private void validateReturnVendorLineSaveData(MesWmReturnVendorLineSaveReqVO reqVO) {
+        // 校验父数据存在且为草稿状态
+        returnVendorService.validateReturnVendorExistsAndPrepare(reqVO.getReturnId());
+        // 校验物料存在
+        itemService.validateItemExists(reqVO.getItemId());
+    }
+
 }
@@ -101,4 +101,12 @@ public interface MesWmReturnVendorService {
      */
     Long getReturnVendorCountByVendorId(Long vendorId);
  
+    /**
+     * 校验供应商退货单存在且为草稿状态
+     *
+     * @param id 编号
+     * @return 供应商退货单
+     */
+    MesWmReturnVendorDO validateReturnVendorExistsAndPrepare(Long id);
+
 }
@@ -52,8 +52,8 @@ public class MesWmReturnVendorServiceImpl implements MesWmReturnVendorService {
     @Override
     @Transactional(rollbackFor = Exception.class)
     public Long createReturnVendor(MesWmReturnVendorSaveReqVO createReqVO) {
-        // 1. 校验关联数据
-        vendorService.validateVendorExists(createReqVO.getVendorId());
+        // 1. 校验数据
+        validateReturnVendorSaveData(createReqVO);
  
         // 2. 插入主表
         MesWmReturnVendorDO returnVendor = BeanUtils.toBean(createReqVO, MesWmReturnVendorDO.class);
@@ -65,10 +65,8 @@ public class MesWmReturnVendorServiceImpl implements MesWmReturnVendorService {
     @Override
     @Transactional(rollbackFor = Exception.class)
     public void updateReturnVendor(MesWmReturnVendorSaveReqVO updateReqVO) {
-        // 1.1 校验存在 + 准备中状态
-        validateReturnVendorExistsAndPrepare(updateReqVO.getId());
-        // 1.2 校验关联数据
-        vendorService.validateVendorExists(updateReqVO.getVendorId());
+        // 1. 校验数据
+        validateReturnVendorSaveData(updateReqVO);
  
         // 2. 更新主表
         MesWmReturnVendorDO updateObj = BeanUtils.toBean(updateReqVO, MesWmReturnVendorDO.class);
@@ -131,22 +129,26 @@ public class MesWmReturnVendorServiceImpl implements MesWmReturnVendorService {
     @Override
     @Transactional(rollbackFor = Exception.class)
     public void finishReturnVendor(Long id) {
-        // 1. 校验存在
+        // 1.1 校验存在
         MesWmReturnVendorDO returnVendor = validateReturnVendorExists(id);
         if (ObjUtil.notEqual(MesWmReturnVendorStatusEnum.APPROVED.getStatus(), returnVendor.getStatus())) {
             throw exception(WM_RETURN_VENDOR_STATUS_INVALID);
         }
+        // 1.2 校验明细不为空
+        List<MesWmReturnVendorDetailDO> details = returnVendorDetailService.getReturnVendorDetailListByReturnId(id);
+        if (CollUtil.isEmpty(details)) {
+            throw exception(WM_RETURN_VENDOR_NO_DETAIL);
+        }
  
         // 2. 遍历所有明细，创建库存事务（扣减库存 + 记录流水）
-        createTransactionList(returnVendor);
+        createTransactionList(returnVendor, details);
  
         // 3. 更新退货单状态
         returnVendorMapper.updateById(new MesWmReturnVendorDO()
                 .setId(id).setStatus(MesWmReturnVendorStatusEnum.FINISHED.getStatus()));
     }
  
-    private void createTransactionList(MesWmReturnVendorDO returnVendor) {
-        List<MesWmReturnVendorDetailDO> details = returnVendorDetailService.getReturnVendorDetailListByReturnId(returnVendor.getId());
+    private void createTransactionList(MesWmReturnVendorDO returnVendor, List<MesWmReturnVendorDetailDO> details) {
         wmTransactionService.createTransactionList(convertList(details, detail -> new MesWmTransactionSaveReqDTO()
                 .setType(MesWmTransactionTypeEnum.OUT.getType()).setItemId(detail.getItemId())
                 .setQuantity(detail.getQuantity().negate()) // 出库数量为负数
@@ -197,10 +199,8 @@ public class MesWmReturnVendorServiceImpl implements MesWmReturnVendorService {
         return returnVendor;
     }
  
-    /**
-     * 校验供应商退货单存在且为准备中状态
-     */
-    private MesWmReturnVendorDO validateReturnVendorExistsAndPrepare(Long id) {
+    @Override
+    public MesWmReturnVendorDO validateReturnVendorExistsAndPrepare(Long id) {
         MesWmReturnVendorDO returnVendor = validateReturnVendorExists(id);
         if (ObjUtil.notEqual(MesWmReturnVendorStatusEnum.PREPARE.getStatus(), returnVendor.getStatus())) {
             throw exception(WM_RETURN_VENDOR_STATUS_INVALID);
@@ -208,6 +208,33 @@ public class MesWmReturnVendorServiceImpl implements MesWmReturnVendorService {
         return returnVendor;
     }
  
+    /**
+     * 校验退货单创建/修改的公共数据
+     */
+    private void validateReturnVendorSaveData(MesWmReturnVendorSaveReqVO reqVO) {
+        // 校验存在 + 草稿状态（仅修改时）
+        if (reqVO.getId() != null) {
+            validateReturnVendorExistsAndPrepare(reqVO.getId());
+        }
+        // 校验供应商存在
+        vendorService.validateVendorExists(reqVO.getVendorId());
+        // 校验编码唯一
+        validateCodeUnique(reqVO.getId(), reqVO.getCode());
+    }
+
+    /**
+     * 校验退货单编号唯一
+     */
+    private void validateCodeUnique(Long id, String code) {
+        MesWmReturnVendorDO existing = returnVendorMapper.selectByCode(code);
+        if (existing == null) {
+            return;
+        }
+        if (ObjUtil.notEqual(id, existing.getId())) {
+            throw exception(WM_RETURN_VENDOR_CODE_DUPLICATE);
+        }
+    }
+
     @Override
     public Long getReturnVendorCountByVendorId(Long vendorId) {
         return returnVendorMapper.selectCountByVendorId(vendorId);