✨ feat(mes): 新增库存记录和批次编码字段，优化退料单功能

在退料单相关的多个类中新增库存记录 ID 和批次编码字段，以支持更精确的库存管理和数据校验。同时，更新了相关的表单和服务逻辑，确保新字段的正确使用和验证。

✨ feat(mes): 新增库存记录和批次编码字段，优化退料单功能
在退料单相关的多个类中新增库存记录 ID 和批次编码字段，以支持更精确的库存管理和数据校验。同时，更新了相关的表单和服务逻辑，确保新字段的正确使用和验证。
YunaiV
1 parent cc29c141
Showing 15 changed files with 85 additions and 7 deletions
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/returnissue/MesWmReturnIssueLineController.java
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/returnissue/vo/line/MesWmReturnIssueLineRespVO.java
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/returnissue/vo/line/MesWmReturnIssueLineSaveReqVO.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/MesWmReturnIssueDetailMapper.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/md/autocode/MesMdAutoCodeRuleCodeEnum.java
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/returnissue/MesWmReturnIssueDetailService.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/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
yudao-module-mes/src/test/resources/sql/create_tables.sql
@@ -41,7 +41,6 @@ public class MesWmReturnIssueLineController {
     @Resource
     private MesMdItemService itemService;
-
     @Resource
     private MesMdUnitMeasureService unitMeasureService;
@@ -31,12 +31,18 @@ public class MesWmReturnIssueLineRespVO {
     @Schema(description = "计量单位名称", example = "千克")
     private String unitMeasureName;
+    @Schema(description = "库存记录 ID", example = "1")
+    private Long materialStockId;
+
     @Schema(description = "退料数量", example = "100.00")
     private BigDecimal quantity;
     @Schema(description = "批次 ID", example = "1")
     private Long batchId;
+    @Schema(description = "批次编码", example = "BAT202601001")
+    private String batchCode;
+
     @Schema(description = "是否需要质检", example = "false")
     private Boolean rqcCheckFlag;
@@ -27,9 +27,15 @@ public class MesWmReturnIssueLineSaveReqVO {
     @DecimalMin(value = "0", inclusive = false, message = "退料数量必须大于 0")
     private BigDecimal quantity;
+    @Schema(description = "库存记录 ID", example = "1")
+    private Long materialStockId;
+
     @Schema(description = "批次 ID", example = "1")
     private Long batchId;
+    @Schema(description = "批次编码", example = "BCH20260330001")
+    private String batchCode;
+
     @Schema(description = "是否需要质检", requiredMode = Schema.RequiredMode.REQUIRED, example = "false")
     @NotNull(message = "是否需要质检不能为空")
     private Boolean rqcCheckFlag;
@@ -43,7 +43,6 @@ public class MesWmReturnIssueDO extends BaseDO {
      * 关联 {@link MesProWorkOrderDO#getId()}
      */
     private Long workOrderId;
-    // TODO @芋艿：可能不需要这个字段。界面上没有；
     /**
      * 工作站 ID
      *
@@ -2,6 +2,9 @@ package cn.iocoder.yudao.module.mes.dal.dataobject.wm.returnissue;
 import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDO;
 import cn.iocoder.yudao.module.mes.dal.dataobject.md.item.MesMdItemDO;
+import cn.iocoder.yudao.module.mes.dal.dataobject.qc.rqc.MesQcRqcDO;
+import cn.iocoder.yudao.module.mes.dal.dataobject.wm.batch.MesWmBatchDO;
+import cn.iocoder.yudao.module.mes.dal.dataobject.wm.materialstock.MesWmMaterialStockDO;
 import com.baomidou.mybatisplus.annotation.KeySequence;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
@@ -35,6 +38,8 @@ public class MesWmReturnIssueLineDO extends BaseDO {
     private Long issueId;
     /**
      * 库存记录 ID
+     *
+     * 关联 {@link MesWmMaterialStockDO#getId()}
      */
     private Long materialStockId;
     /**
@@ -49,10 +54,20 @@ public class MesWmReturnIssueLineDO extends BaseDO {
     private BigDecimal quantity;
     /**
      * 批次 ID
+     *
+     * 关联 {@link MesWmBatchDO#getId()}
      */
     private Long batchId;
     /**
+     * 批次编码
+     *
+     * 关联 {@link MesWmBatchDO#getCode()}
+     */
+    private String batchCode;
+    /**
      * 退货检验单 ID
+     *
+     * 关联 {@link MesQcRqcDO#getId()}
      */
     private Long rqcId;
     /**
@@ -24,4 +24,8 @@ public interface MesWmReturnIssueDetailMapper extends BaseMapperX&lt;MesWmReturnIss
         delete(MesWmReturnIssueDetailDO::getIssueId, issueId);
     }
+    default void deleteByLineId(Long lineId) {
+        delete(MesWmReturnIssueDetailDO::getLineId, lineId);
+    }
+
 }
@@ -23,4 +23,8 @@ public interface MesWmReturnIssueMapper extends BaseMapperX&lt;MesWmReturnIssueDO&gt; 
                 .orderByDesc(MesWmReturnIssueDO::getId));
     }
+    default MesWmReturnIssueDO selectByCode(String code) {
+        return selectOne(MesWmReturnIssueDO::getCode, code);
+    }
+
 }
@@ -468,6 +468,7 @@ public interface ErrorCodeConstants {
     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, "退料明细总数量不能超过退料单行数量");
+    ErrorCode WM_RETURN_ISSUE_CODE_DUPLICATE = new ErrorCode(1_040_710_203, "退料单编码已存在");
     // ========== MES 仓库管理-供应商退货单（1-040-711-000） ==========
     ErrorCode WM_RETURN_VENDOR_NOT_EXISTS = new ErrorCode(1_040_711_000, "供应商退货单不存在");
@@ -20,6 +20,7 @@ public enum MesMdAutoCodeRuleCodeEnum {
     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_RETURN_ISSUE_CODE("WM_RETURN_ISSUE_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 MesWmReturnIssueDetailService {
      */
     void deleteReturnIssueDetailByIssueId(Long issueId);
+    /**
+     * 根据行 ID 删除明细
+     *
+     * @param lineId 行 ID
+     */
+    void deleteReturnIssueDetailByLineId(Long lineId);
+
 }
@@ -87,6 +87,11 @@ public class MesWmReturnIssueDetailServiceImpl implements MesWmReturnIssueDetail
         issueDetailMapper.deleteByIssueId(issueId);
     }
+    @Override
+    public void deleteReturnIssueDetailByLineId(Long lineId) {
+        issueDetailMapper.deleteByLineId(lineId);
+    }
+
     private void validateReturnIssueDetailExists(Long id) {
         if (issueDetailMapper.selectById(id) == null) {
             throw exception(WM_RETURN_ISSUE_DETAIL_NOT_EXISTS);
@@ -40,6 +40,9 @@ public class MesWmReturnIssueLineServiceImpl implements MesWmReturnIssueLineServ
     private MesWmReturnIssueService issueService;
     @Resource
     private MesMdItemService itemService;
+    @Resource
+    @Lazy
+    private MesWmReturnIssueDetailService issueDetailService;
     @Override
     public Long createReturnIssueLine(MesWmReturnIssueLineSaveReqVO createReqVO) {
@@ -69,8 +72,12 @@ public class MesWmReturnIssueLineServiceImpl implements MesWmReturnIssueLineServ
     @Override
     public void deleteReturnIssueLine(Long id) {
         // 校验存在
-        validateReturnIssueLineExists(id);
-        // 删除
+        MesWmReturnIssueLineDO line = validateReturnIssueLineExists(id);
+        // 校验主单为草稿状态才允许删除行
+        issueService.validateReturnIssueExistsAndPrepare(line.getIssueId());
+        // 级联删除该行的明细
+        issueDetailService.deleteReturnIssueDetailByLineId(id);
+        // 删除行
         issueLineMapper.deleteById(id);
     }
@@ -107,8 +114,8 @@ public class MesWmReturnIssueLineServiceImpl implements MesWmReturnIssueLineServ
      * 校验保存时的关联数据
      */
     private MesWmReturnIssueDO validateReturnIssueLineSaveData(MesWmReturnIssueLineSaveReqVO reqVO) {
-        // 校验父数据存在
-        MesWmReturnIssueDO issue = issueService.validateReturnIssueExists(reqVO.getIssueId());
+        // 校验父数据存在 + 草稿状态
+        MesWmReturnIssueDO issue = issueService.validateReturnIssueExistsAndPrepare(reqVO.getIssueId());
         // 校验物料存在
         itemService.validateItemExists(reqVO.getItemId());
         return issue;
@@ -58,6 +58,14 @@ public interface MesWmReturnIssueService {
     MesWmReturnIssueDO validateReturnIssueExists(Long id);
     /**
+     * 校验生产退料单存在且为准备中状态
+     *
+     * @param id 编号
+     * @return 生产退料单
+     */
+    MesWmReturnIssueDO validateReturnIssueExistsAndPrepare(Long id);
+
+    /**
      * 提交生产退料单（草稿 → 待检验/待上架）
      *
      * @param id 编号
@@ -254,7 +254,8 @@ public class MesWmReturnIssueServiceImpl implements MesWmReturnIssueService {
     /**
      * 校验生产退料单存在且为准备中状态
      */
-    private MesWmReturnIssueDO validateReturnIssueExistsAndPrepare(Long id) {
+    @Override
+    public MesWmReturnIssueDO validateReturnIssueExistsAndPrepare(Long id) {
         MesWmReturnIssueDO issue = validateReturnIssueExists(id);
         if (ObjUtil.notEqual(MesWmReturnIssueStatusEnum.PREPARE.getStatus(), issue.getStatus())) {
             throw exception(WM_RETURN_ISSUE_NOT_PREPARE);
@@ -269,9 +270,23 @@ public class MesWmReturnIssueServiceImpl implements MesWmReturnIssueService {
     }
     /**
+     * 校验编码唯一性
+     */
+    private void validateCodeUnique(Long id, String code) {
+        MesWmReturnIssueDO issue = issueMapper.selectByCode(code);
+        if (issue == null) {
+            return;
+        }
+        if (ObjUtil.notEqual(id, issue.getId())) {
+            throw exception(WM_RETURN_ISSUE_CODE_DUPLICATE);
+        }
+    }
+
+    /**
      * 校验保存时的关联数据
      */
     private void validateReturnIssueSaveData(MesWmReturnIssueSaveReqVO reqVO) {
+        validateCodeUnique(reqVO.getId(), reqVO.getCode());
         workOrderService.validateWorkOrderExists(reqVO.getWorkOrderId());
         if (reqVO.getWorkstationId() != null) {
             workstationService.validateWorkstationExists(reqVO.getWorkstationId());
@@ -414,6 +414,7 @@ CREATE TABLE IF NOT EXISTS &quot;mes_wm_return_issue_line&quot; (
     "item_id" bigint NOT NULL,
     "quantity" decimal(12,2) NOT NULL DEFAULT 0.00,
     "batch_id" bigint DEFAULT NULL,
+    "batch_code" varchar(255) DEFAULT NULL,
     "rqc_id" bigint DEFAULT NULL,
     "rqc_check_flag" bit NOT NULL DEFAULT FALSE,
     "quality_status" int DEFAULT NULL,