From 5a347be900bf045c947cdbc08167526cd44116db Mon Sep 17 00:00:00 2001
From: gaoluyang <2820782392@qq.com>
Date: 星期一, 12 十月 2026 18:18:50 +0800
Subject: [PATCH] fix(erp/crm): 单据明细单价口径由「不含税单价」改为「含税单价」
---
yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/dal/dataobject/purchase/ErpPurchaseOrderItemDO.java | 24 +++++++++++++++++++-----
1 files changed, 19 insertions(+), 5 deletions(-)
diff --git a/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/dal/dataobject/purchase/ErpPurchaseOrderItemDO.java b/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/dal/dataobject/purchase/ErpPurchaseOrderItemDO.java
index f20b148..d17e98c 100644
--- a/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/dal/dataobject/purchase/ErpPurchaseOrderItemDO.java
+++ b/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/dal/dataobject/purchase/ErpPurchaseOrderItemDO.java
@@ -11,7 +11,7 @@
/**
* ERP 閲囪喘璁㈠崟椤� DO
*
- * @author 鑺嬮亾婧愮爜
+ * @author 瓒呯骇绠＄悊鍛�
*/
@TableName("erp_purchase_order_items")
@KeySequence("erp_purchase_order_items_seq") // 鐢ㄤ簬 Oracle銆丳ostgreSQL銆並ingbase銆丏B2銆丠2 鏁版嵁搴撶殑涓婚敭鑷銆傚鏋滄槸 MySQL 绛夋暟鎹簱锛屽彲涓嶅啓銆�
@@ -35,6 +35,12 @@
*/
private Long orderId;
/**
+ * 閲囪喘鐢宠鏄庣粏缂栧彿
+ *
+ * 鍏宠仈 {@link ErpPurchaseRequestItemDO#getId()}
+ */
+ private Long requestItemId;
+ /**
* 鐗╂枡缂栧彿
*
* 鍏宠仈 {@link cn.iocoder.yudao.module.mdm.api.item.dto.MdmItemRespDTO#getId()}
@@ -48,7 +54,7 @@
private Long productUnitId;
/**
- * 浜у搧鍗曚綅鍗曚环锛屽崟浣嶏細鍏�
+ * 浜у搧鍗曚綅鍚◣鍗曚环锛屽崟浣嶏細鍏�
*/
private BigDecimal productPrice;
/**
@@ -56,9 +62,10 @@
*/
private BigDecimal count;
/**
- * 鎬讳环锛屽崟浣嶏細鍏�
+ * 涓嶅惈绋庨噾棰濓紝鍗曚綅锛氬厓
*
- * totalPrice = productPrice * count
+ * 鍚◣閲戦 = productPrice * count
+ * totalPrice = 鍚◣閲戦 - taxPrice
*/
private BigDecimal totalPrice;
/**
@@ -68,7 +75,8 @@
/**
* 绋庨锛屽崟浣嶏細鍏�
*
- * taxPrice = totalPrice * taxPercent
+ * 鍚◣閲戦 = productPrice * count
+ * taxPrice = 鍚◣閲戦 * taxPercent
*/
private BigDecimal taxPrice;
@@ -89,4 +97,10 @@
*/
private BigDecimal returnCount;
+ // ========== 璐ㄦ ==========
+ /**
+ * 鏄惁闇�瑕佹潵鏂欐楠�
+ */
+ private Boolean qcCheckFlag;
+
}
\ No newline at end of file
--
Gitblit v1.9.3