From 7ffef0059ddf3d4a82de4a4a8999b4b2429fcda6 Mon Sep 17 00:00:00 2001
From: shiyunteng <shiyunteng@example.com>
Date: 星期四, 25 六月 2026 16:47:14 +0800
Subject: [PATCH] feat:erp石工泵合同推送
---
platformx-business-finance-biz/src/main/java/com/by4cloud/platformx/business/service/impl/OutBoundServiceImpl.java | 13 +++++++++++--
1 files changed, 11 insertions(+), 2 deletions(-)
diff --git a/platformx-business-finance-biz/src/main/java/com/by4cloud/platformx/business/service/impl/OutBoundServiceImpl.java b/platformx-business-finance-biz/src/main/java/com/by4cloud/platformx/business/service/impl/OutBoundServiceImpl.java
index 79dd3bc..954cc14 100644
--- a/platformx-business-finance-biz/src/main/java/com/by4cloud/platformx/business/service/impl/OutBoundServiceImpl.java
+++ b/platformx-business-finance-biz/src/main/java/com/by4cloud/platformx/business/service/impl/OutBoundServiceImpl.java
@@ -388,10 +388,19 @@
contractOutBound.setInvoiceStatus("0");
contractOutBound.setInvoiceNum(new BigDecimal("0"));
contractOutBoundMapper.insert(contractOutBound);
- if (StrUtil.isEmpty(contract.getContractCategory())) {
- if (DateUtil.compare(addDTO.getOutBoundTime(), contract.getExpirationDate()) > 0) {
+ if (!StrUtil.equals(contract.getContractCategory(),"water_house")) {
+ // 1. 纭畾鐢ㄤ簬姣旇緝鐨勫熀鍑嗘棩鏈燂紙浼樺厛绾э細璁″垝浜よ揣鏃ユ湡 > 鍚堝悓鍒版湡鏃ユ湡锛�
+ Date deadline = subjectMatter.getPlannedDeliveryDate();
+ if (ObjUtil.isNull(deadline)) {
+ deadline = contract.getExpirationDate();
+ }
+
+ // 2. 缁熶竴鍒ゆ柇鏄惁閫炬湡
+ // 娉ㄦ剰锛氶渶纭繚 deadline 涓嶄负 null锛岄槻姝㈢┖鎸囬拡寮傚父
+ if (deadline != null && DateUtil.compare(addDTO.getOutBoundTime(), deadline) > 0) {
saveOverdueOutBound(contract, addDTO, subjectMatter);
}
+
}
}
--
Gitblit v1.9.1