From 6ed42390d7231b0d26700898ee2922732043effa Mon Sep 17 00:00:00 2001
From: liyong <18434998025@163.com>
Date: 星期四, 19 六月 2025 16:20:34 +0800
Subject: [PATCH] 2025-06-19 增值税对比 + 问题修改
---
src/main/java/com/ruoyi/sales/service/impl/SalesLedgerServiceImpl.java | 9 ++++++---
1 files changed, 6 insertions(+), 3 deletions(-)
diff --git a/src/main/java/com/ruoyi/sales/service/impl/SalesLedgerServiceImpl.java b/src/main/java/com/ruoyi/sales/service/impl/SalesLedgerServiceImpl.java
index ddc9f5a..a85755e 100644
--- a/src/main/java/com/ruoyi/sales/service/impl/SalesLedgerServiceImpl.java
+++ b/src/main/java/com/ruoyi/sales/service/impl/SalesLedgerServiceImpl.java
@@ -91,6 +91,7 @@
return salesLedgerMapper.selectSalesLedgerList(salesLedgerDto);
}
+ @Override
public SalesLedgerDto getSalesLedgerWithProducts(SalesLedgerDto salesLedgerDto) {
// 1. 鏌ヨ涓昏〃
SalesLedger salesLedger = salesLedgerMapper.selectById(salesLedgerDto.getId());
@@ -107,6 +108,8 @@
// 鎻愪緵涓存椂鏈紑绁ㄦ暟锛屾湭寮�绁ㄩ噾棰濅緵鍓嶆璁＄畻
product.setTempnoInvoiceAmount(product.getNoInvoiceAmount());
product.setTempNoInvoiceNum(product.getNoInvoiceNum());
+ product.setRegister(SecurityUtils.getLoginUser().getUser().getNickName());
+ product.setRegisterDate(LocalDateTime.now().format(DateTimeFormatter.ofPattern("yyyy-MM-dd")));
}
// 3.鏌ヨ涓婁紶鏂囦欢
@@ -504,11 +507,11 @@
}
// 2. 鏌ヨ褰撳ぉ/鍏徃宸插瓨鍦ㄧ殑搴忓垪鍙凤紙涓庡師閫昏緫涓�鑷达級
- Integer tenantId = SecurityUtils.getLoginUser().getTenantId();
- if(null != tenantId){
+ Long tenantId = SecurityUtils.getLoginUser().getTenantId();
+ if (null != tenantId) {
//鑾峰彇鍏徃缂栧彿
SysDept sysDept = sysDeptMapper.selectDeptById(tenantId.longValue());
- if(!ObjectUtils.isEmpty(sysDept)){
+ if (!ObjectUtils.isEmpty(sysDept)) {
datePart = (StringUtils.isEmpty(sysDept.getDeptNick()) ? "" : sysDept.getDeptNick()) + datePart;
}
}
--
Gitblit v1.9.3