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/MesProMpsDO.java |  148 +++++++++++++++++++++++++++++++++++++++++++++++++
 1 files changed, 148 insertions(+), 0 deletions(-)

diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/pro/mps/MesProMpsDO.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/pro/mps/MesProMpsDO.java
new file mode 100644
index 0000000..d4b1b10
--- /dev/null
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/pro/mps/MesProMpsDO.java
@@ -0,0 +1,148 @@
+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.md.item.MesMdItemDO;
+import cn.iocoder.yudao.module.mes.dal.dataobject.pro.workorder.MesProWorkOrderDO;
+import cn.iocoder.yudao.module.mes.enums.DictTypeConstants;
+import cn.iocoder.yudao.module.mes.enums.pro.MesProMpsStatusEnum;
+import com.baomidou.mybatisplus.annotation.KeySequence;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.*;
+
+import java.math.BigDecimal;
+import java.time.LocalDateTime;
+
+/**
+ * MES 鐢熶骇涓昏鍒掞紙MPS锛塂O
+ *
+ * @author 鑺嬮亾婧愮爜
+ */
+@TableName("mes_pro_mps")
+@KeySequence("mes_pro_mps_seq")
+@Data
+@EqualsAndHashCode(callSuper = true)
+@ToString(callSuper = true)
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
+public class MesProMpsDO extends BaseDO {
+
+    /**
+     * 缂栧彿
+     */
+    @TableId
+    private Long id;
+
+    /**
+     * MPS 缂栫爜
+     */
+    private String code;
+
+    /**
+     * 鐘舵��
+     *
+     * 瀛楀吀 {@link DictTypeConstants#MES_PRO_MPS_STATUS}
+     * 鏋氫妇 {@link MesProMpsStatusEnum}
+     */
+    private Integer status;
+
+    // ========== 鏉ユ簮淇℃伅锛堟潵鑷攢鍞鍗曪級 ==========
+
+    /**
+     * 閿�鍞鍗旾D
+     */
+    private Long saleOrderId;
+
+    /**
+     * 閿�鍞鍗曞彿
+     */
+    private String saleOrderNo;
+
+    /**
+     * 閿�鍞鍗曟槑缁咺D
+     */
+    private Long saleOrderItemId;
+
+    // ========== 浜у搧淇℃伅 ==========
+
+    /**
+     * 浜у搧缂栧彿
+     *
+     * 鍏宠仈 {@link MesMdItemDO#getId()}
+     */
+    private Long productId;
+
+    /**
+     * 璁″垝鐢熶骇鏁伴噺
+     */
+    private BigDecimal quantity;
+
+    /**
+     * 宸茬敓浜ф暟閲�
+     */
+    private BigDecimal quantityProduced;
+
+    /**
+     * 璁¢噺鍗曚綅ID
+     */
+    private Long unitMeasureId;
+
+    // ========== 瀹㈡埛淇℃伅 ==========
+
+    /**
+     * 瀹㈡埛缂栧彿
+     *
+     * 鍏宠仈 CRM 瀹㈡埛 {@link cn.iocoder.yudao.module.crm.api.customer.dto.CrmCustomerRespDTO#getId()}
+     */
+    private Long clientId;
+
+    // ========== 鏃堕棿淇℃伅 ==========
+
+    /**
+     * 闇�姹傛棩鏈�
+     */
+    private LocalDateTime requestDate;
+
+    /**
+     * 涓嬪彂鏃ユ湡
+     */
+    private LocalDateTime issueDate;
+
+    /**
+     * 瀹屾垚鏃ユ湡
+     */
+    private LocalDateTime finishDate;
+
+    // ========== 鐢熶骇宸ュ崟鍏宠仈锛堜笅鍙戝悗鐢熸垚锛� ==========
+
+    /**
+     * 鐢熶骇宸ュ崟ID
+     *
+     * 鍏宠仈 {@link MesProWorkOrderDO#getId()}
+     */
+    private Long workOrderId;
+
+    /**
+     * 鐢熶骇宸ュ崟缂栫爜
+     */
+    private String workOrderCode;
+
+    // ========== 鍚堝苟涓嬪彂鏍囪瘑 ==========
+
+    /**
+     * 鏄惁鍚堝苟涓嬪彂锛�0=鍚� 1=鏄級
+     */
+    private Integer mergeFlag;
+
+    /**
+     * 鍚堝苟鎵规鍙�
+     */
+    private String mergeBatchNo;
+
+    /**
+     * 澶囨敞
+     */
+    private String remark;
+
+}
\ No newline at end of file

--
Gitblit v1.9.3