From 8c65f898ed6e5b0c7a94c792c4562f6ec831dccd Mon Sep 17 00:00:00 2001
From: gaoluyang <2820782392@qq.com>
Date: 星期六, 07 十一月 2026 08:50:53 +0800
Subject: [PATCH] feat: 完善质检、生产、销售、财务与人事模块并接入审批流程
---
yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/service/purchase/ErpPurchaseOrderServiceImpl.java | 14 ++++++++++++--
1 files changed, 12 insertions(+), 2 deletions(-)
diff --git a/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/service/purchase/ErpPurchaseOrderServiceImpl.java b/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/service/purchase/ErpPurchaseOrderServiceImpl.java
index 36efd8a..b14e32a 100644
--- a/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/service/purchase/ErpPurchaseOrderServiceImpl.java
+++ b/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/service/purchase/ErpPurchaseOrderServiceImpl.java
@@ -145,6 +145,9 @@
ErpPurchaseOrderDO purchaseOrder = BeanUtils.toBean(createReqVO, ErpPurchaseOrderDO.class, in -> in
.setNo(no).setStatus(submit ? ErpAuditStatus.PROCESS.getStatus() : ErpAuditStatus.DRAFT.getStatus())
.setInCount(BigDecimal.ZERO).setInStatus(ErpPurchaseOrderInStatusEnum.NOT_IN.getStatus()));
+ if (purchaseOrder.getDepositPrice() == null) {
+ purchaseOrder.setDepositPrice(BigDecimal.ZERO);
+ }
calculateTotalPrice(purchaseOrder, purchaseOrderItems);
purchaseOrderMapper.insert(purchaseOrder);
// 2.2 鎻掑叆璁㈠崟椤�
@@ -184,6 +187,9 @@
// 2.1 鏇存柊璁㈠崟
ErpPurchaseOrderDO updateObj = BeanUtils.toBean(updateReqVO, ErpPurchaseOrderDO.class);
+ if (updateObj.getDepositPrice() == null) {
+ updateObj.setDepositPrice(BigDecimal.ZERO);
+ }
calculateTotalPrice(updateObj, purchaseOrderItems);
purchaseOrderMapper.updateById(updateObj);
// 2.2 鏇存柊璁㈠崟椤�
@@ -454,8 +460,12 @@
if (!submitable) {
throw exception(PURCHASE_ORDER_SUBMIT_FAIL_STATUS);
}
+ // 2. 浠樻鏃ユ湡蹇呴�夛細閲囪喘鐢宠鑷姩鐢熸垚鐨勮崏绋胯鍗曟病鏈変粯娆炬棩鏈燂紝鎻愪氦鍓嶅繀椤诲厛缂栬緫琛ラ綈
+ if (purchaseOrder.getPaymentDate() == null) {
+ throw exception(PURCHASE_ORDER_PAYMENT_DATE_REQUIRED);
+ }
- // 2. 鍒涘缓 BPM 娴佺▼瀹炰緥
+ // 3. 鍒涘缓 BPM 娴佺▼瀹炰緥
// 鍏ㄥ眬鍏嶅鎵癸細涓氬姟鏍￠獙閫氳繃鍚庣洿鎺ユ墽琛屽鎵归�氳繃閫昏緫锛屾棤闇�娴佺▼妯″瀷銆�
if (processInstanceApi.isGlobalAutoApprove()) {
purchaseOrderMapper.updateById(new ErpPurchaseOrderDO()
@@ -889,4 +899,4 @@
return arrivalNoticeId;
}
-}
\ No newline at end of file
+}
--
Gitblit v1.9.3