✨ feat(mes): 添加生产退料单确认功能及字段校验

新增确认生产退料单的接口，更新相关字段为必填项并添加数量校验逻辑。此变更旨在提升退料单的管理效率和数据准确性。

✨ feat(mes): 添加生产退料单确认功能及字段校验
新增确认生产退料单的接口，更新相关字段为必填项并添加数量校验逻辑。此变更旨在提升退料单的管理效率和数据准确性。
YunaiV
1 parent 6332e59d
Showing 17 changed files with 290 additions and 54 deletions
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/returnissue/MesWmReturnIssueController.java
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/returnissue/vo/MesWmReturnIssuePageReqVO.java
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/returnissue/vo/MesWmReturnIssueRespVO.java
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/returnissue/vo/MesWmReturnIssueSaveReqVO.java
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/returnissue/vo/detail/MesWmReturnIssueDetailSaveReqVO.java
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/wm/returnissue/MesWmReturnIssueDO.java
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/wm/returnissue/MesWmReturnIssueLineDO.java
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/wm/returnissue/MesWmReturnIssueMapper.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/wm/MesWmQualityStatusEnum.java
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/enums/wm/MesWmReturnIssueStatusEnum.java
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/enums/wm/MesWmReturnIssueTypeEnum.java
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/returnissue/MesWmReturnIssueDetailServiceImpl.java
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/returnissue/MesWmReturnIssueLineService.java
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/returnissue/MesWmReturnIssueLineServiceImpl.java
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/returnissue/MesWmReturnIssueService.java
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/returnissue/MesWmReturnIssueServiceImpl.java
@@ -115,6 +115,15 @@ public class MesWmReturnIssueController {
         return success(true);
     }
+    @PutMapping("/confirm")
+    @Operation(summary = "确认生产退料单")
+    @Parameter(name = "id", description = "编号", required = true)
+    @PreAuthorize("@ss.hasPermission('mes:wm-return-issue:update')")
+    public CommonResult<Boolean> confirmReturnIssue(@RequestParam("id") Long id) {
+        issueService.confirmReturnIssue(id);
+        return success(true);
+    }
+
     @PutMapping("/submit")
     @Operation(summary = "提交生产退料单")
     @Parameter(name = "id", description = "编号", required = true)
