Browse Source

✨ feat(mes): 新增库存物资记录编号字段及相关逻辑

YunaiV 3 months ago
parent
commit
e43dcf374a

+ 3 - 0
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/productreceipt/vo/line/MesWmProductReceiptLineRespVO.java

@@ -19,6 +19,9 @@ public class MesWmProductReceiptLineRespVO {
     @Schema(description = "物料编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
     private Long itemId;
 
+    @Schema(description = "库存物资记录编号", example = "1")
+    private Long materialStockId;
+
     @Schema(description = "物料编码", example = "P001")
     private String itemCode;
 

+ 3 - 0
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/productreceipt/vo/line/MesWmProductReceiptLineSaveReqVO.java

@@ -22,6 +22,9 @@ public class MesWmProductReceiptLineSaveReqVO {
     @NotNull(message = "物料编号不能为空")
     private Long itemId;
 
+    @Schema(description = "库存物资记录编号", example = "1")
+    private Long materialStockId;
+
     @Schema(description = "收货数量", requiredMode = Schema.RequiredMode.REQUIRED, example = "100.00")
     @NotNull(message = "收货数量不能为空")
     @Positive(message = "收货数量必须大于 0")

+ 10 - 1
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/wm/productreceipt/MesWmProductReceiptLineDO.java

@@ -2,6 +2,7 @@ package cn.iocoder.yudao.module.mes.dal.dataobject.wm.productreceipt;
 
 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.wm.batch.MesWmBatchDO;
 import com.baomidou.mybatisplus.annotation.KeySequence;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
@@ -39,6 +40,12 @@ public class MesWmProductReceiptLineDO extends BaseDO {
      * 关联 {@link MesMdItemDO#getId()}
      */
     private Long itemId;
+    /**
+     * 库存物资记录编号
+     *
+     * 关联 {@link cn.iocoder.yudao.module.mes.dal.dataobject.wm.materialstock.MesWmMaterialStockDO#getId()}
+     */
+    private Long materialStockId;
     /**
      * 收货数量
      */
@@ -46,11 +53,13 @@ public class MesWmProductReceiptLineDO extends BaseDO {
     /**
      * 批次编号
      *
-     * TODO DONE @芋艿:保留。待 mes_wm_batch 模块迁移后补充 @link 关联
+     * 关联 {@link MesWmBatchDO#getId()}
      */
     private Long batchId;
     /**
      * 批次号
+     *
+     * 关联 {@link MesWmBatchDO#getCode()}
      */
     private String batchCode;
     /**