From 174b16450916d3e5c18b23911844c4165b9113bf Mon Sep 17 00:00:00 2001
From: gaoluyang <2820782392@qq.com>
Date: 星期一, 12 十月 2026 18:18:55 +0800
Subject: [PATCH] fix(erp/crm): 单据明细单价口径由「不含税单价」改为「含税单价」
---
yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/dal/dataobject/purchase/ErpPurchaseOrderDO.java | 39 ++++++++++++++++++++++++---------------
1 files changed, 24 insertions(+), 15 deletions(-)
diff --git a/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/dal/dataobject/purchase/ErpPurchaseOrderDO.java b/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/dal/dataobject/purchase/ErpPurchaseOrderDO.java
index 6f1c09b..d9a510b 100644
--- a/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/dal/dataobject/purchase/ErpPurchaseOrderDO.java
+++ b/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/dal/dataobject/purchase/ErpPurchaseOrderDO.java
@@ -13,7 +13,7 @@
/**
* ERP 閲囪喘璁㈠崟 DO
*
- * @author 鑺嬮亾婧愮爜
+ * @author 瓒呯骇绠＄悊鍛�
*/
@TableName(value = "erp_purchase_order")
@KeySequence("erp_purchase_order_seq") // 鐢ㄤ簬 Oracle銆丳ostgreSQL銆並ingbase銆丏B2銆丠2 鏁版嵁搴撶殑涓婚敭鑷銆傚鏋滄槸 MySQL 绛夋暟鎹簱锛屽彲涓嶅啓銆�
@@ -53,16 +53,6 @@
*/
private Long accountId;
/**
- * 鍏宠仈閲囪喘鐢宠缂栧彿
- *
- * 鍏宠仈 {@link ErpPurchaseRequestDO#getId()}
- */
- private Long requestId;
- /**
- * 閲囪喘鐢宠鍗曞彿
- */
- private String requestNo;
- /**
* 涓嬪崟鏃堕棿
*/
private LocalDateTime orderTime;
@@ -72,14 +62,15 @@
*/
private BigDecimal totalCount;
/**
- * 鏈�缁堝悎璁′环鏍硷紝鍗曚綅锛氬厓
+ * 鏈�缁堝悎璁′环鏍硷紙鍚◣锛夛紝鍗曚綅锛氬厓
*
* totalPrice = totalProductPrice + totalTaxPrice - discountPrice
+ * 绛変环浜� 危(鍚◣鍗曚环 * 鏁伴噺) - discountPrice
*/
private BigDecimal totalPrice;
/**
- * 鍚堣浜у搧浠锋牸锛屽崟浣嶏細鍏�
+ * 鍚堣浜у搧浠锋牸锛堜笉鍚◣锛夛紝鍗曚綅锛氬厓
*/
private BigDecimal totalProductPrice;
/**
@@ -102,9 +93,22 @@
private BigDecimal depositPrice;
/**
- * 闄勪欢鍦板潃
+ * 鏉ユ簮绫诲瀷
+ *
+ * 鏋氫妇 {@link cn.iocoder.yudao.module.erp.enums.ErpPurchaseOrderSourceTypeEnum}
*/
- private String fileUrl;
+ private Integer sourceType;
+ /**
+ * 鏉ユ簮鍗曞彿
+ */
+ private String sourceNo;
+ /**
+ * 鏉ユ簮鍗曟嵁缂栧彿
+ *
+ * 鍏宠仈鏉ユ簮鍗曟嵁琛ㄧ殑涓婚敭 ID
+ */
+ private Long sourceId;
+
/**
* 澶囨敞
*/
@@ -129,4 +133,9 @@
*/
private Integer inStatus;
+ /**
+ * BPM 娴佺▼瀹炰緥缂栧彿
+ */
+ private String processInstanceId;
+
}
\ No newline at end of file
--
Gitblit v1.9.3