From a0d55bcc8bfebd408d16166b27b7e05b3e4c9f4a Mon Sep 17 00:00:00 2001
From: gaoluyang <2820782392@qq.com>
Date: 星期一, 02 十一月 2026 16:51:50 +0800
Subject: [PATCH] feat(erp): 采购/销售明细按含税单价口径拆税,供应商合同补供应商名称与附件

---
 yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/dal/dataobject/sale/ErpSaleOrderItemDO.java |   34 +++++++++++++++++++++-------------
 1 files changed, 21 insertions(+), 13 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..eb7888d 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;
@@ -12,10 +11,10 @@
 /**
  * ERP 閿�鍞鍗曢」 DO
  *
- * @author 鑺嬮亾婧愮爜
+ * @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;
 
@@ -57,9 +56,9 @@
      */
     private BigDecimal count;
     /**
-     * 鎬讳环锛屽崟浣嶏細鍏�
+     * 鍚◣鎬讳环锛屽崟浣嶏細鍏�
      *
-     * totalPrice = productPrice * count
+     * totalPrice = productPrice锛堝惈绋庡崟浠凤級* count
      */
     private BigDecimal totalPrice;
     /**
@@ -69,7 +68,7 @@
     /**
      * 绋庨锛屽崟浣嶏細鍏�
      *
-     * taxPrice = totalPrice * taxPercent
+     * taxPrice = totalPrice * taxPercent /锛�100 + taxPercent锛夛紝鍗冲惈绋庢�讳环鍊掔畻绋庨
      */
     private BigDecimal taxPrice;
 
@@ -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