From 1458532478eedbd82947e6ee8515f881d4a4912a Mon Sep 17 00:00:00 2001
From: liyong <18434998025@163.com>
Date: 星期六, 18 七月 2026 16:14:23 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_business' into dev_business
---
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/pro/mps/MesProMpsMergeItemDO.java | 62 +++++++++++++++++++++++++++++++
1 files changed, 62 insertions(+), 0 deletions(-)
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/pro/mps/MesProMpsMergeItemDO.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/pro/mps/MesProMpsMergeItemDO.java
new file mode 100644
index 0000000..3d736e5
--- /dev/null
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/pro/mps/MesProMpsMergeItemDO.java
@@ -0,0 +1,62 @@
+package cn.iocoder.yudao.module.mes.dal.dataobject.pro.mps;
+
+import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDO;
+import cn.iocoder.yudao.module.mes.dal.dataobject.pro.workorder.MesProWorkOrderDO;
+import com.baomidou.mybatisplus.annotation.KeySequence;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.*;
+
+import java.math.BigDecimal;
+
+/**
+ * MPS 鍚堝苟涓嬪彂鏄庣粏 DO
+ *
+ * @author 鑺嬮亾婧愮爜
+ */
+@TableName("mes_pro_mps_merge_item")
+@KeySequence("mes_pro_mps_merge_item_seq")
+@Data
+@EqualsAndHashCode(callSuper = true)
+@ToString(callSuper = true)
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
+public class MesProMpsMergeItemDO extends BaseDO {
+
+ /**
+ * 缂栧彿
+ */
+ @TableId
+ private Long id;
+
+ /**
+ * 鍚堝苟鎵规鍙�
+ */
+ private String mergeBatchNo;
+
+ /**
+ * MPS 缂栧彿
+ *
+ * 鍏宠仈 {@link MesProMpsDO#getId()}
+ */
+ private Long mpsId;
+
+ /**
+ * 鐢熸垚鐨勭敓浜у伐鍗旾D
+ *
+ * 鍏宠仈 {@link MesProWorkOrderDO#getId()}
+ */
+ private Long workOrderId;
+
+ /**
+ * 鍒嗛厤鏁伴噺
+ */
+ private BigDecimal quantity;
+
+ /**
+ * 澶囨敞
+ */
+ private String remark;
+
+}
\ No newline at end of file
--
Gitblit v1.9.3