@@ -27,8 +27,8 @@ public class MesWmReturnIssuePageReqVO extends PageParam {
     @Schema(description = "生产工单 ID", example = "1")
     private Long workOrderId;
-    @Schema(description = "退料类型", example = "RMR")
-    private String returnType;
+    @Schema(description = "退料类型", example = "1")
+    private Integer type;
     @Schema(description = "状态", example = "0")
     private Integer status;
@@ -18,20 +18,20 @@ public class MesWmReturnIssueRespVO {
     @Schema(description = "退料单名称", requiredMode = Schema.RequiredMode.REQUIRED, example = "生产退料")
     private String name;
-    @Schema(description = "生产工单 ID", example = "1")
+    @Schema(description = "生产工单 ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
     private Long workOrderId;
-    @Schema(description = "生产工单编号", example = "WO20250226001")
+    @Schema(description = "生产工单编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "WO20250226001")
     private String workOrderCode;
-    @Schema(description = "工作站 ID", example = "1")
+    @Schema(description = "工作站 ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
     private Long workstationId;
     @Schema(description = "工作站名称", example = "装配工作站")
     private String workstationName;
-    @Schema(description = "退料类型", example = "RMR")
-    private String returnType;
+    @Schema(description = "退料类型", example = "1")
+    private Integer type;
     @Schema(description = "退料日期")
     private LocalDateTime returnDate;
@@ -2,11 +2,11 @@ package cn.iocoder.yudao.module.mes.controller.admin.wm.returnissue.vo;
 import io.swagger.v3.oas.annotations.media.Schema;
 import jakarta.validation.constraints.NotBlank;
+import jakarta.validation.constraints.NotNull;
 import lombok.Data;
 import java.time.LocalDateTime;
-// TODO @AI：需要检查下，哪些是必传字段。然后校验下；
 @Schema(description = "管理后台 - MES 生产退料单新增/修改 Request VO")
 @Data
 public class MesWmReturnIssueSaveReqVO {
@@ -22,14 +22,16 @@ public class MesWmReturnIssueSaveReqVO {
     @NotBlank(message = "退料单名称不能为空")
     private String name;
-    @Schema(description = "生产工单 ID", example = "1")
+    @Schema(description = "生产工单 ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
+    @NotNull(message = "生产工单 ID 不能为空")
     private Long workOrderId;
     @Schema(description = "工作站 ID", example = "1")
     private Long workstationId;
-    @Schema(description = "退料类型", example = "RMR")
-    private String returnType;
+    @Schema(description = "退料类型", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
+    @NotNull(message = "退料类型不能为空")
+    private Integer type;
     @Schema(description = "退料日期")
     private LocalDateTime returnDate;
 package cn.iocoder.yudao.module.mes.controller.admin.wm.returnissue.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 MesWmReturnIssueDetailSaveReqVO {
     @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")
@@ -35,13 +37,16 @@ public class MesWmReturnIssueDetailSaveReqVO {
     @Schema(description = "批次号", example = "BATCH20260101001")
     private String batchCode;
-    @Schema(description = "仓库编号", example = "1")
+    @Schema(description = "仓库编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
+    @NotNull(message = "仓库编号不能为空")
     private Long warehouseId;
-    @Schema(description = "库区编号", example = "1")
+    @Schema(description = "库区编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
+    @NotNull(message = "库区编号不能为空")
     private Long locationId;
-    @Schema(description = "库位编号", example = "1")
+    @Schema(description = "库位编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
+    @NotNull(message = "库位编号不能为空")
     private Long areaId;
     @Schema(description = "备注", example = "备注")
@@ -43,19 +43,19 @@ public class MesWmReturnIssueDO extends BaseDO {
      * 关联 {@link MesProWorkOrderDO#getId()}
      */
     private Long workOrderId;
+    // TODO @芋艿：可能不需要这个字段。界面上没有；
     /**
      * 工作站 ID
      *
      * 关联 {@link MesMdWorkstationDO#getId()}
      */
     private Long workstationId;
-    // TODO @AI：可以改成 type 字段；简化；
     /**
      * 退料类型
      *
-     * 字典 {@link cn.iocoder.yudao.module.mes.enums.DictTypeConstants#MES_WM_RETURN_ISSUE_TYPE}
+     * 枚举 {@link cn.iocoder.yudao.module.mes.enums.wm.MesWmReturnIssueTypeEnum}
      */
-    private String returnType;
+    private Integer type;
     /**
      * 退料日期
      */
@@ -59,12 +59,10 @@ public class MesWmReturnIssueLineDO extends BaseDO {
      * 是否需要质检
      */
     private Boolean qcFlag;
-    // TODO @AI：额外加个枚举类；
-    // TODO @芋艿：是这些么？
     /**
      * 质量状态
      *
-     * 字典 {@link cn.iocoder.yudao.module.mes.enums.DictTypeConstants#MES_WM_QUALITY_STATUS}
+     * 枚举 {@link cn.iocoder.yudao.module.mes.enums.wm.MesWmQualityStatusEnum}
      */
     private Integer qualityStatus;
     /**
@@ -19,7 +19,7 @@ public interface MesWmReturnIssueMapper extends BaseMapperX&lt;MesWmReturnIssueDO&gt; 
                 .likeIfPresent(MesWmReturnIssueDO::getName, reqVO.getName())
                 .eqIfPresent(MesWmReturnIssueDO::getWorkstationId, reqVO.getWorkstationId())
                 .eqIfPresent(MesWmReturnIssueDO::getWorkOrderId, reqVO.getWorkOrderId())
-                .eqIfPresent(MesWmReturnIssueDO::getReturnType, reqVO.getReturnType())
+                .eqIfPresent(MesWmReturnIssueDO::getType, reqVO.getType())
                 .eqIfPresent(MesWmReturnIssueDO::getStatus, reqVO.getStatus())
                 .betweenIfPresent(MesWmReturnIssueDO::getReturnDate, reqVO.getReturnDate())
                 .orderByDesc(MesWmReturnIssueDO::getId));
@@ -386,6 +386,8 @@ public interface ErrorCodeConstants {
     ErrorCode WM_RETURN_ISSUE_CANCEL_NOT_ALLOWED = new ErrorCode(1_040_710_004, "生产退料单已完成或已取消，无法取消");
     ErrorCode WM_RETURN_ISSUE_LINE_NOT_EXISTS = new ErrorCode(1_040_710_100, "生产退料单行不存在");
     ErrorCode WM_RETURN_ISSUE_DETAIL_NOT_EXISTS = new ErrorCode(1_040_710_200, "生产退料单明细不存在");
+    ErrorCode WM_RETURN_ISSUE_DETAIL_QUANTITY_INVALID = new ErrorCode(1_040_710_201, "退料明细数量必须大于0");
+    ErrorCode WM_RETURN_ISSUE_DETAIL_QUANTITY_EXCEED = new ErrorCode(1_040_710_202, "退料明细总数量不能超过退料单行数量");
     // ========== MES 仓库管理-供应商退货单（1-040-711-000） ==========
     ErrorCode WM_RETURN_VENDOR_NOT_EXISTS = new ErrorCode(1_040_711_000, "供应商退货单不存在");
+package cn.iocoder.yudao.module.mes.enums.wm;
+
+import cn.iocoder.yudao.framework.common.core.ArrayValuable;
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+
+import java.util.Arrays;
+
+/**
+ * MES 质量状态枚举
+ *
+ * 对应字典 mes_wm_quality_status
+ *
+ * @author 芋道源码
+ */
+@Getter
+@AllArgsConstructor
+public enum MesWmQualityStatusEnum implements ArrayValuable<Integer> {
+
+    /**
+     * 待检验
+     */
+    PENDING(0, "待检验"),
+    /**
+     * 合格
+     */
+    PASS(1, "合格"),
+    /**
+     * 不合格
+     */
+    FAIL(2, "不合格");
+
+    public static final Integer[] ARRAYS = Arrays.stream(values()).map(MesWmQualityStatusEnum::getStatus).toArray(Integer[]::new);
+
+    /**
+     * 状态值
+     */
+    private final Integer status;
+    /**
+     * 状态名
+     */
+    private final String name;
+
+    @Override
+    public Integer[] array() {
+        return ARRAYS;
+    }
+
+}
 package cn.iocoder.yudao.module.mes.enums.wm;
 import cn.iocoder.yudao.framework.common.core.ArrayValuable;
+import cn.iocoder.yudao.module.mes.controller.admin.wm.returnissue.vo.MesWmReturnIssueSaveReqVO;
 import cn.iocoder.yudao.module.mes.enums.MesOrderStatusConstants;
+import cn.iocoder.yudao.module.mes.service.wm.returnissue.MesWmReturnIssueService;
 import lombok.AllArgsConstructor;
 import lombok.Getter;
@@ -16,25 +18,40 @@ import java.util.Arrays;
 @AllArgsConstructor
 public enum MesWmReturnIssueStatusEnum implements ArrayValuable<Integer> {
-    // TODO @AI：参考 /Users/yunai/Java/yudao-all-in-one/ruoyi-vue-pro/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/enums/wm/MesWmArrivalNoticeStatusEnum.java 增加注释
     /**
      * 草稿
+     *
+     * 对应方法：{@link MesWmReturnIssueService#createReturnIssue(MesWmReturnIssueSaveReqVO)}
      */
     PREPARE(MesOrderStatusConstants.PREPARE, "草稿"),
     /**
-     * 待入库（已提交，等待仓库上架入库）
+     * 待检验（已确认，等待质检）
+     *
+     * 对应方法：{@link MesWmReturnIssueService#confirmReturnIssue(Long)}
      */
-    APPROVING(MesOrderStatusConstants.APPROVING, "待入库"),
+    CONFIRMED(MesOrderStatusConstants.CONFIRMED, "待检验"), // "UNCHECK"
     /**
-     * 已入库（上架完成，等待最终确认）
+     * 待上架（检验完成，等待仓库上架）
+     *
+     * 对应方法：{@link MesWmReturnIssueService#submitReturnIssue(Long)}
      */
-    APPROVED(MesOrderStatusConstants.APPROVED, "已入库"),
+    APPROVING(MesOrderStatusConstants.APPROVING, "待上架"), // "UNSTOCK"
     /**
-     * 已完成
+     * 待执行退料（上架完成，等待执行退料操作）
+     *
+     * 对应方法：{@link MesWmReturnIssueService#stockReturnIssue(Long)}
+     */
+    APPROVED(MesOrderStatusConstants.APPROVED, "待执行退料"), // "UNEXECUTE"
+    /**
+     * 已完成（退料执行完成，库存已更新）
+     *
+     * 对应方法：{@link MesWmReturnIssueService#finishReturnIssue(Long)}
      */
     FINISHED(MesOrderStatusConstants.FINISHED, "已完成"),
     /**
      * 已取消
+     *
+     * 对应方法：{@link MesWmReturnIssueService#cancelReturnIssue(Long)}
      */
     CANCELED(MesOrderStatusConstants.CANCELLED, "已取消");
@@ -55,3 +72,5 @@ public enum MesWmReturnIssueStatusEnum implements ArrayValuable&lt;Integer&gt; {
     }
 }
+
+// DONE @AI：状态流转逻辑已在 MesWmReturnIssueServiceImpl 中实现，参考 confirmReturnIssue、submitReturnIssue、stockReturnIssue、finishReturnIssue 方法
+package cn.iocoder.yudao.module.mes.enums.wm;
+
+import cn.iocoder.yudao.framework.common.core.ArrayValuable;
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+
+import java.util.Arrays;
+
+/**
+ * MES 生产退料类型枚举
+ *
+ * 对应字典 mes_return_issue_type
+ *
+ * @author 芋道源码
+ */
+@Getter
+@AllArgsConstructor
+public enum MesWmReturnIssueTypeEnum implements ArrayValuable<Integer> {
+
+    /**
+     * 余料退料（余料退回，直接合格）
+     */
+    REMAINDER(1, "余料退料"),
+    /**
+     * 不良退料（不良品退回）
+     */
+    DEFECTIVE(2, "不良退料"),
+    /**
+     * 其他退料（其他原因退料）
+     */
+    OTHER(3, "其他退料");
+
+    public static final Integer[] ARRAYS = Arrays.stream(values()).map(MesWmReturnIssueTypeEnum::getType).toArray(Integer[]::new);
+
+    /**
+     * 类型值
+     */
+    private final Integer type;
+    /**
+     * 类型名
+     */
+    private final String name;
+
+    @Override
+    public Integer[] array() {
+        return ARRAYS;
+    }
+
+}
 package cn.iocoder.yudao.module.mes.service.wm.returnissue;
+import cn.iocoder.yudao.framework.common.util.collection.CollectionUtils;
 import cn.iocoder.yudao.framework.common.util.object.BeanUtils;
 import cn.iocoder.yudao.module.mes.controller.admin.wm.returnissue.vo.detail.MesWmReturnIssueDetailSaveReqVO;
 import cn.iocoder.yudao.module.mes.dal.dataobject.wm.returnissue.MesWmReturnIssueDetailDO;
+import cn.iocoder.yudao.module.mes.dal.dataobject.wm.returnissue.MesWmReturnIssueLineDO;
 import cn.iocoder.yudao.module.mes.dal.mysql.wm.returnissue.MesWmReturnIssueDetailMapper;
+import cn.iocoder.yudao.module.mes.service.wm.warehouse.MesWmWarehouseAreaService;
 import jakarta.annotation.Resource;
 import org.springframework.context.annotation.Lazy;
 import org.springframework.stereotype.Service;
 import org.springframework.validation.annotation.Validated;
+import java.math.BigDecimal;
 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_ISSUE_DETAIL_NOT_EXISTS;
+import static cn.iocoder.yudao.module.mes.enums.ErrorCodeConstants.WM_RETURN_ISSUE_DETAIL_QUANTITY_EXCEED;
 /**
  * MES 生产退料明细 Service 实现类
@@ -28,11 +33,19 @@ public class MesWmReturnIssueDetailServiceImpl implements MesWmReturnIssueDetail
     @Lazy
     private MesWmReturnIssueLineService issueLineService;
+    @Resource
+    private MesWmWarehouseAreaService warehouseAreaService;
+
     @Override
     public Long createReturnIssueDetail(MesWmReturnIssueDetailSaveReqVO createReqVO) {
         // 校验父数据存在
-        issueLineService.validateReturnIssueLineExists(createReqVO.getLineId());
-        // TODO @AI：校验物料存在
+        MesWmReturnIssueLineDO line = issueLineService.validateReturnIssueLineExists(createReqVO.getLineId());
+        // 校验仓库、库区、库位的关联关系
+        warehouseAreaService.validateWarehouseAreaExists(
+                createReqVO.getWarehouseId(), createReqVO.getLocationId(), createReqVO.getAreaId());
+        // 校验明细总数量不超过行数量
+        validateDetailQuantityNotExceed(createReqVO.getLineId(), createReqVO.getQuantity(), null, line);
+        // TODO @芋艿：【后续搞】不允许物资混放
         // 插入
         MesWmReturnIssueDetailDO detail = BeanUtils.toBean(createReqVO, MesWmReturnIssueDetailDO.class);
@@ -45,8 +58,13 @@ public class MesWmReturnIssueDetailServiceImpl implements MesWmReturnIssueDetail
         // 校验存在
         validateReturnIssueDetailExists(updateReqVO.getId());
         // 校验父数据存在
-        issueLineService.validateReturnIssueLineExists(updateReqVO.getLineId());
-        // TODO @AI：校验物料存在
+        MesWmReturnIssueLineDO line = issueLineService.validateReturnIssueLineExists(updateReqVO.getLineId());
+        // 校验仓库、库区、库位的关联关系
+        warehouseAreaService.validateWarehouseAreaExists(
+                updateReqVO.getWarehouseId(), updateReqVO.getLocationId(), updateReqVO.getAreaId());
+        // 校验明细总数量不超过行数量（排除自身）
+        validateDetailQuantityNotExceed(updateReqVO.getLineId(), updateReqVO.getQuantity(), updateReqVO.getId(), line);
+        // TODO @芋艿：【后续搞】不允许物资混放
         // 更新
         MesWmReturnIssueDetailDO updateObj = BeanUtils.toBean(updateReqVO, MesWmReturnIssueDetailDO.class);
@@ -87,4 +105,26 @@ public class MesWmReturnIssueDetailServiceImpl implements MesWmReturnIssueDetail
         }
     }
+    /**
+     * 校验明细总数量不超过行数量
+     *
+     * @param lineId 行 ID
+     * @param newQuantity 本次新增/修改的数量
+     * @param excludeDetailId 排除的明细 ID（更新时排除自身，新增时传 null）
+     * @param line 退料单行
+     */
+    private void validateDetailQuantityNotExceed(Long lineId, BigDecimal newQuantity,
+                                                  Long excludeDetailId, MesWmReturnIssueLineDO line) {
+        // 计算已有明细总数量（排除自身）
+        List<MesWmReturnIssueDetailDO> details = issueDetailMapper.selectListByLineId(lineId);
+        BigDecimal existingTotal = CollectionUtils.getSumValue(details,
+                detail -> excludeDetailId != null && excludeDetailId.equals(detail.getId())
+                        ? BigDecimal.ZERO : detail.getQuantity(),
+                BigDecimal::add, BigDecimal.ZERO);
+        // 校验：已有 + 本次 <= 行数量
+        if (existingTotal.add(newQuantity).compareTo(line.getQuantity()) > 0) {
+            throw exception(WM_RETURN_ISSUE_DETAIL_QUANTITY_EXCEED);
+        }
+    }
+
 }
@@ -74,4 +74,12 @@ public interface MesWmReturnIssueLineService {
      */
     MesWmReturnIssueLineDO validateReturnIssueLineExists(Long id);
+    /**
+     * 刷新退料单下所有行的质量状态（退料类型变更时调用）
+     *
+     * @param issueId 退料单 ID
+     * @param issueType 退料类型
+     */
+    void updateReturnIssueQualityStatusByIssueId(Long issueId, Integer issueType);
+
 }
 package cn.iocoder.yudao.module.mes.service.wm.returnissue;
+import cn.hutool.core.util.ObjUtil;
 import cn.iocoder.yudao.framework.common.pojo.PageResult;
 import cn.iocoder.yudao.framework.common.util.object.BeanUtils;
 import cn.iocoder.yudao.module.mes.controller.admin.wm.returnissue.vo.line.MesWmReturnIssueLinePageReqVO;
@@ -7,6 +8,8 @@ import cn.iocoder.yudao.module.mes.controller.admin.wm.returnissue.vo.line.MesWm
 import cn.iocoder.yudao.module.mes.dal.dataobject.wm.returnissue.MesWmReturnIssueDO;
 import cn.iocoder.yudao.module.mes.dal.dataobject.wm.returnissue.MesWmReturnIssueLineDO;
 import cn.iocoder.yudao.module.mes.dal.mysql.wm.returnissue.MesWmReturnIssueLineMapper;
+import cn.iocoder.yudao.module.mes.enums.wm.MesWmQualityStatusEnum;
+import cn.iocoder.yudao.module.mes.enums.wm.MesWmReturnIssueTypeEnum;
 import cn.iocoder.yudao.module.mes.service.md.item.MesMdItemService;
 import jakarta.annotation.Resource;
 import org.springframework.context.annotation.Lazy;
@@ -44,14 +47,7 @@ public class MesWmReturnIssueLineServiceImpl implements MesWmReturnIssueLineServ
         // 插入
         MesWmReturnIssueLineDO line = BeanUtils.toBean(createReqVO, MesWmReturnIssueLineDO.class);
         // 质量状态自动赋值
-        // TODO @AI：这里需要在 review 下 @芋艿；
-        if (Boolean.TRUE.equals(createReqVO.getQcFlag())) {
-            line.setQualityStatus(0); // 待检
-        } else if ("RMR".equals(issue.getReturnType())) {
-            line.setQualityStatus(1); // 合格（余料退回直接合格）
-        } else {
-            line.setQualityStatus(2); // 不合格
-        }
+        line.setQualityStatus(calculateQualityStatus(line.getQcFlag(), issue.getType()));
         issueLineMapper.insert(line);
         return line.getId();
     }
@@ -61,12 +57,14 @@ public class MesWmReturnIssueLineServiceImpl implements MesWmReturnIssueLineServ
         // 校验存在
         validateReturnIssueLineExists(updateReqVO.getId());
         // 校验父数据存在
-        issueService.validateReturnIssueExists(updateReqVO.getIssueId());
+        MesWmReturnIssueDO issue = issueService.validateReturnIssueExists(updateReqVO.getIssueId());
         // 校验物料存在
         itemService.validateItemExists(updateReqVO.getItemId());
         // 更新
         MesWmReturnIssueLineDO updateObj = BeanUtils.toBean(updateReqVO, MesWmReturnIssueLineDO.class);
+        // 质量状态自动赋值
+        updateObj.setQualityStatus(calculateQualityStatus(updateObj.getQcFlag(), issue.getType()));
         issueLineMapper.updateById(updateObj);
     }
@@ -107,4 +105,33 @@ public class MesWmReturnIssueLineServiceImpl implements MesWmReturnIssueLineServ
         return line;
     }
+    @Override
+    public void updateReturnIssueQualityStatusByIssueId(Long issueId, Integer issueType) {
+        List<MesWmReturnIssueLineDO> lines = issueLineMapper.selectListByIssueId(issueId);
+        for (MesWmReturnIssueLineDO line : lines) {
+            Integer newStatus = calculateQualityStatus(line.getQcFlag(), issueType);
+            if (ObjUtil.notEqual(newStatus, line.getQualityStatus())) {
+                issueLineMapper.updateById(new MesWmReturnIssueLineDO()
+                        .setId(line.getId()).setQualityStatus(newStatus));
+            }
+        }
+    }
+
+    /**
+     * 根据 qcFlag 和退料类型，计算质量状态
+     *
+     * @param qcFlag 是否需要质检
+     * @param issueType 退料类型
+     * @return 质量状态
+     */
+    private Integer calculateQualityStatus(Boolean qcFlag, Integer issueType) {
+        if (Boolean.TRUE.equals(qcFlag)) {
+            return MesWmQualityStatusEnum.PENDING.getStatus(); // 待检
+        }
+        if (MesWmReturnIssueTypeEnum.REMAINDER.getType().equals(issueType)) {
+            return MesWmQualityStatusEnum.PASS.getStatus(); // 合格（余料退回直接合格）
+        }
+        return MesWmQualityStatusEnum.FAIL.getStatus(); // 不合格
+    }
+
 }
@@ -58,21 +58,28 @@ public interface MesWmReturnIssueService {
     MesWmReturnIssueDO validateReturnIssueExists(Long id);
     /**
-     * 提交生产退料单（草稿 → 待入库）
+     * 确认生产退料单（草稿 → 待检验）
+     *
+     * @param id 编号
+     */
+    void confirmReturnIssue(Long id);
+
+    /**
+     * 提交生产退料单（待检验 → 待上架）
      *
      * @param id 编号
      */
     void submitReturnIssue(Long id);
     /**
-     * 入库上架（待入库 → 已入库）
+     * 入库上架（待上架 → 待执行退料）
      *
      * @param id 编号
      */
     void stockReturnIssue(Long id);
     /**
-     * 完成退料（已入库 → 已完成），更新库存台账
+     * 完成退料（待执行退料 → 已完成），更新库存台账
      *
      * @param id 编号
      */
@@ -48,10 +48,8 @@ public class MesWmReturnIssueServiceImpl implements MesWmReturnIssueService {
     @Override
     @Transactional(rollbackFor = Exception.class)
     public Long createReturnIssue(MesWmReturnIssueSaveReqVO createReqVO) {
-        // 1. 校验关联数据（workOrderId 非必填）
-        if (createReqVO.getWorkOrderId() != null) {
-            workOrderService.validateWorkOrderExists(createReqVO.getWorkOrderId());
-        }
+        // 1. 校验关联数据
+        workOrderService.validateWorkOrderExists(createReqVO.getWorkOrderId());
         if (createReqVO.getWorkstationId() != null) {
             workstationService.validateWorkstationExists(createReqVO.getWorkstationId());
         }
@@ -67,11 +65,9 @@ public class MesWmReturnIssueServiceImpl implements MesWmReturnIssueService {
     @Transactional(rollbackFor = Exception.class)
     public void updateReturnIssue(MesWmReturnIssueSaveReqVO updateReqVO) {
         // 1.1 校验存在 + 准备中状态
-        validateReturnIssueExistsAndPrepare(updateReqVO.getId());
+        MesWmReturnIssueDO oldIssue = validateReturnIssueExistsAndPrepare(updateReqVO.getId());
         // 1.2 校验关联数据
-        if (updateReqVO.getWorkOrderId() != null) {
-            workOrderService.validateWorkOrderExists(updateReqVO.getWorkOrderId());
-        }
+        workOrderService.validateWorkOrderExists(updateReqVO.getWorkOrderId());
         if (updateReqVO.getWorkstationId() != null) {
             workstationService.validateWorkstationExists(updateReqVO.getWorkstationId());
         }
@@ -79,6 +75,11 @@ public class MesWmReturnIssueServiceImpl implements MesWmReturnIssueService {
         // 2. 更新主表
         MesWmReturnIssueDO updateObj = BeanUtils.toBean(updateReqVO, MesWmReturnIssueDO.class);
         issueMapper.updateById(updateObj);
+
+        // 3. 退料类型变更时，刷新所有行的质量状态
+        if (ObjUtil.notEqual(oldIssue.getType(), updateReqVO.getType())) {
+            issueLineService.updateReturnIssueQualityStatusByIssueId(updateReqVO.getId(), updateReqVO.getType());
+        }
     }
     @Override
@@ -107,7 +108,7 @@ public class MesWmReturnIssueServiceImpl implements MesWmReturnIssueService {
     @Override
     @Transactional(rollbackFor = Exception.class)
-    public void submitReturnIssue(Long id) {
+    public void confirmReturnIssue(Long id) {
         // 校验存在 + 草稿状态
         validateReturnIssueExistsAndPrepare(id);
         // 校验至少有一条行
@@ -116,7 +117,26 @@ public class MesWmReturnIssueServiceImpl implements MesWmReturnIssueService {
             throw exception(WM_RETURN_ISSUE_NO_LINE);
         }
-        // 提交（草稿 → 待入库）
+        // 确认（草稿 → 待检验）
+        issueMapper.updateById(new MesWmReturnIssueDO()
+                .setId(id).setStatus(MesWmReturnIssueStatusEnum.CONFIRMED.getStatus()));
+    }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void submitReturnIssue(Long id) {
+        // 校验存在 + 待检验状态
+        MesWmReturnIssueDO issue = validateReturnIssueExists(id);
+        if (ObjUtil.notEqual(MesWmReturnIssueStatusEnum.CONFIRMED.getStatus(), issue.getStatus())) {
+            throw exception(WM_RETURN_ISSUE_STATUS_INVALID);
+        }
+        // 校验至少有一条行
+        List<MesWmReturnIssueLineDO> lines = issueLineService.getReturnIssueLineListByIssueId(id);
+        if (CollUtil.isEmpty(lines)) {
+            throw exception(WM_RETURN_ISSUE_NO_LINE);
+        }
+
+        // 提交（待检验 → 待上架）
         issueMapper.updateById(new MesWmReturnIssueDO()
                 .setId(id).setStatus(MesWmReturnIssueStatusEnum.APPROVING.getStatus()));
     }
@@ -129,7 +149,7 @@ public class MesWmReturnIssueServiceImpl implements MesWmReturnIssueService {
         if (ObjUtil.notEqual(MesWmReturnIssueStatusEnum.APPROVING.getStatus(), issue.getStatus())) {
             throw exception(WM_RETURN_ISSUE_STATUS_INVALID);
         }
-        // 入库上架（待入库 → 已入库）
+        // 入库上架（待上架 → 待执行退料）
         issueMapper.updateById(new MesWmReturnIssueDO()
                 .setId(id).setStatus(MesWmReturnIssueStatusEnum.APPROVED.getStatus()));
     }
@@ -143,6 +163,7 @@ public class MesWmReturnIssueServiceImpl implements MesWmReturnIssueService {
             throw exception(WM_RETURN_ISSUE_STATUS_INVALID);
         }
+        // 完成退料（待执行退料 → 已完成），更新库存台账
         // 遍历所有明细，更新库存台账（增加库存，与领料出库相反）
         // TODO @芋艿：【后续在弄】这里可能有点问题；缺少库存更新；后面在弄；
         List<MesWmReturnIssueDetailDO> details = issueDetailService.getReturnIssueDetailListByIssueId(id);