From 88e384da863bb2f7324cb1e1474885df3b7cce91 Mon Sep 17 00:00:00 2001
From: liyong <18434998025@163.com>
Date: 星期一, 13 七月 2026 11:27:49 +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/purchase/ErpPurchaseOrderDO.java | 23 +++++++++++++++++------
1 files changed, 17 insertions(+), 6 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 7b28cad..6f1c09b 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
@@ -53,6 +53,16 @@
*/
private Long accountId;
/**
+ * 鍏宠仈閲囪喘鐢宠缂栧彿
+ *
+ * 鍏宠仈 {@link ErpPurchaseRequestDO#getId()}
+ */
+ private Long requestId;
+ /**
+ * 閲囪喘鐢宠鍗曞彿
+ */
+ private String requestNo;
+ /**
* 涓嬪崟鏃堕棿
*/
private LocalDateTime orderTime;
@@ -100,12 +110,6 @@
*/
private String remark;
- // ========== BPM 娴佺▼瀹℃壒 ==========
- /**
- * BPM 娴佺▼瀹炰緥缂栧彿
- */
- private String processInstanceId;
-
// ========== 閲囪喘鍏ュ簱 ==========
/**
* 閲囪喘鍏ュ簱鏁伴噺
@@ -118,4 +122,11 @@
*/
private BigDecimal returnCount;
+ /**
+ * 鍏ュ簱鐘舵��
+ *
+ * 鏋氫妇 {@link cn.iocoder.yudao.module.erp.enums.ErpPurchaseOrderInStatusEnum}
+ */
+ private Integer inStatus;
+
}
\ No newline at end of file
--
Gitblit v1.9.3