From e2729587d4a8b9c2e3e2c4dd50a25adedb337e98 Mon Sep 17 00:00:00 2001
From: 云 <2163098428@qq.com>
Date: 星期五, 14 八月 2026 15:58:15 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_business' into dev_business
---
yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/dal/dataobject/sale/ErpSaleOrderDO.java | 42 +++++++++++++++++++++++++++---------------
1 files changed, 27 insertions(+), 15 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 8a9be24..dea60a2 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 绛夋暟鎹簱锛屽彲涓嶅啓銆�
@@ -43,9 +43,17 @@
/**
* 瀹㈡埛缂栧彿
*
- * 鍏宠仈 {@link ErpCustomerDO#getId()}
+ * 鍏宠仈 CRM 瀹㈡埛 {@link cn.iocoder.yudao.module.crm.api.customer.dto.CrmCustomerRespDTO#getId()}
*/
private Long customerId;
+ /**
+ * 鍏宠仈 CRM 鍚堝悓缂栧彿
+ */
+ private Long contractId;
+ /**
+ * CRM 鍚堝悓鍗曞彿
+ */
+ private String contractNo;
/**
* 缁撶畻璐︽埛缂栧彿
*
@@ -98,30 +106,34 @@
private BigDecimal depositPrice;
/**
- * 闄勪欢鍦板潃
- */
- private String fileUrl;
- /**
* 澶囨敞
*/
private String remark;
- // ========== BPM 娴佺▼瀹℃壒 ==========
- /**
- * BPM 娴佺▼瀹炰緥缂栧彿
- */
- private String processInstanceId;
-
// ========== 閿�鍞嚭搴� ==========
+
/**
* 閿�鍞嚭搴撴暟閲�
*/
private BigDecimal outCount;
- // ========== 閿�鍞��璐э紙鍏ュ簱锛夛級 ==========
/**
- * 閿�鍞��璐ф暟閲�
+ * 鍑哄簱鐘舵��
+ *
+ * 鏋氫妇 {@link cn.iocoder.yudao.module.erp.api.sale.enums.ErpSaleOrderOutStatusEnum}
*/
- private BigDecimal returnCount;
+ private Integer outStatus;
+
+ // ========== 鐢熶骇鍏宠仈 ==========
+
+ /**
+ * 鐢熶骇鐘舵�侊細0-鏈畬鎴愶紝1-宸插畬鎴�
+ */
+ private Integer productionStatus;
+
+ /**
+ * 鐢熶骇瀹屾垚鏃堕棿
+ */
+ private LocalDateTime productionFinishTime;
}
\ No newline at end of file
--
Gitblit v1.9.3