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/framework/security/LoginUser.java | 10 +-
src/main/java/com/ruoyi/basic/pojo/Customer.java | 3
src/main/java/com/ruoyi/purchase/pojo/ProductRecord.java | 2
src/main/java/com/ruoyi/purchase/service/IPurchaseLedgerService.java | 3
src/main/java/com/ruoyi/framework/security/service/UserDetailsServiceImpl.java | 2
src/main/java/com/ruoyi/purchase/service/impl/PurchaseLedgerServiceImpl.java | 21 ++++-
src/main/java/com/ruoyi/project/system/controller/SysLoginController.java | 2
src/main/java/com/ruoyi/basic/service/impl/CustomerServiceImpl.java | 25 +++++-
src/main/java/com/ruoyi/purchase/service/impl/PaymentRegistrationServiceImpl.java | 4
src/main/java/com/ruoyi/sales/pojo/InvoiceRegistrationProduct.java | 2
src/main/java/com/ruoyi/sales/service/impl/SalesLedgerServiceImpl.java | 2
src/main/java/com/ruoyi/purchase/controller/PurchaseLedgerController.java | 9 ++
src/main/java/com/ruoyi/basic/service/impl/ProductServiceImpl.java | 5 +
src/main/java/com/ruoyi/basic/pojo/ProductModel.java | 10 ++
src/main/java/com/ruoyi/sales/pojo/InvoiceLedgerFile.java | 2
src/main/java/com/ruoyi/basic/controller/SupplierManageController.java | 13 +++
src/main/java/com/ruoyi/basic/service/IProductModelService.java | 3
src/main/java/com/ruoyi/basic/service/impl/SupplierServiceImpl.java | 31 +++++++
src/main/java/com/ruoyi/basic/controller/ProductController.java | 10 ++
src/main/java/com/ruoyi/sales/pojo/InvoiceRegistration.java | 2
src/main/java/com/ruoyi/basic/pojo/SupplierManage.java | 3
src/main/java/com/ruoyi/common/config/MybatisHandler.java | 4
src/main/java/com/ruoyi/project/system/domain/SysUser.java | 6
src/main/java/com/ruoyi/basic/service/ICustomerService.java | 3
src/main/java/com/ruoyi/basic/service/impl/ProductModelServiceImpl.java | 29 +++++++
src/main/java/com/ruoyi/common/config/IgnoreTableConfig.java | 1
src/main/java/com/ruoyi/sales/pojo/ReceiptPayment.java | 2
src/main/java/com/ruoyi/sales/pojo/InvoiceLedger.java | 2
src/main/java/com/ruoyi/basic/excel/SupplierManageExcelDto.java | 8 +
src/main/java/com/ruoyi/basic/pojo/Product.java | 2
src/main/java/com/ruoyi/basic/service/ISupplierService.java | 4 +
src/main/java/com/ruoyi/basic/controller/CustomerController.java | 12 +++
src/main/java/com/ruoyi/common/handler/CustomTenantLineHandler.java | 2
33 files changed, 203 insertions(+), 36 deletions(-)
diff --git a/src/main/java/com/ruoyi/basic/controller/CustomerController.java b/src/main/java/com/ruoyi/basic/controller/CustomerController.java
index be5f92a..833aa97 100644
--- a/src/main/java/com/ruoyi/basic/controller/CustomerController.java
+++ b/src/main/java/com/ruoyi/basic/controller/CustomerController.java
@@ -11,6 +11,7 @@
import com.ruoyi.framework.web.domain.AjaxResult;
import lombok.AllArgsConstructor;
import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
import javax.servlet.http.HttpServletResponse;
import java.util.List;
@@ -52,6 +53,17 @@
util.exportExcel(response, list, "瀹㈡埛妗ｆ鏁版嵁");
}
+
+ /**
+ * 瀵煎叆瀹㈡埛妗ｆ
+ */
+ @Log(title = "瀹㈡埛妗ｆ", businessType = BusinessType.IMPORT)
+ @PostMapping("/importData")
+ public AjaxResult importData(MultipartFile file) throws Exception {
+
+ return success(customerService.importData(file));
+ }
+
/**
* 鑾峰彇瀹㈡埛妗ｆ璇︾粏淇℃伅
*/
diff --git a/src/main/java/com/ruoyi/basic/controller/ProductController.java b/src/main/java/com/ruoyi/basic/controller/ProductController.java
index 1909c08..a586d4b 100644
--- a/src/main/java/com/ruoyi/basic/controller/ProductController.java
+++ b/src/main/java/com/ruoyi/basic/controller/ProductController.java
@@ -14,6 +14,7 @@
import com.ruoyi.framework.web.domain.AjaxResult;
import lombok.AllArgsConstructor;
import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
import java.util.List;
@@ -92,4 +93,13 @@
public IPage<ProductModel> selectModelListPage(Page page, ProductDto productDto) {
return productModelService.modelListPage(page, productDto);
}
+
+ /**
+ * 瀵煎叆浜у搧
+ */
+ @Log(title = "瀵煎叆浜у搧",businessType = BusinessType.IMPORT)
+ @PostMapping("import")
+ public AjaxResult importProduct(MultipartFile file) {
+ return AjaxResult.success(productModelService.importProduct(file));
+ }
}
diff --git a/src/main/java/com/ruoyi/basic/controller/SupplierManageController.java b/src/main/java/com/ruoyi/basic/controller/SupplierManageController.java
index 123da95..d934e46 100644
--- a/src/main/java/com/ruoyi/basic/controller/SupplierManageController.java
+++ b/src/main/java/com/ruoyi/basic/controller/SupplierManageController.java
@@ -4,10 +4,13 @@
import com.ruoyi.basic.dto.SupplierManageDto;
import com.ruoyi.basic.pojo.SupplierManage;
import com.ruoyi.basic.service.ISupplierService;
+import com.ruoyi.framework.aspectj.lang.annotation.Log;
+import com.ruoyi.framework.aspectj.lang.enums.BusinessType;
import com.ruoyi.framework.web.domain.AjaxResult;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.util.CollectionUtils;
import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
import javax.servlet.http.HttpServletResponse;
import java.util.List;
@@ -87,6 +90,16 @@
}
/**
+ * 渚涘簲鍟嗗鍏�
+ */
+ @PostMapping("/import")
+ @Log(title = "渚涘簲鍟嗗鍏�", businessType = BusinessType.IMPORT)
+ public AjaxResult importData(MultipartFile file) {
+ return AjaxResult.success(supplierService.importData(file));
+ }
+
+
+ /**
* 渚涘簲鍟嗛�夐」鎺ュ彛
* @return
*/
diff --git a/src/main/java/com/ruoyi/basic/excel/SupplierManageExcelDto.java b/src/main/java/com/ruoyi/basic/excel/SupplierManageExcelDto.java
index c91592e..29e1af0 100644
--- a/src/main/java/com/ruoyi/basic/excel/SupplierManageExcelDto.java
+++ b/src/main/java/com/ruoyi/basic/excel/SupplierManageExcelDto.java
@@ -5,6 +5,7 @@
import com.ruoyi.framework.aspectj.lang.annotation.Excel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
+import org.springframework.format.annotation.DateTimeFormat;
import java.time.LocalDateTime;
@@ -38,7 +39,8 @@
@Excel(name = "缁存姢浜�")
private String maintainUserName;
- @Excel(name = "缁存姢鏃堕棿")
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
- private LocalDateTime maintainTime;
+// @Excel(name = "缁存姢鏃堕棿")
+// @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+// @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+// private LocalDateTime maintainTime;
}
diff --git a/src/main/java/com/ruoyi/basic/pojo/Customer.java b/src/main/java/com/ruoyi/basic/pojo/Customer.java
index 1c7898a..d68b918 100644
--- a/src/main/java/com/ruoyi/basic/pojo/Customer.java
+++ b/src/main/java/com/ruoyi/basic/pojo/Customer.java
@@ -85,11 +85,14 @@
private String addressPhone;
@ApiModelProperty(value = "閾惰鍩烘湰鎴�")
+ @Excel(name = "閾惰鍩烘湰鎴�")
private String basicBankAccount;
@ApiModelProperty(value = "閾惰璐﹀彿")
+ @Excel(name = "閾惰璐﹀彿")
private String bankAccount;
@ApiModelProperty(value = "寮�鎴疯鍙�")
+ @Excel(name = "寮�鎴疯鍙�")
private String bankCode;
}
diff --git a/src/main/java/com/ruoyi/basic/pojo/Product.java b/src/main/java/com/ruoyi/basic/pojo/Product.java
index e806af7..6b4e14b 100644
--- a/src/main/java/com/ruoyi/basic/pojo/Product.java
+++ b/src/main/java/com/ruoyi/basic/pojo/Product.java
@@ -28,5 +28,5 @@
@ApiModelProperty(value = "绉熸埛ID")
@TableField(fill = FieldFill.INSERT)
- private Integer tenantId;
+ private Long tenantId;
}
diff --git a/src/main/java/com/ruoyi/basic/pojo/ProductModel.java b/src/main/java/com/ruoyi/basic/pojo/ProductModel.java
index 69abd9e..335dd3a 100644
--- a/src/main/java/com/ruoyi/basic/pojo/ProductModel.java
+++ b/src/main/java/com/ruoyi/basic/pojo/ProductModel.java
@@ -1,6 +1,7 @@
package com.ruoyi.basic.pojo;
import com.baomidou.mybatisplus.annotation.*;
+import com.ruoyi.framework.aspectj.lang.annotation.Excel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@@ -19,19 +20,26 @@
/**
* 鍏宠仈浜у搧id
*/
+ @Excel(name = "鍏宠仈浜у搧id")
private Long productId;
+
+ @TableField(exist = false)
+ @Excel(name = "浜у搧鍚嶇О")
+ private String productName;
/**
* 瑙勬牸鍨嬪彿
*/
+ @Excel(name = "瑙勬牸鍨嬪彿")
private String model;
/**
* 鍗曚綅
*/
+ @Excel(name = "鍗曚綅")
private String unit;
@ApiModelProperty(value = "绉熸埛ID")
@TableField(fill = FieldFill.INSERT)
- private Integer tenantId;
+ private Long tenantId;
}
diff --git a/src/main/java/com/ruoyi/basic/pojo/SupplierManage.java b/src/main/java/com/ruoyi/basic/pojo/SupplierManage.java
index 8a7054f..3855879 100644
--- a/src/main/java/com/ruoyi/basic/pojo/SupplierManage.java
+++ b/src/main/java/com/ruoyi/basic/pojo/SupplierManage.java
@@ -16,6 +16,7 @@
private Integer id;
@ApiModelProperty(value = "渚涘簲鍟嗗悕绉�")
+
private String supplierName;
@ApiModelProperty(value = "绾崇◣浜鸿瘑鍒彿")
@@ -64,5 +65,5 @@
@ApiModelProperty(value = "绉熸埛ID")
@TableField(fill = FieldFill.INSERT)
- private Integer tenantId;
+ private Long tenantId;
}
diff --git a/src/main/java/com/ruoyi/basic/service/ICustomerService.java b/src/main/java/com/ruoyi/basic/service/ICustomerService.java
index e4d9c2b..4ec8646 100644
--- a/src/main/java/com/ruoyi/basic/service/ICustomerService.java
+++ b/src/main/java/com/ruoyi/basic/service/ICustomerService.java
@@ -4,6 +4,7 @@
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.IService;
import com.ruoyi.basic.pojo.Customer;
+import org.springframework.web.multipart.MultipartFile;
import java.util.List;
@@ -64,4 +65,6 @@
List customerList(Customer customer);
List<Customer> selectCustomerLists(Customer customer);
+
+ Boolean importData(MultipartFile file);
}
diff --git a/src/main/java/com/ruoyi/basic/service/IProductModelService.java b/src/main/java/com/ruoyi/basic/service/IProductModelService.java
index 2e81fd7..f254612 100644
--- a/src/main/java/com/ruoyi/basic/service/IProductModelService.java
+++ b/src/main/java/com/ruoyi/basic/service/IProductModelService.java
@@ -6,6 +6,7 @@
import com.ruoyi.basic.dto.ProductDto;
import com.ruoyi.basic.dto.ProductModelDto;
import com.ruoyi.basic.pojo.ProductModel;
+import org.springframework.web.multipart.MultipartFile;
import java.util.List;
@@ -31,4 +32,6 @@
* @return
*/
IPage<ProductModel> modelListPage(Page page , ProductDto productDto);
+
+ Boolean importProduct(MultipartFile file);
}
diff --git a/src/main/java/com/ruoyi/basic/service/ISupplierService.java b/src/main/java/com/ruoyi/basic/service/ISupplierService.java
index d9dd829..f3e46c2 100644
--- a/src/main/java/com/ruoyi/basic/service/ISupplierService.java
+++ b/src/main/java/com/ruoyi/basic/service/ISupplierService.java
@@ -5,6 +5,8 @@
import com.baomidou.mybatisplus.extension.service.IService;
import com.ruoyi.basic.dto.SupplierManageDto;
import com.ruoyi.basic.pojo.SupplierManage;
+import com.ruoyi.framework.web.domain.AjaxResult;
+import org.springframework.web.multipart.MultipartFile;
import javax.servlet.http.HttpServletResponse;
import java.util.List;
@@ -53,4 +55,6 @@
* @param supplierManageDto
*/
void supplierExport(HttpServletResponse response, SupplierManageDto supplierManageDto);
+
+ Boolean importData(MultipartFile file);
}
diff --git a/src/main/java/com/ruoyi/basic/service/impl/CustomerServiceImpl.java b/src/main/java/com/ruoyi/basic/service/impl/CustomerServiceImpl.java
index afc1c30..07431ac 100644
--- a/src/main/java/com/ruoyi/basic/service/impl/CustomerServiceImpl.java
+++ b/src/main/java/com/ruoyi/basic/service/impl/CustomerServiceImpl.java
@@ -11,10 +11,13 @@
import com.ruoyi.basic.service.ICustomerService;
import com.ruoyi.common.utils.SecurityUtils;
import com.ruoyi.common.utils.StringUtils;
+import com.ruoyi.common.utils.poi.ExcelUtil;
import com.ruoyi.framework.security.LoginUser;
+import com.ruoyi.project.system.domain.SysUser;
import lombok.AllArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Service;
+import org.springframework.web.multipart.MultipartFile;
import java.util.Arrays;
import java.util.List;
@@ -98,8 +101,8 @@
@Override
public int insertCustomer(Customer customer) {
LoginUser loginUser = SecurityUtils.getLoginUser();
- Integer tenantId = loginUser.getTenantId();
- customer.setTenantId(Long.valueOf(tenantId));
+ Long tenantId = loginUser.getTenantId();
+ customer.setTenantId(tenantId);
return customerMapper.insert(customer);
}
@@ -112,8 +115,8 @@
@Override
public int updateCustomer(Customer customer) {
LoginUser loginUser = SecurityUtils.getLoginUser();
- Integer tenantId = loginUser.getTenantId();
- customer.setTenantId(Long.valueOf(tenantId));
+ Long tenantId = loginUser.getTenantId();
+ customer.setTenantId(tenantId);
return customerMapper.updateById(customer);
}
@@ -142,6 +145,20 @@
}
@Override
+ public Boolean importData(MultipartFile file) {
+ try {
+ ExcelUtil<Customer> util = new ExcelUtil<Customer>(Customer.class);
+ List<Customer> userList = util.importExcel(file.getInputStream());
+
+ this.saveOrUpdateBatch(userList);
+ return true;
+ }catch (Exception e){
+ e.printStackTrace();
+ }
+ return false;
+ }
+
+ @Override
public List<Map<String, Object>> customerList(Customer customer) {
LambdaQueryWrapper<Customer> queryWrapper = Wrappers.lambdaQuery();
queryWrapper.select(Customer::getId, Customer::getCustomerName, Customer::getTaxpayerIdentificationNumber);
diff --git a/src/main/java/com/ruoyi/basic/service/impl/ProductModelServiceImpl.java b/src/main/java/com/ruoyi/basic/service/impl/ProductModelServiceImpl.java
index 6953d6e..eb9eedb 100644
--- a/src/main/java/com/ruoyi/basic/service/impl/ProductModelServiceImpl.java
+++ b/src/main/java/com/ruoyi/basic/service/impl/ProductModelServiceImpl.java
@@ -6,15 +6,21 @@
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ruoyi.basic.dto.ProductDto;
import com.ruoyi.basic.dto.ProductModelDto;
+import com.ruoyi.basic.mapper.ProductMapper;
import com.ruoyi.basic.mapper.ProductModelMapper;
+import com.ruoyi.basic.pojo.Product;
import com.ruoyi.basic.pojo.ProductModel;
import com.ruoyi.basic.service.IProductModelService;
import com.ruoyi.common.utils.bean.BeanUtils;
+import com.ruoyi.common.utils.poi.ExcelUtil;
import lombok.AllArgsConstructor;
import org.springframework.stereotype.Service;
+import org.springframework.web.multipart.MultipartFile;
import java.util.Arrays;
import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
/**
* 銆愯濉啓鍔熻兘鍚嶇О銆慡ervice涓氬姟灞傚鐞�
@@ -26,6 +32,7 @@
@AllArgsConstructor
public class ProductModelServiceImpl extends ServiceImpl<ProductModelMapper, ProductModel> implements IProductModelService {
+ private final ProductMapper productMapper;
private ProductModelMapper productModelMapper;
@Override
@@ -64,4 +71,26 @@
queryWrapper.eq(ProductModel::getProductId, productDto.getId());
return productModelMapper.selectPage(page, queryWrapper);
}
+
+ @Override
+ public Boolean importProduct(MultipartFile file) {
+ try {
+ ExcelUtil<ProductModel> productModelExcelUtil = new ExcelUtil<>(ProductModel.class);
+ List<ProductModel> productModelList = productModelExcelUtil.importExcel(file.getInputStream());
+ Map<String, List<ProductModel>> collect = productModelList.stream().collect(Collectors.groupingBy(ProductModel::getProductName));
+ collect.forEach((k,v)->{
+ Product product = productMapper.selectOne(new LambdaQueryWrapper<Product>().eq(Product::getProductName, k).last("LIMIT 1"));
+ if (product != null) {
+ v.forEach(productModel -> {
+ productModel.setProductId(product.getId());
+ });
+ this.saveOrUpdateBatch(v);
+ }
+ });
+ return true;
+ }catch (Exception e) {
+ e.printStackTrace();
+ }
+ return false;
+ }
}
diff --git a/src/main/java/com/ruoyi/basic/service/impl/ProductServiceImpl.java b/src/main/java/com/ruoyi/basic/service/impl/ProductServiceImpl.java
index 9825b39..b93e14a 100644
--- a/src/main/java/com/ruoyi/basic/service/impl/ProductServiceImpl.java
+++ b/src/main/java/com/ruoyi/basic/service/impl/ProductServiceImpl.java
@@ -10,8 +10,11 @@
import com.ruoyi.basic.pojo.ProductModel;
import com.ruoyi.basic.service.IProductService;
import com.ruoyi.common.utils.bean.BeanUtils;
+import com.ruoyi.common.utils.poi.ExcelUtil;
+import com.ruoyi.framework.web.domain.AjaxResult;
import lombok.AllArgsConstructor;
import org.springframework.stereotype.Service;
+import org.springframework.web.multipart.MultipartFile;
import java.util.ArrayList;
import java.util.Arrays;
@@ -49,6 +52,8 @@
return tree;
}
+
+
// 閫掑綊鏋勫缓瀛愯妭鐐�
private List<ProductTreeDto> buildChildrenNodes(Long parentId) {
// 鏌ヨ褰撳墠鐖惰妭鐐圭殑瀛愯妭鐐�
diff --git a/src/main/java/com/ruoyi/basic/service/impl/SupplierServiceImpl.java b/src/main/java/com/ruoyi/basic/service/impl/SupplierServiceImpl.java
index a929dda..816fe04 100644
--- a/src/main/java/com/ruoyi/basic/service/impl/SupplierServiceImpl.java
+++ b/src/main/java/com/ruoyi/basic/service/impl/SupplierServiceImpl.java
@@ -10,11 +10,17 @@
import com.ruoyi.basic.pojo.Customer;
import com.ruoyi.basic.pojo.SupplierManage;
import com.ruoyi.basic.service.ISupplierService;
+import com.ruoyi.common.utils.SecurityUtils;
import com.ruoyi.common.utils.poi.ExcelUtil;
+import com.ruoyi.framework.web.domain.AjaxResult;
+import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
+import org.springframework.web.multipart.MultipartFile;
import javax.servlet.http.HttpServletResponse;
+import java.time.LocalDate;
+import java.util.ArrayList;
import java.util.List;
@Service
@@ -87,4 +93,29 @@
ExcelUtil<SupplierManageExcelDto> util = new ExcelUtil<SupplierManageExcelDto>(SupplierManageExcelDto.class);
util.exportExcel(response, supplierManageList, "渚涘簲鍟嗗鍑�");
}
+
+ @Override
+ public Boolean importData(MultipartFile file) {
+
+ try {
+ ExcelUtil<SupplierManageExcelDto> util = new ExcelUtil<SupplierManageExcelDto>(SupplierManageExcelDto.class);
+ List<SupplierManageExcelDto> list = util.importExcel(file.getInputStream());
+ ArrayList<SupplierManage> supplierManages = new ArrayList<>();
+ list.stream().forEach(dto -> {
+ SupplierManage supplierManage = new SupplierManage();
+ BeanUtils.copyProperties(dto,supplierManage);
+ supplierManage.setMaintainTime(LocalDate.now());
+ Long userId = SecurityUtils.getLoginUser().getUser().getUserId();
+
+ supplierManage.setMaintainUserId(Integer.parseInt(userId+""));
+ supplierManages.add(supplierManage);
+ });
+
+ this.saveOrUpdateBatch(supplierManages);
+ return true;
+ }catch (Exception e){
+ e.printStackTrace();
+ }
+ return false;
+ }
}
diff --git a/src/main/java/com/ruoyi/common/config/IgnoreTableConfig.java b/src/main/java/com/ruoyi/common/config/IgnoreTableConfig.java
index 597a0af..fcb7a12 100644
--- a/src/main/java/com/ruoyi/common/config/IgnoreTableConfig.java
+++ b/src/main/java/com/ruoyi/common/config/IgnoreTableConfig.java
@@ -32,5 +32,6 @@
IGNORE_TABLES.add("DepartmentHierarchy");
IGNORE_TABLES.add("sys_oper_log");
IGNORE_TABLES.add("sys_user_dept");
+ IGNORE_TABLES.add("sys_job_log");
}
}
diff --git a/src/main/java/com/ruoyi/common/config/MybatisHandler.java b/src/main/java/com/ruoyi/common/config/MybatisHandler.java
index ec8aa3c..71d9b56 100644
--- a/src/main/java/com/ruoyi/common/config/MybatisHandler.java
+++ b/src/main/java/com/ruoyi/common/config/MybatisHandler.java
@@ -12,7 +12,7 @@
@Override
public void insertFill(MetaObject metaObject) {
Integer userId = null;
- Integer tenantId = null;
+ Long tenantId = null;
try {
userId = SecurityUtils.getUserId().intValue();
tenantId = SecurityUtils.getLoginUser().getTenantId();
@@ -23,7 +23,7 @@
this.strictInsertFill(metaObject, "updateTime", LocalDateTime.class, LocalDateTime.now());
this.strictInsertFill(metaObject, "createUser", Integer.class, userId);
this.strictInsertFill(metaObject, "updateUser", Integer.class, userId);
- this.strictInsertFill(metaObject, "tenantId", Integer.class, tenantId);
+ this.strictInsertFill(metaObject, "tenantId", Long.class, tenantId);
}
@Override
diff --git a/src/main/java/com/ruoyi/common/handler/CustomTenantLineHandler.java b/src/main/java/com/ruoyi/common/handler/CustomTenantLineHandler.java
index 031f614..d1b6d54 100644
--- a/src/main/java/com/ruoyi/common/handler/CustomTenantLineHandler.java
+++ b/src/main/java/com/ruoyi/common/handler/CustomTenantLineHandler.java
@@ -19,7 +19,7 @@
@Override
public Expression getTenantId() {
try {
- Integer tenantId = SecurityUtils.getLoginUser().getTenantId();
+ Long tenantId = SecurityUtils.getLoginUser().getTenantId();
return new LongValue(tenantId);
} catch (Exception e) {
return null;
diff --git a/src/main/java/com/ruoyi/framework/security/LoginUser.java b/src/main/java/com/ruoyi/framework/security/LoginUser.java
index 33f27a2..3b020b0 100644
--- a/src/main/java/com/ruoyi/framework/security/LoginUser.java
+++ b/src/main/java/com/ruoyi/framework/security/LoginUser.java
@@ -74,7 +74,7 @@
/**
* 绉熸埛ID
*/
- private Integer tenantId;
+ private Long tenantId;
/**
* 褰撳墠閮ㄩ棬id
@@ -99,7 +99,7 @@
this.permissions = permissions;
}
- public LoginUser(Long userId, Long [] deptIds, SysUser user,Integer tenantId, Set<String> permissions)
+ public LoginUser(Long userId, Long [] deptIds, SysUser user,Long tenantId, Set<String> permissions)
{
this.userId = userId;
this.deptIds = deptIds;
@@ -108,7 +108,7 @@
this.tenantId = tenantId;
}
- public LoginUser(Long userId, Long [] deptIds, SysUser user,Integer tenantId,Long currentDeptId, Set<String> permissions)
+ public LoginUser(Long userId, Long [] deptIds, SysUser user,Long tenantId,Long currentDeptId, Set<String> permissions)
{
this.userId = userId;
this.deptIds = deptIds;
@@ -293,11 +293,11 @@
return null;
}
- public Integer getTenantId() {
+ public Long getTenantId() {
return tenantId;
}
- public void setTenantId(Integer tenantId) {
+ public void setTenantId(Long tenantId) {
this.tenantId = tenantId;
}
diff --git a/src/main/java/com/ruoyi/framework/security/service/UserDetailsServiceImpl.java b/src/main/java/com/ruoyi/framework/security/service/UserDetailsServiceImpl.java
index 53cca34..c1b46e0 100644
--- a/src/main/java/com/ruoyi/framework/security/service/UserDetailsServiceImpl.java
+++ b/src/main/java/com/ruoyi/framework/security/service/UserDetailsServiceImpl.java
@@ -71,7 +71,7 @@
// 鏌ヨ绉熸埛
Long teantId = deptMapper.maxLevelDeptId(factoryId);
user.setCurrentDeptId(factoryId);
- user.setTenantId(teantId.intValue());
+ user.setTenantId(teantId);
}
}
// 鑾峰彇鐢ㄦ埛褰撳墠鐧诲綍閮ㄩ棬锛屽苟鏌ヨ绉熸埛id
diff --git a/src/main/java/com/ruoyi/project/system/controller/SysLoginController.java b/src/main/java/com/ruoyi/project/system/controller/SysLoginController.java
index 9d67b6f..c9f0e1e 100644
--- a/src/main/java/com/ruoyi/project/system/controller/SysLoginController.java
+++ b/src/main/java/com/ruoyi/project/system/controller/SysLoginController.java
@@ -79,7 +79,7 @@
LoginUser loginUser = SecurityUtils.getLoginUser();
SysUser user = loginUser.getUser();
// 鑾峰彇褰撳墠鐧诲綍鍏徃
- Integer tenantId = loginUser.getTenantId();
+ Long tenantId = loginUser.getTenantId();
if(null != tenantId){
user.setTenantId(tenantId);
SysDept sysDept = sysDeptMapper.selectDeptById(tenantId.longValue());
diff --git a/src/main/java/com/ruoyi/project/system/domain/SysUser.java b/src/main/java/com/ruoyi/project/system/domain/SysUser.java
index d461608..b568471 100644
--- a/src/main/java/com/ruoyi/project/system/domain/SysUser.java
+++ b/src/main/java/com/ruoyi/project/system/domain/SysUser.java
@@ -88,7 +88,7 @@
private Long roleId;
/** 绉熸埛ID */
- private Integer tenantId;
+ private Long tenantId;
private Long[] deptIds;
@@ -319,11 +319,11 @@
this.roleId = roleId;
}
- public Integer getTenantId() {
+ public Long getTenantId() {
return tenantId;
}
- public void setTenantId(Integer tenantId) {
+ public void setTenantId(Long tenantId) {
this.tenantId = tenantId;
}
diff --git a/src/main/java/com/ruoyi/purchase/controller/PurchaseLedgerController.java b/src/main/java/com/ruoyi/purchase/controller/PurchaseLedgerController.java
index bfb9a31..eb917ec 100644
--- a/src/main/java/com/ruoyi/purchase/controller/PurchaseLedgerController.java
+++ b/src/main/java/com/ruoyi/purchase/controller/PurchaseLedgerController.java
@@ -88,6 +88,15 @@
return salesLedgerService.getSalesNo();
}
+
+ /**
+ * 鏍规嵁閿�鍞悎鍚屾煡璇骇鍝佷俊鎭�
+ */
+ @GetMapping("/getProductBySalesNo")
+ public AjaxResult getProductBySalesNo(Long id) {
+ return AjaxResult.success(purchaseLedgerService.getProductBySalesNo(id));
+ }
+
/**
* 鏌ヨ閲囪喘鍚堝悓鍙�
*/
diff --git a/src/main/java/com/ruoyi/purchase/pojo/ProductRecord.java b/src/main/java/com/ruoyi/purchase/pojo/ProductRecord.java
index c1d33ac..eda285a 100644
--- a/src/main/java/com/ruoyi/purchase/pojo/ProductRecord.java
+++ b/src/main/java/com/ruoyi/purchase/pojo/ProductRecord.java
@@ -121,5 +121,5 @@
private Date createdAt;
@TableField(fill = FieldFill.INSERT)
- private Integer tenantId;
+ private Long tenantId;
}
diff --git a/src/main/java/com/ruoyi/purchase/service/IPurchaseLedgerService.java b/src/main/java/com/ruoyi/purchase/service/IPurchaseLedgerService.java
index a8520c4..e1978f1 100644
--- a/src/main/java/com/ruoyi/purchase/service/IPurchaseLedgerService.java
+++ b/src/main/java/com/ruoyi/purchase/service/IPurchaseLedgerService.java
@@ -5,6 +5,7 @@
import com.baomidou.mybatisplus.extension.service.IService;
import com.ruoyi.purchase.dto.PurchaseLedgerDto;
import com.ruoyi.purchase.pojo.PurchaseLedger;
+import com.ruoyi.sales.pojo.InvoiceRegistrationProduct;
import java.io.IOException;
import java.util.List;
@@ -34,4 +35,6 @@
PurchaseLedgerDto getPurchaseNoById(Long id);
IPage<PurchaseLedger> selectPurchaseLedgerListPage(IPage ipage, PurchaseLedger purchaseLedger);
+
+ List<InvoiceRegistrationProduct> getProductBySalesNo(Long id);
}
diff --git a/src/main/java/com/ruoyi/purchase/service/impl/PaymentRegistrationServiceImpl.java b/src/main/java/com/ruoyi/purchase/service/impl/PaymentRegistrationServiceImpl.java
index 95a51ff..9cab585 100644
--- a/src/main/java/com/ruoyi/purchase/service/impl/PaymentRegistrationServiceImpl.java
+++ b/src/main/java/com/ruoyi/purchase/service/impl/PaymentRegistrationServiceImpl.java
@@ -121,8 +121,8 @@
}
LoginUser loginUser = SecurityUtils.getLoginUser();
- Integer tenantId = loginUser.getTenantId();
- paymentRegistration.setTenantId(tenantId.longValue());
+ Long tenantId = loginUser.getTenantId();
+ paymentRegistration.setTenantId(tenantId);
paymentRegistration.setRegistrantId(loginUser.getUserId());
paymentRegistration.setCreateTime(DateUtils.getNowDate());
paymentRegistration.setUpdateTime(DateUtils.getNowDate());
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 94066bb..ac9691b 100644
--- a/src/main/java/com/ruoyi/purchase/service/impl/PurchaseLedgerServiceImpl.java
+++ b/src/main/java/com/ruoyi/purchase/service/impl/PurchaseLedgerServiceImpl.java
@@ -28,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;
@@ -85,6 +84,8 @@
private final ProductRecordMapper productRecordMapper;
+ private final InvoiceRegistrationProductMapper invoiceRegistrationProductMapper;
+
@Value("${file.upload-dir}")
private String uploadDir;
@@ -111,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());
@@ -427,6 +428,18 @@
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;
+ }
+
/**
* 涓嬪垝绾垮懡鍚嶈浆椹煎嘲鍛藉悕
*/
diff --git a/src/main/java/com/ruoyi/sales/pojo/InvoiceLedger.java b/src/main/java/com/ruoyi/sales/pojo/InvoiceLedger.java
index 802ae90..bac55ed 100644
--- a/src/main/java/com/ruoyi/sales/pojo/InvoiceLedger.java
+++ b/src/main/java/com/ruoyi/sales/pojo/InvoiceLedger.java
@@ -57,6 +57,6 @@
@ApiModelProperty(value = "绉熸埛ID")
@TableField(fill = FieldFill.INSERT)
- private Integer tenantId;
+ private Long tenantId;
}
diff --git a/src/main/java/com/ruoyi/sales/pojo/InvoiceLedgerFile.java b/src/main/java/com/ruoyi/sales/pojo/InvoiceLedgerFile.java
index 2972dda..474e949 100644
--- a/src/main/java/com/ruoyi/sales/pojo/InvoiceLedgerFile.java
+++ b/src/main/java/com/ruoyi/sales/pojo/InvoiceLedgerFile.java
@@ -40,5 +40,5 @@
@ApiModelProperty(value = "绉熸埛ID")
@TableField(fill = FieldFill.INSERT)
- private Integer tenantId;
+ private Long tenantId;
}
diff --git a/src/main/java/com/ruoyi/sales/pojo/InvoiceRegistration.java b/src/main/java/com/ruoyi/sales/pojo/InvoiceRegistration.java
index 0b8849d..080bd56 100644
--- a/src/main/java/com/ruoyi/sales/pojo/InvoiceRegistration.java
+++ b/src/main/java/com/ruoyi/sales/pojo/InvoiceRegistration.java
@@ -49,5 +49,5 @@
@ApiModelProperty(value = "绉熸埛ID")
@TableField(fill = FieldFill.INSERT)
- private Integer tenantId;
+ private Long tenantId;
}
diff --git a/src/main/java/com/ruoyi/sales/pojo/InvoiceRegistrationProduct.java b/src/main/java/com/ruoyi/sales/pojo/InvoiceRegistrationProduct.java
index ecfb880..23a2557 100644
--- a/src/main/java/com/ruoyi/sales/pojo/InvoiceRegistrationProduct.java
+++ b/src/main/java/com/ruoyi/sales/pojo/InvoiceRegistrationProduct.java
@@ -83,5 +83,5 @@
@ApiModelProperty(value = "绉熸埛ID")
@TableField(fill = FieldFill.INSERT)
- private Integer tenantId;
+ private Long tenantId;
}
diff --git a/src/main/java/com/ruoyi/sales/pojo/ReceiptPayment.java b/src/main/java/com/ruoyi/sales/pojo/ReceiptPayment.java
index 1971d4a..7963758 100644
--- a/src/main/java/com/ruoyi/sales/pojo/ReceiptPayment.java
+++ b/src/main/java/com/ruoyi/sales/pojo/ReceiptPayment.java
@@ -58,6 +58,6 @@
@ApiModelProperty(value = "绉熸埛ID")
@TableField(fill = FieldFill.INSERT)
- private Integer tenantId;
+ private Long tenantId;
}
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..6a2536e 100644
--- a/src/main/java/com/ruoyi/sales/service/impl/SalesLedgerServiceImpl.java
+++ b/src/main/java/com/ruoyi/sales/service/impl/SalesLedgerServiceImpl.java
@@ -504,7 +504,7 @@
}
// 2. 鏌ヨ褰撳ぉ/鍏徃宸插瓨鍦ㄧ殑搴忓垪鍙凤紙涓庡師閫昏緫涓�鑷达級
- Integer tenantId = SecurityUtils.getLoginUser().getTenantId();
+ Long tenantId = SecurityUtils.getLoginUser().getTenantId();
if(null != tenantId){
//鑾峰彇鍏徃缂栧彿
SysDept sysDept = sysDeptMapper.selectDeptById(tenantId.longValue());
--
Gitblit v1.9.3