From be5783c8a7e13bbc76d33c95643d75779cce21db Mon Sep 17 00:00:00 2001
From: liyong <18434998025@163.com>
Date: 星期六, 18 七月 2026 15:39:05 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_business' into dev_business
---
yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/dal/dataobject/sale/ErpSaleOrderItemDO.java | 26 +++++++++++++++++---------
1 files changed, 17 insertions(+), 9 deletions(-)
diff --git a/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/dal/dataobject/sale/ErpSaleOrderItemDO.java b/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/dal/dataobject/sale/ErpSaleOrderItemDO.java
index 4c82976..5d91f51 100644
--- a/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/dal/dataobject/sale/ErpSaleOrderItemDO.java
+++ b/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/dal/dataobject/sale/ErpSaleOrderItemDO.java
@@ -1,7 +1,6 @@
package cn.iocoder.yudao.module.erp.dal.dataobject.sale;
import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDO;
-import cn.iocoder.yudao.module.erp.dal.dataobject.product.ErpProductDO;
import com.baomidou.mybatisplus.annotation.KeySequence;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
@@ -15,7 +14,7 @@
* @author 鑺嬮亾婧愮爜
*/
@TableName("erp_sale_order_items")
-@KeySequence("erp_sale_order_items_seq") // 鐢ㄤ簬 Oracle銆丳ostgreSQL銆並ingbase銆丏B2銆丠2 鏁版嵁搴撶殑涓婚敭鑷銆傚鏋滄槸 MySQL 绛夋暟鎹簱锛屽彲涓嶅啓銆�
+@KeySequence("erp_sale_order_items_seq")
@Data
@EqualsAndHashCode(callSuper = true)
@ToString(callSuper = true)
@@ -36,15 +35,15 @@
*/
private Long orderId;
/**
- * 浜у搧缂栧彿
+ * 鐗╂枡缂栧彿
*
- * 鍏宠仈 {@link ErpProductDO#getId()}
+ * 鍏宠仈 {@link cn.iocoder.yudao.module.mdm.api.item.dto.MdmItemRespDTO#getId()}
*/
private Long productId;
/**
- * 浜у搧鍗曚綅鍗曚綅
+ * 璁￠噺鍗曚綅缂栧彿
*
- * 鍐椾綑 {@link ErpProductDO#getUnitId()}
+ * 鍏宠仈 {@link cn.iocoder.yudao.module.mdm.api.unitmeasure.dto.MdmUnitMeasureRespDTO#getId()}
*/
private Long productUnitId;
@@ -79,15 +78,24 @@
private String remark;
// ========== 閿�鍞嚭搴� ==========
+
/**
* 閿�鍞嚭搴撴暟閲�
*/
private BigDecimal outCount;
- // ========== 閿�鍞��璐э紙鍏ュ簱锛夛級 ==========
+ // ========== 鐢熶骇鍏宠仈 ==========
+
/**
- * 閿�鍞��璐ф暟閲�
+ * 鏄惁闇�瑕佺敓浜э紙0=鍚� 1=鏄級
*/
- private BigDecimal returnCount;
+ private Integer needProduction;
+
+ /**
+ * 鍏宠仈鐨� MPS 缂栧彿
+ *
+ * 鍏宠仈 {@link cn.iocoder.yudao.module.mes.dal.dataobject.pro.mps.MesProMpsDO#getId()}
+ */
+ private Long mpsId;
}
\ No newline at end of file
--
Gitblit v1.9.3