From 7d2ee3cef2e0d68ba6400bc5957640d2771bbf4c Mon Sep 17 00:00:00 2001
From: liu <2021943741@qq.com>
Date: 星期三, 16 九月 2026 18:05:40 +0800
Subject: [PATCH] refactor: 单据审核改为审批配置状态机（新增:audit接口/审核人字段/DB变更脚本）
---
yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/dal/dataobject/purchase/ErpPurchaseRequestDO.java | 129 +++++++++++++++++++++++++++----------------
1 files changed, 81 insertions(+), 48 deletions(-)
diff --git a/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/dal/dataobject/purchase/ErpPurchaseRequestDO.java b/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/dal/dataobject/purchase/ErpPurchaseRequestDO.java
index a3e896c..b24aca3 100644
--- a/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/dal/dataobject/purchase/ErpPurchaseRequestDO.java
+++ b/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/dal/dataobject/purchase/ErpPurchaseRequestDO.java
@@ -1,7 +1,6 @@
package cn.iocoder.yudao.module.erp.dal.dataobject.purchase;
import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDO;
-import cn.iocoder.yudao.module.erp.dal.dataobject.finance.ErpAccountDO;
import com.baomidou.mybatisplus.annotation.KeySequence;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
@@ -12,10 +11,8 @@
/**
* ERP 閲囪喘鐢宠 DO
- *
- * @author 鑺嬮亾婧愮爜
*/
-@TableName(value = "erp_purchase_request")
+@TableName("erp_purchase_request")
@KeySequence("erp_purchase_request_seq")
@Data
@EqualsAndHashCode(callSuper = true)
@@ -30,14 +27,20 @@
*/
@TableId
private Long id;
+
/**
* 閲囪喘鐢宠鍗曞彿
*/
private String no;
+
/**
- * 瀹℃壒鐘舵��
+ * 鐘舵��
*
- * 鏋氫妇 {@link cn.iocoder.yudao.module.erp.enums.ErpPurchaseRequestStatusEnum}
+ * 0: 鏈彁浜�
+ * 10: 瀹℃壒涓�
+ * 20: 瀹℃牳閫氳繃
+ * 30: 瀹℃牳涓嶉�氳繃
+ * 40: 宸插彇娑�
*/
private Integer status;
@@ -45,23 +48,24 @@
* 鐢宠浜虹紪鍙�
*/
private Long requestUserId;
+
/**
* 鐢宠閮ㄩ棬缂栧彿
*/
private Long requestDeptId;
+
/**
* 鐢宠鏃堕棿
*/
private LocalDateTime requestTime;
+
/**
* 鐢宠鐞嗙敱
*/
private String requestReason;
/**
- * 渚涘簲鍟嗙紪鍙�
- *
- * 鍏宠仈 {@link ErpSupplierDO#getId()}
+ * 渚涘簲鍟嗙紪鍙凤紙鍙�夛級
*/
private Long supplierId;
@@ -69,61 +73,90 @@
* 鍚堣鏁伴噺
*/
private BigDecimal totalCount;
+
/**
- * 鍚堣浜у搧浠锋牸锛屽崟浣嶏細鍏�
- */
- private BigDecimal totalProductPrice;
- /**
- * 鍚堣绋庨锛屽崟浣嶏細鍏�
- */
- private BigDecimal totalTaxPrice;
- /**
- * 鏈�缁堝悎璁′环鏍硷紝鍗曚綅锛氬厓
- *
- * totalPrice = totalProductPrice + totalTaxPrice - discountPrice
+ * 鍚堣浠锋牸
*/
private BigDecimal totalPrice;
+
+ /**
+ * 鍚堣浜у搧浠锋牸
+ */
+ private BigDecimal totalProductPrice;
+
+ /**
+ * 鍚堣绋庨
+ */
+ private BigDecimal totalTaxPrice;
+
/**
* 浼樻儬鐜囷紝鐧惧垎姣�
*/
private BigDecimal discountPercent;
+
/**
- * 浼樻儬閲戦锛屽崟浣嶏細鍏�
- *
- * discountPrice = (totalProductPrice + totalTaxPrice) * discountPercent
+ * 浼樻儬閲戦
*/
private BigDecimal discountPrice;
/**
- * 宸ヤ綔娴佺紪鍙�
+ * 瀹氶噾閲戦
*/
- private String processInstanceId;
+ private BigDecimal depositPrice;
- /**
- * 鍏宠仈閲囪喘璁㈠崟缂栧彿锛堝鎵归�氳繃鍚庣敓鎴愶級
- *
- * 鍏宠仈 {@link ErpPurchaseOrderDO#getId()}
- */
- private Long orderId;
- /**
- * 鐢熸垚閲囪喘璁㈠崟鏃堕棿
- */
- private LocalDateTime orderTime;
-
- /**
- * 鍏ュ簱鐘舵��
- *
- * 鏋氫妇 {@link cn.iocoder.yudao.module.erp.enums.ErpPurchaseOrderInStatusEnum}
- */
- private Integer inStatus;
-
- /**
- * 闄勪欢鍦板潃
- */
- private String fileUrl;
/**
* 澶囨敞
*/
private String remark;
-}
+ /**
+ * BPM 娴佺▼瀹炰緥缂栧彿
+ *
+ * 宸插簾寮冿細閲囪喘鐢宠鏀逛负杞婚噺绾х姸鎬佹満瀹℃壒鍚庝笉鍐嶅啓鍏ワ紝浠呬繚鐣欏巻鍙叉暟鎹��
+ */
+ @Deprecated
+ private String processInstanceId;
+
+ /**
+ * 瀹℃牳浜虹紪鍙凤紙绯荤粺鐢ㄦ埛锛�
+ *
+ * 瀹℃壒浜虹敱銆岀郴缁熺鐞� - 瀹℃壒閰嶇疆銆嶆寜涓氬姟绫诲瀷缁熶竴閰嶇疆锛堜笟鍔＄紪鐮� purchase_request_approve锛夛紝
+ * 鎻愪氦鏃朵笉鎸囧畾锛涙澶勮褰曞疄闄呮墽琛屽鏍哥殑鐢ㄦ埛銆�
+ */
+ private Long reviewerId;
+
+ /**
+ * 瀹℃牳浜烘樀绉帮紙鍐椾綑灞曠ず鐢級
+ */
+ private String reviewerName;
+
+ /**
+ * 瀹℃牳鏃堕棿
+ */
+ private LocalDateTime reviewTime;
+
+ /**
+ * 瀹℃牳鎰忚锛堝鏍镐笉閫氳繃鏃跺繀濉紝浣滀负椹冲洖鍘熷洜锛�
+ */
+ private String reviewRemark;
+
+ /**
+ * 鐢熸垚鐨勯噰璐鍗曠紪鍙�
+ */
+ private Long orderId;
+
+ /**
+ * 鐢熸垚鐨勯噰璐鍗曞彿
+ */
+ private String orderNo;
+
+ /**
+ * 鍏ュ簱鐘舵��
+ *
+ * 0: 鏈叆搴�
+ * 1: 閮ㄥ垎鍏ュ簱
+ * 2: 鍏ㄩ儴鍏ュ簱
+ */
+ private Integer inStatus;
+
+}
\ No newline at end of file
--
Gitblit v1.9.3