From 2a4d9802f9117d5d110e63ddaa41aada68731c4d Mon Sep 17 00:00:00 2001
From: liyong <18434998025@163.com>
Date: 星期一, 16 六月 2025 17:08:51 +0800
Subject: [PATCH] tenantId修改类型 + 客户导入+ 供应商导入+产品导入
---
src/main/java/com/ruoyi/purchase/service/impl/PurchaseLedgerServiceImpl.java | 31 +++++++++++++++++++++++++++----
1 files changed, 27 insertions(+), 4 deletions(-)
diff --git a/src/main/java/com/ruoyi/purchase/service/impl/PurchaseLedgerServiceImpl.java b/src/main/java/com/ruoyi/purchase/service/impl/PurchaseLedgerServiceImpl.java
index 3fb150a..ac9691b 100644
--- a/src/main/java/com/ruoyi/purchase/service/impl/PurchaseLedgerServiceImpl.java
+++ b/src/main/java/com/ruoyi/purchase/service/impl/PurchaseLedgerServiceImpl.java
@@ -1,6 +1,7 @@
package com.ruoyi.purchase.service.impl;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
@@ -27,10 +28,9 @@
import com.ruoyi.purchase.pojo.PurchaseLedger;
import com.ruoyi.purchase.pojo.TicketRegistration;
import com.ruoyi.purchase.service.IPurchaseLedgerService;
-import com.ruoyi.sales.mapper.CommonFileMapper;
-import com.ruoyi.sales.mapper.SalesLedgerMapper;
-import com.ruoyi.sales.mapper.SalesLedgerProductMapper;
+import com.ruoyi.sales.mapper.*;
import com.ruoyi.sales.pojo.CommonFile;
+import com.ruoyi.sales.pojo.InvoiceRegistrationProduct;
import com.ruoyi.sales.pojo.SalesLedger;
import com.ruoyi.sales.pojo.SalesLedgerProduct;
import lombok.RequiredArgsConstructor;
@@ -84,6 +84,8 @@
private final ProductRecordMapper productRecordMapper;
+ private final InvoiceRegistrationProductMapper invoiceRegistrationProductMapper;
+
@Value("${file.upload-dir}")
private String uploadDir;
@@ -110,7 +112,7 @@
BeanUtils.copyProperties(purchaseLedgerDto, purchaseLedger);
LoginUser loginUser = SecurityUtils.getLoginUser();
if(ObjectUtils.isNotEmpty(loginUser) && null != loginUser.getTenantId()) {
- purchaseLedger.setTenantId(loginUser.getTenantId().longValue());
+ purchaseLedger.setTenantId(loginUser.getTenantId());
}
purchaseLedger.setSalesContractNo(ObjectUtils.isNotEmpty(salesLedger) ? salesLedger.getSalesContractNo() : null);
purchaseLedger.setSupplierName(supplierManage.getSupplierName());
@@ -417,6 +419,27 @@
return purchaseLedgerDto;
}
+ @Override
+ public IPage<PurchaseLedger> selectPurchaseLedgerListPage(IPage ipage, PurchaseLedger purchaseLedger) {
+ LambdaQueryWrapper<PurchaseLedger> queryWrapper = new LambdaQueryWrapper<>();
+ if (StringUtils.isNotBlank(purchaseLedger.getPurchaseContractNumber())) {
+ queryWrapper.like(PurchaseLedger::getPurchaseContractNumber, purchaseLedger.getPurchaseContractNumber());
+ }
+ return purchaseLedgerMapper.selectPage(ipage, queryWrapper);
+ }
+
+ @Override
+ public List<InvoiceRegistrationProduct> getProductBySalesNo(Long id) {
+ List<InvoiceRegistrationProduct> invoiceRegistrationProducts = invoiceRegistrationProductMapper.selectList(new LambdaQueryWrapper<InvoiceRegistrationProduct>()
+ .select(InvoiceRegistrationProduct::getId, InvoiceRegistrationProduct::getProductCategory, InvoiceRegistrationProduct::getSpecificationModel,
+ InvoiceRegistrationProduct::getUnit, InvoiceRegistrationProduct::getQuantity)
+ .eq(InvoiceRegistrationProduct::getSalesLedgerId, id));
+ if (invoiceRegistrationProducts.isEmpty()) {
+ return new ArrayList<>();
+ }
+ return invoiceRegistrationProducts;
+ }
+
/**
* 涓嬪垝绾垮懡鍚嶈浆椹煎嘲鍛藉悕
*/
--
Gitblit v1.9.3