From 43b878fc35d2c4b2a7163aa472a333ac9fbd53f2 Mon Sep 17 00:00:00 2001
From: gaoluyang <2820782392@qq.com>
Date: 星期一, 12 十月 2026 18:19:17 +0800
Subject: [PATCH] fix(erp/crm): 单据明细单价口径由「不含税单价」改为「含税单价」
---
yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/dal/dataobject/sale/ErpSaleOrderItemDO.java | 38 ++++++++++++++++++++++++--------------
1 files changed, 24 insertions(+), 14 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..c912b11 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,20 +35,20 @@
*/
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;
/**
- * 浜у搧鍗曚綅鍗曚环锛屽崟浣嶏細鍏�
+ * 浜у搧鍗曚綅鍚◣鍗曚环锛屽崟浣嶏細鍏�
*/
private BigDecimal productPrice;
/**
@@ -57,9 +56,10 @@
*/
private BigDecimal count;
/**
- * 鎬讳环锛屽崟浣嶏細鍏�
+ * 涓嶅惈绋庨噾棰濓紝鍗曚綅锛氬厓
*
- * totalPrice = productPrice * count
+ * 鍚◣閲戦 = productPrice * count
+ * totalPrice = 鍚◣閲戦 - taxPrice
*/
private BigDecimal totalPrice;
/**
@@ -69,7 +69,8 @@
/**
* 绋庨锛屽崟浣嶏細鍏�
*
- * taxPrice = totalPrice * taxPercent
+ * 鍚◣閲戦 = productPrice * count
+ * taxPrice = 鍚◣閲戦 * taxPercent
*/
private BigDecimal taxPrice;
@@ -79,15 +80,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