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/ErpSaleOrderDO.java | 41 +++++++++++++++++++++++++++--------------
1 files changed, 27 insertions(+), 14 deletions(-)
diff --git a/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/dal/dataobject/sale/ErpSaleOrderDO.java b/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/dal/dataobject/sale/ErpSaleOrderDO.java
index 83b8634..94d211b 100644
--- a/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/dal/dataobject/sale/ErpSaleOrderDO.java
+++ b/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/dal/dataobject/sale/ErpSaleOrderDO.java
@@ -13,7 +13,7 @@
/**
* ERP 閿�鍞鍗� DO
*
- * @author 鑺嬮亾婧愮爜
+ * @author 瓒呯骇绠＄悊鍛�
*/
@TableName(value = "erp_sale_order")
@KeySequence("erp_sale_order_seq") // 鐢ㄤ簬 Oracle銆丳ostgreSQL銆並ingbase銆丏B2銆丠2 鏁版嵁搴撶殑涓婚敭鑷銆傚鏋滄槸 MySQL 绛夋暟鎹簱锛屽彲涓嶅啓銆�
@@ -76,14 +76,15 @@
*/
private BigDecimal totalCount;
/**
- * 鏈�缁堝悎璁′环鏍硷紝鍗曚綅锛氬厓
+ * 鏈�缁堝悎璁′环鏍硷紙鍚◣锛夛紝鍗曚綅锛氬厓
*
* totalPrice = totalProductPrice + totalTaxPrice - discountPrice
+ * 绛変环浜� 危(鍚◣鍗曚环 * 鏁伴噺) - discountPrice
*/
private BigDecimal totalPrice;
/**
- * 鍚堣浜у搧浠锋牸锛屽崟浣嶏細鍏�
+ * 鍚堣浜у搧浠锋牸锛堜笉鍚◣锛夛紝鍗曚綅锛氬厓
*/
private BigDecimal totalProductPrice;
/**
@@ -106,31 +107,43 @@
private BigDecimal depositPrice;
/**
- * 闄勪欢鍦板潃
- */
- private String fileUrl;
- /**
* 澶囨敞
*/
private String remark;
+ // ========== 鍗忓悓鍔炲叕(BPM)瀹℃壒 ==========
+
+ /**
+ * BPM 娴佺▼瀹炰緥缂栧彿
+ *
+ * 鎻愪氦瀹℃壒鍒板崗鍚屽姙鍏悗鐢熸垚鐨勬祦绋嬪疄渚嬬紪鍙凤紝鐢ㄤ簬鍏宠仈瀹℃壒璁板綍
+ */
+ private String processInstanceId;
+
// ========== 閿�鍞嚭搴� ==========
+
/**
* 閿�鍞嚭搴撴暟閲�
*/
private BigDecimal outCount;
- // ========== 閿�鍞��璐э紙鍏ュ簱锛夛級 ==========
- /**
- * 閿�鍞��璐ф暟閲�
- */
- private BigDecimal returnCount;
-
/**
* 鍑哄簱鐘舵��
*
- * 鏋氫妇 {@link cn.iocoder.yudao.module.erp.enums.ErpSaleOrderOutStatusEnum}
+ * 鏋氫妇 {@link cn.iocoder.yudao.module.erp.api.sale.enums.ErpSaleOrderOutStatusEnum}
*/
private Integer outStatus;
+ // ========== 鐢熶骇鍏宠仈 ==========
+
+ /**
+ * 鐢熶骇鐘舵�侊細0-鏈畬鎴愶紝1-宸插畬鎴�
+ */
+ private Integer productionStatus;
+
+ /**
+ * 鐢熶骇瀹屾垚鏃堕棿
+ */
+ private LocalDateTime productionFinishTime;
+
}
\ No newline at end of file
--
Gitblit v1.9.3